5677 files changed, 31733 insertions, 24537 deletions

diff --git a/Manifest b/Manifest
index b232591ac92f..4bfab06cbec8 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 28802 BLAKE2B 2513cdb86b9f8f739c9a0b8e6150330df6f74754b488a7bbfcf0bb167b9f6c84ece7959b809456b9959da2a22c06325c1e6d3cc94e2bd0215d4a7e880311e4f0 SHA512 a30c94922408f7a3850878e5fd8036da975a33e05f70f818c524973c406511382c3256e1f2ff22fbaf36066ee9ccb027edff4955e5570d121e7ad8e7e30a1f0d
-TIMESTAMP 2018-01-13T05:38:58Z
+MANIFEST Manifest.files.gz 28824 BLAKE2B d363e2baff52469a0ddbe74bac1d7a09e44a58db5fab42a0e23520804f3ed85226136c77b2320f027af2b92796ffa15a6d05ad590008074fbd09d5f2b020432a SHA512 81252e33c278ee44307e24d146ca737fac98b4a7d659a282b7221ab5b3769e30c50fe8784a78e720fd6599105527f61e1c7ab3eb1101704414702c85897c2a1d
+TIMESTAMP 2018-01-16T16:39:22Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpZm3JfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpeKrpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDGjxAAtnnPZx+XrbXmyKDd0IHkBfVeo4UsFZYEjsLbb9YoXTYOPaCjyg+iZqdt
-4/3X3kqRoj36znF8rZy8UNClhky2uo3iVUcVdtiGZwdzB1Qsiqs/30NRBSBjgrNp
-w3U21QHECyuI2E9lD1HOcsNIB84qDFISklipt4UxRdaeFHqXKinjNbzUxL3cdzCH
-Q2Hvw0Kk6iB+Kfp6reFVTKlN0bxOOnscrMLFkH+N22IUAGUoPEfacucRblEaIEIp
-nmGeJfhxUzMbfzPF/g6cyhQFUDx7nrDLCFj7RnwlagNnPHwgnLRCpqlqA4b6ZkzQ
-g60W9p5jvZbdVZfl5dsjJRQeHzs1uVt3h2dOxMA7f927rpRKvAZS8A6feVjZSqZX
-3SVdZ2mUr7Yoluzql8hJFeBXUqxJUe/IAqaGKOS9FXpyDEwNbbkKhUKSDjX4Q4/N
-dF21EA20Sxw38NNeuz6uGeQ9T6xgDiI0e8HXmZTOMAlsGJh4sQq4fJqsAeWx8ABB
-nF27SYZeZoveCVJ5Qz1h6IHj+YGiwvd8OwZQMNADTmFyVJPEV/pUm1F9EyMxiJbG
-mhOrPK4I17lQoa4rSakX2hDQG18xvGYcRjwDqvCXfoHP6t/8ioQ444XPTGwWeGZZ
-gpQhrZuNoPWbLj+PcM4obfSbHExxNlpKeB8U0kVtxJI4r+q9WYM=
-=68kw
+klD/vRAAiipgxrq6mdzJDuH1ayMjvhw9bht40I7LmTZSQtNBIs8QJGlort3BkS5D
+vvFwcY7c+PytDqKQk73ySBwgcbzw0MvfY7LC0wHfkrgoZ7Y3oth/vjDdPCpu/Yly
+RWXvZClQRGnMegdbBQr7HHGtg1IBtoxBAlL/bwItcpb2Irix0btbZCT5USso/opl
+jeeor3sjoSUPcaS0D574FgWRSl6ymeHqq1q6WiHbU8m/tTvhKGEKqixfO72+N7e4
+KhWkpKurF1oRu1RG1N97RO+SAncK2MM5CW0lBS51DXQa/pvadNNGrwCiRBneH0EX
+O8+cCMSLH46S9duVzkJG3jN8T+r04oe8pz6zZnHGoSiuXSy7nxnz/U2X4FG31NTt
+cs8Xelk3HKsdEEvoexKakvtPQhQPtioSYWryZi5FUbumB20ltsfizuvT1lnEjP1K
+GMOp6BCXNvzpr8m2vSMO/S3MWaarAvY8FS8yhT7VmX5H53g5gPS2W83+pN+D+pbG
+fw7olLN5It4OggB3/poP8olEFB6xw51jKnApjOjhgniPqUR86/JsSYp8zEV8IrFn
+WW96SYGLpIJhWnRGvHhLYtNaVRJwsyXailGJ94QU5gu4vE1uZ011fbioObZrNYXu
+88G+knjl/qAadvfAFPv+jywEfhqho0g1i6XTpXyFEifN4F8vqtg=
+=nNJI
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 2ba9e85ecce4..6536323d4e1d 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index a521820a7c34..7c2837a11688 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/at-spi2-atk/Manifest b/app-accessibility/at-spi2-atk/Manifest
index 9ca44cb3b1d0..ced80dcf85c0 100644
--- a/app-accessibility/at-spi2-atk/Manifest
+++ b/app-accessibility/at-spi2-atk/Manifest
@@ -10,5 +10,5 @@ AUX at-spi2-atk-2.20.0-tests-data/test-value.xml 289 BLAKE2B 0d8a8421e4443aab9a9
 DIST at-spi2-atk-2.22.0.tar.xz 306148 BLAKE2B 3606f96ca89dcc23700c2aaa67da9daf51709113b5d5a15d4864e565dd559e4136007f125801de08e9c6bc6c14d7b1c39e8307340c1758a6145aeb0caeb0a5c9 SHA512 9b815eecbe01164df8a3341a3b0e1fe57a4f333964a0836f89f54712512a32d69c333c0c099eb194716d081f5460bb6e6d2c852f7218df51549e88e75880f284
 DIST at-spi2-atk-2.24.1.tar.xz 308576 BLAKE2B 92b96c54cd5a2dbd8a3dddbaa3188b3396ef8e4631cc9438e4ba57da27672d509babae3415c66d2c6afc74855ff0536d4cc6f24a8cecf66478021d350b3572a1 SHA512 5dbc186c7ea4f7f34aa0acaf90f683e549162caa274ba5b5818ae9992b52f1b475923d9818870978e87e3dacdf1018db31810d2d53b39bb4f068bcb64a423f23
 EBUILD at-spi2-atk-2.22.0.ebuild 1305 BLAKE2B 5eb5cf35564ecdf2dc0bed7bcdfb0f7cea1a89d9ff7d0aa711a6b0eb257350c54ec16380d121c12c69df23d9b064f2eb77b61d7da58dce4e888963566cf4bac4 SHA512 e9a31fbdabb3ed984bb7909faa53c4ea34915d551b2e24791282610819989168da73215586d470b4862620d334b68b0bd8832370c6a1b36b0482bdbbbdd225cf
-EBUILD at-spi2-atk-2.24.1.ebuild 1314 BLAKE2B 492c847887b7de21ef3469f213939d210250ef2217698bae35484d2f9e013a16e21c09ff6ed9e31846582e10a4e17e56ff0fbb6a11057528522bdee56dfd715d SHA512 682d6dae219b7d16e32cf2cf6990dee0dd2361aa6b69e1fe0bc645292a48231c6764e4d75c64bf2bf4769c8df4d56dfcc7d74cb9eb88bb198c431398a5eeddba
+EBUILD at-spi2-atk-2.24.1.ebuild 1313 BLAKE2B e4afe452b316fce94648483d3dc481e7548a929df496cc8bdfac179f60ee034cde4f4f917f86a47079c96f98d044c1056050865592ce42322a1b3eb18ba89698 SHA512 9c8a7aae69a8d9accded33b094b8d50d36635c5cb61876f4e7b25e53e7b4eee7ccd4973768c07650736cdcd79be73834036286611e9eca7499b6b9eb31c26dc3
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild b/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
index 13c9a1bdd7fd..507799ad86a1 100644
--- a/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
+++ b/app-accessibility/at-spi2-atk/at-spi2-atk-2.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="test"
 
 COMMON_DEPEND="
diff --git a/app-accessibility/at-spi2-core/Manifest b/app-accessibility/at-spi2-core/Manifest
index ac90f7f6d715..90ffdb4ac9fe 100644
--- a/app-accessibility/at-spi2-core/Manifest
+++ b/app-accessibility/at-spi2-core/Manifest
@@ -2,5 +2,5 @@ AUX at-spi2-core-2.0.2-disable-teamspaces-test.patch 302 BLAKE2B 4165c68b7e8d983
 DIST at-spi2-core-2.22.1.tar.xz 454048 BLAKE2B 5ee4cdb83815258d9be8b81870b590b2f85311acf75e3c830c00092cbe5dd66a07f933318ce7d4bc308308f6f87e46579b30948b67b8b7f753adc5e10589246b SHA512 2376b57ce744351ed09a13cd02f0c02264c0998860710cfcdac59f0efb78061512986f5d7305a2f6c594d70213722f81795620e8cd2c6587c6d3f1335477171f
 DIST at-spi2-core-2.24.1.tar.xz 452440 BLAKE2B 2e3e262d507dadbdb8fc5bb1bd60d3dbe8a9c2946228b6dc551d0a9564684d96b1b6cbe29849c1d846b3106b5444a2c6880a10825ba20cca87893f6a52815023 SHA512 e7f354a90204f12d4e464a6b4e4cb27141af3715d7c5ec253bdd2ebe65bc7d191ae7b775c45470a1bd1fe2c0accdd4e84feeb5e1eb1a6c05f3e5e734371027be
 EBUILD at-spi2-core-2.22.1.ebuild 1771 BLAKE2B e401dfb647adf50ce166d5871393ef12af00af92d26e0c1d735cbe3ed927ef9b2bd9a63438e7ffa7736a9d61940c8783d6b31307bd2c0ef7aacb12cb7c05ee95 SHA512 824732f4a7c7fc484fb591a7862d8a18a5326ad58150e3c23befb8f23d089d5a5fe7cd71ac7914877aff6015b99b10c086bc4a3cf6fb9b1ad71ab8085e9ba722
-EBUILD at-spi2-core-2.24.1.ebuild 1780 BLAKE2B 5285e77fe245012ff72cfce6fe6077826e19c625061eaadb73a02a49db8eb30108cb65bf0dcecf70ca2424fbb6a9e79108d2862ce54a631ff3ad07a3ea7f653f SHA512 67dd60c666a87d9f052bed1acdf7c9460224443e1fd30608ef06a13e556ec50a9b9a7503bd8af8b0d22aeaca98abb407bf2971f7cb3c06918f720a18010f55d5
+EBUILD at-spi2-core-2.24.1.ebuild 1779 BLAKE2B 11da2ae629c6f4ba8a06094e065ad589712c5abccf2c00689061c4e1e1ca2b951264368ae6d9846997da5eb81428e93372fdf6a2658e4aedd6dee70c13c8c621 SHA512 77bd6f6f55482d91fc6071294eda059ee1bca6d0dacf015056c39428a15b9317a4fc44a38b3b40dd87f2e87417eede0a46afeacd2c0ff29903c9ebdcde3e0462
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild b/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
index 7a3aed291611..c291e6bc09b5 100644
--- a/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
+++ b/app-accessibility/at-spi2-core/at-spi2-core-2.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 LICENSE="LGPL-2+"
 SLOT="2"
 IUSE="X +introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 
 # x11-libs/libSM is needed until upstream #719808 is solved either
 # making the dep unneeded or fixing their configure
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 16886c9ebe4b..e72a4b8ed08d 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -3,5 +3,5 @@ DIST speech-dispatcher-0.8.3.tar.gz 1292321 BLAKE2B a9a69734b9aa3c38041ea2872fa8
 DIST speech-dispatcher-0.8.7.tar.gz 1333677 BLAKE2B 0b08f1a1228fe1240e14b3d52913f8fa64a1f2ee9b563294b49ea8d3e5cfd3041aa5572ec72354b360dabd2d263deb79e418b95b6174a5b89ee541e9fd23c7e2 SHA512 0e7af02e8521aa8d397ea4d0329f9a8d56970beed645456dfedc738ececd2ccd8ecfdf66e92ae852878a473ba991175e1d4dc2b8b0148c958163682b49678375
 EBUILD speech-dispatcher-0.8.1.ebuild 2645 BLAKE2B a6d970c44f8c1a1217de41fb6d78644ec3bccf0043116c6bd57a13fefa66927b93a84d45cf886946ea4b708cab1e49ff3ed59d886e790357980925741297f507 SHA512 7b9ada7edd6d2ccf949805c743f68848dbb35b8a3c4714e33b7a1c4248770165c77405214d24d38549d89309a85cc2233311b74594e9c0b21dcbc3390ab388a4
 EBUILD speech-dispatcher-0.8.3.ebuild 2626 BLAKE2B 357703a8a6f4417843ddbcd85954b50d957f68a633a38c1f26b4e95dd73328fbf1fef1ed8192e6013e9bce2c54647f1609cb12a1c26f7aee48f6a8a6bbf46017 SHA512 1556ab61c84259db988c92d9ad9f0d02d647872c97bfc04f59be31cadec4a9aa42a7eed3197bd3c6812daa330a7bb5075ed98cac9e1a8d743d784700ad7d53a3
-EBUILD speech-dispatcher-0.8.7.ebuild 2631 BLAKE2B 98117f5701dba68d88ea694e929f52f44345a73c127f4c84ec44fee23911766eceeaf04ce4e7912dbb87eca9cbcd8e6d418ca30cdc1a7768a2061d830231133e SHA512 3cb229e6012a9795283750478dfe64835aae212a6151e97cbcbcafa4cd48ff8d3da500ade6e65f6e24036b94ca449ec931ba7db2965a997fa9137b4dab0aeac3
+EBUILD speech-dispatcher-0.8.7.ebuild 2630 BLAKE2B 29e3d10692a618edff5d455a943fb08e1628a9e52da8d8a9d31c465e45159b9483a69b6bcc1c181834b28a0e04008f4fef5662f1859ac7a4422c1e3c4576729e SHA512 6512b77dcef92666b6fbeb281655806afc1dbe2ec99115b5e462827d827f4e07fcaa6adfaf546b344644ebb9200e1cd14c86d0d3034020dd3b08367e670e98e9
 MISC metadata.xml 632 BLAKE2B 2a60d2e822db36bf3f0547d97ccaad05d6bcce11afa71534b108358f1d71f857f200907f01c31c3083a5196e43eb681c06e2991a086c91731daced3f56282c2d SHA512 db94cba99bd2c9bbfe98b1647ac53a3861cbd697df791bea025e2a713a5991ca6929f2bc82a985ba38eef4a2571515d96aac6558fe143b68e24713490c12dd0a
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
index 215c3bf2c2c8..6c16832830c0 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.8.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://www.freebsoft.org/pub/projects/speechd/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE="alsa ao +espeak flite nas pulseaudio python static-libs"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 52f40d3ba774..eb0212e5f900 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/eselect/Manifest b/app-admin/eselect/Manifest
index 98c2318f5bd8..8d89595d5130 100644
--- a/app-admin/eselect/Manifest
+++ b/app-admin/eselect/Manifest
@@ -3,7 +3,7 @@ DIST eselect-1.4.11.tar.xz 177444 BLAKE2B e6f758e2acd17cea3ae37af48e4b4327a9c9d7
 DIST eselect-1.4.8.tar.xz 176692 BLAKE2B d24f87ecd7fed1f23a26f9017ecaecaf5b69c02ffbcf9cf7d7b93fa8cad6364d934de8196aff1af955076c167ac4fa8911be03473c757f6a623c63820f3b8255 SHA512 13faa3b21d352975498eb2ea62dfb8d371f30afd6e283c30ff4e89cef035598a8cfe8fafbc6763f39081c547f6743c7f4731d21170625781b89d64eb46c22194
 DIST eselect-1.4.9.tar.xz 176776 BLAKE2B 0e30f1d55470c49ee9c93da294cc66dbfb5638a3aa0677665936a5eb6f1d253c38736b4037c8676da526a01c75dec86f09fe37cebae954d41f2ae9b6955a088d SHA512 88e9d81086596849ef6daf87da3f782886286b1b829d0d6378c3c3c7d9f044a2eb2dc4e1596c2f49eb2ee4e443eebaab3be4bdb223a36bb5f7b66ac0686e2640
 EBUILD eselect-1.4.10.ebuild 1659 BLAKE2B 08caf31182bf2c672d82031328e3068f30465a68a5f2fa1883cac6b744b1c8be69f27d35ba70b528798482f699680c1e922d9706e6b372fc11793d9118578aed SHA512 1e9d9c9b857ca698882210565b9a178cfac83553e1b90a22485ab866891e2eeabda2fe9ef6c6514555db10024ca30bd665d0f0c9c38908fa3f1fec8812b4ac70
-EBUILD eselect-1.4.11.ebuild 1659 BLAKE2B 8b71dd594e82bbc0d72e9ddb3e42b748092074dc7464fa39da4185b8bbfeb5c08f96e4315eb5588d6c0660b70cac64d6606fdc7fa330a543309a0d809eb40274 SHA512 133b95fa86266dcee993e8fae269d0e521b8d15ce33a8213a246b3d6636a6ee9b40bf04ccffb05518c7347099b7bd9bbe2420e50b9600a220d940e5f196194dc
+EBUILD eselect-1.4.11.ebuild 1653 BLAKE2B 6538ff47c88170471f78818ac28d44cda8b441a3fc420b683c3e61217811ba52c5de2519f8cc641b410db6e4a59ac276b52bd33c00576150559292cd864110d6 SHA512 8d754f41fe01f1b92b15361b78563d685c8ee9c3e1abaf40e8ae7e5798908f5d3a07406feda13c413a897237132cb44d0f6d3fabe90c594f4484e6b36788f88a
 EBUILD eselect-1.4.8.ebuild 1653 BLAKE2B e8b465b071afd54478dad7b15672289deba1c5aebb34a01c065d35557149e9a840dac359d87922c1afc9bf136989aa7739a4fe34059a295b119b0199cade51ba SHA512 2511797662024b62a8fbb3286f7671785e09a29a2efd79a0631f1d46574ab03d71b9bf58328985e0043d04cfedc349af35a2695cdcc3b2848f9bfaec0e39b0b3
 EBUILD eselect-1.4.9.ebuild 1666 BLAKE2B 50d5f7993886cc9321667996626b1a9f63ab0aab3183a5a931efd230ed85763cdea503eeea3234aeabcc8e2d0b93f8f24cf1e0ba175c88ee5c978c6b2c873b3f SHA512 37ff35a9765872c8d96fa2129f1e7632106d40d6439dc85da2cd612fba4d198f47c4911ec1096a5ae199f0ef2315c4eb38fa9be04760e6469b975587060b66c7
 EBUILD eselect-9999.ebuild 1437 BLAKE2B a390e3198a7f7f52f48ef56bdb73a8075d5c4c1560c0df7971d32798f1296114053b16a8faeee2982b8e106be835e3b61c3655dc2de270b488259f185e8a8980 SHA512 06a5eb4f7bed5a17f9cd56fe497a7cadb7a153580fac6aeefd6f0762ed029c78c79e4f4a50301177eff4e50ac3ac5ddfae342eb0eb4b5c64aa6a840493fa5868
diff --git a/app-admin/eselect/eselect-1.4.11.ebuild b/app-admin/eselect/eselect-1.4.11.ebuild
index 16046ac94317..703a66821684 100644
--- a/app-admin/eselect/eselect-1.4.11.ebuild
+++ b/app-admin/eselect/eselect-1.4.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~ulm/eselect/${P}.tar.xz"
 
 LICENSE="GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="doc emacs vim-syntax"
 
 RDEPEND="sys-apps/sed
diff --git a/app-admin/mongo-tools/Manifest b/app-admin/mongo-tools/Manifest
index 5331976d303d..93b4a471c3cc 100644
--- a/app-admin/mongo-tools/Manifest
+++ b/app-admin/mongo-tools/Manifest
@@ -12,7 +12,7 @@ EBUILD mongo-tools-3.0.15.ebuild 1098 BLAKE2B ff13b5f35493bead934b47f56a30246734
 EBUILD mongo-tools-3.2.12.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8f964e140353ad7ac025a5105e84f88688785b8777787abca5fd99c7358bd7395742f8340323bf4f918aee47543ca55 SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15
 EBUILD mongo-tools-3.2.13.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8f964e140353ad7ac025a5105e84f88688785b8777787abca5fd99c7358bd7395742f8340323bf4f918aee47543ca55 SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15
 EBUILD mongo-tools-3.2.16.ebuild 1198 BLAKE2B 3db31f3d6fde60f2f482a92415c93bfbb8f964e140353ad7ac025a5105e84f88688785b8777787abca5fd99c7358bd7395742f8340323bf4f918aee47543ca55 SHA512 f71ff59918d4d8278bae4408ff7649fdda928980d1cc08ab169391c5adbabed4e2d1ba0f4cfd23a8b0f05be1850c2037b971f99fd2ee2557ae76dfdae89e2d15
-EBUILD mongo-tools-3.2.17.ebuild 1222 BLAKE2B 9fa9d1407e44dfd3b41f13b828aed85dc7174e6c84634312000065ef0c8c8537005e6b76ee6028df02258333ccf13f7b87d713c96f35798ce9ce072de0ed87dc SHA512 fc34ecd308d0c22832afa41b51f1cfcc2fdd447e7c0269ca434ea01057b3d99366636fb94c86be7336a58f27ff69fd7427f2b15dc62965709fc656a2fc7594a1
+EBUILD mongo-tools-3.2.17.ebuild 1221 BLAKE2B 7943f052ee8a6b2fefb1c84233d87f7b3189ba6eee59d764cd2af46d9350d697ee3379405b40be77cc751fdcfccbf0f3aa61640d0e5fd0aafbfe5bac34ae7519 SHA512 1bb25c1e8c72fcc6fe0374ea3469634dfbdf3fa37d41a91bf9e562d16031a23ec227d3a402a0eeb1e66742773db983e823f68f7334c734638620f1040cefe87f
 EBUILD mongo-tools-3.4.10.ebuild 1238 BLAKE2B cefa920eea7240d51bf726c4717c7400556e76e63534566825625a842373a72a80e0a843f92574964199710fbc2c1b4522e52bdbc9bd1324288570aa318aac86 SHA512 c37664f0902b8a763181af85dbc2e20a0f2e0d63610fb83cb7f75fe3892b7ef265c2be8341635e052aa723de741872c5dc880672f8b3d1216e7ea5917e1cb13e
 EBUILD mongo-tools-3.6.2.ebuild 1257 BLAKE2B c9f6bf6e4e5aaf602e65f9dae6dc406506e4d590e392bc96cba776eaed1c4053e596ed6b1f55664b474e7b302d2032a9627fcf01b237ce06ec214275715d9fc2 SHA512 12eca5b3936d64a8cf0252c3cfa10594be9a7c5bfb22b4734c0ebbd9782e13249a9b389fd2e5d338cef721b4b1cf90c15237b8fda37b1e7e5a58a423a26af97c
 MISC metadata.xml 463 BLAKE2B 1e4d37c222538ce5d55e6f5c05ecbe85f57ac74eacaf5935540797f03c4c069b2ce2bd0cbb6b433eb86de9b2480058013759db3d504982df908c2ba9e1b4d2ec SHA512 f09474b3932dd6ae36da20c64a394acf65ad1e3a875e7ca743efa22db8b7e3109c9ebe4c489e62eda12c5bdd4d689ede61eca8a4cc89c42d0a08a270f041fcdc
diff --git a/app-admin/mongo-tools/mongo-tools-3.2.17.ebuild b/app-admin/mongo-tools/mongo-tools-3.2.17.ebuild
index 1da373e5820b..9616e9801418 100644
--- a/app-admin/mongo-tools/mongo-tools-3.2.17.ebuild
+++ b/app-admin/mongo-tools/mongo-tools-3.2.17.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mongodb/mongo-tools/archive/r${MY_PV}.tar.gz -> mong
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="sasl ssl"
 
 RDEPEND="!<dev-db/mongodb-3.0.0"
diff --git a/app-admin/puppet-agent/Manifest b/app-admin/puppet-agent/Manifest
index 37b0e6ebe6bf..4fc32fb746d8 100644
--- a/app-admin/puppet-agent/Manifest
+++ b/app-admin/puppet-agent/Manifest
@@ -6,11 +6,11 @@ AUX puppet.initd 765 BLAKE2B 4b48126506cbafe50bccd364a5aab10e57fb2412795122d3520
 AUX puppet.service 355 BLAKE2B 96b24396f6b91181c13ef66cb06ff8197135d0bceefe4b01bdeb461d337b369c7fb7721ccbb2bf8680c0e8029d281d1bb0d5eafc7de6393f8fe058b7e67285de SHA512 a4dfb4f510413f0c4cbdcac911d35c33659d661b1dd52f2f9fe296fcff53f8ea4b2270dcb0b56d0128d629e15ffffd1e2c75a4ae338c47233194a035965fe2d6
 DIST puppet-agent_1.10.9-1xenial_amd64.deb 16308224 BLAKE2B c7fb29e83b0aff89c01f9625b9233871e799bb85d80ec17e38f4ef598d9eb268c2bab04b7bb8304370c304909570ea93fd8f467d101f5e4a1c40aaa9794c5083 SHA512 5fc5d70a9fabeb73ac384875f485263c9e890d3792e56aa41f42de86c971190a21526381bb5330c2f52790e6aa82b9c1e5a7dd61f378b086b78cab8de7120b5b
 DIST puppet-agent_1.10.9-1xenial_i386.deb 16202586 BLAKE2B 293d7802058caf762157c209e233a344d565c0d9a536b6aba92d787647f2b2708f45dedb80d0fb1a270f0867ec9aa91bdd91b8615e689ac98ca65bebf861fdb4 SHA512 19b84b5b6080c5b842877d9e7ee6b10837309c25e52429a14bc20939b18850eec616a5daa3a457d36504d51c9c0a8a9b71c3c9cb9c84dceb66e332a075b91e73
-DIST puppet-agent_5.3.3-1jessie_amd64.deb 16230292 BLAKE2B b06365ee797398329baae017b9608b6284a0a0f4e813fad17116d8820acb3bcb89bb536e1b7625c34b25efeb51dd1071e2385273ac48b89a2611550d8442684e SHA512 6b118325f56875879cf8088e40213bb12988a42066879fc2c52ebc82ebf712dcf7473190526629743b87800fc9f758e3ca78093175f132b18fc0a044aea6b384
-DIST puppet-agent_5.3.3-1jessie_i386.deb 16353862 BLAKE2B e54db4907fdc8836591e1911f16e426f3297e481afbc90f5d10bad7e3c5a3f0c71887320a401f29b50ef578f1f4ffc46adfbb6894213f6d0971fb0b80c6cf38e SHA512 32f151fbaf80e4918e0126ce3d4b689fbc676a16dcd9de0c0166d5c032aa0bc7e44b1eada2695dbbd463b5580cdfb3a181949645b9a4f1a3bf5256462d1e5bab
+DIST puppet-agent_5.3.3-1stretch_amd64.deb 15954126 BLAKE2B 08772e94464bc3d56685c8f3f7da77e322c849166c41ca5f2d6efb8100059631c500a8d381e3d94058e960398b2c1f1e0d25987e48c1886f8ae72a32bbb7895d SHA512 8c3c3605b5c48036e9806b8c7472618b37724839cb2db496c4e95963f4003d918c046cf35a10f0c2236ed31d9a92e6e489483c5c30e966284e92b76c59c50541
+DIST puppet-agent_5.3.3-1stretch_i386.deb 16544078 BLAKE2B 38e8d2608b48d54387e87a6791a6a316a60b7ce33e3bf5aea7037e08eb756f5c881756a802f5f75f4c3dd841488c96acf3534b9d47529cf1bbd21abf0de2a04e SHA512 b365ffe15575b8a17837ef89e21d9cf0128971d563cc540fbd1f7e2d847f84a7d4444ae1d17e5a0d3e3f66c9f145b246f4429f53088aad25d54b11e2658defba
 DIST puppet-agent_5.3.3-1xenial_amd64.deb 15647308 BLAKE2B 461532d697b645c6e36f0abaf6c366a6bbd6caeabb1f7f1fc9357e92b252555b1ab05ba433a2f3319008ba59eaa892dc9b8642070ae4322f9826e9f758937cfe SHA512 29c826d891a3930e18ed71a1c788819fe421b6a398d77ab21900feba457a386bad34ecb210d63054372af19de81eb31b13ea729adc3cb1fdd2fa09b0783b1e7d
 DIST puppet-agent_5.3.3-1xenial_i386.deb 16329408 BLAKE2B 7d024c3c39bd2ef495c2864f69aaba599cb26e8fc9bc924211780552436c275b5ef4a89db756cad77d1c1d30b5dec0b7561c871c97c9acdcedac550db212f972 SHA512 418c5f0a289d9c7335b49961dd6ad28340ed66cddbd476ca4f2fe6edbc3933c1d4841783d3a0f1f0ea1fab748c6f14f90ebc82fd02cf4046cde95c87b7b94548
 EBUILD puppet-agent-1.10.9.ebuild 3499 BLAKE2B 5a8599c231a5836f20092a787738b6637b400858b99e3332b6d1e5a34697d3036abbacab65e086221ea025be246be278eada08984e5d5734302014fcba3aeccf SHA512 22bd5df84895605e506ce0b9ee000bf72208b1e24c3907834c744613d341430336ee8abc0125f94af8accbf22057e739612a939e18b4206fbd122848d1446366
-EBUILD puppet-agent-5.3.3-r1.ebuild 3293 BLAKE2B 3b53c864aaf4474eaaa3c9023e3221af76d68f47528b9df89da4dac4a23cd0c0b7680f9c882e4f9d8591663c1b3b9f1db0b80640f035f50d153e0864f08ed03e SHA512 509975ded3dea9ac6b27892aaf174c2c77f172dd3189ddb1ab217ed43ac241e78a6548ae4fab0ad02739ece04db7ae86359e6ab50c1fe3305dbb65f4df530289
+EBUILD puppet-agent-5.3.3-r2.ebuild 3295 BLAKE2B 871f9831d01ebafd2c9464e0897e2e149a69e5cbc8d01e5182edffd1e0ed69ee74558c8ae8d36d44a70271feb3c14c62700e616500c528cf9e1adb7a41c91af4 SHA512 e7a3c01bf515a83d053d0b884a45c5f1171810a17ed8dfcdb8141a49da11279337936b4637a86d842f0656a7bbf0aa0004661773aece42fd98ba1a6813733188
 EBUILD puppet-agent-5.3.3.ebuild 3290 BLAKE2B be765f86f89267d5cb2a2e6da357671edf3329d3b8e73d201e55970f650aa5c36f9327a73d93581756da302852f3218b2767921958c4dae8a82122e39d1409bf SHA512 9babb71d75b321e7d795ffbdcf8f6c3986bbbc302e6f70331f145eaa72dd7192d39e50587f9604927db08bdd2b705d89b8caff49bf914e35b3e5dbb58de5d22c
 MISC metadata.xml 502 BLAKE2B 9eaaec32ba54988999831d4d873dff6c525b42ede2da3cc9a5b67359299233f2ffdafa04a949df6aa58d764e36beaf8ce64c053a306f6e055a245b207e8f2aaa SHA512 aedf4322173910c202b105d904e4528c6b6bb949fc05ed95c4a8d9a74133f5c7391ae30d7675bfa36a3f85880c971aff6e4a57ffdcde57b3b63c02dbed083a95
diff --git a/app-admin/puppet-agent/puppet-agent-5.3.3-r1.ebuild b/app-admin/puppet-agent/puppet-agent-5.3.3-r1.ebuild
deleted file mode 100644
index ab3914bf5d6b..000000000000
--- a/app-admin/puppet-agent/puppet-agent-5.3.3-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils systemd unpacker user
-
-DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
-HOMEPAGE="https://puppetlabs.com/"
-SRC_BASE="http://apt.puppetlabs.com/pool/jessie/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1jessie"
-SRC_URI="
-	amd64? ( ${SRC_BASE}_amd64.deb )
-	x86?   ( ${SRC_BASE}_i386.deb )
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="puppetdb selinux"
-RESTRICT="strip"
-
-CDEPEND="!app-admin/augeas
-	!app-admin/mcollective
-	!app-admin/puppet
-	!dev-ruby/hiera
-	!dev-ruby/facter
-	!app-emulation/virt-what"
-
-DEPEND="
-	${CDEPEND}"
-RDEPEND="${CDEPEND}
-	app-portage/eix
-	sys-apps/dmidecode
-	sys-libs/glibc
-	sys-libs/readline:0/7
-	sys-libs/ncurses:0[tinfo]
-	selinux? (
-		sys-libs/libselinux[ruby]
-		sec-policy/selinux-puppet
-	)
-	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
-
-S=${WORKDIR}
-
-QA_PREBUILT="
-	/opt/puppetlabs/puppet
-	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
-	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
-	/opt/puppetlabs/puppet/lib/engines/*
-	/opt/puppetlabs/puppet/lib/virt-what/*
-	/opt/puppetlabs/puppet/lib/*
-	/opt/puppetlabs/puppet/bin/*"
-
-pkg_setup() {
-	enewgroup puppet
-	enewuser puppet -1 -1 /var/run/puppet puppet
-}
-
-src_install() {
-	# conf.d
-	doconfd etc/default/puppet
-	doconfd etc/default/mcollective
-	doconfd etc/default/pxp-agent
-	# logrotate.d
-	insinto /etc/logrotate.d
-	doins etc/logrotate.d/mcollective
-	doins etc/logrotate.d/pxp-agent
-	# puppet itself
-	insinto /etc/puppetlabs
-	doins -r etc/puppetlabs/*
-	# logdir for systemd
-	dodir var/log/puppetlabs/puppet/
-	fperms 0750 var/log/puppetlabs/puppet/
-	# the rest
-	insinto /opt
-	dodir opt/puppetlabs/puppet/cache
-	doins -r opt/*
-	fperms 0750 /opt/puppetlabs/puppet/cache
-	# init
-	newinitd "${FILESDIR}/puppet.initd" puppet
-	newinitd "${FILESDIR}/mcollective.initd" mcollective
-	systemd_dounit lib/systemd/system/puppet.service
-	systemd_dounit lib/systemd/system/mcollective.service
-	systemd_dounit lib/systemd/system/pxp-agent.service
-	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
-	# symlinks
-	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
-	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
-	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
-	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
-	dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
-	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
-	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
-	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
-	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
-	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
-}
diff --git a/app-admin/puppet-agent/puppet-agent-5.3.3-r2.ebuild b/app-admin/puppet-agent/puppet-agent-5.3.3-r2.ebuild
new file mode 100644
index 000000000000..45e9783e9bc4
--- /dev/null
+++ b/app-admin/puppet-agent/puppet-agent-5.3.3-r2.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils systemd unpacker user
+
+DESCRIPTION="general puppet client utils along with mcollective hiera and facter"
+HOMEPAGE="https://puppetlabs.com/"
+SRC_BASE="http://apt.puppetlabs.com/pool/stretch/puppet5/${PN:0:1}/${PN}/${PN}_${PV}-1stretch"
+SRC_URI="
+	amd64? ( ${SRC_BASE}_amd64.deb )
+	x86?   ( ${SRC_BASE}_i386.deb )
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="puppetdb selinux"
+RESTRICT="strip"
+
+CDEPEND="!app-admin/augeas
+	!app-admin/mcollective
+	!app-admin/puppet
+	!dev-ruby/hiera
+	!dev-ruby/facter
+	!app-emulation/virt-what"
+
+DEPEND="
+	${CDEPEND}"
+RDEPEND="${CDEPEND}
+	app-portage/eix
+	sys-apps/dmidecode
+	sys-libs/glibc
+	sys-libs/readline:0/7
+	sys-libs/ncurses:0[tinfo]
+	selinux? (
+		sys-libs/libselinux[ruby]
+		sec-policy/selinux-puppet
+	)
+	puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )"
+
+S=${WORKDIR}
+
+QA_PREBUILT="
+	/opt/puppetlabs/puppet
+	/opt/puppetlabs/puppet/lib/ruby/vendor_ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/mathn/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/io/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/dl/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/racc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/enc/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/json/ext/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/rbconfig/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/digest/*
+	/opt/puppetlabs/puppet/lib/ruby/2.1.0/x86_64-linux/*
+	/opt/puppetlabs/puppet/lib/engines/*
+	/opt/puppetlabs/puppet/lib/virt-what/*
+	/opt/puppetlabs/puppet/lib/*
+	/opt/puppetlabs/puppet/bin/*"
+
+pkg_setup() {
+	enewgroup puppet
+	enewuser puppet -1 -1 /var/run/puppet puppet
+}
+
+src_install() {
+	# conf.d
+	doconfd etc/default/puppet
+	doconfd etc/default/mcollective
+	doconfd etc/default/pxp-agent
+	# logrotate.d
+	insinto /etc/logrotate.d
+	doins etc/logrotate.d/mcollective
+	doins etc/logrotate.d/pxp-agent
+	# puppet itself
+	insinto /etc/puppetlabs
+	doins -r etc/puppetlabs/*
+	# logdir for systemd
+	dodir var/log/puppetlabs/puppet/
+	fperms 0750 var/log/puppetlabs/puppet/
+	# the rest
+	insinto /opt
+	dodir opt/puppetlabs/puppet/cache
+	doins -r opt/*
+	fperms 0750 /opt/puppetlabs/puppet/cache
+	# init
+	newinitd "${FILESDIR}/puppet.initd" puppet
+	newinitd "${FILESDIR}/mcollective.initd" mcollective
+	systemd_dounit lib/systemd/system/puppet.service
+	systemd_dounit lib/systemd/system/mcollective.service
+	systemd_dounit lib/systemd/system/pxp-agent.service
+	systemd_newtmpfilesd "${FILESDIR}/puppet-agent.conf.tmpfilesd" puppet-agent.conf
+	# symlinks
+	chmod 0755 -R "${D}/opt/puppetlabs/puppet/bin/"
+	chmod 0755 "${D}//opt/puppetlabs/puppet/lib/virt-what/virt-what-cpuid-helper"
+	dosym ../../opt/puppetlabs/bin/facter /usr/bin/facter
+	dosym ../../opt/puppetlabs/bin/hiera /usr/bin/hiera
+	dosym ../../opt/puppetlabs/bin/mco /usr/bin/mco
+	dosym ../../opt/puppetlabs/bin/puppet /usr/bin/puppet
+	dosym ../../opt/puppetlabs/puppet/bin/mcollectived /usr/sbin/mcollectived
+	dosym ../../opt/puppetlabs/puppet/bin/virt-what /usr/bin/virt-what
+	dosym ../../opt/puppetlabs/puppet/bin/augparse /usr/bin/augparse
+	dosym ../../opt/puppetlabs/puppet/bin/augtool /usr/bin/augtool
+}
diff --git a/app-admin/rasdaemon/Manifest b/app-admin/rasdaemon/Manifest
index 714fc0b86093..3b1b0c791876 100644
--- a/app-admin/rasdaemon/Manifest
+++ b/app-admin/rasdaemon/Manifest
@@ -1,3 +1,4 @@
 DIST rasdaemon-0.6.0.tar.bz2 361721 BLAKE2B af992c810024df4f553727b4aff4f4f1d41cb3f7e458ac91916ccbac6815b6ade697f0c49bf1e072205c7f872cfc9c2f7223fe0d3f090064ffaa0bab002d4f67 SHA512 cb363ee9968dab10951077edea6558adc235c2ba1a57294ccf2d483c49af3366bcec0a5857fe2b475a5407de850f706c44bfe4d8a80bcfb53b1c7e2d101ba72f
+EBUILD rasdaemon-0.6.0-r1.ebuild 906 BLAKE2B 90cff87350e41d02fec42bcd123023d974e5cc08a79c5e1a8b87516c5b4d8f5b86f280d7891097dbc57d0d94aa227d95b8391b2d300321b902f13794a124c88e SHA512 975cd7e0555bcf6a9c685d3822a83e70b20bc0085a552556f0304470c6a1c5e78381182d45d9d50c4b59266aaff44719632f09e0ab1c264a90492c9ed837056f
 EBUILD rasdaemon-0.6.0.ebuild 723 BLAKE2B 03c921e0ef2eb1047410c4c15299a1141325fa00ed6f3145197189baa9b4461527718e14b258da0ad4ab5b0fc4abeec0ecaf50ebdfb83bcdb507e2afed59346c SHA512 492b51108bd5349a88e71b78c76125ed2ba1c020d8e96eef161d763ad798238bc8e03dd852ccb6c266acb5255c32599754c4c917f7a000e7d2257594b48128c4
 MISC metadata.xml 871 BLAKE2B c9b484c2fd3019681f9c335fc046c7718c35bcafd9fa46f59328c68fb4404571818b861cb938bcb00fa08a164688a58735d7db27e73120597cd114a3a39acaba SHA512 1815bc3a92340071b40de8129441bbf55fee7edbec94f5337d6a9b42311cc3c1d898598d0756b60b56d804629700a2c0109362933acf5442a74097e752b24935
diff --git a/app-admin/rasdaemon/rasdaemon-0.6.0-r1.ebuild b/app-admin/rasdaemon/rasdaemon-0.6.0-r1.ebuild
new file mode 100644
index 000000000000..aa124a97770d
--- /dev/null
+++ b/app-admin/rasdaemon/rasdaemon-0.6.0-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info systemd
+
+DESCRIPTION="Reliability, Availability and Serviceability logging tool"
+HOMEPAGE="http://www.infradead.org/~mchehab/rasdaemon/"
+SRC_URI="http://www.infradead.org/~mchehab/${PN}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND=""
+RDEPEND="
+	${DEPEND}
+	sys-devel/gettext
+	dev-db/sqlite
+	sys-apps/dmidecode
+"
+
+pkg_setup() {
+	linux-info_pkg_setup
+	local CONFIG_CHECK="FUNCTION_TRACER FUNCTION_GRAPH_TRACER STACK_TRACER DYNAMIC_FTRACE"
+	check_extra_config
+}
+
+src_configure() {
+	econf --enable-abrt-report \
+		--enable-aer \
+		--enable-arm \
+		--enable-extlog \
+		--enable-hisi-ns-decode \
+		--enable-mce \
+		--enable-non-standard \
+		--enable-sqlite3 \
+		--localstatedir=/var
+}
+
+src_install() {
+	default
+	systemd_dounit misc/*.service
+}
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 1bc02e624930..4ed4b776196e 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,8 +1,8 @@
 DIST sudo-1.8.20p2.tar.gz 2930769 BLAKE2B 90338e7d436683f94a9e13e9f0da668f2bbbf2184530feb63166186309881b737b783d2be80f935e5d64fd2a4264928423d2b754121be5caf07acbacbe2a6d42 SHA512 8bf67e687f7a84605fdef8d547b5cd661141b6c8fd25820c33c7e37e97ca7f21f564c3bae691f8a8cd08df7d80338e36a8f06bb5086cc104509d71d6ab1bceda
 DIST sudo-1.8.21p2.tar.gz 2976081 BLAKE2B c0b555879ddb6832c6396b557793f5d4783481fca5d721901c7ef81c1856c1cf7630fddd09bbb42207c27d51892a79c2bf5c653b5b5091ebc84f2d59981207b7 SHA512 f04bbff54ad74ba73c078e15c75d2f41332d4912078ed66157ba7346b7fff914bd0747460cb4cd0c472af2d3b344fa72f5c62c95169df68a9cac74d7245c720c
-DIST sudo-1.8.22b3.tar.gz 3021539 BLAKE2B 8e6c207fe2e56e76b46040ce7a468089a1ecdbc02c1fc514926c2b129c1d7869d307be79d8567d42d38eb2a3df9abae0864a14954fb8da4fb880f9fc223ad9f7 SHA512 e80c7a0f10aaacfb875503e35b7f16c8fe5c019848338e6d8a4c354a42f5613a23713a12ec7a5ceba78bc428223c3d9ccfc285703f8cd04d0c34658d4a21f45e
+DIST sudo-1.8.22rc1.tar.gz 3028312 BLAKE2B 8ead08be7c5d5314f0567e2683fdffb67e05783edb38a4619c4ed9c50d7abb500589742c91e82e077e2ade88be9371457fce026752ab6eeb02af91c818453b9b SHA512 819425f7e9da66088e7a942f3610660ce139dfba9a1db808d84b2b31c066942cbfa7ac3795df38c2c2061bbe1d9531cc214117239c71f190f41efcde9a744025
 EBUILD sudo-1.8.20_p2.ebuild 5749 BLAKE2B 123169c823e490ae3a5f1dbf43521bc3603cf34488e4a5bd87ed02a2e816de3555a8c58aa3ec52fb83230ab3e32f4da8220a0c8cdba4ff81bd149e64f5b2b7f9 SHA512 89c82af30974c8f44abb6a01a01ce31309c9c0d5d8d47ce67160e91d05e4bdda7fdc3d82c5171fe994f00faff3c51f65f7909972e8017a403adf0451f3d935a3
 EBUILD sudo-1.8.21_p2.ebuild 5819 BLAKE2B f41a745952896b5b3a6b1cd07808af308402db5cc7405fa040f205755e333fdddd0f6195b664c4db630fad8d011e9e613bae08c3bb955a819a5ba454c5d29612 SHA512 a49951e2e639839c0e95f99c6091c1e02f25e5d072337dab9ebacb491f556f60e0ac3552eba482c33c0c3737ac50efd8c12f6326c14357bff9a37a8fafdba2b0
-EBUILD sudo-1.8.22_beta3.ebuild 5819 BLAKE2B 424998594187730de2794a8d8bf3468b754281e6b15ec61c4610a29a22339624dc5419949506c7f608c43c6a17e0b6bbe007e4d8ea42d9e3ddedf1fbc8c98d8d SHA512 2415707df16bd21e491ecbacc53cb914caecffcc9ad109188a1309b9294018006f70d6d2b2a55a8ff249eb7db51bac852fceda22c2476c0cc4365958b6e7ca73
+EBUILD sudo-1.8.22_rc1.ebuild 5819 BLAKE2B 424998594187730de2794a8d8bf3468b754281e6b15ec61c4610a29a22339624dc5419949506c7f608c43c6a17e0b6bbe007e4d8ea42d9e3ddedf1fbc8c98d8d SHA512 2415707df16bd21e491ecbacc53cb914caecffcc9ad109188a1309b9294018006f70d6d2b2a55a8ff249eb7db51bac852fceda22c2476c0cc4365958b6e7ca73
 EBUILD sudo-9999.ebuild 5959 BLAKE2B 5b11f68280f6ce261b9579101726164a38c9bf68e67a1df47562ea356dbe68a80e10d30af1332092731c59e7f33bb0df6ac8731970dff2b200e080c0904ab98c SHA512 ea1939a94dda5eb85ba5bcb963c76c54da6ca0f5eb8785964cfcf700391049b57d18a6397556d9213f988d3d7292dd9a6c76d2531fef2c6e319c63e2b26cc33c
 MISC metadata.xml 989 BLAKE2B c7f7d49fda7750b172dd4b2e5c3fc5f1f3dd602b6347479834bf6444c9311738bcd10fbbba100cee45c97bb899e53f3c113abc61ee89b3353b50876c30966589 SHA512 bc9addd017e474acbc753d6d2cce5d77281a3c1f0857de538168eb1a7b80e0d0b313ad2b03cc710b483cc9588dcaf0208a5b8aaccea18e2ca51b567020bea9ec
diff --git a/app-admin/sudo/sudo-1.8.22_beta3.ebuild b/app-admin/sudo/sudo-1.8.22_rc1.ebuild
index 2e08b4eb383c..2e08b4eb383c 100644
--- a/app-admin/sudo/sudo-1.8.22_beta3.ebuild
+++ b/app-admin/sudo/sudo-1.8.22_rc1.ebuild
diff --git a/app-admin/syslog-ng/Manifest b/app-admin/syslog-ng/Manifest
index f36c832ad2d6..f0fa206aa899 100644
--- a/app-admin/syslog-ng/Manifest
+++ b/app-admin/syslog-ng/Manifest
@@ -23,6 +23,6 @@ DIST syslog-ng-3.12.1.tar.gz 8905646 BLAKE2B abe273c561569047ef4ea0b21b08341d207
 DIST syslog-ng-3.13.2.tar.gz 9047998 BLAKE2B a18b11a31e1bf4c981071e7509ff154f08076c5ca659e814a3d8a49108dcc6f324ba3025f4e43bb32d23a9554fc188da4b116089fe29bf866f323f76280c460f SHA512 fd5c6645f1e8e10cba940ea29715f9e7cc286cd49c2f45bde2a447731189d6171ca204aa066ac96dd09246fd7ed1751130d143d807c979518d688e7750490cfe
 DIST syslog-ng-3.7.3.tar.gz 3511155 BLAKE2B 25ba2ca241a5847c75792c78d39a4667f55cf1fcff46be5102256ee6a9d2f39e2042ac00fa0b1559f94e0df80a0853249692b443b565dd4f46f0354c453cacaf SHA512 e58d793bd1a8b48c5836090ee244f6e8b223f234f5a27fbf81f6a838b9b1e3e45f73a66dab2bc58a0bba230bd778a247ae22bf529a28fb2e9fee52b8181d304b
 EBUILD syslog-ng-3.12.1.ebuild 4376 BLAKE2B 2d746d6733b9da5cc81684254743769c5c769fed298c852d71e8a5cc8b51380a90fd4e43f88c9fa236e7189dde850266cf244fac30a7df04650ac0d38918ec78 SHA512 f110f4d7f66cc910c845490e7f61aa094a83ff95d8d886d3a807eb1bc9ccb20fc3c6cf0ef335ffa7d08ed673918edf30362f964cd349516074b14f26438a52e2
-EBUILD syslog-ng-3.13.2.ebuild 4898 BLAKE2B 73b03f440f3b1c30dae4c8edb3ae4f7468df0d9098ea470e90f469586cebcfd4727aa62ccc0a5c72ce72aff1e874821f6f5466e2478551125601b8fa136fda4e SHA512 7a8821b3cad5c8e4c72e1342e290d425bf7c5c6cc2442e4f84d2bac01d653962813b87071a2408badfb6e53cc92430075335a9341da78ce8b19fcdbff0cf4b10
+EBUILD syslog-ng-3.13.2.ebuild 4676 BLAKE2B 1aaefbef2a2d445b8085644c9a61e835de34ec7583e80b9ce5e7289717a6c75a62e75a4d62c38c5e516bb3715e4e738b3ce005c9d4ef7b49e9775a5ff83ef7c8 SHA512 ffb813e4af346e1b74be4d84db7c7987fc966d121f9949608d3acc77ab2dd33e7258fe22ae78af4142c153120de8f87f297e9e2cda48e9c8b65787748611bbd4
 EBUILD syslog-ng-3.7.3.ebuild 3974 BLAKE2B caa4bbf5823b17ebd2a7409294508712c16927ae7211b364b0462edfbd954d97c83b223a84a0370b54daa819d6490c92c0d88d657948cd3ec6d11f0da011a59d SHA512 1d8cd3d4e81963d0edbfde50d8c137d70fc8cce664cb1696504111d50a355659d87e3ad5d85040b4b89c026a57931ad2184adffb3b7642319cc3f317fc63a158
 MISC metadata.xml 1080 BLAKE2B 913203dd1c18414dfb03794e9053151638c56bbb306b9da3c731c64e392a126a30adc38f8516b99c3c5cec024675e9779a10bdd5178f8e87f8bee2ad0b08044b SHA512 4d776d710534634a84d1415f93e3412a580319bf2580451fb27581ca498d2ca81747d3247aaaadde10319b82cefd36e9d29899778ce918838a583aec17130f00
diff --git a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
index fc965332d85e..a40f2a249fa6 100644
--- a/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
+++ b/app-admin/syslog-ng/syslog-ng-3.13.2.ebuild
@@ -150,9 +150,6 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "For detailed documentation please see the upstream website:"
-	elog "https://www.balabit.com/sites/default/files/documents/syslog-ng-ose-${MY_PV_MM}-guides/en/syslog-ng-ose-v${MY_PV_MM}-guide-admin/html/index.html"
-
 	# bug #355257
 	if ! has_version app-admin/logrotate ; then
 		echo
diff --git a/app-admin/sysstat/Manifest b/app-admin/sysstat/Manifest
index 4d36231d699c..868a5a2cc125 100644
--- a/app-admin/sysstat/Manifest
+++ b/app-admin/sysstat/Manifest
@@ -2,9 +2,11 @@ AUX sysstat-10.0.4-flags.patch 887 BLAKE2B 289e53b21e8f3cd2b1a46219ec7fe7ba82b6f
 AUX sysstat-11.0.4-cron.patch 1609 BLAKE2B b190f9b6e47da5240ced4fed912bdcdb130d88cf326e0e8109dc5996c22c812c64f2dfaaa6b0456b368d2b59aa30271b4de402bd83c2754c0224b4fd6598c604 SHA512 531340bb0770c07743caa6c760584c0f4cda5a5db7dd46bd2eee8ae1cccabecffee084571fb68a3510735b04430f2bb454068d9983da2856a0459ccb258eb89d
 AUX sysstat.init.d 378 BLAKE2B fe781f1a53e183023da2b46ecefb37881eedf8e8df2623927b24f33aa3344776b39db038d598ad050f1d48462d52300fb17731f29b0a8ab9c800fbe379efa249 SHA512 328ee3d40d45a0b1702c74fe0195ce4444cc8f63cb0fa68ba40ca20cfa183dd7acf4fc846cd76a4bcf426a3b4064316061dbbf26ca20047711528399e17b20b4
 DIST sysstat-11.4.0.tar.xz 343968 BLAKE2B e34da8cf0216f66fad3ade0ed40e8ec3b7641f7568ebcce5bc3122f888c90885ece346bf7f4f8e71e92435257ee5c6c0e5a89913c0e22a0ad28fa1018a73ea71 SHA512 4a5c81d75fdbc8dcaf80685f302688c39bd7143554e5a06cb324532ddb5180caac19b261182d5320f40b317bdb1e81664887acc7cedfeb5a95dc6ad37a898604
-DIST sysstat-11.6.0.tar.xz 468528 BLAKE2B 512a1b9723ee6c96155fdff93c9aebff23901c13f92fd8352241851612c92ba15033e267aab6c4dd2a9fdf4f88a7f61c2e3af46f32aff5e9a60e52cb6ba3a066 SHA512 b54af1724777e20df54e9dac97b558abd4f669724234d4a62debbfa2dd5788020683ca8e47f95ea018feefd024abe2f930a91363b35ef490ddf69b7cf2d5df68
 DIST sysstat-11.6.1.tar.xz 470584 BLAKE2B e9f85567743e6f0f2958afed40919c8bea7fc52f053fdd9bc7480e942e9a4a5620287f72cf26feedf4b74fc698331da2c305864b0037cf11e0617af2bc0da63b SHA512 55b3c361f7cda3d5efc0a42bef26d154c159a465ef45b56d2567f38aeec8c935c4e3b65a92eaf996abbf2d6a2604b2b8bba95741d707e8f387c9fadc05fafa93
+DIST sysstat-11.6.2.tar.xz 471452 BLAKE2B da0647f25e9f4ec4d320f664d2124bd2bd3cc42a78201f2c86480afeb6525b20c158e1577321a0316134fca7e77c04b303829104ae59b0d790ab29bff09889ed SHA512 8f117601272d3d9b887c454d610d06f014b76902cdc68f6a11e693bdc58bb7ad1cac1006681774b3e6173f3cadd9b1f36e126d1d7501f0910b092d125d1c68ce
+DIST sysstat-11.7.1.tar.xz 476916 BLAKE2B 016c5b6e2759af440ecd3bfc9b66f2b01988ef2e889090ab9156a7fdea02d9a3e6e47f6852ea699cf865d2ccf79d3152c70f0e23daf199edb936cb55a9a28fa7 SHA512 c0a8ce7a412e16d7d471cc0421a0f5586143ef8253f9a38872a63687bba50f98eebab5d501f92c4d085da51af56343628c8154cbd2d260b314153a17e23ff2e8
 EBUILD sysstat-11.4.0.ebuild 1945 BLAKE2B 60e245699e621770f3f8aac3d622063b8e6bdad5135e3408dce587eae8d3b32c6884dc4db78a397b2a7ca0b58a7277fb652b21fad8a6e3c0e008f70eea0c8503 SHA512 25438d8e95dac4789c18215f83c09868ef7bb9886d5abe76f70b5461b65cfa42648c7593d861c0d075f1ec7bde52503d3235f3aea716e9fc9a39dfc5762e269c
-EBUILD sysstat-11.6.0.ebuild 1833 BLAKE2B 6eb80ec1213c377bbe549ec4553740fa7af7686029270c288545ca0ffa892fc4adea2e083de4d1327cb00434282a19f4012578062f60ffd7c6485653055eab75 SHA512 643e2d9abd82818c04ae64858afd3682b61ec60f5a74f61f945319563eac525c95cfbac2a9d5143456214f48c4b5936b8138db2ac4ec04604fa6011c4549838b
 EBUILD sysstat-11.6.1.ebuild 1833 BLAKE2B 6eb80ec1213c377bbe549ec4553740fa7af7686029270c288545ca0ffa892fc4adea2e083de4d1327cb00434282a19f4012578062f60ffd7c6485653055eab75 SHA512 643e2d9abd82818c04ae64858afd3682b61ec60f5a74f61f945319563eac525c95cfbac2a9d5143456214f48c4b5936b8138db2ac4ec04604fa6011c4549838b
+EBUILD sysstat-11.6.2.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
+EBUILD sysstat-11.7.1.ebuild 1833 BLAKE2B 5991244b94e68e4a8f7ecd0379500768ab5af2b11d880ac9c0b8e451fc06dbdfde90e43e964e7f0f19ac9325a1230a4636814a9a32697c8045e028429cf0bfe5 SHA512 acfadd3a0124319565e2175b2a63c81024900a2b11595f4615c509b3e802169b37a8d46c2bcb6201858a9f2946a1ce3da938cbdde065cf4ca75f15581df4cba1
 MISC metadata.xml 336 BLAKE2B ba4225003301f291de8d348fcec269a2f7dc8f729a93e3c974a3eb9712f7fe08f59d799e4bf2e936a1224bfa5fa59d4b4b333aeacde9864313c20e1d3a7f4580 SHA512 63adb90aca54ec347aac7feaad3b2ee3c707fc536c0de0e0ee045d4fe2c08e231bdbd4473b9722a747ef1263cb98a067a43cbbbae28aabad71458c16df946bc6
diff --git a/app-admin/sysstat/sysstat-11.6.0.ebuild b/app-admin/sysstat/sysstat-11.6.0.ebuild
deleted file mode 100644
index aa17b2d17f98..000000000000
--- a/app-admin/sysstat/sysstat-11.6.0.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit flag-o-matic multilib systemd toolchain-funcs
-
-DESCRIPTION="System performance tools for Linux"
-HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
-SRC_URI="${HOMEPAGE}${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="debug nls lm_sensors selinux static"
-
-CDEPEND="
-	nls? ( virtual/libintl )
-	lm_sensors? ( sys-apps/lm_sensors )
-"
-DEPEND="
-	${CDEPEND}
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${CDEPEND}
-	selinux? ( sec-policy/selinux-sysstat )
-"
-PATCHES=(
-	"${FILESDIR}"/${PN}-10.0.4-flags.patch
-	"${FILESDIR}"/${PN}-11.0.4-cron.patch
-)
-
-SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
-
-src_prepare() {
-	if use nls; then
-		strip-linguas -i nls/
-		local lingua pofile
-		for pofile in nls/*.po; do
-			lingua=${pofile/nls\/}
-			lingua=${lingua/.po}
-			if ! has ${lingua} ${LINGUAS}; then
-				rm "nls/${lingua}.po" || die
-			fi
-		done
-	fi
-
-	default
-}
-
-src_configure() {
-	tc-export AR
-	use static && append-ldflags -static
-
-	sa_lib_dir=/usr/$(get_libdir)/sa \
-		conf_dir=/etc \
-		rcdir=${SYSSTAT_FAKE_RC_DIR} \
-		econf \
-			$(use_enable debug debuginfo) \
-			$(use_enable lm_sensors sensors) \
-			$(use_enable nls) \
-			--enable-copy-only \
-			--enable-documentation \
-			--enable-install-cron \
-			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
-}
-
-src_compile() {
-	emake LFLAGS="${LDFLAGS}"
-}
-
-src_install() {
-	keepdir /var/log/sa
-
-	emake \
-		CHOWN=true \
-		DESTDIR="${D}" \
-		DOC_DIR=/usr/share/doc/${PF} \
-		MANGRPARG='' \
-		install
-
-	dodoc -r contrib/
-
-	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
-	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
-	systemd_dounit ${PN}.service
-
-	rm -f "${D}"usr/share/doc/${PF}/COPYING
-}
diff --git a/app-admin/sysstat/sysstat-11.6.2.ebuild b/app-admin/sysstat/sysstat-11.6.2.ebuild
new file mode 100644
index 000000000000..b9b3e8d42883
--- /dev/null
+++ b/app-admin/sysstat/sysstat-11.6.2.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.0.4-flags.patch
+	"${FILESDIR}"/${PN}-11.0.4-cron.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	tc-export AR
+	use static && append-ldflags -static
+
+	sa_lib_dir=/usr/$(get_libdir)/sa \
+		conf_dir=/etc \
+		rcdir=${SYSSTAT_FAKE_RC_DIR} \
+		econf \
+			$(use_enable debug debuginfo) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls) \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_compile() {
+	emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-admin/sysstat/sysstat-11.7.1.ebuild b/app-admin/sysstat/sysstat-11.7.1.ebuild
new file mode 100644
index 000000000000..b9b3e8d42883
--- /dev/null
+++ b/app-admin/sysstat/sysstat-11.7.1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic multilib systemd toolchain-funcs
+
+DESCRIPTION="System performance tools for Linux"
+HOMEPAGE="http://pagesperso-orange.fr/sebastien.godard/"
+SRC_URI="${HOMEPAGE}${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="debug nls lm_sensors selinux static"
+
+CDEPEND="
+	nls? ( virtual/libintl )
+	lm_sensors? ( sys-apps/lm_sensors )
+"
+DEPEND="
+	${CDEPEND}
+	nls? ( sys-devel/gettext )
+"
+RDEPEND="
+	${CDEPEND}
+	selinux? ( sec-policy/selinux-sysstat )
+"
+PATCHES=(
+	"${FILESDIR}"/${PN}-10.0.4-flags.patch
+	"${FILESDIR}"/${PN}-11.0.4-cron.patch
+)
+
+SYSSTAT_FAKE_RC_DIR=Gentoo-does-not-use-rc.d
+
+src_prepare() {
+	if use nls; then
+		strip-linguas -i nls/
+		local lingua pofile
+		for pofile in nls/*.po; do
+			lingua=${pofile/nls\/}
+			lingua=${lingua/.po}
+			if ! has ${lingua} ${LINGUAS}; then
+				rm "nls/${lingua}.po" || die
+			fi
+		done
+	fi
+
+	default
+}
+
+src_configure() {
+	tc-export AR
+	use static && append-ldflags -static
+
+	sa_lib_dir=/usr/$(get_libdir)/sa \
+		conf_dir=/etc \
+		rcdir=${SYSSTAT_FAKE_RC_DIR} \
+		econf \
+			$(use_enable debug debuginfo) \
+			$(use_enable lm_sensors sensors) \
+			$(use_enable nls) \
+			--enable-copy-only \
+			--enable-documentation \
+			--enable-install-cron \
+			--with-systemdsystemunitdir=$(systemd_get_systemunitdir)
+}
+
+src_compile() {
+	emake LFLAGS="${LDFLAGS}"
+}
+
+src_install() {
+	keepdir /var/log/sa
+
+	emake \
+		CHOWN=true \
+		DESTDIR="${D}" \
+		DOC_DIR=/usr/share/doc/${PF} \
+		MANGRPARG='' \
+		install
+
+	dodoc -r contrib/
+
+	rm -r "${D}/${SYSSTAT_FAKE_RC_DIR}" || die
+	newinitd "${FILESDIR}"/${PN}.init.d ${PN}
+	systemd_dounit ${PN}.service
+
+	rm -f "${D}"usr/share/doc/${PF}/COPYING
+}
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 1b507d7eacc2..4bda06b78d11 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/defluff/Manifest b/app-arch/defluff/Manifest
deleted file mode 100644
index d7a2923fb15b..000000000000
--- a/app-arch/defluff/Manifest
+++ /dev/null
@@ -1,4 +0,0 @@
-DIST defluff-0.3.2-linux-i686.zip 14258 BLAKE2B 48427ee0448d679efb678b4d2addf12facc80fba5ffd3c86cbf7fbe9a0d9fdbb3d810cd2f993134180a7d59c3fbe9b8a2603b59affe5a06ad9af8c181d097ecf SHA512 8befa4c0f4daefd1adbafeddcec65bb808859df6df9c8d43d6a0aaa797a395e3c18b682b955d7e0271dab84da0ce8323d8dc7d17efa2978db7b94e1467fca3f9
-DIST defluff-0.3.2-linux-x86_64.zip 15601 BLAKE2B 750caba1e51d593907ec0a24ce4cc6d0a918d4144ab0790c9810d42bbd7bb8ab9a8bb5efca32db85a67a3bd448e2f055bca43733dacedfb1db3fda429ca6b792 SHA512 15c0355eb926541a7b9f55880c9e7196fdab1da7117d3dc8fb392c413a09938e759ec95b1759ef870cd4b6c005f110245045a1786e5a4accfa5be83342485f67
-EBUILD defluff-0.3.2.ebuild 671 BLAKE2B 8e6b168939ec2890cc50075602fe9ddbcb6e465a445b98e14f00df19fd7df893c7e9b0a49f26d8a6cfed6d2e5c8b931d820f5031691b66f0e4c8488c2e774091 SHA512 67693cfee49fa680d33802db62f5652b524b44b9885e1e8ef7f4d48a5ef2a6c70f456dba3d4ff158ee3ae03d365ccdd0a09b873c9e5599fb861bbd3226ea5929
-MISC metadata.xml 514 BLAKE2B 0f141a149420dec3e464ed9969c33787136b2784763c06077c47eaccbd21585aed7d7598a7c4ee7586f1531068d3ac92fa7a6493b3b869d30ef57dbe321cb2f6 SHA512 dea2f532c568da8dc7b34f2a7f67ec9a9da7bf7e75bb9faf9dbd8aa268af52902815c96fd2deb8d155d194209cbd689ef568df0213ef2974109e55eb4848b80e
diff --git a/app-arch/defluff/defluff-0.3.2.ebuild b/app-arch/defluff/defluff-0.3.2.ebuild
deleted file mode 100644
index 34237978956a..000000000000
--- a/app-arch/defluff/defluff-0.3.2.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
-
-DESCRIPTION="deflate huffman optimizer"
-HOMEPAGE="http://j-o.users.sourceforge.net/
-	http://encode.ru/threads/1214-defluff-a-deflate-huffman-optimizer"
-SRC_URI="amd64? ( http://encode.ru/attachment.php?attachmentid=1523 -> ${P}-linux-x86_64.zip )
-	x86? ( http://encode.ru/attachment.php?attachmentid=1522 -> ${P}-linux-i686.zip )"
-
-LICENSE="all-rights-reserved"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 -*"
-IUSE=""
-
-DEPEND="app-arch/unzip"
-RDEPEND=""
-S="${WORKDIR}"
-
-QA_PREBUILT="/opt/bin/${PN}"
-RESTRICT="bindist mirror"
-
-src_install() {
-	into /opt
-	dobin ${PN}
-}
diff --git a/app-arch/defluff/metadata.xml b/app-arch/defluff/metadata.xml
deleted file mode 100644
index 11f44c748913..000000000000
--- a/app-arch/defluff/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>alex_y_xu@yahoo.ca</email>
-		<name>Alex Xu</name>
-		<description>Proxied maintainer; set to assignee in all bugs</description>
-	</maintainer>
-	<maintainer type="project">
-		<email>proxy-maint@gentoo.org</email>
-		<name>Proxy Maintainers</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">j-o.users</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-arch/engrampa/Manifest b/app-arch/engrampa/Manifest
index 2adc21d2df6b..7f243426a217 100644
--- a/app-arch/engrampa/Manifest
+++ b/app-arch/engrampa/Manifest
@@ -2,11 +2,11 @@ AUX engrampa-1.10.2-p7zip-15.09-compat.patch 851 BLAKE2B 50734ebd04df0f3a277408a
 AUX engrampa-1.10.2-p7zip-15.14-compat.patch 1225 BLAKE2B b1aa1546aeed6bc3116d8a7ccd8bb2e8a101a5df4fd902d748fbc2afc909db2f0071248107d8dc0f6d2bb2b3c6a2382955e6fab30a3f0ab3430b80c4e1d72104 SHA512 e396976cfce32b4ac48205c0c72a342d713c8798926a2c56855f4083e3f7598b6ce1e3df3fb03ee8b08c0bf18657a2c750389b465a142f4261eb03f12f4a8a3a
 DIST engrampa-1.12.0.tar.xz 1380144 BLAKE2B 87c8a69d3706489f7f2dfc704212714976ba3bb24954d02b798700be4f5c98bada0eec0e22402f85e3ea4d7852ab6bbb523deeef411887c68f5b998871c72069 SHA512 8c694b1f1baab099316f6e5d5ec67ae95171df3a988aee11b0527ae797717e7b3e57fa1ec53cb78e9aa397b1758f768736231ad1bd91c1bb8b2ba2f8f755cfec
 DIST engrampa-1.14.1.tar.xz 1417444 BLAKE2B 95dd08ba2264fb2ba937be61522cf56da8363fdc4af21c18bd3d8a22609ab0c9a606bda5f16b2795ad6b0b7bd017bf1150a2e31f6c29d9c111362ca93ff0ed65 SHA512 fea510d95fe483f676f66490706aa919b6a62bc20af9e22893304235ce0a38ff006c66494d548a3207dc4cd241cb785abe77652693d1b600e4ca6c8a0a60d763
-DIST engrampa-1.16.0.tar.xz 1430028 BLAKE2B 1ab133d30e44c0c1378197a5453dc9214949d6708203b593314332e51487293d5e43f3d7c0db9e4641878854bf73b51ebd427e7550498fa5fa5e029517dee1d5 SHA512 d0bf44040b4aa8298137605b632a1b022a69c665cc0324a3358693e7151091f1adba0f6eb01ee04b8ada09977f979ed3c3ed8b3f5314b06d96fede0c4ff37ce2
+DIST engrampa-1.16.1.tar.xz 1432272 BLAKE2B 6181da44c6a80030c1ac856c017ba190bf91527e51c9d2eba38e267632360ad5497ee02d0a3ea00d73df4e6f507311e839e0d8d999b6d6561e298d784c3251ec SHA512 d61ee877b5e7ce0aacc46a8b786b1d074bc4d6870f453edf238d9b8fe3eecab750ce14f668c94bbceedec4a9b5bf16a828fff24edef227ae0108351adcfc73f6
 DIST engrampa-1.18.1.tar.xz 1427140 BLAKE2B 29bfa3a3480dfe20eed30fb6017119def521bb49798f08f0cdafa621a2f6922902cc1dd9b471d71a875d14a0620da0902ed6601c8d338dc1d8a73e3a397a32cf SHA512 9b39783f508a0582a2e77ea6a2cd3665b6054274bea8ad14f78ed37e20533e78554eca23fc171e090bd881468d630d5f644d687bee8bb282f5a106c80b1daf17
 EBUILD engrampa-1.12.0-r1.ebuild 1943 BLAKE2B 98c5255e301058a3aa09fa54fbd93bfb6c1c70f9f468608eca2cd6cf0b1838bc52ea708b8de3f7347e1d3b970be8a30e7f28803f13678908372cefaede528a75 SHA512 624884bbbc2a2a7c9eaa9f84c4ab7189ed70079f26535c5945eb2c5a96543fdf249599805ac538f304e316ed882645a1b3592b5752b1ba05f6142b356b60eb8d
 EBUILD engrampa-1.12.0-r2.ebuild 1948 BLAKE2B 7563e099ccf74cb69a5bce96804750f8edbb293207910ee652b8cd80a40a0f603c42e128a90f11ea0b737e371ad39dc23106336671846851dac5ee22e22492dc SHA512 0de7123927b4b41fd04606a1b11649ae2ed1f9250bfe6dad32cb8138fcaed7c5271eb9aa30fc921c8134ebbb7f867b36d0b867520a3defa63d1d31e36bd20d44
 EBUILD engrampa-1.14.1-r1.ebuild 1934 BLAKE2B 0d3565cc92cfa229671efd0b8ebdcfa32db2f74b3e2282f2da1969483dd16645dd2e1c6446ad3388ff9d9b502373c25d94719af56a07dd4d48e20e44d5c81fa2 SHA512 48a85e45c15b8d21f9e11e992efcf0fe24f8b6fc3934e26fba77221a8bf568a1f185eb584171d3a16500ab35ba0bd15d4a7d83e2d4dc9030c0a76166ed2643ec
-EBUILD engrampa-1.16.0-r2.ebuild 1774 BLAKE2B 829133aaf13e34d6309a7ea89f48f4aad8a1aa818c5fb46fd65819c87f7dd4911668921dfdaefe279126796ff21a4c5a286c7e662f2d8ae2726c36a90d931328 SHA512 ae360e7bda00b5cfef8846f459848b25b5b89fba6bb4b829ba99aadd1c90160d48fb3158cc2d6a4c4a3e1382ee711b16df68cde0f136da3a47a2a2d4949be3c7
+EBUILD engrampa-1.16.1.ebuild 1774 BLAKE2B b239d80ccc155e40d733b9de4997e689c9a0650eebf58f4c0615c4bd19ea71e51944bf9312135e5cf87ebf45bcc7ef6d8063f8f03c1ccef169b0a392c2efd787 SHA512 975831c6e938ccf8ad5547639a10d7224d01fc4d0b7870878b48cf8cf3051c9dcf779f72aea393c1a2798fb6e818f5e0bd5d8408a773e8b2c64dfeea30534056
 EBUILD engrampa-1.18.1.ebuild 1755 BLAKE2B b741f70a2227e598afdd926a67b3ab4732d04ecfa15de0a3dd370e84df249e0513061bfe2177b771417aea4fa7bfe96af3474b1ddd87687c4e94374bd2f1c8db SHA512 3242a31d0136264618427a4ac7c403d7291a27a8ee357fe443a237859a4e445c3170668fa6e2ff2b8644fdae091010ef558f741885c28abb30819f5f126f41c9
 MISC metadata.xml 763 BLAKE2B 7efc42df178dd52843a8f9c165d2c7a717fb05d24309dfcec6d7dbf61e8943b65f4a8febf2d58bfe29a81e0be37165f1b7345155d75e3e3d7676f625d679aea6 SHA512 fc5a05da5bf07067fc598b9849b068b497d3b9d107eddbe8d38bc15afb9b3df0e1071fae57e9c0a05b9813c03873581e66b0212cd126f14ccaddaccd85a57a96
diff --git a/app-arch/engrampa/engrampa-1.16.0-r2.ebuild b/app-arch/engrampa/engrampa-1.16.0-r2.ebuild
deleted file mode 100644
index 3cf6e95bd41f..000000000000
--- a/app-arch/engrampa/engrampa-1.16.0-r2.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Engrampa archive manager for MATE"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="caja magic packagekit"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.32.0:2
-	>=dev-libs/json-glib-0.14:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/pango:0
-	virtual/libintl:0
-	caja? ( >=mate-base/caja-1.1.0 )
-	>=x11-libs/gtk+-3.14:3[X]
-	magic? ( sys-apps/file )
-	packagekit? ( app-admin/packagekit-base )
-	!!app-arch/mate-file-archiver"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--disable-run-in-place \
-		--disable-deprecations \
-		$(use_enable caja caja-actions) \
-		$(use_enable magic) \
-		$(use_enable packagekit)
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog ""
-	elog "${PN} is a frontend for several archiving utilities. If you want a"
-	elog "particular achive format supported install the relevant package."
-	elog
-	elog "For example:"
-	elog "  7-zip   : emerge app-arch/p7zip"
-	elog "  ace     : emerge app-arch/unace"
-	elog "  arj     : emerge app-arch/arj"
-	elog "  cpio    : emerge app-arch/cpio"
-	elog "  deb     : emerge app-arch/dpkg"
-	elog "  iso     : emerge app-cdr/cdrtools"
-	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
-	elog "  lha     : emerge app-arch/lha"
-	elog "  lzma    : emerge app-arch/xz-utils"
-	elog "  lzop    : emerge app-arch/lzop"
-	elog "  rar     : emerge app-arch/unrar"
-	elog "  rpm     : emerge app-arch/rpm"
-	elog "  unstuff : emerge app-arch/stuffit"
-	elog "  zoo     : emerge app-arch/zoo"
-}
diff --git a/app-arch/engrampa/engrampa-1.16.1.ebuild b/app-arch/engrampa/engrampa-1.16.1.ebuild
new file mode 100644
index 000000000000..6f37d339de9f
--- /dev/null
+++ b/app-arch/engrampa/engrampa-1.16.1.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Engrampa archive manager for MATE"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="caja magic packagekit"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.32.0:2
+	>=dev-libs/json-glib-0.14:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango:0
+	virtual/libintl:0
+	caja? ( >=mate-base/caja-1.1.0 )
+	>=x11-libs/gtk+-3.14:3[X]
+	magic? ( sys-apps/file )
+	packagekit? ( app-admin/packagekit-base )
+	!!app-arch/mate-file-archiver"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--disable-run-in-place \
+		--disable-deprecations \
+		$(use_enable caja caja-actions) \
+		$(use_enable magic) \
+		$(use_enable packagekit)
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	elog ""
+	elog "${PN} is a frontend for several archiving utilities. If you want a"
+	elog "particular achive format supported install the relevant package."
+	elog
+	elog "For example:"
+	elog "  7-zip   : emerge app-arch/p7zip"
+	elog "  ace     : emerge app-arch/unace"
+	elog "  arj     : emerge app-arch/arj"
+	elog "  cpio    : emerge app-arch/cpio"
+	elog "  deb     : emerge app-arch/dpkg"
+	elog "  iso     : emerge app-cdr/cdrtools"
+	elog "  jar,zip : emerge app-arch/zip  or  emerge app-arch/unzip"
+	elog "  lha     : emerge app-arch/lha"
+	elog "  lzma    : emerge app-arch/xz-utils"
+	elog "  lzop    : emerge app-arch/lzop"
+	elog "  rar     : emerge app-arch/unrar"
+	elog "  rpm     : emerge app-arch/rpm"
+	elog "  unstuff : emerge app-arch/stuffit"
+	elog "  zoo     : emerge app-arch/zoo"
+}
diff --git a/app-arch/wimlib/Manifest b/app-arch/wimlib/Manifest
new file mode 100644
index 000000000000..01672551c8f2
--- /dev/null
+++ b/app-arch/wimlib/Manifest
@@ -0,0 +1,3 @@
+DIST wimlib-1.12.0.tar.gz 1014508 BLAKE2B d12f4e0b458fe756b74c67f2f643256c44021e0f0c3e2a3a70eb87647c3c6cabd93413917bf8a8c6ab6820860c407f4454454719227f5cbf1a9a81a7bedc1a6e SHA512 0343b37550366f07fd6a6689f4445f390187beddde677f4d6d831c07936d03b613ae95f612ec7a75e978a5e678f33ab766d0f3b3d942886df56e4ef77d4b07b9
+EBUILD wimlib-1.12.0.ebuild 1354 BLAKE2B 09ae48963f04ec4bd75e1708887ba906646eded815f1e39bf7f39e29db0ce5c4243026b561d0da64a2efe996995343b13fac9889349917b9e221c72b28e66d08 SHA512 4cedce5df5303d5b90c60045f3c1b94943a28f3e3060b8ad76ea5cb84a8e85dbd473d0e528dc281af3bd7d628e19c5b764f282efa23c79c6a287b22053026946
+MISC metadata.xml 588 BLAKE2B 29822d420fb395605213953fe402b6de7dde80853cf49687473ae6a3ea65d3582d423f8ea6223423ef73c6b46f0a3828332d1056180741a8ce5538e369d48b7c SHA512 79614ff5ee010b013980d62d611d04e6bfa35c9cf6b4e07e5d8d34b717d3e7cc08159c5ac1ded84bbec1eab6a4b1bf8d4305ac5cba5106516009e1038a210ad6
diff --git a/app-arch/wimlib/metadata.xml b/app-arch/wimlib/metadata.xml
new file mode 100644
index 000000000000..6f9a4af2ec33
--- /dev/null
+++ b/app-arch/wimlib/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>slis@gentoo.org</email>
+  </maintainer>
+  <use>
+    <flag name="fuse">
+      Use fuse libraries
+    </flag>
+    <flag name="ntfs">
+      Use libntfs-3g library from sys-fs/ntfs3g
+    </flag>
+    <flag name="openssl">
+      Use the SHA-1 message digest from libcrypto instead of compilling another implementation
+    </flag>
+    <flag name="yasm">
+      Use yasm assembler instead of nasm
+    </flag>
+  </use>
+</pkgmetadata>
diff --git a/app-arch/wimlib/wimlib-1.12.0.ebuild b/app-arch/wimlib/wimlib-1.12.0.ebuild
new file mode 100644
index 000000000000..591962cc8862
--- /dev/null
+++ b/app-arch/wimlib/wimlib-1.12.0.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 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 ntfs openssl threads yasm"
+REQUIRED_USE="cpu_flags_x86_ssse3? ( !openssl )"
+
+RDEPEND="
+	dev-libs/libxml2:2
+	ntfs? ( sys-fs/ntfs3g )
+	fuse? ( sys-fs/fuse:0 )
+	openssl? ( dev-libs/openssl:0 )
+"
+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-benchmarks/Manifest.gz b/app-benchmarks/Manifest.gz
index 6adeeaaf6c29..d78ea33f7864 100644
--- a/app-benchmarks/Manifest.gz
+++ b/app-benchmarks/Manifest.gz
diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index 39e05f1ee594..0c63c0395411 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,6 +1,6 @@
 DIST sysbench-1.0.10.tar.gz 1496937 BLAKE2B d2cf3283a2e2cac89a54e51e975eecec4b5514c08b14fe81138dc36b077e82de54cb3c5d218e1cc00dc6bff66319d780c69249c49c93e810d3ebde3c0b36b656 SHA512 3e2c9597538c9b71a50a0fb0e198f8852206fc609b0968253ee6b12f652fd56f1b2c6e7a4c93161b725e5c56193f7ce9d5cf58c4882839a4c1055c539861d16d
 DIST sysbench-1.0.7.tar.gz 1494571 BLAKE2B 56b351cbc1af687b48cce0a98e07301c0d8d35104199adb1e05076091e06e363fd465caec14eb3b1572297f97d35e8fc5eb23eab5ecb70bb4bdb2b2886bc77e2 SHA512 0b32ad27180ab02df9c2e5e85a8b9bec231338cfb20d7337dd80f1e0628b48bae480fde9d69cd21730aa0ab7c65fecbede9c10cd4b96d0dcf44cd012afa10d65
-EBUILD sysbench-1.0.10.ebuild 1257 BLAKE2B ac7ec6f225018ed7453d5e90a5d7b9eb233248c8bd2d381d1a5e874da1ea5a78495ec7f0c2f85445acafdfebe2b421066f0b5c6f8bb1f706b9ec9a99062c8461 SHA512 bf0ac825d0ff12f745825134f24d58ea849cc61408324b5847d683d5a2c29884c1c98a47048067e1135a9057b8ef4d501ae9d2680a746a7cdd3ce26cb182ef02
+EBUILD sysbench-1.0.10.ebuild 1256 BLAKE2B d5d726931e768d61f947772ec53c65502f5b4e47a606645d865eb2a5a8d4a87d882d9fe6c5e1a561185a5e5e20efc7685b80916ad780b2ffe0f4511691927e18 SHA512 8f1e1da773fcf7ed68d8e5467de91096eb8f70ec63a58111acbf6caf8682863f2b09e17a7cc024256853a68fad2849927b0a9329f680f935dcd77ad5dcff03b8
 EBUILD sysbench-1.0.7.ebuild 1255 BLAKE2B 0999b1d683b47e6e3958f8a80e5faa10e9de052242e9bd2480363d0a31bb438db32b993b38dbc59ae5ee346f9cf5478f5a6ef7aa9593b1f31aa069f98e04efeb SHA512 4ca05385888089b471af38ea33861ff0b275494ccfafa090c8ae6893c206f842139aa2ce2be51f091eb0a16f903ea4c4a67ea55351bfc2702ca5a3fe9a7be88d
 EBUILD sysbench-9999.ebuild 1079 BLAKE2B dbf775776602edaff8ea8b12e1e1f895e7334c352be5ec6fec17400142a8e5dff1b3e3fbc89a19dad0ba86ea84a613b3d080261dafa8317471c1ce25603584ec SHA512 9bc554eaf47f3ddb41d8aa0590d686f9fd724dcf98445610a7bebe6fbd8f0b40a815c0cf5c4f0378a6424c1222ba117163c1c7e27bf5c7e717d3825aaa8193a2
 MISC metadata.xml 512 BLAKE2B c696a3f13c62ecdb93f09f486e27dce240ad3875bea3edf21a1cc74738b3e0cc293e4d5c42dd0175a3ae709d9d8f197aa06a8f5423d4b9b617ba4cac88cba3cb SHA512 8187049c2a67b1219cde6ababe233df864380dcb4adf9e5b3144f0fe488eb79d39739b80017ab47b0400c81b8c0d1f247de95e9dd0ef4c50b2a0d8a322ae81fd
diff --git a/app-benchmarks/sysbench/sysbench-1.0.10.ebuild b/app-benchmarks/sysbench/sysbench-1.0.10.ebuild
index 899409479d82..eaf22142c5cb 100644
--- a/app-benchmarks/sysbench/sysbench-1.0.10.ebuild
+++ b/app-benchmarks/sysbench/sysbench-1.0.10.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="aio mysql postgres test"
 
 RDEPEND="aio? ( dev-libs/libaio )
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 080ef986b9e0..4670a45df93d 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/eid-mw/Manifest b/app-crypt/eid-mw/Manifest
index 3911cc8290f9..fe149ee10310 100644
--- a/app-crypt/eid-mw/Manifest
+++ b/app-crypt/eid-mw/Manifest
@@ -1,5 +1,4 @@
 AUX fix_libressl_check.patch 1623 BLAKE2B da42629b930ecb956f8cc48b60ccbf4fe2f250cbd66a6cc93e0bf88bbd634c3d7bb8be40f1c9f19d011aadebc5cba60f3ca6fcbbaf2a7312d7daaa0e56e9c302 SHA512 0d834c62623e312b37e5908dbe6738efc726ae036bb7576cd25cb88156519dee17e35711ae4d583aeb4ea17e7220ff3210334c78d1e314fa0b972025250194fd
-AUX gtk_not_required_4_2.patch 3247 BLAKE2B d96e525bb14de06231e9bf5f124c52bf7db21ebef272d20356e7160940a168e35db241fb2ecbe97e49a550c455dfe8827d80f151934e8a3c6a4e27d0385aab3c SHA512 32e2da278c1fc8fdaf479a575daf65a1a3ed49475568556fba91cdca081b39fe6e7533f98aba4774f7eb00a04911fec3cf55fb2a75c57465d992801d3a4ee11f
 AUX gtk_not_required_4_2_5.patch 3495 BLAKE2B fa99e1ad8695795dd1c8d1a1fc0041fa7138d82fee98d98ef359141dc03d18cbeeaae4f1ad151f19b15ed1de37c387aeadcb3d69b6f79791a650e243faf2710d SHA512 9c5e1b614bb4230b67e1c11fed3693c1aae0b982ca7c5a26678ee6af7da48d0ef2eef479335d498ea5f75408a2a957763a611367aa39585c50ed2556aa09232b
 DIST eid-mw-4.2.5.tar.gz 7751526 BLAKE2B 4836dc3a5ba4d781b8c342231cbbe74411fc6f0bf4b32eaa42ac28ea7688815361f74a1def371a05e250d3249af7ff58d24a66062fe169717872d6789ffb54f1 SHA512 cf00f6aa295c3d057e77faddde31ba6b00ce44402bc0ad141c773fb58067d7cf2e107fc5f3a294be8731de592cb0895537cd29ad4e69f6721e6c77fa99c12075
 DIST eid-mw-4.2.8.tar.gz 7076407 BLAKE2B e1d9b375adb326cb710da9eb5cd125086cb40b6ee37ce2ac3912ac4b5fa9c92d66c8af002a47c9ce73ff98ad2306e96529e1c87486eb0f36e61a1f4eb2231b9f SHA512 bf910e8b5bad40fe65765524af20cf18e2c615b6b7bddfdd3024309d90767952875f1c264ea8bd8dfc73621a41683fce02501febe71c016816ccc0f75d88d8cb
diff --git a/app-crypt/eid-mw/files/gtk_not_required_4_2.patch b/app-crypt/eid-mw/files/gtk_not_required_4_2.patch
deleted file mode 100644
index 7990acaebdd2..000000000000
--- a/app-crypt/eid-mw/files/gtk_not_required_4_2.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-diff --git a/Makefile.am b/Makefile.am
-index de5416f..8e55277 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -1,7 +1,7 @@
- ACLOCAL_AMFLAGS = -I scripts/m4
- EXTRA_DIST = scripts/build-aux/config.rpath  debian rpm doc
- 
--SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi plugins_tools/aboutmw/gtk plugins_tools/eid-viewer
-+SUBDIRS=cardcomm/pkcs11/src doc/sdk/include/rsaref220 plugins_tools/util tests/unit plugins_tools/xpi 
- 
- xpipackage:
- 	$(MAKE) -C plugins_tools/xpi xpipackage
-diff --git a/cardcomm/pkcs11/src/Makefile.am b/cardcomm/pkcs11/src/Makefile.am
-index 6e33315..fce4494 100644
---- a/cardcomm/pkcs11/src/Makefile.am
-+++ b/cardcomm/pkcs11/src/Makefile.am
-@@ -165,8 +165,6 @@ libbeidpkcs11_la_SOURCES += \
- 	dialogs/dialogsgtk/single_dialog.c
- endif
- 
--libexec_PROGRAMS = beid-askpin beid-changepin beid-badpin beid-askaccess beid-spr-askpin beid-spr-changepin
--
- if P11KIT
- dist_p11kitcf_DATA = beid.module
- install-exec-hook:
-@@ -176,28 +174,4 @@ install-exec-hook:
- 		$(LN_S) $(libdir)/libbeidpkcs11.so.0 beidpkcs11.so
- endif
- 
--beid_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askpin.c
--beid_askpin_CPPFLAGS = -I$(srcdir)/dialogsgtk -I$(srcdir)/../common/src -I$(srcdir)/src @GTK_CFLAGS@
--beid_askpin_LDADD = @GTK_LIBS@
--
--beid_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-changepin.c
--beid_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_changepin_LDADD = @GTK_LIBS@
--
--beid_badpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-badpin.c
--beid_badpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_badpin_LDADD = @GTK_LIBS@
--
--beid_askaccess_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-askaccess.c
--beid_askaccess_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_askaccess_LDADD = @GTK_LIBS@
--
--beid_spr_askpin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-askpin.c
--beid_spr_askpin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_spr_askpin_LDADD = @GTK_LIBS@
--
--beid_spr_changepin_SOURCES = dialogs/dialogsgtk/parent.c dialogs/dialogsgtk/beid-spr-changepin.c
--beid_spr_changepin_CPPFLAGS = -I$(dialogsdir)/dialogsgtk -I$(dialogsdir)/../common/dialogs -I$(dialogsdir)/dialogs @GTK_CFLAGS@
--beid_spr_changepin_LDADD = @GTK_LIBS@
--
- pkgconfig_DATA=libbeidpkcs11.pc
-diff --git a/configure.ac b/configure.ac
-index 92bbb3b..a47e7c2 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -59,14 +59,6 @@ fi
- 
- AC_DEFINE_UNQUOTED([HAVE_GTK], [$have_gtk], [Set to major version of libgtk])
- 
--if test "$have_gtk" = "no"
--then
--	AC_MSG_ERROR([At least one version of GTK is required.])
--fi
--
--PKG_CHECK_MODULES([XML2], [libxml-2.0])
--PKG_CHECK_MODULES([libproxy], [libproxy-1.0])
--
- ###########################################################################
- ####### read user-specific requests from --enable directives         ######
- ###########################################################################
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index b66714d33f75..519140081ea4 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/leo/Manifest b/app-editors/leo/Manifest
index 4070579b522d..ffdcd1305337 100644
--- a/app-editors/leo/Manifest
+++ b/app-editors/leo/Manifest
@@ -1,3 +1,5 @@
 DIST Leo-5.1-final.zip 9028778 BLAKE2B 17dcec884acc552c8079a842bc645c3279e66e52e2f043a92867ce4f00491561753156c8e4a31b9b132d2546d44a79d2d9c0050dfc153e0f37f043c992d0cb74 SHA512 a8e1d42c0b7c8f6aa4465295515ef19965a03142997a1b65304fd72a2c541248b7dba66d7be295465fd6dbdd7fcd5c6e6542d222edb71ddcab093c0c360340b1
+DIST leo-5.6.tar.gz 9255687 BLAKE2B 46a9aa1d90a1663ece57731b3685def3bf050f2c398310aca9d24c07256d23e40a94e505c43bd90c6c5a58fda2021409d3e6510eddd5a1bc0533273c45495475 SHA512 c9f6583be4f6a76d781adccc4076782c6f136b1057796228a398cd31c92d61e1b7a86d151f36352c6b1f677bb3d298b6f347c9874e3782c645fdb6ee38747955
 EBUILD leo-5.1.ebuild 752 BLAKE2B 3e332a29baad839b4d77e98696030bad380c6114cf434ee7b3ae1ec64e4105c206e44fb7e17d2fb27a6dc5ca634b5750d279bf0796bd76b15445cc1af754ccfc SHA512 18dfa9502681e7f206ec99e3a3c82e7b5b8b00e0b0a1f7b6a00a218db1458cf6944cda41dfa4dbc419b8208e123fd23ad07122fe755c7120d814876f68410110
+EBUILD leo-5.6.ebuild 816 BLAKE2B f3f952bb40e8d3bd36d3a6e7fa637618b02bd6e28dbfb01c70019113bad9562e0ab063335243ebfd84d26eba06e5001027989671ebffd564feb4f10ecab6392e SHA512 0a77b58defea7f4a00c8c3cad0376570da17511d2f18298d97159c524911a62669b1dc859d3c1370c1a4342436c615fa31db4fa4aec5e4212671d05e1f5a5a89
 MISC metadata.xml 308 BLAKE2B 2c8d0a692156e40f0d67d490212ded6b82a67efb0450e6512db856cc108772745dbcc5fade6b866b85bf07b4416db3357d3c04f3287ef8958477e6008828a8a3 SHA512 cfa3bb11079aca56b6b381f365e655078a1f07738c3af9d6c7d10313ee0a6826c0f40cc70e8ff31be6bf033a5effc8a7d725bccda8f78341700df10717976c66
diff --git a/app-editors/leo/leo-5.6.ebuild b/app-editors/leo/leo-5.6.ebuild
new file mode 100644
index 000000000000..a0947693d106
--- /dev/null
+++ b/app-editors/leo/leo-5.6.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="${PN}-editor-${PV}"
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQUIRED_USE="tk"
+inherit distutils-r1
+
+DESCRIPTION="Leo: Literate Editor with Outlines"
+HOMEPAGE="https://github.com/leo-editor/leo-editor/"
+SRC_URI="https://github.com/leo-editor/leo-editor/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	app-text/silvercity[${PYTHON_USEDEP}]
+	dev-python/PyQt5[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	cp leo/dist/setup.py leo/dist/leo-install.py . || die
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( leo/doc/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/app-editors/pluma/Manifest b/app-editors/pluma/Manifest
index 983ca61d6b60..0324bf819215 100644
--- a/app-editors/pluma/Manifest
+++ b/app-editors/pluma/Manifest
@@ -1,9 +1,9 @@
 DIST pluma-1.12.2.tar.xz 3397280 BLAKE2B 23af095549ff944b0936889deda6576717a6376aa2f2be8ed9b7d8ad70f8bb0524aff7314f9c335a42d80951c047c8008278144f45c2c5edb09a259b298c0024 SHA512 db2878161903868703514531ba214fc34dad1789885f18756e9192d6ba17950c8be03141ada72f8c386b515d8b0f9d58a0ee94a33fe3ffe00f360ea667c2b275
 DIST pluma-1.14.1.tar.xz 3415364 BLAKE2B 9449fc6b5e98d8ecb25f70df6c114c13cc32a8c0348ed2047eb874e85c7d448d3d7f0b4d7dd6e2fada3de847ded425651dc6d0ca92ce3c784fd32948735f3b25 SHA512 5d04e053ab2eb0f90e34d9af541004867c7317fd9386229c4e702e95a80420df16b20e4ae4c30bbee79fe904282f6134f7c361971be07cd6952612d975c88d11
-DIST pluma-1.16.0.tar.xz 3412640 BLAKE2B dff2b93ff24a75b0c3f4418ea117297092ec52cc550ee1da5fbbde157dd354d8ca754de88b511eea255b6b4aea62d9e17002d6cf9ea865c267c09b79054e65f1 SHA512 2472a1631cb89f4df0d09558bd274b6c6d042ae4cbb6ae0134a089cfefb5d0673ec28d78d3665dd1933f76a9c20517afe626f921e06703af9e3c71b9f3b96260
+DIST pluma-1.16.2.tar.xz 3428472 BLAKE2B c3b543fb11678269fbbc2d049686b2a553aa1fede4ef1bab8abbc7fed316f27ba67cbb366908966b6c844f8ad0c4899499e52b4720378364555ef9156c80ae95 SHA512 bf91a7e4e1cfb92f9fd9a1d5b4ac9f0fd2704785b2da5d7a3aa360b4c217a57653d6f7bf509c156b8711bc5164e022c685331c93a139f55ea41431bc72e848fe
 DIST pluma-1.18.2.tar.xz 3348500 BLAKE2B 356e01e268f0a9447a08bc5daf8facb1b1249c96a041cc34a1311a4f96cf01ae53e08141f08ab14ff37bfda28adbf5cdb26a9b381ca7e87d739c7931bb551936 SHA512 285170531c92ad13fdd35286c06de62b75f0426a830c51f4f54799b4b5377d65b3e1fd1e1af3827462a356947e853e4203a4ed394a8b6137bbd87e289f490b6d
 EBUILD pluma-1.12.2-r1.ebuild 1957 BLAKE2B 439ee1e569e161b2227abc7dffcb3815582f4f2a597b4d1769f1d0d1d2308361156cbaba558bd8e760499f129dade20a987e66dc94a7caf3cf530f3ead64a997 SHA512 fc460f11527c2a5cdced694b8c59ede5931f2ecf452e7a862791fe93fa18b2c260a51d8f6fca17c58445a59357efe48a6431d5824c8c045fd719ebaca5730860
 EBUILD pluma-1.14.1.ebuild 1999 BLAKE2B 179b831656292280771e6d4244ff24f8a4cf3285e82ba021ec73a32e6047cc9db2ce3ee9da226fb70d674e9b183c07ed55fe6cdb151b891b9b00a4199e4c4ac9 SHA512 095ec46f710d2ad58819291e28a560a4fadcab2790142604d025c69bfd1842ae78f7dca3ff5098062b2bf63f2448b5e96d66a64504edee21e9ba43a84a4e4c7e
-EBUILD pluma-1.16.0-r1.ebuild 1999 BLAKE2B ec8c5e41a7174d22fe15653d21a9690a87c28c2469a17b5795df93f7462f661b05b50f097464c47936c881f17f7fadd60425c89e0486e250d7929c0c632abdd6 SHA512 53bed20531162710f96ecb1cf3386b136792cd8a68eaf99608b7578f1ea54c4220dfbd327b890eda9db3d535b2196cbe11dbdc0f827bc2e90b27b5e7d3484482
+EBUILD pluma-1.16.2.ebuild 1999 BLAKE2B e301396e062768616a2c775d8fe644340eaaa4b085f2e8faf697f0aade4494b86cb4d5b3ad7218caec0677458f43ff27d80aa1f64cc5c40b07296127f8479ca9 SHA512 3394730f3248e8eaae6703aa472a4916e68e3aa96cc01dbe77df11786a48b95ba8a6936948fd3e2d6b921d8465f3ad05e98226802bdc8a198fee1a9aa66b31b6
 EBUILD pluma-1.18.2.ebuild 1764 BLAKE2B bad2f6fada432458399f17e3de3c467ad99662c7ecfcf06217e19e39349f1e283b88f31955ebff44fb243d4ca24de6a0f4c9e5b9b15237a3ab9b2cbd920cfd46 SHA512 edfcedeebe9b8a8ac20531ed4a6ebda38d9cc2b93873de10c535de146c0ffb5a7004d0a79cb8de2031090c638f24c64042bcb9321adcf9a80c0fba48ca655c4d
 MISC metadata.xml 410 BLAKE2B b9e15ebb574ba3482e7317f89fd1bd599a0ba5d42a27e0c0da34f86ed64830819f23fca50865cdba6081daea8313b82a58cf98fa46e3ccc61eb389222cd1bfd4 SHA512 0e79ae54838d841d9e4d65b82af5042223e07585808bcdbf9c26ae7b59cfc7b66d1bb24b39e1835ca75dd724d34854fd12d881b7edb20850fa434cf1db2b2e14
diff --git a/app-editors/pluma/pluma-1.16.0-r1.ebuild b/app-editors/pluma/pluma-1.16.0-r1.ebuild
deleted file mode 100644
index bba625640334..000000000000
--- a/app-editors/pluma/pluma-1.16.0-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate multilib python-single-r1 virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Pluma text editor for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="gtk3 python spell"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
-# https://github.com/mate-desktop/mate-text-editor/issues/33
-RESTRICT="test"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.5:2
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libX11:0
-	>=x11-libs/libSM-1.0
-	x11-libs/pango:0
-	virtual/libintl:0
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=x11-libs/gtksourceview-2.9.7:2.0
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=x11-libs/gtksourceview-2.9.7:3.0
-	)
-	spell? (
-		>=app-text/enchant-1.2:0
-		>=app-text/iso-codes-0.35:0
-	)
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtksourceview-2.9.2:2
-	)
-	!!app-editors/mate-text-editor"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]"
-
-DEPEND="${COMMON_DEPEND}
-	~app-text/docbook-xml-dtd-4.1.2
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	>=sys-devel/libtool-2.2.6:2
-	>=sys-devel/gettext-0.17:*
-	virtual/pkgconfig:*"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable python) \
-		$(use_enable spell)
-}
-
-src_test() {
-	# FIXME: This should be handled at eclass level.
-	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
-
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
-}
diff --git a/app-editors/pluma/pluma-1.16.2.ebuild b/app-editors/pluma/pluma-1.16.2.ebuild
new file mode 100644
index 000000000000..801ac0a47337
--- /dev/null
+++ b/app-editors/pluma/pluma-1.16.2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate multilib python-single-r1 virtualx
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Pluma text editor for the MATE desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="gtk3 python spell"
+
+REQUIRED_USE="
+	gtk3? ( !python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+# Tests require gvfs sftp fs mounted and schema's installed. Disable tests.
+# https://github.com/mate-desktop/mate-text-editor/issues/33
+RESTRICT="test"
+
+COMMON_DEPEND="dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.5:2
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libX11:0
+	>=x11-libs/libSM-1.0
+	x11-libs/pango:0
+	virtual/libintl:0
+	!gtk3? (
+		>=x11-libs/gtk+-2.24:2
+		>=x11-libs/gtksourceview-2.9.7:2.0
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3
+		>=x11-libs/gtksourceview-2.9.7:3.0
+	)
+	spell? (
+		>=app-text/enchant-1.2:0
+		>=app-text/iso-codes-0.35:0
+	)
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-2.15.4:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.12:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtksourceview-2.9.2:2
+	)
+	!!app-editors/mate-text-editor"
+
+RDEPEND="${COMMON_DEPEND}
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]"
+
+DEPEND="${COMMON_DEPEND}
+	~app-text/docbook-xml-dtd-4.1.2
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	>=sys-devel/libtool-2.2.6:2
+	>=sys-devel/gettext-0.17:*
+	virtual/pkgconfig:*"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable python) \
+		$(use_enable spell)
+}
+
+src_test() {
+	# FIXME: This should be handled at eclass level.
+	"${EROOT}${GLIB_COMPILE_SCHEMAS}" --allow-any-name "${S}/data" || die
+
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	GSETTINGS_SCHEMA_DIR="${S}/data" Xemake check
+}
diff --git a/app-editors/xemacs/Manifest b/app-editors/xemacs/Manifest
index e737b619995b..57e5c5fabee7 100644
--- a/app-editors/xemacs/Manifest
+++ b/app-editors/xemacs/Manifest
@@ -10,7 +10,7 @@ AUX xemacs.desktop 1061 BLAKE2B 47941fc8b380e08aad13e44fc1899ee73ef502dbbf5d8be4
 DIST NeXT_XEmacs.tar.gz 39571 BLAKE2B 7abf17627ec34e6b0d0edde444028c46dca6d703cfa208a8a1eaf30e2fc2543b953c9a9582c3d55bd5b37e746f45c03ebfc408a0d965606e45d5f4adb9148dea SHA512 611ddbbf5be3d2274e7f76be7f8200c6c7f3cba917efcc24e73685aa5f61c94237e6e48ce66f2d59ee4b74862e686f3ea7a29cf006717d5d0674db24d243d566
 DIST xemacs-21.4.24.tar.gz 8543879 BLAKE2B d7e60e4e053a10bfc4591a5d691c849ef5e5436f6951c801f5a169592b160669d0f6b9dc8f10b6b79889a3210de977ed78a5cea826c02e425495364745ef9e10 SHA512 b7a88d5a4a9f74f74c2067ed60f7ea87ac8ccad5d9c2c1033ecf07f540250191f8fa5f9e6d23d9fedd0f2ab1eb5ea6c29a7665a310ec512d85e2e4f337447213
 DIST xemacs-21.5.34.tar.gz 15816932 BLAKE2B e3be282717b91308c94d3d4bee74527d0b31ea5019e8ac38a62385d2ffd6f684c9e4eaf37c025db5e48a4c8f82d165fcc5258e49934c094cb66e0655d27c3e7d SHA512 b61d88fe530a77b88c2ed0cecd6597ed3c265450bc61f7c6823920f774b2d566ef6fc18a6c33928d846d08d465617d4ccd3c4656606ec8634127a683abbc929a
-EBUILD xemacs-21.4.24-r1.ebuild 6738 BLAKE2B 571c00ed71efe82e49a43260c32758131cce9e4e7c4e5be605852b07a55c90649ed6c8453fed1c44a896952816145e280f1d4039e5840a8ec57a95fc539676df SHA512 744cce7616b1a80044cd3ec463ccef658acf1fdb89ddaf7a9ffd04667dd3375dd119c495de30150502cf40ec04ea15b78bf6c2c66d14a86dea5c4e10f6d06961
+EBUILD xemacs-21.4.24-r1.ebuild 6746 BLAKE2B cd3424b256c531370bc391dd7a3aa0d4dd0f957732b7b5e3a90b77969291dc0195fc5d996a504a914a671e6fe7ec68e8e7ff82a15f65adb835ee1bd9ade03a9e SHA512 9ade0e7cea5ff4e1f3a0d845ffc2205b261e39bc877038f9d14cd3105630234a7eee3d340bafa80d961115d14d4442437ee3ede9f38a078b48989bc487ce7e89
 EBUILD xemacs-21.4.24.ebuild 6788 BLAKE2B a8d5f8e02091ddf74fdfa162495ffb4e1916217c67a918ca6ab6608e8b93e27c1870837a928bc5e2c054fb01bcf30e2afd5d3408e5cf72899e71cf3a306c7d47 SHA512 16138020c9b6cbc0530bfb19e4d0f70761b07e4cff8d18cdb68685f0d377fb21537b2d2e96822a06cc78d03908e0ac1ea82e109b58a02bf1b0a32fa7388f4fc9
 EBUILD xemacs-21.5.34-r4.ebuild 7233 BLAKE2B ce8899fb0469c40d4e7d23c79acacd7572c2dd851c6552a4c5d1b5e90da5962cb5586aa9721568169a8d3387a491ae3086823a341e840ebf466eacf75a2d8309 SHA512 ae27520c812aeb17cd6de7dea660d3c2f5bc9394a608b17f1e254ce197b68aa05b9a1c7fa173ae7cc0f2ae0462189ecbca13b5ae6df3555fb8ab9727d0bffcd6
 MISC metadata.xml 666 BLAKE2B 973f63c51ed0fc6532c2ba3acdac88ae4224eaa9fc5a6524712660d24dc5b8672b39123841eb3122b767f454006aefc7b2b7ebb443a7e45063467c659c813983 SHA512 e106c48dd98ac741c2fe9780e86f77a339957ecb490b0f33b88e65b61724f8f96531c8cc6075bd724e97ea4efb9b7e4cae5d7a33fe51e5693fd04734d83c135a
diff --git a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
index 6975de5d4292..1afc4acebc1a 100644
--- a/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
+++ b/app-editors/xemacs/xemacs-21.4.24-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Note: xemacs currently does not work with position independent code
@@ -23,7 +23,7 @@ X_DEPEND="x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps"
 
 RDEPEND="
 	berkdb? ( sys-libs/db:= )
-	gdbm? ( >=sys-libs/gdbm-1.8.3 )
+	gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] )
 	>=sys-libs/zlib-1.1.4
 	>=dev-libs/openssl-0.9.6:0
 	>=media-libs/audiofile-0.2.3
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index a25fa55d4e44..6e88d8761f73 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/pariemacs/Manifest b/app-emacs/pariemacs/Manifest
new file mode 100644
index 000000000000..f408e01feed8
--- /dev/null
+++ b/app-emacs/pariemacs/Manifest
@@ -0,0 +1,5 @@
+AUX 64pariemacs-gentoo.el 224 BLAKE2B 8ae37110131dc88c43273313d52e6036c71712b77a08d66bbd4316dd363cd23a3892f35693ab2f446d5600ab480fec6bd567c5280c7632f69f70103d0ff24116 SHA512 3d3304a3b44a686186e1054af3fa55d7881742f62000d968a4651da1cfddb53650b3b690ee0430b684493578fb11d73531ad07a5a8681516d837788262cc9477
+AUX pariemacs-3.14-makefile.patch 1487 BLAKE2B a7fa6fa8aea98627a6e9f509376fe0a11e1e8b5db8c5bb6b486c053d6f716500f2ccb189c1cc0cbe49ac68b74d49fb6313a178d7178070365bc19d2ac4ebf96b SHA512 87a3c229561498f7f7256a2b3dfe2abecd6e962d53379cc38fc6a4fe7a86940ba0c4e8ba51c7520480c218c18f48cde90dfdfe7b371db53f1c8c36e2a6a0f0a1
+DIST pariemacs-3.14.tar.gz 114347 BLAKE2B 40e7b11d3fd674a2525c145be97f3b9119379e7a2a1c689b1e76107bccc0d48b08d7e8e2f1785bd315723e99961e06409e102946fceaf52099f4bc7cf6ef9ed1 SHA512 97ef66c497594c288e7f3e3c77d8d5ec31acf6cdcf86443e0754c69074adf51b07620c858dd5a71d3dbb2a58b05f6774e348c2079e9cc888a909988c4470c79c
+EBUILD pariemacs-3.14.ebuild 872 BLAKE2B 597294183d298d68c9bf12936a1cfbe1e1720048b23b875410960ef39498ffe6d242d4daaf5533b283a7ebb4310cd8b48ac84845d4d6131c319049f3660254cf SHA512 a26b1b58d4442a424d98108e5d47be739888691e7d8bc09634fe8ad50920b822a57bb5c4815e07b7d8b71cf8752628edf2cd6027bcb8e4a77580ea49fc72d544
+MISC metadata.xml 385 BLAKE2B 571589c01efc6d5a066ed50fbe40d5136a13184c4fc755457e73d75fa0cf76a580a42488da78363d476c4c089f69d34b9ff3cf99d407157b3993b6d7caa22a11 SHA512 60a84b02c2a242f238ce0a1fba4be9a1b2e7ece99c09d13e647835aece76ae8ddb93617fd43c390e5185c486bcdf62afb3169d64693f94c947954d57a4de6270
diff --git a/app-emacs/pariemacs/files/64pariemacs-gentoo.el b/app-emacs/pariemacs/files/64pariemacs-gentoo.el
new file mode 100644
index 000000000000..2dc1967ac762
--- /dev/null
+++ b/app-emacs/pariemacs/files/64pariemacs-gentoo.el
@@ -0,0 +1,7 @@
+;; site-init for pariemacs
+
+(add-to-list 'load-path "/usr/share/emacs/site-lisp/pariemacs")
+(autoload 'gp-mode "pari" nil t)
+(autoload 'gp-script-mode "pari" nil t)
+(autoload 'gp "pari" nil t)
+(autoload 'gpman "pari" nil t)
diff --git a/app-emacs/pariemacs/files/pariemacs-3.14-makefile.patch b/app-emacs/pariemacs/files/pariemacs-3.14-makefile.patch
new file mode 100644
index 000000000000..bbcd8b77c585
--- /dev/null
+++ b/app-emacs/pariemacs/files/pariemacs-3.14-makefile.patch
@@ -0,0 +1,51 @@
+diff -r -U2 pariemacs.orig/Makefile pariemacs/Makefile
+--- pariemacs.orig/Makefile	2017-12-05 18:54:54.000000000 +0700
++++ pariemacs/Makefile	2018-01-13 19:15:31.095946659 +0700
+@@ -5,19 +5,8 @@
+ 
+ # Path to pari.cfg file.
+-# Several possibilites:
+-PARI_CFG=/usr/local/lib/pari/pari.cfg
+-# For Debian (package "libpari-dev") install: 
+-#PARI_CFG=/usr/lib/pari/pari.cfg
+-# For some other install, the architecture is mentioned 
+-# (see https://wiki.ubuntu.com/MultiarchSpec):
+-#PARI_CFG=/usr/lib/i386-linux-gnu/pari/pari.cfg
+-#PARI_CFG=/usr/lib/x86_64-linux-gnu/pari/pari.cfg
+-
+-# In case, you cannot find it, you can use the following default file
+-# (but edit this file first): 
+-#PARI_CFG=./pari.cfg-default
++PARI_CFG=./pari.cfg
+ 
+ # Where to install ourselves ?
+-INSTALL=/usr/local/share/emacs/site-lisp/pari
++INSTALL=/usr/share/emacs/site-lisp/pari
+ 
+ # Path to 'emacs' binary
+@@ -34,8 +23,4 @@
+ TARFILE=$(DIR).tar
+ 
+-install: pari-conf.el elc
+-	mkdir -p $(INSTALL)
+-	cp *.elc *.el README CHANGES COPYING $(INSTALL)
+-
+ pari-conf.el: 
+ 	@if test ! -f $(PARI_CFG); then \
+@@ -52,16 +37,4 @@
+ 	   -f batch-byte-compile *.el
+ 
+-distrib: 
+-	@if test -d $(DIR); then \
+-	  echo "Remove $(DIR) before building a new release"; exit 1; \
+-	fi
+-	@tar cf $(TARFILE) $(FILES)
+-	@mkdir $(DIR) && mv $(TARFILE) $(DIR)
+-	@cd $(DIR) && tar xf $(TARFILE) && rm -f $(TARFILE)
+-	@tar cf $(TARFILE) $(DIR)
+-	@rm -rf $(DIR)
+-	@rm -f $(TARFILE).gz
+-	@gzip  $(TARFILE)
+-
+ clean:
+ 	rm -f *.elc pari-conf.el
diff --git a/app-emacs/pariemacs/metadata.xml b/app-emacs/pariemacs/metadata.xml
new file mode 100644
index 000000000000..5946ec67bdb8
--- /dev/null
+++ b/app-emacs/pariemacs/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>sci-mathematics@gentoo.org</email>
+    <name>Gentoo Mathematics Project</name>
+  </maintainer>
+  <longdescription lang="en">
+    Emacs modes to edit gp scripts and to run gp in emacs.
+  </longdescription>
+</pkgmetadata>
diff --git a/app-emacs/pariemacs/pariemacs-3.14.ebuild b/app-emacs/pariemacs/pariemacs-3.14.ebuild
new file mode 100644
index 000000000000..aa608c9b7eaa
--- /dev/null
+++ b/app-emacs/pariemacs/pariemacs-3.14.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit elisp
+
+DESCRIPTION="sci-mathematics/pari emacs mode"
+HOMEPAGE="http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+SRC_URI="http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/latest-pari-distrib/${P}.tar.gz"
+
+RDEPEND="sci-mathematics/pari"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"
+SITEFILE="64${PN}-gentoo.el"
+DOCS="README CHANGES"
+
+src_prepare() {
+	eapply "${FILESDIR}"/${P}-makefile.patch
+	eapply_user
+	if [ -f /usr/share/doc/pari-*/pari.cfg ]; then
+		cp /usr/share/doc/pari-*/pari.cfg .
+	elif [ -f /usr/share/doc/pari-*/pari.cfg.bz2 ]; then
+		cp /usr/share/doc/pari-*/pari.cfg.bz2 .
+		bunzip2 pari.cfg.bz2
+	else die "pari.cfg not found"
+	fi
+}
+
+src_compile() {
+	make pari-conf.el
+	make elc
+}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 641ac630eb7e..6260dfdb2df8 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/free42/Manifest b/app-emulation/free42/Manifest
index 0d8cdedb62fc..1724d8fdc8d5 100644
--- a/app-emulation/free42/Manifest
+++ b/app-emulation/free42/Manifest
@@ -1,9 +1,13 @@
+AUX free42-2.0.10-fix-build-intel-lib.patch 690 BLAKE2B f385747de929bb5963f9dccd8b44c79cc3b57a2842650792f1b20e31ff59ec30ab4cc8ec27f15b8fd134005b568da1e928722c04ff9e58d30751b7b761403b93 SHA512 5888aa234e102135659599babcc3bf765d1076813e6a1b6600236a698fc369f8800212da60027fa2c3428f8c49934563f0f602828f059d57367b2b6e9387147c
+AUX free42-2.0.10-fix-makefile.patch 1742 BLAKE2B 89e7ca26a56b335b15da74d97cd2ef57495cdb09c8cb1189246e31df171fc16f4dc043e60dcb7854c9ea593d38c6c5d89a01818a93e4033544736e7e2ecb66e8 SHA512 36906f03461ac391766b833fe0ccd59919799fe33e3cf4bd975a03f18d1f6ef26934a34e1df2eeb6d42afa147b7bfb5bf93d8ea13283033c96c49d284df52862
 AUX free42-2.0.6-fix-build-intel-lib.patch 690 BLAKE2B 0d8de8c32f92c01174e420e0dc74880bd3c3316c36dc947f84803a8f61ad491a0de9d27fa45ed7c72992b4e22c5e204bce27d47ec976048c4eff655d14312839 SHA512 624cf0af83f02b3a43231739de3d84e76cbdfe49becd219c9211cbc8ba7fc7d3474fc465edbf7e707f1474844e109d5d30361c7e15e3799db48bf0dda068d5ed
 AUX free42-2.0.6-fix-makefile.patch 1742 BLAKE2B 239bbb40c70a3627cf08859397bace5ecd6bbd215cc06f6d82862b908169af4851002fbb3cb7059aa553c3b7da266e5b0b2a1dede891a4f085822a2e731a9399 SHA512 d3add6369d6f2b5d4690355d93cfff903866f24aeed7d73246a79b4ba7b2551fec4ec61cf2d8c80d089194bf39f0c3a1faa4c6d1829f81b6c636b8f5d132b2bd
 AUX free42-2.0.8-fix-build-intel-lib.patch 690 BLAKE2B e7a5f572ec87593ddca5fb91b08a10d67a516233eb2fedf9442fd7a69603230e6db97b67f65d3b699ef326cb834ac34ce388aea4dca6fbc90c4de1dae53d981b SHA512 9c8ff817e64022e2b476518387e0ded4b3353401c3d2a0a09f68c0142721b91c2dce4bbd6a5bd397d6a768d1eb5ff37d1686161b01709d964f0cc86783c42779
 AUX free42-2.0.8-fix-makefile.patch 1742 BLAKE2B 900cafe1140e32f7b8c3a281f9d0d789d4bb54b720a21780b4a7796d0746417178b2a0b577d3973d3f9a3f9d4c6f0a50fe1f6ee208ce33022efe645deb8a3eeb SHA512 cc5c147fa0f209f2b69b4825f964733f33e6c984308f3652042782bf607dfa6074dffc0b8e2463fa0d3d9c36ae10735cefc16221d3aa0cfe46aa7b464a253dd6
+DIST free42-nologo-2.0.10.tgz 7389429 BLAKE2B a633a78ed5974e327aafa9d783c04bdcaa895940580c595c9c67ab0181ec7000efaa92021a485199268341f15f4c4bafe3964d4118c068e8abbfa2f358045b5a SHA512 4f03b9b206ef17e71295f0baac96ca26f34a00844cee6cad254f8ab798d3d0c724788200f3f207a3301f62eb0960707a23e6bcbb2ac924a78b0f0e1c78e70e6d
 DIST free42-nologo-2.0.6.tgz 7348647 BLAKE2B 708c88b4903358c23989d515c61884ffc9feae3d43fc54f1ac8a18779cfe8aa2d0e1a2ec667e24f78da58cd94ad515399191b7dc968adbc59bb97517b34680be SHA512 078a79cc4dfa36ae7342be5b90350f4b7269f4e71777f2620c2043510d6313acbc1fa9415b75f8b01bebb2de747b9af8a26738f877c34a4d82a1fdd52c75a61d
 DIST free42-nologo-2.0.8.tgz 7388038 BLAKE2B e2065ae71cf0be55d7de295965d7c884d2db6bd8aad6eefe85d04028dacf114c7d6cfc90f02b78a220f118ee26fd3b8fa830a802015da5c56f695621bf4ec5ff SHA512 3da4045ddf8a9993369a25344f5d4f472283a7affd4d5640a47dbce4debe4e071b83ad7858f79113d8be2255fc11df8b22edb4c66471945d341e8ffb79495fee
+EBUILD free42-2.0.10.ebuild 1044 BLAKE2B c4c0605c674b6168c07d5696eab9186f1fa4734e87b9a3ce0ccb7deb0a35320050b2221d6293d39e95f2863ea680fb945a2cb4fe9cc9825335c9e5825113f86c SHA512 56023c7c1d1d87ca4fdecfc8b28512373bce0e59fdf1d264c2b2e981a7ac1471bd8c3e48cfda94ae7d2971fa01920485cb2d755a3dc6a51607202541160da0bc
 EBUILD free42-2.0.6.ebuild 1043 BLAKE2B b36c46e0cbc518ff8b016e78850a8f50694d82e79f0105af11d3a550ab6edabd8d49f64f089c286b95edd4609e0daa99feacf90a8304525275fd08b88a9ede92 SHA512 fd74b7b6fc40bf7e72e6af0cbc5e376dc08d2b687c751f899dad78a62783463d23b917a27ab663d5c94dc063b8910d5e3f992b7d0847b0434db15f70ce68c900
 EBUILD free42-2.0.8.ebuild 1040 BLAKE2B 3b04a83622ee7b6f0bbfd79137c6ea82dcce5438155b409a6161c878f5b6d794e4fb45cb01faf3ae53ad634cd37280ff415ae86ce64b48f9b9feb93c9413803b SHA512 c69790682e684bc136cd095bd093e8ac23e7fbff77081c88a395e3317473edc8fec1f2356ef50bd0d5e78f84086b2d28fc3bf8e4c668065190b141f995b8cc03
 MISC metadata.xml 540 BLAKE2B de6a28fadb4dba9dac7c9aadbbd0972cb9583c8b1aac154ed9247199287c060adbf5df8a0639b7e4ff218da84a5e1c19e855e2c11688124c76c1cc07fca1e393 SHA512 88a7488f445dc2233eecb68e9100751da821c45ddb6c60a18600dabe7278681a3625abd59ed7088bc526d0853529c98bb84fdd76796a5cdd4a5379bd6e17b7cb
diff --git a/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch b/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch
new file mode 100644
index 000000000000..a321b1d714b8
--- /dev/null
+++ b/app-emulation/free42/files/free42-2.0.10-fix-build-intel-lib.patch
@@ -0,0 +1,12 @@
+diff -Nuar a/gtk/build-intel-lib.sh b/gtk/build-intel-lib.sh
+--- a/gtk/build-intel-lib.sh	2018-01-08 02:52:33.000000000 +0100
++++ b/gtk/build-intel-lib.sh	2018-01-13 19:43:23.709997784 +0100
+@@ -4,7 +4,7 @@
+ cd IntelRDFPMathLib20U1
+ patch -p0 <../intel-lib-linux.patch
+ cd LIBRARY
+-make CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
++make A=a CC=gcc CALL_BY_REF=1 GLOBAL_RND=1 GLOBAL_FLAGS=1 UNCHANGED_BINARY_FLAGS=0
+ mv libbid.a ../../gcc111libbid.a
+ cd ../..
+ ( echo '#ifdef FREE42_FPTEST'; echo 'const char *readtest_lines[] = {'; tr -d '\r' < IntelRDFPMathLib20U1/TESTS/readtest.in | sed 's/^\(.*\)$/"\1",/'; echo '0 };'; echo '#endif' ) > readtest_lines.cc
diff --git a/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch b/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch
new file mode 100644
index 000000000000..7642316920f4
--- /dev/null
+++ b/app-emulation/free42/files/free42-2.0.10-fix-makefile.patch
@@ -0,0 +1,58 @@
+diff -Nuar a/gtk/Makefile b/gtk/Makefile
+--- a/gtk/Makefile	2018-01-08 02:52:33.000000000 +0100
++++ b/gtk/Makefile	2018-01-13 19:40:49.059998446 +0100
+@@ -15,11 +15,11 @@
+ # along with this program; if not, see http://www.gnu.org/licenses/.
+ ###############################################################################
+ 
+-CFLAGS = -MMD \
++CFLAGS := -MMD \
+ 	 -Wall \
+ 	 -Wno-parentheses \
+ 	 -Wno-write-strings \
+-	 -g \
++	 -Wno-error=narrowing \
+ 	 -I/usr/X11R6/include \
+ 	 $(shell pkg-config --cflags gtk+-2.0) \
+ 	 -DVERSION="\"$(shell cat ../VERSION)\"" \
+@@ -27,21 +27,25 @@
+ 	 -DDECIMAL_GLOBAL_ROUNDING=1 \
+ 	 -DDECIMAL_GLOBAL_ROUNDING_ACCESS_FUNCTIONS=1 \
+ 	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS=1 \
+-	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1
++	 -DDECIMAL_GLOBAL_EXCEPTION_FLAGS_ACCESS_FUNCTIONS=1 \
++	 ${CFLAGS}
+ 
+-CXXFLAGS = $(CFLAGS) \
++CXXFLAGS := $(CFLAGS) \
+ 	 -fno-exceptions \
+ 	 -fno-rtti \
+-	 -D_WCHAR_T_DEFINED
++	 -D_WCHAR_T_DEFINED \
++	 ${CXXFLAGS}
+ 
+-LDFLAGS = -L/usr/X11R6/lib
+-LIBS = gcc111libbid.a -lXmu $(shell pkg-config --libs gtk+-2.0)
++MYLDFLAGS = -L/usr/X11R6/lib
++LIBS = gcc111libbid.a -lX11 -ldl -lXmu $(shell pkg-config --libs gtk+-2.0)
+ 
+ ifeq "$(shell uname -s)" "Linux"
+-LDFLAGS += -Wl,--hash-style=both
++MYLDFLAGS += -Wl,--hash-style=both
+ LIBS += -lpthread
+ endif
+ 
++MYLDFLAGS += ${LDFLAGS}
++
+ SRCS = shell_main.cc shell_skin.cc skins.cc keymap.cc shell_loadimage.cc \
+ 	shell_spool.cc core_main.cc core_commands1.cc core_commands2.cc \
+ 	core_commands3.cc core_commands4.cc core_commands5.cc \
+@@ -83,7 +87,7 @@
+ endif
+ 
+ $(EXE): $(OBJS)
+-	$(CXX) -o $(EXE) $(LDFLAGS) $(OBJS) $(LIBS)
++	$(CXX) -o $(EXE) $(MYLDFLAGS) $(OBJS) $(LIBS)
+ 
+ $(SRCS) skin2cc.cc keymap2cc.cc skin2cc.conf: symlinks
+ 
diff --git a/app-emulation/free42/free42-2.0.10.ebuild b/app-emulation/free42/free42-2.0.10.ebuild
new file mode 100644
index 000000000000..ce44a72c5aed
--- /dev/null
+++ b/app-emulation/free42/free42-2.0.10.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils toolchain-funcs
+
+MY_PV="${PN}-nologo-${PV}"
+
+DESCRIPTION="An HP-42S Calculator Simulator"
+HOMEPAGE="http://thomasokken.com/free42/"
+SRC_URI="http://thomasokken.com/free42/upstream/${MY_PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="alsa"
+
+DEPEND="dev-libs/atk
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/pango
+	alsa? ( media-libs/alsa-lib )"
+
+RDEPEND="${DEPEND}
+	x11-libs/libX11
+	x11-libs/libXmu"
+
+S="${WORKDIR}/${MY_PV}"
+
+src_prepare() {
+	sed -i -e 's/print_gif_name\[FILENAMELEN\]/print_gif_name\[1000\]/' \
+		"${S}/gtk/shell_main.cc" || die
+	epatch "${FILESDIR}"/${P}-fix-makefile.patch
+	epatch "${FILESDIR}"/${P}-fix-build-intel-lib.patch
+	eapply_user
+}
+
+src_compile() {
+	local myconf
+	use alsa && myconf="AUDIO_ALSA=yes"
+	emake CC="$(tc-getCC)" CXX="$(tc-getCXX)" BCD_MATH=1 ${myconf} -C "${S}/gtk"
+}
+
+src_install() {
+	dodoc CREDITS HISTORY README
+	dobin gtk/free42dec
+}
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index dbb48aed04c0..f493519b6cfe 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -28,6 +28,6 @@ DIST xen-ovmf-patches-2.tar.xz 4344 BLAKE2B 1514c89dcba05c84281e9d46ec5c3e9e946e
 DIST xen-ovmf-patches-3.tar.xz 4208 BLAKE2B 0df8f85667a33c91cbfd86c59aec2ae65eca892b45d66eed76f793a52e2748989bc2785861f8bfdf94235ef7a6c0be6572c6e6cce9695469e40f0facd0ce3947 SHA512 abe001053ca702138bbcdd6bea14e2daae5c785f862d6a15001ca894c8ed8617f0c5dc439c6f54a41433b988acf57c71911af1db074aa76732c39d98622a3b5b
 EBUILD xen-tools-4.8.2-r3.ebuild 13955 BLAKE2B 52f60a82e49dacfd8125b7bafa850d9349192814f4c9cc1ce25e00f0781399f06faa90161941274dbc730cfd8c3c477110d0f4786e3f5dde71b3bb41e6f529db SHA512 405bf5661339cb4384e59cf2c019fbad39074f595dfc6bc6dd00347fb433ebfd843c5c02e29b918cf760390731569fd58ced5f57073edd2db626ca51fd7b1fd2
 EBUILD xen-tools-4.9.0.ebuild 13941 BLAKE2B 5fa54a3ca4a191aa9ca927eb3bfd2daa2a6ef7ec9941e9761369dffbef7f0a2aac9097abb68ceda913ea69ffba9f33f716ce85079f4610c26909afa94617e1aa SHA512 ba54bdc680040454856aa7f950bfed5dc9aefeeaaa9256059160814182a51b3c2f8fcfdffa22c961e614e8cc67eaa1aaec473720982d1956d9dea46abf28bbd4
-EBUILD xen-tools-4.9.1-r1.ebuild 13741 BLAKE2B 65366b9f3a106f1860ef5a7496ec1048f704aee7dfc4f5311636624f5666816d4d241cd4b7baef93a30a93b7e01bac507d98d14780d45eb88144e9df02daf77f SHA512 c765d1f1bcfd9b01878d33abda3c4f8b252d6b54539300a1fcb02833132517ff6cc12a7dc0a8d3ff4df7a110aa44ed535576a43e1175207b0264a013484dd7a8
+EBUILD xen-tools-4.9.1-r1.ebuild 13748 BLAKE2B 6fb80abd4b3e26d3297e6201e92f40d19952225e9693a2e381a80b723ae5076d7b749e7b49468b88b411395aecaee1ebc3548d1ad4e0f4ac758df7e2033f4152 SHA512 461975ff8b587fc2e54953bff1ffe6b3fe44e50280f443f659df09db46d1ba326a8d503c78218812065bd980cc5a68ba6a68a71232d0d132713c47b85bcd5fb7
 EBUILD xen-tools-4.9.1.ebuild 13741 BLAKE2B 52b179de0a023ff0045c819eeeface99bd48adbd3087f4d7c615dc466164cd12a6fa75aebef9c14f2a923c6e34a0baf7c98110148f437866143adf8a4ac842d8 SHA512 2eaa8c4faafa3f191bdcc52d61fb7965c53216a75ef0ee4e65c4098ef77cd06b28e75761b7bd85e80acf0d3ecb66b9e04e950cd382b766649eab353eb757f8e6
 MISC metadata.xml 1267 BLAKE2B 8b9111b781201a51e373b606c888440fe42630f9cb08a43a4bb5a512456f57e7bb4e4f2af0a23d4cbf75489ba01efbc38820a6881317f16a459c96f8717d2b52 SHA512 c4e947a8cff20e4c5e77f5764fe26ee86a5674cc24ba2eedb7867476f9805ca47b895fcee92e8f353bb4bce877d32832318f8f7fd9514103fb2a963d6ea74647
diff --git a/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild b/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild
index 4f9eb745833c..4c35903b2c5d 100644
--- a/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,12 +13,12 @@ MAJOR_V="$(get_version_component_range 1-2)"
 
 if [[ $PV == *9999 ]]; then
 	inherit git-r3
-	KEYWORDS=""
+	KEYWORDS="amd64 x86"
 	REPO="xen.git"
 	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
 	S="${WORKDIR}/${REPO}"
 else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 	UPSTREAM_VER=1
 	SECURITY_VER=
 	# xen-tools's gentoo patches tarball
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 276f98c7e998..676e8819a32d 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -10,6 +10,6 @@ DIST xen-4.9.1.tar.gz 23368303 BLAKE2B 4cfddb351c9a4aa08227138dc1afa921f3d188004
 EBUILD xen-4.8.2-r2.ebuild 4933 BLAKE2B bb5a4b58eb2820d1aaf50d395fca36192fbda8c0bb337771f22745591e41fb405798f53e8994771fad1a9c6598cc7c71864aa7c5f97d053847636af3227684df SHA512 ce0551c26ed51598405eab862b42c872bccfe05e2064b2dd589e56c34828820356f4f39ffbffaf78cd07408e91569091de947cfe0cc0602faa3503063d3a7fa1
 EBUILD xen-4.8.2-r3.ebuild 4788 BLAKE2B 7d86e51fd58fa5f817d045d0b1eb8c4941c05258fde806e90d0aa442b6f293e58ea3e8c93dda16597df080a8860bac2f88597ae5a64fd6a0518ef22688e9a83c SHA512 0a284557d9bbe0baea2c72ddeb2fcebfa3a72ab11ff94b68125644249ac7675d053bf5c3962e7f571aa3557404e472866495d92b0c2d4d9e990b82cb4679476a
 EBUILD xen-4.9.0.ebuild 4907 BLAKE2B 79f07a9604c8d3d20903d9da5f410d2ce1b85fd0b888d8f0b2ff8d768941abf0f18a006bd1748cb480beac6c9cd7c1434a0005b15e6d33c4bfc0e81905009498 SHA512 a70419e05a800da71ef24b097a950b7eea338c467fb0313d69fae25e7f6555b8ffdc3c7c27f18b11081625e315f5a90858668a56fe863cc21fe7c94357c08e57
-EBUILD xen-4.9.1-r1.ebuild 4715 BLAKE2B 930781effec60cbaeb35fb579b93cfaaee2733cb01b3c00a446f25135294616fa017a3015e9475e3416406147f378ab03eee1288df4240ee54d6f6e0cfca610f SHA512 292fc89c18ac5c282a1e2c64dad5a76a4e35043e18b1a2e9da978b3c22bee83f21ba66a80fde5398af5c783611ca6f78dc3865ff82f37627581c13f1898c9321
+EBUILD xen-4.9.1-r1.ebuild 4719 BLAKE2B bd5c63e4ed7046568f8276c0a5b65c1cee97e07e0410eec66324b7625619ed6320282181c9b10519f683c54cf22fd0af1e7bce14d5558966535b2393e6136af6 SHA512 3758dd6eb2323e30e9e77efbc46917bb16fed2f8380967903582d0c834d61fde1caa7902d96e5846af6ea4f0b914d64aaac2a58ad75c695e8a7c389e33f4971d
 EBUILD xen-4.9.1.ebuild 4715 BLAKE2B 3b7fa7af4b51afda5effb7e723e169be2a3db76aefcd4496220362d3ea0d07d51e78b99547860efd4e036c5156f67ae1ba77f4404c98e5d978a0820cebef0ca3 SHA512 955c0089c6ec4bd489141d60ed4f40ce5f21769dd25231f332db9674badbadf9aacb47d8783b80fcff7d076e384456214ea227f71f6de67506d82e03f32edf2e
 MISC metadata.xml 417 BLAKE2B 5713c8e5f27d56714938b7d2bed096c3b3f9fbb0ad9bce2bb3240e4a8556134cfc88efe0e2c7feb2e9cc722c11800e8433afa0d03746b05998909dd976230225 SHA512 2708f84b8a1508eebc96539993ae1bde4b921d4401229c221e2bee9a0cd643fdf1f854fcbba6033ed68667d0efb00c25222f4c68535a96f2200084d8d8759946
diff --git a/app-emulation/xen/xen-4.9.1-r1.ebuild b/app-emulation/xen/xen-4.9.1-r1.ebuild
index 6b7b46c13e64..ff12221cf111 100644
--- a/app-emulation/xen/xen-4.9.1-r1.ebuild
+++ b/app-emulation/xen/xen-4.9.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,11 +12,11 @@ MY_P=${PN}-${MY_PV}
 
 if [[ $PV == *9999 ]]; then
 	inherit git-r3
-	KEYWORDS=""
+	KEYWORDS="amd64"
 	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
 	SRC_URI=""
 else
-	KEYWORDS="~amd64 ~arm -x86"
+	KEYWORDS="amd64 ~arm -x86"
 	UPSTREAM_VER=1
 	SECURITY_VER=
 	GENTOO_VER=
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index fb0920971688..c7a436ae6bbb 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 0a4ff0d6bbfb..dc27d6da6925 100644
--- a/app-eselect/eselect-postgresql/Manifest
+++ b/app-eselect/eselect-postgresql/Manifest
@@ -1,9 +1,7 @@
 DIST eselect-postgresql-1.2.1.tbz2 3645 BLAKE2B 17262fa368b30142599145b8d0afcdb4cc82be70e40bb7b72f157abe70eb31b7f35f6acb135ef7fab0f6f95044a2150b3550968903722cc741158d21043f72a2 SHA512 9b24cb7620dd3de979ef595c60ebf607cd9da5c7d3c4da19ebe242c25961883e2db54341f916690abb9fe7a76663d9f1ac73fc76c90389f72eff425aa6fb43e4
-DIST eselect-postgresql-2.0.tbz2 4326 BLAKE2B fb363882d283c7c212a9eb546659213750037dda9aa15d31e3feaa1f58083beaf050594f7a70255f10829a3bbb15f9748b724dc3fce1d94adc2f6681816ac606 SHA512 bc72d752bc4b2d8f3c255d446253143ff0036f6ca1a0c10eb19e23b8242bd5a912272298034279a6f9ca50c13fccbb6b89c79ed647f762a2ccb36f416060cd87
-DIST eselect-postgresql-2.1.tbz2 4404 BLAKE2B 3b7a7d20cc715a748d45fdf182c35c6a0dab1808c643a5a3de1436e01f40863b0e421b1d4717388da401a133f64c94810bafdb318409254edd27daa06ed35ef1 SHA512 83050da6ec5f5f4ae20230cdffebbb78f9335cbcbb3bc1bd38279188f0dedcf828d80aeac3c75629605cdde0b2d1d74d8ef81e9cd9a8faacc7dba2f15beb3af0
 DIST eselect-postgresql-2.2.tbz2 4428 BLAKE2B f18b7daaccb9ab2fe08bb6e7f88dd41dcdf69b951a3c20b65ee2955ff33fc614e5740ddbbe8eb8f55d20f5705d47fb2da8c3f3fc89e403ea24eb4b8d912404a0 SHA512 2a0b9b3c8c75792fb6b6f90f034562a3bef7c9391cac0d7c95a6a86db38b4c9840fce2fa0edb32b745905f974920ee1ce5dfb21d33f22c79d1bc776e013edf76
+DIST eselect-postgresql-2.3.tbz2 4526 BLAKE2B 226f2be462d54d835cc884f6b2c33e0f84d4500e19251fb6794929901ec033e0fa457d8606e36ada462d538674110ba8aab901ca9f86dccd52ccf9c860ba5ce1 SHA512 d7f87aa3e21c5e35f3a6879bdfb9404a2884f761463f77952f21c522b1605f191385ba7b4758548b121ad7eb56d395163e0d6bba57df446be515e6d7163635b4
 EBUILD eselect-postgresql-1.2.1.ebuild 672 BLAKE2B 14f4da8c135dbaaeaffcdadd7bac6dbb12226f6ea19b131b9337e1b5a9f8e51bb13fa93090da5321d13a44f886fabb3e1925468cf12fd177221ac0b2a4c7d157 SHA512 d137b8ef89461e40a8f2fe1afaf290e4e029a5b1374e00b3f9a4b96d0a8d5490bd71da30aaf33f3cd690c03652764f1371074d2f0320c7cfb57972a0a0ba06d1
-EBUILD eselect-postgresql-2.0.ebuild 953 BLAKE2B 10fc66ff7dfc51aef82d6544f97a5fe8acd7d8ce3471d56125e9e0d9db3c90c78bfd3b0b16556a08990bb3fa400f7e02bd2c45cedb0fb55b9d6ffbdd82dc9f20 SHA512 c437f9753c52b012250d404007ebf30f046a800692981c415e63d798b39c6b9de686b4dd6f6a92837fff495ebc43ba5ca04155aac5e2d0b45a4a684e4a94acd7
-EBUILD eselect-postgresql-2.1.ebuild 945 BLAKE2B bb913d7263445a49e360994527a2c9f5cc52f2a668c1303a7d1e918f1007affaea79ce37b9a0801106385eb2059324e4d1259d4f93817f014f4369c90f34a9ac SHA512 094973b5db9a173c6a4045d7cc8174dcaf5bac1ff9711a4f39f39acc61f7876135a645c511e2abe7818ba069f013e0328bcd233721ae6e4a724d608887628f64
 EBUILD eselect-postgresql-2.2.ebuild 945 BLAKE2B bb913d7263445a49e360994527a2c9f5cc52f2a668c1303a7d1e918f1007affaea79ce37b9a0801106385eb2059324e4d1259d4f93817f014f4369c90f34a9ac SHA512 094973b5db9a173c6a4045d7cc8174dcaf5bac1ff9711a4f39f39acc61f7876135a645c511e2abe7818ba069f013e0328bcd233721ae6e4a724d608887628f64
+EBUILD eselect-postgresql-2.3.ebuild 943 BLAKE2B 3a6a1e2917b10e77ade56c63351d48b0eaf6c5937eb62173d7b346f4aea769789519a08e550f10527c4a11eba516f8fbf595cb7e2578e629b9f580bdafa513f9 SHA512 293d53431dc6c7e0af5b7f13d4a646b3f9c4694bed86a57d3c0ee23f9b8ef706d4343ac7f0c2a21e945a64408d6ebaeb9ab4886ccfe64da689ca66bd3652d436
 MISC metadata.xml 447 BLAKE2B 9bfd56f325d41f2d3d143e6747ce59055a32f70540084712ebc7756cb6cec6e1891f63bb02bf6bf9910a2ccf9cc66bc47c86f83aaef7ad60b7026b36ecdbc189 SHA512 17796c1b2b963db9237314a7ec5bc459bd59946d8c2d38e836d21e79f45249ed307d6fa82dd3130ffc3f5f4416015d68fadb5947b107c69a8fe04a8ea1845d95
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.0.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.0.ebuild
deleted file mode 100644
index 575b77d2b676..000000000000
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-DESCRIPTION="Utility to select the default PostgreSQL slot"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-admin/eselect"
-
-# All dev-db/postgresql ebuilds from 10.0 on are well supported. Earlier
-# ebuilds may present some quality of life issues.
-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
-"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins postgresql.eselect
-
-	dosym eselect /usr/bin/postgresql-config
-}
-
-pkg_postinst() {
-	postgresql-config update
-}
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.1.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.1.ebuild
deleted file mode 100644
index 4cdbf680c4fd..000000000000
--- a/app-eselect/eselect-postgresql/eselect-postgresql-2.1.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="Utility to select the default PostgreSQL slot"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
-IUSE=""
-
-RDEPEND="app-admin/eselect"
-
-# All dev-db/postgresql ebuilds from 10.0 on are well supported. Earlier
-# ebuilds may present some quality of life issues.
-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
-"
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins postgresql.eselect
-
-	dosym eselect /usr/bin/postgresql-config
-}
-
-pkg_postinst() {
-	postgresql-config update
-}
diff --git a/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild b/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
new file mode 100644
index 000000000000..7545dbe10cca
--- /dev/null
+++ b/app-eselect/eselect-postgresql/eselect-postgresql-2.3.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Utility to select the default PostgreSQL slot"
+HOMEPAGE="https://www.gentoo.org/"
+SRC_URI="https://dev.gentoo.org/~titanofold/${P}.tbz2"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~ppc-macos ~x86-solaris"
+
+RDEPEND="app-admin/eselect"
+
+# All dev-db/postgresql ebuilds from 10.0 on are well supported. Earlier
+# ebuilds may present some quality of life issues.
+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
+"
+
+src_install() {
+	insinto /usr/share/eselect/modules
+	doins postgresql.eselect
+
+	dosym eselect /usr/bin/postgresql-config
+}
+
+pkg_postinst() {
+	postgresql-config update
+}
diff --git a/app-eselect/eselect-rails/Manifest b/app-eselect/eselect-rails/Manifest
index 5c8eb7cf4b29..3bac29fe85c5 100644
--- a/app-eselect/eselect-rails/Manifest
+++ b/app-eselect/eselect-rails/Manifest
@@ -1,7 +1,3 @@
-DIST eselect-rails-0.21.tar.xz 1592 BLAKE2B f033e4672693c26c12291aaddae2e13d995e74ea0b3090f36ef6deb32d108c082cb95276077809178e1650e86e1f0e9188b60130de6a4a5d8063849abc039fc3 SHA512 8d72d1abdb0bf767a71a518ff390dcd676fc05a35652d6a727d2d5f2029f26d2df8e56da3c4e611267d92505cc9217da0a53712bcaabff03f0f2422e1c9d9658
-DIST eselect-rails-0.22.tar.xz 1596 BLAKE2B 95b6fa4f57d2207abb3057a5de2346d21ae2a81151e5340554697abc019dcd7367ff4f7c39c35167f395a8b1c2b71d32d1c9ee1cf829312c812dc76b476d0810 SHA512 ff563520c68352d529f213f5a63cfac9acf4bda2ef0fe01626636669718997be8f4b749c98de1746b8b22cf45fc43042bfc485e1e8998175d8a15b9048a81cc5
 DIST eselect-rails-0.23.tar.xz 1596 BLAKE2B d958e870c63d32517d681d5e815616506cf318004e5d4f00d0ff6db4e0927a405b295bb0ede5e13664fe510f7cf9324eb63042abe283f0386bc9600552a32193 SHA512 34a2d8a2b613eb3a3e20515fdf916c4b7e862322816d78a32a9243fcc56bea1c154892df7f27eb5e640560b1e63b273b02807669155184ad28f085d2f84dd3b8
-EBUILD eselect-rails-0.21.ebuild 702 BLAKE2B a6251158542a9c37b2dbbd07039880aea207e52fd40cb7c2c7ee3c8072783274630d0cccec1d362b524211f79965ca62b20c2f75506ac85accb5a5552f96a1e5 SHA512 b1c82ee61976650f5bb244151f438ad1ff711321ac40764366c7272b20bbb1e1e2de6d2a518789be161d590effbfffba2a79c8b97e606b9e898b238162939538
-EBUILD eselect-rails-0.22.ebuild 712 BLAKE2B c2eb6e756f3514d689306d83de0189d81e27bce69cc27a512ccb91d08bf4967af09cf1ab405baa3221f60e3a62842599e86c00755b8886e6f373615371d3aca7 SHA512 894d77c5752f880e477e5187a437dcde0a0b2b48f1f97f4b9ca1f700042abcabc658786a8182953442e1d460d097093dadadfeaab23d106a348f684e684d0de9
-EBUILD eselect-rails-0.23.ebuild 716 BLAKE2B e52e5c24d5127bc4eedffe3469677dcd8f201dab71c5f325f0f9e7954d7b2e6120cd10696916f2b694dd608a09f21aeed79787ddaaa4e53c92b0d625a011aaa5 SHA512 ae521efb4ae8520325dd4ae0ec4bf8c91de92d1e0da09160b94e4e96b231e88f14a54e4e7d984ca453136f2fdf24fe607c15310874574092de0311a1a5be5fa0
+EBUILD eselect-rails-0.23.ebuild 715 BLAKE2B efaf94b820812f95a9bc0b30fe24c2b414ffb4df00bf91e261ee44219e9a194757e8762207f139f0b3a6621c068f108e12926b5d40a102e5524b5e473ec5721a SHA512 a604fa8c897a23c6173ff7a4647eec09b4dae6fd8aa39c8f95d4503a35c37c1343f67dc05e7af0a1d9517243ac907fda0cf5a01898126709d53b9418f69d9a8d
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/app-eselect/eselect-rails/eselect-rails-0.21.ebuild b/app-eselect/eselect-rails/eselect-rails-0.21.ebuild
deleted file mode 100644
index e2ec4f840c3e..000000000000
--- a/app-eselect/eselect-rails/eselect-rails-0.21.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
-
-DESCRIPTION="Manages Ruby on Rails symlinks"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~flameeyes/ruby-team/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.0"
-
-S=${WORKDIR}
-
-src_prepare() {
-	# Fix/Add Prefix support
-	sed -i -e 's/\${ROOT}/${EROOT}/' *.eselect || die
-}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins *.eselect || die "doins failed"
-}
diff --git a/app-eselect/eselect-rails/eselect-rails-0.22.ebuild b/app-eselect/eselect-rails/eselect-rails-0.22.ebuild
deleted file mode 100644
index 4b02e13bc77f..000000000000
--- a/app-eselect/eselect-rails/eselect-rails-0.22.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-DESCRIPTION="Manages Ruby on Rails symlinks"
-HOMEPAGE="https://www.gentoo.org/"
-SRC_URI="https://dev.gentoo.org/~flameeyes/ruby-team/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-RDEPEND=">=app-admin/eselect-1.2.0"
-
-S=${WORKDIR}
-
-src_prepare() {
-	default
-
-	# Fix/Add Prefix support
-	sed -i -e 's/\${ROOT}/${EROOT}/' *.eselect || die
-}
-
-src_install() {
-	insinto /usr/share/eselect/modules
-	doins *.eselect || die "doins failed"
-}
diff --git a/app-eselect/eselect-rails/eselect-rails-0.23.ebuild b/app-eselect/eselect-rails/eselect-rails-0.23.ebuild
index d5dfaf21b7bc..94ac2f1ba5b4 100644
--- a/app-eselect/eselect-rails/eselect-rails-0.23.ebuild
+++ b/app-eselect/eselect-rails/eselect-rails-0.23.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~graaff/ruby-team/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND=">=app-admin/eselect-1.2.0"
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 12278af748d6..34cdfb1c82f7 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/cbview/Manifest b/app-misc/cbview/Manifest
index e52e4ed29fea..62614505ac7c 100644
--- a/app-misc/cbview/Manifest
+++ b/app-misc/cbview/Manifest
@@ -1,3 +1,3 @@
 DIST cbview-0.06.tar.gz 16351 BLAKE2B 5e343eb00250d470b7e64d717b06ea1d048aace755ada2348c656443759a12c6912b7f766f066d0b2c2e7b6926ccb46472051f636646dddc288f64b66e752684 SHA512 4a680243a8c31fafad8826d1ead6d21fcce3642beef9ed82b19a7a75d78e7af32cd8d7800de15bd2b9a59241f81a295b7da8f7a80fa482b41fb589a274bfea06
-EBUILD cbview-0.06-r1.ebuild 494 BLAKE2B 0beddac6881f5372529e76753c6b942967cf594507e4916855bd6ba68c114dd610da3dbc870e9c09ccd79c132b5205ef4faa83764466a33439ce43affd0c6c87 SHA512 5b5cd0a0f4f2177b3c90513b9be70c39edf5cdfdd9f1e2d3a128247df0aed9e5fca9e37c537c347a4a5699e2e32f1c4d57d21051ff9dedf3d3803637c24d4762
+EBUILD cbview-0.06-r1.ebuild 540 BLAKE2B 1c9d7c3f3a918b5743961a31afa0f3236c2a88e507141d04b93b5683d215e10b62f9dd1da8a640c5608dbbee25e84da11596aea70db9a5b6aeaf68c08dc3ce57 SHA512 0fea9e78cb782cceaa4b3bddd7fa699b09f254613ae73fb0904ada2011041aed03313fbe36e04a911845eaf06c286b20777f6ec38984c09f9a6f74fd22029036
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/cbview/cbview-0.06-r1.ebuild b/app-misc/cbview/cbview-0.06-r1.ebuild
index 9e3c8db7a9c6..286374eacc42 100644
--- a/app-misc/cbview/cbview-0.06-r1.ebuild
+++ b/app-misc/cbview/cbview-0.06-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=6
 
 DESCRIPTION="viewer/converter for CBR/CBZ comic book archives"
-HOMEPAGE="http://elvine.org/code/cbview/"
+HOMEPAGE="https://web.archive.org/web/20061108214126/http://elvine.org:80/code/cbview/"
 SRC_URI="http://elvine.org/code/cbview/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/hachoir-metadata/Manifest b/app-misc/hachoir-metadata/Manifest
index b83b3bd2844b..a551b975af51 100644
--- a/app-misc/hachoir-metadata/Manifest
+++ b/app-misc/hachoir-metadata/Manifest
@@ -1,3 +1,3 @@
 DIST hachoir-metadata-1.3.3.tar.gz 52304 BLAKE2B 31da89c0ca95c381fef3354a56f45569ca0f69e8e14518e1e83897dccd5be8a77d8636127f3363f9b28998e39dfccf0d008af00f0c1e49257fe95012aa2c738e SHA512 f0958e1bb6fbeca56caa31a8574da2f64df969cdb9de80e733b36dfae0e07c8f0fbecc53f801a359f7d16ac1a3b3e0605b7c6a3bd6da3c09a3cf2c971bf8750a
-EBUILD hachoir-metadata-1.3.3-r1.ebuild 1505 BLAKE2B 0e78d8f8034d8d0aeea1f5b7bb90d5e8842bf56347e7a51b155ccbcdbf32686e9d602fc3d94f6c330aaa002d4fd541f80f53809a3ff0629afa5157ab3cdee3ed SHA512 a5ec6af0f65fb43962b7862439e571ff98978a9720c0c9be9240a229726b5f276a954d0a576aa2536518a359727da75ac71d7c079eb9772ae77f477156412079
+EBUILD hachoir-metadata-1.3.3-r1.ebuild 1548 BLAKE2B 479929627709ab54cd0dd670fb5f030d8afd4b2eb0a2dc580aef769b4a65c3fcf0d62d7c3d5b50df0725911ac359fc30a9ced01189749f994e4992e7de7eb8c4 SHA512 6af1f545e7a3cdd447793d5f89ef8eadbf037265a78a63824ee5cc0f6d7b29d4dcc630c81a235eec21cf5197c4b60300ad118b3182f63925770e5f7e2e564a0d
 MISC metadata.xml 428 BLAKE2B e53b795402d41bbf42f54ec1745cfa0d238a7e185d8db0fc06fdfb5faec4d6d72c6b395003f365cd8a33750ec35b7b0c62753dcc0fc949934d5de457a6b254a2 SHA512 c76d6bc6b172d7329562c87557d9695e5629a3ceafcc126f663b5af51af7f728a6f64dd875832af4acb2057ac63d23dc71526724a61395c3e34303da4177acd7
diff --git a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
index 7d83e7bd7178..2dba4bb923a7 100644
--- a/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
+++ b/app-misc/hachoir-metadata/hachoir-metadata-1.3.3-r1.ebuild
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Program to extract metadata using Hachoir library"
-HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.python.org/pypi/hachoir-metadata"
+HOMEPAGE="https://web.archive.org/web/20161220105023/https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.python.org/pypi/hachoir-metadata"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/hachoir-subfile/Manifest b/app-misc/hachoir-subfile/Manifest
index 81026f314cc0..fc43562321df 100644
--- a/app-misc/hachoir-subfile/Manifest
+++ b/app-misc/hachoir-subfile/Manifest
@@ -1,3 +1,3 @@
 DIST hachoir-subfile-0.5.3.tar.gz 15499 BLAKE2B a055f19285cdfa5a6d31b9f7a346b7ab54b8eb3c54d78890079bde25bf9660b5cadd18f9418b4dc55a543b329bbf38f274aa78fccddf52f47f9f65f28a0d4375 SHA512 b34cf7d7befc1031ae821dc5124b83d198cbd6d2f95666b8497b23a87c748d574637ed65023c7e1e2532a3a62ca079dfd13d11dbcac31457c6423309208d0ce4
-EBUILD hachoir-subfile-0.5.3-r1.ebuild 730 BLAKE2B 8d76a74d505370121c2b7d6b273d562cc2d31182fe9bf45248fe29e2b885d2f59e00689dfae2a6669f96f40c567c5ae2cf5d22b4a54b99fbfbba6368b7bf2bd9 SHA512 4e2ec28067f3917fc16044b10b305a3f58fd36e5733c34f1c574508113687c32bbdd7aa22ca426987a1af4fcfd07853deff620c0e646be7b4fc3ff28ca7d9f31
+EBUILD hachoir-subfile-0.5.3-r1.ebuild 773 BLAKE2B 6b00d243438595181917d17f033e9f108ae91262326cd2428509e9c0bf7ec50e236cc247a3be5a72cf3ce6a30e6e78ef9acb4c8dbe6d49451df87999cc58ca5c SHA512 1501a7f4c042a4d460f2b9d1bd6f99f5b91872457c9d8c67eabe327dbf0865e08436cf745411f094e47d999a4f07730afa4707f474c82149fc24716f0da12cdc
 MISC metadata.xml 425 BLAKE2B 6636365b918a8252757c0a69ea4dad61a9ea1eefe45ad2b0864b33a72e41c9af358662550bb9e9bdb42c88d3c627d9c316192f45d78761bfc5ecab7c76e00cb9 SHA512 7c19037ce6003a18113d0ef240041a0ad9501080b5021a018124be678ee86240f6ad3cbb4fa0ece3a8a4994884eb499374f714b2ab2dd1e60ce82e885051af2d
diff --git a/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild b/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
index 31512f7fcb2d..1d2887f48a74 100644
--- a/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
+++ b/app-misc/hachoir-subfile/hachoir-subfile-0.5.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit distutils-r1
 
 DESCRIPTION="Find subfile in any binary stream"
-HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.python.org/pypi/hachoir-subfile"
+HOMEPAGE="https://web.archive.org/web/20170502140945/https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.python.org/pypi/hachoir-subfile"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/hachoir-urwid/Manifest b/app-misc/hachoir-urwid/Manifest
index a81e8f642c3c..86d24b86afa0 100644
--- a/app-misc/hachoir-urwid/Manifest
+++ b/app-misc/hachoir-urwid/Manifest
@@ -1,3 +1,3 @@
 DIST hachoir-urwid-1.1.tar.gz 17845 BLAKE2B 09262c5faa41e15f160ba30c5813578fcc30fe9f620e287421199345f21c5d912e7d70c00e1753719d011c5cc9d788f1d70cc1bcb45df822da5c175ebb7c1fd7 SHA512 e434756903e4b3885166b825331921fe9c959247a9bf8bad324aa8e3e2b5f4ce22a1546e38df9ce9a8fcfbbb96c6e6ca4bc42e455e66eeec178d85849b1526b2
-EBUILD hachoir-urwid-1.1-r1.ebuild 759 BLAKE2B d6e4a2204697203b83ffd3f8a5835e7ea6d5a329af87f8ca62be4f3ee7ae102216c67e75cfca20827a82768027d977b8dfcd08cef10e3062df20e32b3e5841a9 SHA512 d1fb7d61fb2b52a92be8d642071793539bbd7dfc533b2dda293d33b170f1f06701e5b119c610c23e0f96ec6e0d6c313746d4c6bccc9e9eaf34e53a028a61f987
+EBUILD hachoir-urwid-1.1-r1.ebuild 802 BLAKE2B b74de1e36a85f285cf6e9d45d85af0550a448f453f389a05148896fd13fd0238e8cc7b164dc5292bdca0dc13ed2885a342e8bb0c18dddd1c30d8f422c90b658e SHA512 390db20ea8d108671120d467b42eee20485716f421bb882c67389a933684f00294beb977e550f73ae945d7297bfc565782ae610d1e05cc45d04677bc3236cb86
 MISC metadata.xml 418 BLAKE2B 3be1c8cb3fcd1d9c72ba300431ba67483a5ac160ec955619678a723b06ddfe14ff53dd53ce4f3604b3ecaec54ed45b9e163bc072818e9b35aa29912787898985 SHA512 7f3f6a1d6b9239aeae423fa3b8e172283c5cac3f05b738c06a17ce699576078b18649c8fbf41f4006d3bb2de2fca9f4b751a9466710539133d314d1e64527349
diff --git a/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild b/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
index 45c28a7c3053..1274cc5ab5a4 100644
--- a/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
+++ b/app-misc/hachoir-urwid/hachoir-urwid-1.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -9,7 +9,7 @@ PYTHON_REQ_USE="ncurses"
 inherit distutils-r1
 
 DESCRIPTION="Binary file explorer using Hachoir and urwid libraries"
-HOMEPAGE="https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.python.org/pypi/hachoir-urwid"
+HOMEPAGE="https://web.archive.org/web/20161220110246/https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.python.org/pypi/hachoir-urwid"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/lsx/Manifest b/app-misc/lsx/Manifest
index efd45cf80043..e71e3d9583cc 100644
--- a/app-misc/lsx/Manifest
+++ b/app-misc/lsx/Manifest
@@ -1,3 +1,3 @@
 DIST lsx-0.1.tar.gz 2130 BLAKE2B 0293945b76d76d755675d8d57ef7f09b668d0df7997ec0e5df927dfb4dcd6d24217b27e114c498680028c52bb21c8a1106dbde2010c47d77d66acf9589e74a9d SHA512 19f3fa4ecc22817332716d58d287ab7ea4b07bbed1d909b00931b272f1613d8aeb315435495d51a5f918f53e3f0ce68e964813cdbfefce0176924f3c75aa623a
-EBUILD lsx-0.1-r1.ebuild 807 BLAKE2B 12274a5912dbaf9ba97f7824659183e746ebfc5a1d4e1ac85395852fe1056c99da23ddb9d5a514f17e538119a76cd22240179adf8995e999dbfeb1ae6a5299c5 SHA512 d69600df5e519e488a930fbb2dc6fa13d2c8719b76ad8e733b9d5e1b0b15da63ea2e9bea2878a5af07447042d95c1faa4c5cddf5e16ea1282206f25a19c9cb23
+EBUILD lsx-0.1-r1.ebuild 852 BLAKE2B acf329ff72e9e47a73fccd133575858cf36cdac05f6078e6d48b803907405f780fdf15fc98eb6efdf43f37a91977905a52383651e5c7e67013ce03488f8a93dc SHA512 51d0adb918d04d522156ec631560bd2f83afaaed1661401e002f92ab27b4943f87f5ff0465cafbe80e9d7a588b256060770c7aab0b8e7c25a8148ed5c4707b7c
 MISC metadata.xml 277 BLAKE2B b9389d5db9efc1f16568f1fce62c47e9fd8829608aa3084db3decedefa711e065af20f29b0c5a2d9e93beac60ed0f54d098640e56fb93824dcb0b3d2f75af7bf SHA512 99cfc61af14bb324d776b6865339d8f9626450ba2f837bced0624ed80aad5f177c35c4ac3e3cfe636d175ad1f7eb478cc735dde57a6bb691fd608c57253db1c4
diff --git a/app-misc/lsx/lsx-0.1-r1.ebuild b/app-misc/lsx/lsx-0.1-r1.ebuild
index 8401b8ed3b51..1cfccc2c3cd2 100644
--- a/app-misc/lsx/lsx-0.1-r1.ebuild
+++ b/app-misc/lsx/lsx-0.1-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="list executables"
-HOMEPAGE="https://tools.suckless.org/lsx"
+HOMEPAGE="https://web.archive.org/web/20160104002819/http://tools.suckless.org:80/lsx"
 SRC_URI="https://dl.suckless.org/tools/${P}.tar.gz"
 
 LICENSE="MIT"
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
index 5bbacafdef88..f3476672c358 100644
--- a/app-misc/mc/Manifest
+++ b/app-misc/mc/Manifest
@@ -9,6 +9,6 @@ DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3
 EBUILD mc-4.8.15.ebuild 2602 BLAKE2B 3b279bf633a0299e11a4ff247c02e4293fb6a221c2009e149136ecda8b03cd1d9433ea8dcd1a3194e61e5380c81b905072f7c3e1688920e4dc57ceb3c270d41f SHA512 906e1842f664cff03939a0fed27aaa447abf92553916bedcdbe7c23aa65f704c2538ca5be666086dbe2ce3204bbdfc87854346f3894293ccef8ef5d8a2ae6e7f
 EBUILD mc-4.8.18-r1.ebuild 2466 BLAKE2B 97822d672464a1956119a1f44c9fb9bfebf39573ff944c70d0a3ce053efa7965fe00418b90352fa9937fafc228f3854eae09fbac27f3e8561be379583c3abeaf SHA512 3bea1c8e2c8aa1e882ccfde6619dff042939290de9075ed111360925a78d6e631bfde6cc47d60bb6e1b287826fe6cc0483201ee317a3698894c3a900fd6af505
 EBUILD mc-4.8.19.ebuild 2722 BLAKE2B fb279a01c7d86133d64f50fe330d7e94e321b9aabbac51583412d49fe2fbe6b5f826bbb2381f1212760e846c05fae2eeccc0e56928491143e0680fa996fce597 SHA512 8c88c706cbed51a95ef9c2577b7dad338c187db961c7365616d4085b856d3b45035251efa86746c48232f02ed83ffe9c8fa24a629463968dd26847e1c019f353
-EBUILD mc-4.8.20-r1.ebuild 2491 BLAKE2B 68f4143f4eb084d352cb0280eb1e39c7ffd411c241561240806a96f86bbf03b1d252f08c2e7683dc0641ba244e810665d564ce3526343b19c8739aa07d427109 SHA512 d614abf0d2d8294ef31964d99a5f81d4444c1efb321ded4cfb9ec8c3cb8ef894d7754c1ec824a4675ed129e413701eeb245fb919abe50099a58fa903b8f68922
+EBUILD mc-4.8.20-r1.ebuild 2486 BLAKE2B 945d8fbcbca52c67ac46bd2b26d2eb41ac16ab2946e6a84d4ed81330896b8aa4b1da2c36a0b65940746523d2845b6fab6d1bd84193eb6c53190aaa845c53e8ee SHA512 2ffd4b88c9061486b67bd4fa47374f653d3a2e91f692a867d387ca97e85157fe74e369f0a19102f65d0bf635273e9a8e1ab3b6ac4b14411810e76052acf5248c
 EBUILD mc-9999.ebuild 2585 BLAKE2B c226f71fd8a9ea6abfa2c0b3cf9c731f1271e64d257d34797635738cf634b9159c693ef312cfcbda43f0aa2207b79bbb0d2071f41c3393372da44c547c6fcdd3 SHA512 bab03c4a246785495ff69deaba2c97268ec95449b5887a941dbc54513d0f00d193fec63c26a69f1d95c45612a81c5c8818f12dcf0b0ede5f4e7afa81595d6d91
 MISC metadata.xml 994 BLAKE2B 59d3e1c9bc8bcaf74ef8f646f1067a07127a70825bb2651e7bee1628e93131769caf1c7251b6aecd4ed35707984b95c928fcf5563b3e2ba6997c090ea08ea0b4 SHA512 8e36834754b8335c133eb3693d17d02a0c6c3c7d25263857558cf290922b8e7508bf90c609e09ebbfaed54eecc2179936ded60c2b723cc0abc6722db180cc3ed
diff --git a/app-misc/mc/mc-4.8.20-r1.ebuild b/app-misc/mc/mc-4.8.20-r1.ebuild
index 1a2e5e3918ae..3d228f0c06ec 100644
--- a/app-misc/mc/mc-4.8.20-r1.ebuild
+++ b/app-misc/mc/mc-4.8.20-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~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"
+KEYWORDS="~alpha amd64 ~arm ~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 X +xdg"
 
 REQUIRED_USE="spell? ( edit )"
diff --git a/app-misc/mepl/Manifest b/app-misc/mepl/Manifest
index bd565f52e3da..30a22698aa97 100644
--- a/app-misc/mepl/Manifest
+++ b/app-misc/mepl/Manifest
@@ -1,6 +1,6 @@
 AUX gcc433.patch 600 BLAKE2B 12835e147142dbd001bbbb6c8a642a549b6f08d0d85751909ece7eb38010b76506cdc1a38dd44ab2cf105bcc1af1a665df1af61ea502b4ba275b12bcd3f54e1d SHA512 847c3006e2afc2fd0bd5cd614b8893d8b3bd8ebb2ff39662e3f0e38945220609843d1e6d072d1ffc168192e04160a7da7c579e59d7467527f75e9395e9ff0f12
 AUX mepl-0.45-gcc433.patch 600 BLAKE2B 12835e147142dbd001bbbb6c8a642a549b6f08d0d85751909ece7eb38010b76506cdc1a38dd44ab2cf105bcc1af1a665df1af61ea502b4ba275b12bcd3f54e1d SHA512 847c3006e2afc2fd0bd5cd614b8893d8b3bd8ebb2ff39662e3f0e38945220609843d1e6d072d1ffc168192e04160a7da7c579e59d7467527f75e9395e9ff0f12
 DIST mepl0.45.tar.gz 18968 BLAKE2B 15d5e426ea3984e8b6672e1512afcfb6b4e5678bfc473e1b21df7ba66da9596a0971a08114792720de6f779deb767846ad77a9545ee4734906679207a2c690f1 SHA512 679ac7548f6a4870164410db403d9fb8a18d7daa651a29d8e0dd87d8d3fdf1f9e8d381513ab922188951eba0798b1d32eadceafa117236ff54ef3e645d876c1e
-EBUILD mepl-0.45-r1.ebuild 657 BLAKE2B 1207a52a93708a34640243bc623322f94277507858c217eef1d7edb309e28ec94f44d5b9663470c58842e68d3b0393217cdd1690b92e8cddc040c1df309b0aaf SHA512 959ea71379351ceb1503b92ef6b39b0a10aff5887d836ec1ab1ad66f2c03c66d4dc415ee6426b0c2c05a9891577712bbd3a55bbb5c0e8febb45bbdef25e4f782
-EBUILD mepl-0.45.ebuild 705 BLAKE2B 85bcb0c9e484b80a99776a93e434cb64be695c063f301fbd3d4a4db6f95188bc912d8e0dac1189791d16898d883ef0a0c568fbb7a23c0887c1e7f3d67621209d SHA512 fb99c7571dc976fd826ddf6e5b96ce809aa3809772bfad7d1c9cbc4602f742fffc1c3434f9afd1d10575ebfd7898c438b35bd4c97c74990155682a7b16fd218e
+EBUILD mepl-0.45-r1.ebuild 703 BLAKE2B b5c6abb91a1af69eb1ca9d7298ba7a0d3710e0ded9cd9ebe02590c60a9040d52619c20cc08f830626c9224979b4c6c3a7c73aba60ee471b2ecd1e2d4ce3734f8 SHA512 69ee20e09351548d5aed2b080a0455d6e642fdaf6f90aca61ff4c93c14fb504f535bba1cc22d5f67df141ec0c8330cbe36f3da7b8fa7bedbe49599392fab0608
+EBUILD mepl-0.45.ebuild 751 BLAKE2B dc57323a6975a3f7449239fa0b43002fc4513585ab34aeadd447e3c4214ff0bebc037d948373619ba54dad62cbc9920f6667bb2d92e7013bcc49727cf64d7b70 SHA512 4e05c749580e35532731f1aa48fca36efc95be8f49b13b6734c100a9bf347b9f2c92fda2863e2a14f120bf19177c4817f6753adc6d1da73616c7cf8044ff6c45
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-misc/mepl/mepl-0.45-r1.ebuild b/app-misc/mepl/mepl-0.45-r1.ebuild
index 65c2b5cb7bf8..a2d1d730c8ec 100644
--- a/app-misc/mepl/mepl-0.45-r1.ebuild
+++ b/app-misc/mepl/mepl-0.45-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit toolchain-funcs
 
 DESCRIPTION="Self-employed-mode software for 3COM/USR message modems"
-HOMEPAGE="http://www.hof-berlin.de/mepl/"
+HOMEPAGE="https://web.archive.org/web/20031204100644/http://www.hof-berlin.de:80/mepl/"
 SRC_URI="http://www.hof-berlin.de/mepl/mepl${PV}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-misc/mepl/mepl-0.45.ebuild b/app-misc/mepl/mepl-0.45.ebuild
index 77d7acf80473..5c4b07351dd4 100644
--- a/app-misc/mepl/mepl-0.45.ebuild
+++ b/app-misc/mepl/mepl-0.45.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Self-employed-mode software for 3COM/USR message modems"
-HOMEPAGE="http://www.hof-berlin.de/mepl/"
+HOMEPAGE="https://web.archive.org/web/20031204100644/http://www.hof-berlin.de:80/mepl/"
 SRC_URI="http://www.hof-berlin.de/mepl/mepl${PV}.tar.gz"
 
 LICENSE="GPL-2"
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index ba33c5561899..79a6af6bad04 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/gnucash/Manifest b/app-office/gnucash/Manifest
index a20d52b9c0a7..5a0a621f8270 100644
--- a/app-office/gnucash/Manifest
+++ b/app-office/gnucash/Manifest
@@ -1,6 +1,9 @@
+AUX gnucash-2.7.3-no-gtest-src.patch 518 BLAKE2B e61dbf22ab7f02af16289bee02ca1617e135d9e92526836efd04952e03ebe7a7e8c8710b174c2b5a9c03565ece674fd04403a146ddba793f9ec02ee4a9b22636 SHA512 d5279af31d454fc71b18c4308cb0d854c1e654190a1c43324d6bd5ab7d91415c4905c008fcd4320ebd49f12236eb43bd60da11d0c6ea6f791f7f6a8ce718e0f4
 DIST gnucash-2.6.15.tar.bz2 13406483 BLAKE2B 927838c5c9c11a19eb9f8e11726825458d5b414f4ef24baf1a7ae15c33825eeed2fd87892e728b37c43385360fd06a60df0bade4244b5c93dac5522f09849c92 SHA512 6ec0652565025ac8281152ed64f2f820ecdb17ead5f17738728e094d116e638a08af57a46c0d5b59679f30f142ce372a5f61bd164f68f6b608d09de37cec38c6
 DIST gnucash-2.6.19.tar.bz2 13612124 BLAKE2B cc66e4d7994274bb2ad97437333dbe62b0e9228e20e05e01fc7861bc45a8f07bc56d2a69850eda301d5e7f679d96a9d28c24c56a4860cff6727b66867482deae SHA512 0a979caf48ba96d6f37a929036e7172855cfb03af8832f479966bce72fad3400903925134d33aaa31eb6b36a2041f5e0d3f74b88e95b83c7d76e96b1503bec13
+DIST gnucash-2.7.3.tar.bz2 13736166 BLAKE2B 352c7bd9fe11b3b1b039acedb43be6f48960fac7ef6e4eaca5ca1ce944808d2d36c3a22b15b7150b8026bad10bfa0766fd19ac8d1b4f5f2cb2bcb8c112ee87bc SHA512 78c482eb3146406d561320866c480101cf35c51d8ab789e8d2688c7f7e16d1870b33feb7bcdb3cd8feaca300ce9bcf9fa05ba8e1804b221526d181763dcea611
 EBUILD gnucash-2.6.15-r1.ebuild 3216 BLAKE2B 1989921ba59e5fdf7da887aa85e9a9ad966ab7b037df69fa2827703652e679180762785ef20cc7f0c12b99a20eccb61d4cb30d70a23cc88060690fc55e5ea424 SHA512 8823d1681347cf1f4b52dce75302ca431c0b9b675c5bd6e2e97978237027511acf7f25309755f02d329aa62814881f5df927948c432339c47ef7387ed2bbbe54
 EBUILD gnucash-2.6.15.ebuild 3238 BLAKE2B 5f11f80f426e510fb46e8cdedc0dd9a8ba7f783e5d9eada1185cd4507b34945be105083a28eefacfe91f692e49436cfec3dd7747bd1a60dd87226897cb7e4098 SHA512 00fb4c31296021b9cbb7bc1a83662ff04c89aa5425f4a814ba91cab19ca6ebf8ffd29f60f641770a56b8af48d7ba8c195c0d641c3046e8d2365a841639ef74fb
 EBUILD gnucash-2.6.19.ebuild 3331 BLAKE2B 67b53dbb60ab5b8160c0e73d3135a200e41f21fd5cfceb7e7f652967af5fcf0381bcd5436f9120fb025bf4ab22a4bd4eae94ac9dacfcdfcda9efec5375fd52d4 SHA512 3c928dd6a952c570f744bae0d843b5dfd48548e12b40c15f73cc4651e49d81989eb845643ec99b175b3eaf01a042f8bf5ceadb02917ea2e998595db0b3e68b8b
-MISC metadata.xml 697 BLAKE2B 49ebf92faf650b5ff054cb7f23f907b8a6cab2d26889acf57fb55e67164c468b37a70e830c903c5041df8e48e47bfef4ef7248c52e889f3d3c168ad678c5d6ec SHA512 f58b4f51e04ed60f4d84265592fe4f49753ba00e621181f89e9a447c5138435aa277918c0111c1034c9d1a3ec6378de00a9943c5f9c14032a98306a12cca6aad
+EBUILD gnucash-2.7.3.ebuild 3507 BLAKE2B b686ba37ab8566cfde98d7f0606b0b6fd5738a59ac2d08c3149fbfc00ccef117cef80ee6c0f3494480f3f81fb524a8dacb547fbf260a82ffb78dde6672a6b347 SHA512 507aa648e1dbc301b4f80b5433c0d5d925793909f31304f5b744f6ef4553a36f541adc69f08f0d6bfc2a5c1969b405c777c82c6b68d9ce034d8dd99471359d73
+MISC metadata.xml 842 BLAKE2B 32276a0205e3726e5dc547bbac615cb04f1137cf9f34389810921ec6fe55312af21f31732cbfd998a2f1678b06b8f54a16601d0b02e580e3c4a609159f0628dd SHA512 ef6c9aacda5849e8d6a8bc03ff9266fbf38b2256f085b4e4cd3c4a91007f3a4a81740417f18d7f5f437fbf4167de4ffbdb4742e381ded06b12a8433b550ed542
diff --git a/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch b/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch
new file mode 100644
index 000000000000..66c1f9fec852
--- /dev/null
+++ b/app-office/gnucash/files/gnucash-2.7.3-no-gtest-src.patch
@@ -0,0 +1,15 @@
+Bug: https://bugs.gentoo.org/643566
+
+--- a/common/test-core/Makefile.am
++++ b/common/test-core/Makefile.am
+@@ -80,9 +80,9 @@
+         libgmock.a
+ nodist_libgtest_a_SOURCES = ${GTEST_SRC}/src/gtest-all.cc
+ libgtest_a_CPPFLAGS = ${AM_CPPFLAGS} -I${GTEST_HEADERS} -I${GTEST_SRC}
+-endif
+ nodist_libgmock_a_SOURCES = ${GMOCK_SRC_PATH}/gmock-all.cc
+ libgmock_a_CPPFLAGS = ${libgtest_a_CPPFLAGS} -I${GMOCK_HEADERS} -I${GMOCK_SRC}
++endif
+ 
+ gncscmmoddir = ${GNC_SCM_INSTALL_DIR}/gnucash
+ gncscmmod_DATA = unittest-support.scm
diff --git a/app-office/gnucash/gnucash-2.7.3.ebuild b/app-office/gnucash/gnucash-2.7.3.ebuild
new file mode 100644
index 000000000000..9bf87b6b7157
--- /dev/null
+++ b/app-office/gnucash/gnucash-2.7.3.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# We need to run eautoreconf to prevent linking against system libs,
+# this can be noticed, for example, when updating an old version
+# compiled against guile-1.8 to a newer one relying on 2.0
+# https://bugs.gentoo.org/show_bug.cgi?id=590536#c39
+# https://bugzilla.gnome.org/show_bug.cgi?id=775634
+GNOME2_EAUTORECONF="yes"
+GNOME2_LA_PUNT="yes"
+PYTHON_COMPAT=( python2_7 )
+
+inherit gnome2 python-single-r1
+
+DESCRIPTION="A personal finance manager"
+HOMEPAGE="http://www.gnucash.org/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+
+# Add doc back in for 3.0 and bump app-doc/gnucash-docs
+IUSE="aqbanking chipcard debug gnome-keyring 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.
+RDEPEND="
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libxml2-2.7.0:2
+	>=dev-scheme/guile-2.0.0:12=[regex]
+	>=sys-libs/zlib-1.1.4
+	>=x11-libs/gtk+-3.14.0:3
+	dev-libs/boost:=[icu,nls]
+	dev-libs/icu:=
+	dev-libs/libxslt
+	gnome-base/dconf
+	net-libs/webkit-gtk:4=
+	aqbanking? (
+		>=net-libs/aqbanking-5[gtk,ofx?]
+		sys-libs/gwenhywfar[gtk]
+		chipcard? ( sys-libs/libchipcard )
+	)
+	gnome-keyring? ( >=app-crypt/libsecret-0.18 )
+	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-1.8.0
+		(
+			dev-cpp/gmock
+			dev-cpp/gtest
+		)
+	)
+	dev-lang/perl
+	dev-perl/XML-Parser
+	dev-util/intltool
+	gnome-base/gnome-common
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+
+# Uncomment for 3.0
+# PDEPEND="doc? (
+# 	~app-doc/gnucash-docs-${PV}
+# 	gnome-extra/yelp
+# )"
+
+# Bug 643566: Conditional didn't enclose everything related to gtest source
+# files and they're not needed.
+PATCHES=( "${FILESDIR}"/gnucash-2.7.3-no-gtest-src.patch )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myconf
+
+	if use sqlite || use mysql || use postgres ; then
+		myconf+=" --enable-dbi"
+	else
+		myconf+=" --disable-dbi"
+	fi
+
+	# As of 2.7.3, the presence of --disable-register2 would enable register2 as
+	# well.
+	use register2 && myconf+=" --enable-register2"
+
+	gnome2_src_configure \
+		--disable-doxygen \
+		--disable-error-on-warning \
+		--disable-binreloc \
+		$(use_enable nls) \
+		$(use_enable debug) \
+		$(use_enable gnome-keyring password-storage) \
+		$(use_enable aqbanking) \
+		$(use_enable ofx) \
+		$(use_enable python) \
+		${myconf}
+}
+
+src_test() {
+	emake check
+}
+
+src_install() {
+	gnome2_src_install
+
+	rm "${ED}"/usr/share/doc/${PF}/{COPYING,INSTALL,projects.html} || die
+	rm "${ED}"/usr/share/doc/${PF}/*win32-bin.txt || die
+
+	use aqbanking && dodoc doc/README.HBCI
+	use ofx && dodoc doc/README.OFX
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+
+	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."
+
+}
diff --git a/app-office/gnucash/metadata.xml b/app-office/gnucash/metadata.xml
index 97283552223d..4c84c7d43e6d 100644
--- a/app-office/gnucash/metadata.xml
+++ b/app-office/gnucash/metadata.xml
@@ -10,11 +10,13 @@
 		<name>Gentoo GNOME Desktop</name>
 	</maintainer>
 	<use>
+		<flag name="aqbanking">Connect to some internet banks via AqBanking</flag>
 		<flag name="chipcard">Enable support for chipcard reading and
 		processing.</flag>
 		<flag name="hbci">Enable HBCI support, for connecting to some internet
 		banks</flag>
 		<flag name="quotes">Enable Online Stock Quote retrieval</flag>
+		<flag name="register2">Use the new register (Experimental)</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">gnucash</remote-id>
diff --git a/app-office/kraft/Manifest b/app-office/kraft/Manifest
index 82b28827c958..a3c3874b323a 100644
--- a/app-office/kraft/Manifest
+++ b/app-office/kraft/Manifest
@@ -1,3 +1,3 @@
-DIST kraft-0.80_beta3.tar.gz 625756 BLAKE2B ecbad304b76b7bec827573d4f001ac36b55c84df1a78fcdee25d71dc6efc9b341aa6d708bd288beee3a7c75d2f1b60f01aa6877a29ef750487a516d7575de5a3 SHA512 d94b00fb8b366473948641425288118acf276b429169c4e187b66dfb1ce4bc0d326ee215bd8b3dcbde25d2ec04ab2f0c3dcf4c22ada676a31e761a8278bc06da
-EBUILD kraft-0.80_beta3.ebuild 1128 BLAKE2B 5929e31d759e445ea1bcc932869abbca16723d91a26b210d91ce98903147e185999fd17aeeaf3c256840a5a5e86448bd0cf1da6ed32a048bba8a81e4e5221c5b SHA512 cad140f88e0f1569b5e500eea74d33e565fa451e7f6c57e4721d7d4cc95d458bad2f2603310f35706b72e85643d33b4f488f0fa57017b5b5456638ef43b1a473
+DIST kraft-0.80_beta5.tar.gz 626664 BLAKE2B 431e6908414fbbdd13b19f4ddac54395099cbefb96ea1dc73ecdb97fbfba66f5b4c42dd77bf479f81fdbcfa867e5d75a3a0b1aaf6fcc0c908bff3092d81787f7 SHA512 0a39fa8d98cf2aa156a9219d5950006b88bd45af59cf23fd4486e27ec54288e1bb18d8887dd53fc99c7e9f47ceeea20e27e55a281d8ccb1e29a82c073e2c0360
+EBUILD kraft-0.80_beta5.ebuild 1128 BLAKE2B fd1f01b8dd6fab92035a94582c2774e5f0ef35265fa13266bc2a81be75619ba7ad1e4b426b9f088d3505c80bb8127d5c55091cf6feb1745d4fcbe8a017a4b338 SHA512 f6dbd645a7bb1534de65552dd5e92d28a59a062b58e28ebee61a4f6987191e5f31f8441e5e49cf0e4534ebc89e2a47ac76c5838b53469b730965971f1e67ed1d
 MISC metadata.xml 418 BLAKE2B b99b3d436a90af1cd1a791e8cd1aeaed2c654a659a45f5e88b5c5b0cd02d57bc15df8e225cd93e9041732dfbf45792721d29df8c2187d409ecf3a4202855266e SHA512 eb8a053a7375546c713741d2bcacdb4604c725322c6680d76eade40ea4166cf20d8ecef4c4f0a7ef4304961bf2740b8277f5372137e04d32a52bc254daf65232
diff --git a/app-office/kraft/kraft-0.80_beta3.ebuild b/app-office/kraft/kraft-0.80_beta3.ebuild
deleted file mode 100644
index 8046838cfbcf..000000000000
--- a/app-office/kraft/kraft-0.80_beta3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-inherit kde5
-
-DESCRIPTION="Software to manage quotes and invoices in small enterprises"
-HOMEPAGE="http://www.volle-kraft-voraus.de/"
-SRC_URI="https://github.com/dragotin/${PN}/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
-
-KEYWORDS="~amd64 ~x86"
-IUSE="pim"
-
-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_kdeapps_dep kcontacts)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-cpp/ctemplate
-	pim? (
-		$(add_kdeapps_dep akonadi)
-		$(add_kdeapps_dep akonadi-contacts)
-	)
-"
-RDEPEND="${DEPEND}
-	!app-office/kraft:4
-"
-
-DOCS=( AUTHORS Changes.txt README Releasenotes.txt TODO )
-
-S="${WORKDIR}/${PN}-${PV/_/}"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package pim KF5Akonadi)
-		$(cmake-utils_use_find_package pim KF5AkonadiContact)
-	)
-
-	kde5_src_configure
-}
diff --git a/app-office/kraft/kraft-0.80_beta5.ebuild b/app-office/kraft/kraft-0.80_beta5.ebuild
new file mode 100644
index 000000000000..c064cd20d985
--- /dev/null
+++ b/app-office/kraft/kraft-0.80_beta5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Software to manage quotes and invoices in small enterprises"
+HOMEPAGE="http://www.volle-kraft-voraus.de/"
+SRC_URI="https://github.com/dragotin/${PN}/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="pim"
+
+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_kdeapps_dep kcontacts)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	dev-cpp/ctemplate
+	pim? (
+		$(add_kdeapps_dep akonadi)
+		$(add_kdeapps_dep akonadi-contacts)
+	)
+"
+RDEPEND="${DEPEND}
+	!app-office/kraft:4
+"
+
+DOCS=( AUTHORS Changes.txt README Releasenotes.txt TODO )
+
+S="${WORKDIR}/${PN}-${PV/_/}"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package pim KF5Akonadi)
+		$(cmake-utils_use_find_package pim KF5AkonadiContact)
+	)
+
+	kde5_src_configure
+}
diff --git a/app-office/scribus/Manifest b/app-office/scribus/Manifest
index 93960a060369..115dc114b9ec 100644
--- a/app-office/scribus/Manifest
+++ b/app-office/scribus/Manifest
@@ -9,6 +9,6 @@ AUX scribus-9999-fpic.patch 499 BLAKE2B 68790e6d7a76c4ae01490956b0db09bc79e1c272
 DIST scribus-1.4.6.tar.xz 73601104 BLAKE2B 5968a48410d1a2a4caa333c9f83b43f68c964862d9aa3cb20e136760201ef2ef6cb82f770026b6f962758c9d397f25a017d906433f52f88bec11c57105c27f6b SHA512 74d8a89eb767535bcd8fe5e3c55d03709d59ff8fc5280005bcc2ad36cae1d37c8442ab85abaea86fdee9f351a901c86947231001324e2d8df00cbd8e5c18d1e3
 DIST scribus-1.5.3.tar.xz 74222084 BLAKE2B ffb50c728c0669ab8a22c416c143e8dd47c818120247b4cf5a890872857326b53491be99004a344d78ea2cf2b174ae2987ddcddb4cef39a6e95fe1695be45d48 SHA512 487cea685869397bc52acc7be8e8e9f4bad3f594c1f95740207e4d9e26b07461a7fd2a95d5337b38f1b0fa6504a9f6059cca6740c78cc165eab0b779ffdfe980
 EBUILD scribus-1.4.6.ebuild 4501 BLAKE2B b30fa6004319b54965b5b61f9cc466535135a8dd78434b090ff827df779ec003af1cf9ed00903d1614b6102be34298a95a1c3c609b1c5ec7a707b09b42bfe393 SHA512 0ede0bf314d6aea40da9316ea1778b9e2810780d715fe5fb66221354467147c54694b3b6f620faa7da6ad386034cb4b8b03df9acb3cd372b17ecc4415543531b
-EBUILD scribus-1.5.3-r1.ebuild 7027 BLAKE2B 5b25c5f90dca16433427427d257d36ab4a8d587f8a71e0a95f717628ae11a69e9d0861ca45aed2db10406e312c7b5aa1086d242e0949a4958504d43c3322a0ba SHA512 fd96085999ccc2354b671e603357d396031d0a697b0fc20b4f8ce91c75cdf8c22e0dc52c180da85bbe7a5b81d62d3c25609fbd84a5e7d75f07bc09c74f8462fd
+EBUILD scribus-1.5.3-r1.ebuild 7026 BLAKE2B 139b7d8c68bf429b36286e1835eaba88cdfa72b957c34895c9131b148e9639cc95be968bf62db98de084a6c299b5fde0b30e92625a3487deaf5d442c4e11a3de SHA512 db437b2d712c5f995654392e939e8f83f47241d240824e963a436823957658562b1a54bd9c9b3a7f3f94488ae469eede495c848ec20d9b4d6b98aff580ca0923
 EBUILD scribus-9999.ebuild 6947 BLAKE2B 98d7eacf3fe442b1539519139e9a127a3d7c0ea7fa5b9e75c6b7b220353ce7635c97675df9f2df1f272116c44f6825817e8c62fff75860d4cfeb75bc4fa388f8 SHA512 fd3911b80f04485f8fc11f2b30bc3f3e1ced644217b6e1d00716e48a68154b5b12102267e363b39dcaeaff129eb46b246f415c581f724951f45b3a9e174355af
 MISC metadata.xml 895 BLAKE2B 9f470d1d5f1eec9f76aca47dce40a3b276f3c7646f0a89ecc69f09f2644af7622655eadbe76486e3f1312fc282400592d7bfcddf3fe4c12b865c7642f61174b6 SHA512 a4b3ba4d363b674e781faa22cab86ef0455b235d9aa1bc4da12b4cc1ae4f23b954f81fdd4ca2348057d2c5108b141a4d6f3307eaf8ff79f76a2754538b80faa1
diff --git a/app-office/scribus/scribus-1.5.3-r1.ebuild b/app-office/scribus/scribus-1.5.3-r1.ebuild
index e1ed169825aa..2faefea4a252 100644
--- a/app-office/scribus/scribus-1.5.3-r1.ebuild
+++ b/app-office/scribus/scribus-1.5.3-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/project/${PN}/${PN}-devel/${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~hppa ~ppc ~ppc64 ~x86"
 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
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index b02f64a9587d..e7a6c65ad625 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/cpuid2cpuflags/Manifest b/app-portage/cpuid2cpuflags/Manifest
index d250b672f701..cca4eeadcb20 100644
--- a/app-portage/cpuid2cpuflags/Manifest
+++ b/app-portage/cpuid2cpuflags/Manifest
@@ -1,6 +1,6 @@
 DIST cpuid2cpuflags-5.tar.bz2 72050 BLAKE2B e9b7022ae5b7d51c88b5e41d9d7af1175498cb5a1f32876bfb766f785060f501d07ba3a5c346961e742bbf7022121faf3d0d068ec711ee9ed4e67cbdcd72a58a SHA512 41dcd2b974f6bd96867dea15a3839a8d63a3ff600189107ab16a67b5bc77ef421acbedb83f3e3b16ec90ac900d187aa8c44baae6fbdb4988f3bf7caa2d0d19a2
 DIST cpuinfo2cpuflags-1.tar.gz 1429 BLAKE2B 5126e643e5e2ea0be2418068fbcfbbae1781a0e3ab7903d909d4a5a291cb2e5db132a7a6a5c6db12a757688efca0557e4331a91f64af4b7e47deca415fd05b34 SHA512 68a21cfdb0fc8c6eb5aad5c6702d50dd56c927b2010efea1651dbc6a9657654b770bc5a4055fb11e790066c2c63c9ea29c3e03d91057abe187e7029e6797aede
 EBUILD cpuid2cpuflags-1.ebuild 1058 BLAKE2B 2f84de424a39c3f163dffffb5acf0b919e1abd2375b961e6f1f281011157fe7fabcebcee4ba771abfb2fef9407fbf4c67a104aa3ec4de2bf1d81b91cbc6e272c SHA512 ca30faabee1bd898fc80f7207fe71d205d6ee6a09e1697f242bfafaca1071fb343ab58623d713b15202096f6e3e240dd83600ce0b695be546721037c77e9c850
-EBUILD cpuid2cpuflags-5.ebuild 930 BLAKE2B 3e5303f56f197a2d2e7212d47fb7ca3cbd153401938274d3f262ab7266f4ac934c4cd5ae4d17438aab3ddc129b0df84d283229f27fba4393ac12fab5ed42b512 SHA512 428b39f888875375ecb735e2d75e562e4df447133e9eece95156e0eafcd6672baa09d2ffad96769f171027cd4207d1fc02d4e24f9cf900dcce0425183db3adc0
+EBUILD cpuid2cpuflags-5.ebuild 929 BLAKE2B a9568135089815a20bc27a37cf9584a36fca6dc1300d79d31f94359c871b1f577bb9e7d4cee1d45d9d3ed5c3cfa9126d47f6b81661e932baf957af9d0374625c SHA512 5ff8e6fcbda6428cf86a4580b04222266eafd24ecec7801b5242675a6300850b82eacc2895ed5c5ec3d65f7d8f7c09a95bf602d316c6d37e8c31e31010f7c01b
 EBUILD cpuid2cpuflags-9999.ebuild 410 BLAKE2B db323508784e37a7f4220c8d192460e854ab54bccfcebb40826821335de6834e97460dd4bc6dfbe11fc6d650171fb76a0a9196bb1bf6af81a08db35afda2e466 SHA512 02a38010f453641b73461f5afb980b7e1cb1817f3a688064d699827d698f94a3f27a65f7c0dddb7be287694cfe426bbfdd5ec03714d3b777a4975a38e5561b69
 MISC metadata.xml 343 BLAKE2B 29f607a891c673bbf997aa75bb445adfc43cffa35f63a30d1f2b06e4c5a7429ad503fae596c4c633b7e6680e26da674bd9f8aaea32a8a9bd8a3ac2c79a0a5667 SHA512 8ae8b8d61adaf555d1f59e50655e9e12f342e194ab8363f03a34390eed1455144acee39553b93306d9775b8c9fb119de52b8bb4d9284c71ddc39c3d3414a31dc
diff --git a/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild b/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
index 318806faa56c..6467a205914b 100644
--- a/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
+++ b/app-portage/cpuid2cpuflags/cpuid2cpuflags-5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mgorny/cpuid2cpuflags/releases/download/v${PV}/${P}.
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE=""
 
 pkg_postinst() {
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index f4ba8684b56e..31f965926493 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,4 +1,6 @@
 DIST gemato-9.2.tar.gz 60217 BLAKE2B f46cb35b5ae71fe1743c7a43bfeff42a9d77517ef48dca1dd05c5c8cd569d5dcd9bdb0c0957d81d2db6b8d873099463fd6132121be04e0fd6f55bb130df48c2e SHA512 bb40abb910b528e455bdc01ed528071ca6f1390a8a5ae670692c93e6c3fc8fd7fc7e95d7321c81ad5144fc8a042676a8dac634c7b3f68e7f725edc98edd30c94
+DIST gemato-9.3.tar.gz 60601 BLAKE2B d85bf5910736da2ca887567799dee1823e9be6af9b17a8f9deb84ee24bb725c3550aafffa51b15484acb7d37ddbd5996aa4175a8f307b6e3a593f8b5497822be SHA512 7f81409b3b9bd65d295cd760af5cabfc7daf257740f00015f07cd7a0cffd02a40f219b59378179b58bf53b321fb543b308457d3a8b7adcb02981562282f1f46f
 EBUILD gemato-9.2-r1.ebuild 1576 BLAKE2B 53a4d0f449757f13b456e4ecd364fd8b4ab054f14bda9fd00f9ff4774fae47c902e874ba72d76c0808bf3a5dcf392d1f2f4339c0d31fce727d3d452a9e369b23 SHA512 510cc1699b35cb234d86e41ab43f84b4b2798ccf29f0e1209e8806c5598864b7317c559f0e7ff3763ba28b6067edf1c7088d979314709bbb6233d6408536dd1b
+EBUILD gemato-9.3.ebuild 1370 BLAKE2B 0fc7416830c23b65f8fbe9e2d766fd2e52f551654cd6dd583fec60dea70f7045f2d5e859cb9fb021b62deda75d9af6a4485abf862c1ac04e06617736d759b3de SHA512 efc1627f4874ecb324c047cf31cebf04db7e14c09652a0ece6c89311fa9416693c1fa52c2f23053b31b76ba927591d0e4f3f6f1d67ac69dd1616230091fb10d1
 EBUILD gemato-9999.ebuild 1373 BLAKE2B 7e8bc4fe97e744414e52bf382707c997ffc06b6f996e622c90c6d4dc1816889b947ea775efa64f2589c4801a039c18c7fa44796b75fa063c2a250923a575817c SHA512 b7f6a5f21aa92c933dc6ab0b66b35a76949ea8daca49a2e37a87505483b820c3e54fe03db9ccbc3d32e0b722a893681193fb5f5738e0d4e6b3f2d1be700e0f62
 MISC metadata.xml 785 BLAKE2B ad8381a17cee4fee5099ca5e4312b703eae026436ec8082f272954ec0850547844923e108c02d9041beb6bfcd33bf18c846344d797f56a61170fd6b4445557c2 SHA512 86ffb0a9b39e261b35430d1055deebe8c66eb2c285211274feb793bf003296389a3bbb38ccd33d350a8bf56fcd241edcf9576305fc3aaf68cab68401ad983b83
diff --git a/app-portage/gemato/gemato-9.3.ebuild b/app-portage/gemato/gemato-9.3.ebuild
new file mode 100644
index 000000000000..fc3300922c24
--- /dev/null
+++ b/app-portage/gemato/gemato-9.3.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# pyblake2 & pysha3 are broken with pypy*
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit distutils-r1
+
+DESCRIPTION="Stand-alone Manifest generation & verification tool"
+HOMEPAGE="https://github.com/mgorny/gemato"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="+blake2 bzip2 +gpg lzma +portage-postsync sha3 test"
+
+MODULE_RDEPEND="
+	blake2? ( $(python_gen_cond_dep 'dev-python/pyblake2[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )
+	bzip2? ( $(python_gen_cond_dep 'dev-python/bz2file[${PYTHON_USEDEP}]' python2_7 pypy) )
+	gpg? ( app-crypt/gnupg )
+	lzma? ( $(python_gen_cond_dep 'dev-python/backports-lzma[${PYTHON_USEDEP}]' python2_7 pypy) )
+	sha3? ( $(python_gen_cond_dep 'dev-python/pysha3[${PYTHON_USEDEP}]' python{2_7,3_4,3_5} pypy{,3}) )"
+
+RDEPEND="${MODULE_RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	portage-postsync? ( app-crypt/gentoo-keys )"
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( ${MODULE_RDEPEND} )"
+
+python_test() {
+	esetup.py test
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use portage-postsync; then
+		exeinto /etc/portage/repo.postsync.d
+		doexe utils/repo.postsync.d/00gemato
+	fi
+}
diff --git a/app-portage/grs/Manifest b/app-portage/grs/Manifest
index 8bf6e0042399..25c9a0e00328 100644
--- a/app-portage/grs/Manifest
+++ b/app-portage/grs/Manifest
@@ -1,6 +1,7 @@
+DIST ISO-1.tar.gz 2887967 BLAKE2B 0ae9d9c4078974316d6865a8601705f7c69c8305d8401835bfa544d14a90b3688ea6b881a1c07bcb969fe2b15f210d05f114ebaf3af5ba6f1ae3705d395f1603 SHA512 50bd9bcaa3d1900763936beb4801fd9e5cb963e39d51c39c9cc9a8d160469db1b0c6fffae01bbb5d5d5c6d4e42d84a6c499c465bbdd964835c2d190785eed52d
 DIST grs-0.5.tar.gz 34213 BLAKE2B 3745d68db8da65f72e3b82ed2350d8a8696848d451aa3da5c941174403be7fea9a4b7536cdf532d0d89b6014817c14f874d0dbca3408bdd8326e88396767f119 SHA512 85cb78d898c266fe4f1a5298d3add20fb127d43469cd00d32400bebf0c7350c07b581f9e8714a32db62c57f5a92fca0cbe66f0e2812dab86f57d9e8c66aaab7f
 DIST grs-0.6.tar.gz 34752 BLAKE2B cbd99ba7fea491db032d08cd1daa5a18cab8e8f21110bbe7d6d9c2b532776a9c9f55bd4a1d2b9bd6ea5fdaefdd2fb5af5b35beb6adcfe57d0d02b779c6ceaacb SHA512 ede5117ffe5dad982366b3acabc98bc018cc74aa079080f1a20fe31e86bca0b6ed48589ce22a400bf43d882f17dc630a4f7c99a7f7b4a4cb7c6f2f97974ecc5d
 EBUILD grs-0.5.ebuild 1037 BLAKE2B 715b4ca9f91d01a445de5bb151f30704db2ceceff33d24b35183c9d42b881e7c9336608956e827face1068059d594748bc9ebfcbfc1b3c604f1f8f2558cda123 SHA512 bd97ae2e24f527e13138fd6b9bf00ac453c566e10ad0051c985fc78ff4b26a205c71e36e0f98b691f8bbd9b90b3db5af5b3521c3715f4800cae43cef5327d04b
-EBUILD grs-0.6.ebuild 1096 BLAKE2B 3df3288f9efb43d596bb0fed93dd2c4d9cbc935f6844706ffdc2b05489e27808d439100ca91fa9326c63721e541463bdfbe913d7446103ca15319917243e0557 SHA512 1e68f0f68753d77a28cb87851fce63754a5694f5e916e65b10cf3aeb05acdc577acc950a0500d094d18773c007db5115b886c7e55a13354bc09bb53b27805e72
-EBUILD grs-9999.ebuild 1097 BLAKE2B 109c0ac7b7e35eb0b65f85b01349f28ef435431131ea9007e79cd18061de5aac6be6d5c5e30dfd03e2ba0ebc05c4ee113a1cb7c1767519f6368d6668f183a36a SHA512 bc8f4346b4348184f36b0ce304a74fec7a2f549269d77516d3491a90257872225e1294d3b75be017f02b622b19280b462e391c3328013ebacec8bf44985080e6
+EBUILD grs-0.6.ebuild 1101 BLAKE2B 411546307ad2b43b8c15a6dc35efbff288f42b7efa5cfe59f998722e8c9ea98d4320ec9179d36c34e62bae43452e58f8ee6244df9e5cbc1ad50db4e7063c9f82 SHA512 933c86210a1a8520a6e05d36a0a644fb659f153bf7015b629c6f144675d64caa527c31afe7ed0f51d276bb32dd43403a6e7e6efeffb13c12c085fcd5557468a6
+EBUILD grs-9999.ebuild 1326 BLAKE2B 0c6fe46c8f6d318367d2b23d08d28c2339bf29707a2fe273a2470fa8059514e6dd1f9c439e92dab290a5a3300575d7442d5f08d7979925533d3b7b670555ec81 SHA512 7076b8e574bda5525c9daa3a41e59d3191c04236ae2915c827b5b4df73993d3a9f1351ca5752573060df73060ceaa7a2be03a1be4982177b695a9d33d85930fa
 MISC metadata.xml 335 BLAKE2B 24dec8cf9113a9a1114ebac569e5f335f82bbd0e89efc87f4897fd79e7da509450e562aa825c01a20e3edfa82523bf443f0d24f8a0964b73f1074975eee821d8 SHA512 e753c37f63f2d42e2745076a5969ef57a87e71a9dc96b6f681d138c6d9c23d8903683208fa1519e91f08856f40e900812cba2b4d53c51c3827e18edd940b8d7b
diff --git a/app-portage/grs/grs-0.6.ebuild b/app-portage/grs/grs-0.6.ebuild
index 3ad135db3609..9f035617c7c3 100644
--- a/app-portage/grs/grs-0.6.ebuild
+++ b/app-portage/grs/grs-0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64"
+	KEYWORDS="amd64 ~x86"
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
diff --git a/app-portage/grs/grs-9999.ebuild b/app-portage/grs/grs-9999.ebuild
index 5e16f8b436e0..abf196bc0732 100644
--- a/app-portage/grs/grs-9999.ebuild
+++ b/app-portage/grs/grs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -6,12 +6,16 @@ PYTHON_COMPAT=( python3_{4,5,6} )
 
 inherit distutils-r1 linux-info
 
+ISO="ISO-1.tar.gz"
+
 if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/grss.git"
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${ISO}"
 	inherit git-r3
 else
-	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64"
+	SRC_URI="https://dev.gentoo.org/~blueness/${PN}/${P}.tar.gz
+	https://dev.gentoo.org/~blueness/${PN}/${ISO}"
+	KEYWORDS="~amd64 ~x86"
 fi
 
 DESCRIPTION="Suite to build Gentoo Reference Systems"
@@ -50,4 +54,8 @@ src_install() {
 	distutils-r1_src_install
 	echo "CONFIG_PROTECT=\"/etc/grs/systems.conf\"" > "${T}"/20grs
 	doenvd "${T}"/20grs
+	if use server; then
+		mkdir ${D}/usr/share/${PN}
+		cp "${DISTDIR}"/${ISO} ${D}/usr/share/${PN}
+	fi
 }
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index b4199bfb9239..3658ffcfb388 100644
--- a/app-shells/Manifest.gz
+++ b/app-shells/Manifest.gz
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index f3f97eaffe7b..73851e2b1d62 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -44,6 +44,7 @@ AUX bash-4.3-arrayfunc.patch 439 BLAKE2B 8fd293185d6ebed88788999a671aae6d490ecff
 AUX bash-4.3-compat-lvl.patch 628 BLAKE2B 8b077871ff09cc61ab34287e57da9917170956086fb75b8fe6a49ad3d6f927a389faae15c427f593e6c1554e4f37d845b4f8bb40a0b7b557244cc2f0c7ced5d6 SHA512 c552e1c7154d69201329f26e039c06a61e1bbaf5eaf16b7eea4f89d56aef0f710ebdfb115a1c00f07bd94893e51f9cbceee12bb57e51f6009c0e2327d53d7286
 AUX bash-4.3-mapfile-improper-array-name-validation.patch 407 BLAKE2B 34644cc552d50cfd1db1904164fa69c84a315a8e0b0660bd0377669db532cca6af8f02f8e32d57ea117696f3caaf7a00e765773cf19c840a9aec57b3fd72f99a SHA512 214935a751c3275593654c36b471cbb47ca4f5bb6f2a19e0a7ff73b646e5318a861538bf923ebb5f84abafa6d0d6eeece7b2f36ef77ab8c582223e098b4eb356
 AUX bash-4.3-protos.patch 174 BLAKE2B 02d65bba8a12ab7d280a66d7e292e2ba6eea026fc252d302ee8a167e14bbccb9d3906a75728c9fe617b202ef63649fed13d82ff7407a71ee36baee6e1ad1c944 SHA512 4af0540467bbcf7cf041de6fe6ed080b149a2ff309e5dbe5e7b76bb30459aaeead813be678384feb01a7b64d3a649372f8a8aaf686f69ac7958baa87b25340b0
+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_logout 205 BLAKE2B b8c0266c3d1e31a714304a2b3b33389f042ae5bd497379f9b15ce31d47d1e3da73ba6536023953b00efe27b687e2ff45d94e3f01a13acc824dc12e31552c5b94 SHA512 7234250c03fc920996a381f9daef9e2d8ab1e1a29acdebed6669d8e0fe1c872a7fa343adf7d9ddc81225b0cd9eb223ba7ad1ff42448aff057fc6d6baa8f04a7d
@@ -358,5 +359,6 @@ EBUILD bash-4.1_p17.ebuild 4154 BLAKE2B a8ff6552229406e76b6a9b49f3675630a3910b9a
 EBUILD bash-4.2_p53.ebuild 4356 BLAKE2B 1043056eed9633f3eca86a89e4ebc595ad7f59f057638088a7e56929d22a4aeb48a410660ecda72ffd5ec43921c067b783bbd8dd2dac4b80b99f03604292e729 SHA512 1bf922d25ededa1ba9f809f1281c0276a220e4f5f1265caddc6a2f095ec9f62f6026b8a9df93002891eeec6252c8943437940fcd08c61543261dbccb523609d2
 EBUILD bash-4.3_p39_pre0.ebuild 3581 BLAKE2B 51c88610e9a35420efa938d7bcedc09005a7c86cf5fe45a671607a89e517442f8316667f7883ef87bc5671ed1898097bbc4fd3d5e2d4baa515601cddf8abc8b3 SHA512 f41cf7c82dc1316f61e132a2b29a2e4ac5b7a20f3856b69d51d39a18723c7e4713fec3654331d8bf4425f84d8d43408834d4e63934f7369232d87ce12156d2a2
 EBUILD bash-4.3_p48-r1.ebuild 7260 BLAKE2B 82316e5db3a371f6856b0a22020b34842bf6d5313a0391d21e009c98381464c901638f7247a9eb38d72452c29f996629b3c8b4b53f894cba54b0d375b5f77aed SHA512 7b15ebc166dd814164deddd0821650b4d66e77ce35ee0d3d57682c1b404be4f7ed9437af1fd6bf58696849bd5e9d23d6d92701f44bed2d09362dc3aa3a2b715a
+EBUILD bash-4.4_p12-r1.ebuild 7234 BLAKE2B a51bf6dd560d28f9a728581649b6e1e67455b70de6b35adcee1b54f8bb9323ae9e62d072b0947f9d28e375fd2e0b80ee346e37a7e2c7a137bb7150fe585c4d72 SHA512 0b1b27ab481b77bff2ae1a652b27474dba0599d8208b7c75bb0191bba8dc347fa6c082024014ed965628ff9b0bfc46b0fbb4ee3f7f9f25e8037b6a44b6243455
 EBUILD bash-4.4_p12.ebuild 7178 BLAKE2B 0ac21583041940a5b2f4bab801b9a497d9830092c8f3cbd850bc6518e7fe2e4281a374a101cf6f2eabf003bca78c851735b780dde79ac5bc2db0001985440afe SHA512 ccbfa406cffa505d90ab3abb16c5106b32e80bca45f58e62c323046bbaa7d3ee6fe3dd0bb55e3161a3e33279a0d5bbfb3afcb9cdd1279bb24ed9c09fd531509d
 MISC metadata.xml 734 BLAKE2B 242fda202379209b74e12c1726c4f4aa487eb09423d2249d13cae38cb9b077a285beff221a824647c826c39f7400178cd04d6082915ad9c23287ea70da9ef961 SHA512 a9301e8d2347e0cf90a97325d9a705076150c00609d28338e5d7d72c135468e4f0531b2a4077b69679ae6ccf89eee691e0e5f0748caab60689f5f017afb544f1
diff --git a/app-shells/bash/bash-4.4_p12-r1.ebuild b/app-shells/bash/bash-4.4_p12-r1.ebuild
new file mode 100644
index 000000000000..5e54bf0070ba
--- /dev/null
+++ b/app-shells/bash/bash-4.4_p12-r1.ebuild
@@ -0,0 +1,260 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="7.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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+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
+	!<sys-apps/paludis-0.26.0_alpha5
+"
+# 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)
+
+	eapply "${FILESDIR}/${PN}-4.4-jobs_overflow.patch" #644720
+
+	# 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_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-4.4-jobs_overflow.patch b/app-shells/bash/files/bash-4.4-jobs_overflow.patch
new file mode 100644
index 000000000000..8753d62ec6c1
--- /dev/null
+++ b/app-shells/bash/files/bash-4.4-jobs_overflow.patch
@@ -0,0 +1,14 @@
+https://lists.gnu.org/archive/html/bug-bash/2017-12/msg00025.html
+https://bugs.gentoo.org/644720
+
+--- bash-4.4/jobs.c
++++ bash-4.4/jobs.c
+@@ -750,7 +750,7 @@
+   else
+     nsize = bgpids.nalloc;
+ 
+-  while (nsize < js.c_childmax)
++  while (nsize < (ps_index_t)js.c_childmax)
+     nsize *= 2;
+ 
+   if (bgpids.nalloc < js.c_childmax)
diff --git a/app-shells/hstr/Manifest b/app-shells/hstr/Manifest
index 9c250d827478..5b9781830aea 100644
--- a/app-shells/hstr/Manifest
+++ b/app-shells/hstr/Manifest
@@ -1,4 +1,6 @@
 AUX hstr-1.23-tinfo.patch 481 BLAKE2B 3279671caf216d810c3fef490c5ae219906e59430dc15a850118bbafe49140f46fb1645be1c0a8a8977c795af018164027f928d4fcb0a664186c97f2b968edfb SHA512 64c1e0a5b2ee28354f85563472dd301a9e45eb568fe74c0d601765ee25095650320b8f853c95280f294f323eec6b7f9a155c2a09a5fde2e52568d2c9809c1e91
 DIST hstr-1.23.tar.gz 47239 BLAKE2B dec630f1e8161edc40544561dd85ea1c128a6704eeeaeb39eb6987bdc096a070c9e242b938bed01b80e208aadf08606518a007919d353f76ff1c36e7906aeabb SHA512 234c72587d0492d788b1c001b5e53f74820790a9ebe670e8abd28cd82fc7db65996d54160e675055be54cab110686838fe6e36dbefe0fbef9175613633bc5910
+DIST hstr-1.24.tar.gz 47523 BLAKE2B 6e84ea6bd26cb0745f48e5f8701d4d956ae4b83ed825398fdc401fd0b7f13eb9874de62d438e71a57fa048a535a538504e7fabd7b4a698665a10a901e0a570e6 SHA512 fe522374e33150007c0bbe5d11d38e63c355519350f5777c8787aae62826553b61a358185994d196d015590649fb3accf75948e340233459409d594e51874658
 EBUILD hstr-1.23.ebuild 631 BLAKE2B d3eb2ade2c30a1e61cc58349e52fe33d76ddb14ca490416aae276b106961287d79c1546b48ba8d56396ea84f95d741b1931b19516cc3e4a173398b644b75b99d SHA512 355201bac2ed090066c79e2c4d6d195510c28a18dd7105a0d23142724292221f2bdeb8f70de0db4ca6f2ae43e59969201110b00f4a461b49fe776f34d790042f
+EBUILD hstr-1.24.ebuild 590 BLAKE2B da2f711c59a6de9a7df26352289b14d60a3c08176c62a4b9dfb50c649fea996d8784fe045f48de2e4ffd0524163dc1a4fd36b6d73f5fe621a74a5941290427a7 SHA512 6528964c77fd4867b4d0f54afdc563325ca2b799bafcabebd4242c402e99fa5651ce347bd55756d7acfc5c68ec2828b92157fd4b2242a6913b4141857d6ff2d5
 MISC metadata.xml 453 BLAKE2B f0d991ae15d9b76c28a58f73be00cbb4824451019e9ef2858611681c4472c13cc4367166a130b3a313ac8ecafb859593610c52dab6c0cb7783ab079e31abeb27 SHA512 07997cef95d27c283b525f9a09d2762338c5bc8c2129904672cabf85e0d441ef7dc9b06608c0d38f0ae8d5d86e3fe8fc22bf8ebc7b29a81f8e9469436e62cf3e
diff --git a/app-shells/hstr/hstr-1.24.ebuild b/app-shells/hstr/hstr-1.24.ebuild
new file mode 100644
index 000000000000..0f8e9981f2a3
--- /dev/null
+++ b/app-shells/hstr/hstr-1.24.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="Shell history suggest box"
+HOMEPAGE="https://github.com/dvorka/hstr http://www.mindforger.com"
+SRC_URI="https://github.com/dvorka/hstr/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86 ~amd64-fbsd"
+
+RDEPEND="sys-libs/ncurses:0="
+
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( CONFIGURATION.md README.md )
+
+src_prepare() {
+	default
+	sed \
+		-e 's:-O2::g' \
+		-i src/Makefile.am || die
+	eautoreconf
+}
diff --git a/app-shells/mksh/Manifest b/app-shells/mksh/Manifest
index 563b1eca1dbf..8810a5b53593 100644
--- a/app-shells/mksh/Manifest
+++ b/app-shells/mksh/Manifest
@@ -4,11 +4,13 @@ DIST mksh-R52c.tgz 386254 BLAKE2B 027cf8e2bff4b8cc00ccd574a8a11b0e5d0164d9e59a9a
 DIST mksh-R53a.tgz 393344 BLAKE2B 4dd331eea194ffa354359134677272aeca07cbbec45a07198d75bee623285f368f2887042faa5f7f5a58a935f53dd2e1b4cd930bed6b48c13cda0a82305ae58e SHA512 634e1cbdba7eaa3b6a7d75d9ade23e6465c8874ef616adb708867f6c46e5722bd2e4818f92350aeb7908872678fb446635224fff990d4dcdd4cf4f666cf2e91c
 DIST mksh-R56.tgz 414865 BLAKE2B b50ff737efd899ff3a8d588717492c37b06f8f8dca147f34a974ccd15563259457472188886f0b1a73b78cf11531585c0bad40b86eec7841c4058a0572fb3355 SHA512 33839ed112b1b80eb6090f7fd3027d136e5b7c57ff5b3bd16f76f76fe1f39c8c0d49a0b43381ecfd3b20366c5edec515e554535151fe17021ab3dfaa70e84d82
 DIST mksh-R56b.tgz 415088 BLAKE2B fef8baf664cb61ddfb312e2ec1c81f192478bfdc889ad82e7dc51f50517ec54c13fb32586c70f3d3a276ac739a93ac64ee1a511492e1e592d015b4882f4107f3 SHA512 a6f9061b2bfd19e9f4fdf3212a1c5a53a53cdb52650c95287cd380530c08f4a65a1ccec4bdcbba5e7c34e4764bf04eb43abb01742bcbf83107847a6996cc77a8
+DIST mksh-R56c.tgz 417218 BLAKE2B 3512855dd177be8432fe503716ca571a3c06ab3eeb6b44de923ab7d9eb9246087f627b7d7a3e9bb29a849da126b88c223864f140b136e922776ec7bd4a04e96d SHA512 7e4cd2d24c6bca2ebad7c6b02d158188e766bd4693d93f5bed198d69238aef078d42ce911431ad4e419e4af55083047d823bfad53973db5c6d8a685482770135
 EBUILD mksh-52.ebuild 1082 BLAKE2B 5d2c18022c68e39de07d10458d85ad6e726fe1b45944b51d44570bbce8b88284f86259b6254ceda26d0c6adc6d2cdf251345b8bbdf0b5abbe202948920711b31 SHA512 90f87cb081ada2babc72b0048b6703beb1c35a3206aa174922b0a4b3b81466d4bbaf96898cd43c778fba62c4e78bde4517317cfe215faa42c77c579b395dcb27
 EBUILD mksh-52b.ebuild 1085 BLAKE2B c400c971f383fa4dddfb1ab063b255e5f0717895ca257800edfd661e7ceda26d072d4a24fbf134f9786911530a71e52e799d753b56042c903c01c270612050a3 SHA512 ca4a8a47682e493fd4c49fa9e35c91300958168136963e5945b8c6952e3d3e4679ee6992c1b7bad8397ccbca8574105906fcfe556b4efc2e50f8c36c8d381e27
 EBUILD mksh-52c.ebuild 1085 BLAKE2B cffad7a2f7e305c8e61364dc8c71ce57d255925298671bff3a4f5639ce20f53e0f30c0f632195e365bfca55f7f810e927bcfaa8c47ff5a3724862d655bc954a7 SHA512 b24cc00634ed94becd73b64a8ed60e2c39d9fa1c6ab2227ac4c82d1acfd892d3c76bd874b53c5599b6693e55ce713b7364dc1d3e0565d69f7a89a247edc60c95
 EBUILD mksh-53a.ebuild 1090 BLAKE2B 500c5b089bcfd80ab28903e0492866ec961778fba8e9b47b2328d7968ff5e426caf8770f312be1c18522f96f575cc60cd51b01bb7b12f0efab32f02bab3ac54c SHA512 836b10ec92c4139e27ef473e768a56edd19a2b6dac0261f8d0729d9afc2253fe909f85f33fb8c43501df61c3de5348e2e1548f796a924275ca5518343320fe78
 EBUILD mksh-56.ebuild 1085 BLAKE2B 5ce8a8c02755968976048d3597326e5f5a35ac168552fdc6746363bf01b4b4ab1dae6b3b8f81b5fac23e9b0e396c792c5179bfb2e21ad798ff21d0c9a3b5bf3e SHA512 2a8b4e31a3cb2fe1701cd884b2803eade709aeeccafef03327b3f581227b4c919b945c7fe56872d737658207fae09db19498b17285feddea474548779a3b1413
 EBUILD mksh-56b.ebuild 1085 BLAKE2B 5ce8a8c02755968976048d3597326e5f5a35ac168552fdc6746363bf01b4b4ab1dae6b3b8f81b5fac23e9b0e396c792c5179bfb2e21ad798ff21d0c9a3b5bf3e SHA512 2a8b4e31a3cb2fe1701cd884b2803eade709aeeccafef03327b3f581227b4c919b945c7fe56872d737658207fae09db19498b17285feddea474548779a3b1413
+EBUILD mksh-56c.ebuild 998 BLAKE2B a884854af8f0c063da2aca2327dcc24a010bbe99529fe4ee26e503d6e6fe6b14f2ff46846d10c3afcb562a71cb35d382e9ba19acabce25151d52b2e28991bd6e SHA512 f9f26d80c7a716deb944f3689c4ebe7096523e9b51c09fab67c126cab1a745fd01a10404fbda0fea85805fdf38041fad9286d7ea337963d18a02c1378ff001c3
 EBUILD mksh-9999.ebuild 1244 BLAKE2B b0ea3d58199d7c3f4ee45140c166bdd1fa535d41228e6690415cde5d2675e89282bdb8ab910a8991d585d76d3f75ce44ce11d5e69a35ab05521499b28e446353 SHA512 636cf54fe70436f74837d1e41fbfcf82dfd2c199a8b6a7fb85b72bf83b32373238b711fdb21fbcf57aab227460337a71a16055f264c76c2beea86cf8587581d5
 MISC metadata.xml 210 BLAKE2B a547b5e8dbb5d674ce2df4bcc6ee71c3aae3b0c7863c38a66c1fac3cf0f0c16c7bb302264082f345d2da87d0e544d321e6fd8385a16d01620a733a8ab29082a3 SHA512 27fbc849a311e57c8dbad0cae9975d564c03ae8a7b495b2e7a5cd160c6a09c0101e695ba4d2edf07c0d4c4d7329ff9a4bd91656aa685623342883b83bcb9ac0f
diff --git a/app-shells/mksh/mksh-56c.ebuild b/app-shells/mksh/mksh-56c.ebuild
new file mode 100644
index 000000000000..fe3b54c6ab82
--- /dev/null
+++ b/app-shells/mksh/mksh-56c.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="MirBSD KSH Shell"
+HOMEPAGE="http://mirbsd.de/mksh"
+SRC_URI="http://www.mirbsd.org/MirOS/dist/mir/mksh/${PN}-R${PV}.tgz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="static"
+DEPEND="static? ( dev-libs/klibc )"
+RDEPEND=""
+S="${WORKDIR}/${PN}"
+
+src_compile() {
+	tc-export CC
+	# we want to build static with klibc
+	if use static ; then
+		unset CC
+		export CC="/usr/bin/klcc"
+		export LDSTATIC="-static"
+	fi
+	export CPPFLAGS="${CPPFLAGS} -DMKSH_DEFAULT_PROFILEDIR=\\\"${EPREFIX}/etc\\\""
+	sh Build.sh -r || die
+}
+
+src_install() {
+	exeinto /bin
+	doexe mksh
+	doman mksh.1
+	dodoc dot.mkshrc
+}
+
+src_test() {
+	./test.sh || die
+}
+
+pkg_postinst() {
+	ebegin "Updating /etc/shells"
+	( grep -v "^/bin/mksh$" "${ROOT}"etc/shells; echo "/bin/mksh" ) > "${T}"/shells
+	mv -f "${T}"/shells "${ROOT}"etc/shells
+	eend $?
+}
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 23bcad4f9b6a..0a036e1ef2b5 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -12,7 +12,7 @@ DIST zsh-5.3.1.tar.xz 2928832 BLAKE2B b561629f8641dac70a5b35e12333fb3b214c83ebd9
 DIST zsh-5.4.2-doc.tar.xz 3198880 BLAKE2B 9ef3c6690251025b669a1cb46d3903d26a7407bc9fc0463c6d3678db57180b690f11302b202346a67afde16f6177fc8a597edca53bf55aaa835a5208e205b75e SHA512 5dcf561380ec46358754a0a03224152cb0db197d8a1558c6457342a6fd0ec6ea43bc3c1c1a79390a2a6034e09e0e668466962462ab14e90807170436a36f82b7
 DIST zsh-5.4.2.tar.gz 4482413 BLAKE2B c3b9eb2b1458d88d8849898fa468a5e8575ac06f7859c809e741410b672a61c877027d4d5057b8c2295e6f15ce1f2fed9c0ca3eacf4024b8478b9e1d287c0378 SHA512 5eaa2ff3dc8052dfb50d2be19bfeed1856b00f7c2dc698129c95c2373a516ee61dba5b42ded390ac20b171abe352b1875f177a4dda8fdc15a4f2a05bb7a024e2
 EBUILD zsh-5.2.ebuild 5904 BLAKE2B ff2f87b4eef53df352533abb8055dba59f164ef2e228dced3a2a6f5a790ca21468438cf8be9dacb3b3aa08f36f93cd6cbe29d48c98e9f2748622c6cf82eef9f8 SHA512 4e1194cebc50f0dcf2c3b7c1398b3e19842876bd3a2e9ae74c8734aa4fc260e9f3e4cfa396372c6dc21e4330102934e9d0cb5f3544c174175b400714b36dfcaa
-EBUILD zsh-5.3.1.ebuild 5997 BLAKE2B 002eab805afe9874b4db8092fc166d21cae909fe5408da338ef36c4857d4ad7c8f6fa7f8a72d2e4fad89af9753443fd7adc9fb9ea1d952a11ef42d6d7c6a989f SHA512 222ea7724eee76d969134a2b601271d433a35f9878c9c6f26fcf0e059519d2bcf519281a7e066c09f524a4334db54d871faf01b6c43c9ff1668464d5f7741ae9
+EBUILD zsh-5.3.1.ebuild 5993 BLAKE2B 5b27a02b20427761294a85f4163ec29d42703e7e2a29f839b0db3c31623808d8bc2441a3a81819eb786c2f5eb9dc450be2e9b94c9b4cdbd9a0a1abb178051217 SHA512 816c85c535046f44defbf2a79a46b8f92ec39b287d4bc7a3caa614e5c13f99f4d191c4e7f5b88333c4b23d3556561d8e9eb65e57ffe240b2ddb158e7842b31c9
 EBUILD zsh-5.4.2-r1.ebuild 5831 BLAKE2B 0152c2e02b368e88b616099df8a26b5132491ff0d18bd2c6c5dc390a909351d3f8025577d723d5dcdc234502a73e0b5bf0e79698d682af70bfd7d551c39eb00d SHA512 caf124ecd8eec33070546272dce04702b68b1c693e6b32c8f6abfe8d005a02c5159936fcfb83a3ee8fa272fc9de15cd8cc74fcdf7bff89f0a796a2aef7f84ee5
 EBUILD zsh-9999.ebuild 6010 BLAKE2B 6740b811aee76184fb1e1c4e8f0f8f8497fb27314cd2651a8a03734bbcbf34363084e0326ac7cefedf857129eead29f0c4c84a45e1edbab1dd23cd6b72682cda SHA512 8ce2a9c12b57f2c34b99f09d220aab57204a3c737dd132073f7220be55b3a848519444463e0205e470a4de332c085265556d425e77ec07ad5902042861e820e6
 MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
diff --git a/app-shells/zsh/zsh-5.3.1.ebuild b/app-shells/zsh/zsh-5.3.1.ebuild
index 62b5c6462022..434a0b32d8cd 100644
--- a/app-shells/zsh/zsh-5.3.1.ebuild
+++ b/app-shells/zsh/zsh-5.3.1.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == 9999* ]] ; then
 	inherit git-r3 autotools
 	EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
 else
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
 		doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
 fi
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index 677a2897c094..3e9135c5d4e8 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/cedilla/Manifest b/app-text/cedilla/Manifest
index 1ae2d82809fc..51db8cde98a5 100644
--- a/app-text/cedilla/Manifest
+++ b/app-text/cedilla/Manifest
@@ -1,4 +1,6 @@
 AUX cedilla-gentoo-r1.patch 645 BLAKE2B cedc4626df03c6706c5fee463cd2b662f1b5e297050cb3e67e585609319daa013d499f37fd6cff1ce2a10fcb21626e6b5178dc5545a02eef0778c404cd00f9fb SHA512 4a9d4c4f28509e2b527568a28a69dbcce0c4e7a8d6ae9a967dfb33ff639f12a5dae16a885b0f51686d3d444c9f651cf904bb5c93326308fc37e13d4ec8bb4162
 DIST cedilla-0.6.tar.gz 130676 BLAKE2B e316dff5ab9bb89dd350e9842847ed700846cfd57370be17198aa3c54f0562a4c26d23a49acccf8c7dc0b55f1765668dbfa24dbf57f50e568ac3039f7b5d662c SHA512 95d98fd4ab95b48023f635d61133ea1a8138a797cd1c414da0d4907531eb067ac147e8d612a528373da425d37fee7c1139dc7f0019308938c096e37caebf4e38
+DIST cedilla-0.7.tar.gz 114899 BLAKE2B 100c22be30ffed585a1eb44c96109dadab9cbf90c5c3432efd4ed8daa135fa0d9fb82374eda9f9f13126cc5d453ecb5933d8733a58e374ab3192ea7d5bd6d273 SHA512 a137bceee2c70e911922b17e823093dc37b19cce8dece99596003ae7b4bc8c02afbae164d7dfa4e4873b4f549f7d948faf1da9dc1d3ef89cde6d1f36ba91be77
 EBUILD cedilla-0.6.ebuild 697 BLAKE2B c1f1bcb2967e8c6068d3b6906dee9ca5279360689e4aa80836d72aeca426db5d94631ee8f541acd3b71c89084965e87919b9e2a64a7ed837ddcb93c25e9c2e04 SHA512 61c7d132115f2e255de5b1aad34397541f89fdaa1ebd24dab36e7b2d71bac7e592884a78d36bc3addd8108133091455bd0025c28c672787f0a995b0bba919fae
+EBUILD cedilla-0.7.ebuild 654 BLAKE2B b784971be122031e96b156d0cf2d2b6930bb97236101a931b92094c0860e817618654fbc42ca3828222daa1208065722b62ba1b60d13c13c7ec163f9b2d4f92f SHA512 66dc5955c4b7391b91fa8f0cf521b5f1a7b8962c2ba8ded1c379dc678ed197db3217bf661da9cfa55569161acf45f70af95955d44e092d703237bf7afb01ade3
 MISC metadata.xml 253 BLAKE2B 34807135fdbc8396660d3fa85339e80c0c14693b937e360de963062b40d1a4306d86c3f6fbe60c45146632f934695d26c06083a2977031c36bdee17f57140f72 SHA512 06255a02d9a177532c33fb7a9271f8f538cef82354feb7689c839e2eb1516d53fd0e78aca22fee2f9a19dbf1e3f7ad96dea23c8d97efdac952e4b754314664d9
diff --git a/app-text/cedilla/cedilla-0.7.ebuild b/app-text/cedilla/cedilla-0.7.ebuild
new file mode 100644
index 000000000000..d6e687479ec5
--- /dev/null
+++ b/app-text/cedilla/cedilla-0.7.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="UTF-8 to postscript converter"
+HOMEPAGE="http://www.pps.jussieu.fr/~jch/software/cedilla/"
+SRC_URI="http://www.pps.jussieu.fr/~jch/software/files/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+SLOT="0"
+LICENSE="GPL-2"
+
+DEPEND="dev-lisp/clisp"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}"/cedilla-gentoo-r1.patch )
+
+src_compile() {
+	./compile-cedilla || die "Compile failed."
+}
+
+src_install() {
+	sed "s#${ED%/}##g" -i cedilla || die "sed failed"
+	dodir /usr/share/man/man1/
+
+	./install-cedilla || die "Install failed."
+
+	einstalldocs
+}
diff --git a/app-text/dvisvgm/Manifest b/app-text/dvisvgm/Manifest
index 017ad5ba351a..7131866eb256 100644
--- a/app-text/dvisvgm/Manifest
+++ b/app-text/dvisvgm/Manifest
@@ -4,6 +4,7 @@ DIST dvisvgm-2.2.1.tar.gz 2841744 BLAKE2B a9221bd927544249a30262f1916a1323efd3e5
 DIST dvisvgm-2.2.2.tar.gz 2848315 BLAKE2B 157237fcd7e61a9cf7978f3b595d1ac5fa7765dc1615721dc9812a27e26b20f077aa46535fc19f9fee28bc5714467f6176df6ab1ca094be2299d77ae4542a103 SHA512 e15384b4842a9c6963110b96b611f4f4beff301818972ef0aa77590b7aefdb488c3df16f93a5b786c97229df730c112db97770b612786fdff9011b5a2808d917
 DIST dvisvgm-2.2.3.tar.gz 2813537 BLAKE2B 0cc2625c779d22dceef8b26c0e977086601f246beed5610f722e2efe59ca617b29f27bf5de87c7b1aaf2b87ddb3320ede9852b39bd8633ca13594752e62869f0 SHA512 b3d17f13496a371914baa0a498e845b5c52dd74bf3d54cbd86fc91977f786d148f34145fee53272029ddf7507e468c827a41ef48ba2fb02212448858e868ad03
 DIST dvisvgm-2.2.tar.gz 2841354 BLAKE2B 713257347b258338b8ebf408ee6affddef4a53b51621496cb64638e295a27f90ea03f6d752b692f609429f1e5220363f866e4bbff3e82de1f4a03494ded3052e SHA512 310b3272f41d3378ddfb5663d4b6906f7b1cd1dfbbcff0ad249b27c5c37290c5eb496ec84a536f3166a51de4708f6069da9c6811bb7fc9e667d00b1c3aaafd53
+DIST dvisvgm-2.3.1.tar.gz 2854014 BLAKE2B 7df3090e53e5ea11338b5d439f52fad0aecb0658e048792565239fb6121ac05605dd992f9dcaefcc1cfad2c35d0194abdad66173d6c4b9199ab926bb02d93ad9 SHA512 ea105c343bc37b178afca41a20a167fac52341083881866585c12d965961cbbcd3f1580dcb5d5c8b42326c0872b2513bc9d5763942dd2631dd404097ea3b26a6
 DIST dvisvgm-2.3.tar.gz 2816291 BLAKE2B 3c804b49d9a5447063cd70646d0c6bdb56bf7f457aa84a4ef535341e2b5b9bea2b3dbb3209c3afebb5ebaea04300b5784b25ed244145a1afd6a8a4974326c914 SHA512 b1efc505db2c52471306eca099285c35685cf92d0f084a46daa476423d3706a2a3260584f9fdcc5722630a49b4178c9bd36d6cd8019a5b4c9f3759468e8e8313
 EBUILD dvisvgm-1.10.ebuild 1090 BLAKE2B b4c79de3986a2fba7881da8c2434f1678d7b367f8b13dea7bf7421dcf68f6250681562754100a081b42c9b7d9d3d02cbadc8e7658faf26b29b6c9d2c2a317843 SHA512 d8e598f3c9b47aa88aa5aa2ec38abdb543fdcf46b48be9fa7b967be3fbba15bb1fd995498f0e6743b54c802ee7c8149eb5ea0cfc5415fe3c3371c5b2f0180ccc
 EBUILD dvisvgm-2.1.3.ebuild 1145 BLAKE2B e82da95f1e0ef36b946ed42c5ce02a2aa3ab6e30bb81d01ea6d59a664d524944dbdabcb4562cfefb5bb4d1c9b4f79dcae6405bf5b708a59a7c603914c882199b SHA512 37c82be8f2bb33c19e0a82f8e6dc927973b727e9d406591a4774f12f1179ebfea4c04dd5c79bdd28869641afbb65c44bab0a8589ecca1ceaf62ca2da3c2f1b0b
@@ -11,5 +12,6 @@ EBUILD dvisvgm-2.2.1.ebuild 1153 BLAKE2B ffdcc15b191a4bc0c3b5dedc833fb622726a50d
 EBUILD dvisvgm-2.2.2.ebuild 1153 BLAKE2B ffdcc15b191a4bc0c3b5dedc833fb622726a50d9212ba3b8ab47b858a5ae8248d6ddadfaa6be2ccc397110699b0650b847d7dadc22356644448425fecc0a12dc SHA512 45d2ce74fdd8c2097b8c499d363647c76ac8e663fcc1228e723cf7a021664745adca1449fccfec1a94a5342fbddefe1585d889bf2527696b124b7f1eae0660dc
 EBUILD dvisvgm-2.2.3.ebuild 1185 BLAKE2B 0ae97decf87076b5faaefa67c17c01ddfc4e6811550d3dbbe3b25af423ab53a66c6035391ed59b3eed6e323ebff89eafaa5679b931077dad57deda3743941144 SHA512 af5c91311b75be4c344d94748c650ebc317db6e7ca961f0d4dd834f817870623ec2302ade85cb1f9e9597d4799eff2e7c40f5dd61b9ecafe95153047f4ac7443
 EBUILD dvisvgm-2.2.ebuild 1153 BLAKE2B ffdcc15b191a4bc0c3b5dedc833fb622726a50d9212ba3b8ab47b858a5ae8248d6ddadfaa6be2ccc397110699b0650b847d7dadc22356644448425fecc0a12dc SHA512 45d2ce74fdd8c2097b8c499d363647c76ac8e663fcc1228e723cf7a021664745adca1449fccfec1a94a5342fbddefe1585d889bf2527696b124b7f1eae0660dc
+EBUILD dvisvgm-2.3.1.ebuild 1159 BLAKE2B 69efedec3789bc0d02775fd59a275f8cc2556d05ca71540b955eb8df113e94a2235482ec76a997dfdc10cac9ce7ce6c63e8708fe07bc4d03e6ebbd818c598a66 SHA512 61970d32ed3ffcbbc41a25b5bf4b83cfee9fbda3800dc905a907d7f4749036259cb7f00e05f1ca4eef32a643bc2f909151bd7bdb2186c0e2af2dae657684e8cb
 EBUILD dvisvgm-2.3.ebuild 1159 BLAKE2B 30ef40ab739050535e3741719be165a3342c9524a3384c9482e9381782fd22bdfd843e5010f2569466e11ed679405b1bb6ab3d2a910d390916cd7d0b648509ac SHA512 0ff07d7e87ef3bc17ff1883ac3fae3292b4232c441e04e0ffbf575ed729574896328a47055485a777209c9a637a0d3469c697bf8e4f7c044539ef6c6b72fce44
 MISC metadata.xml 382 BLAKE2B ccc1e78101b4a4bcd72e8898d75270b38231df2e3563f9d0ad2beb826fdfcad0da3e0ef9ed39c4f0adcb79eef87b17bc639a2414eca0d9a5dbf88795b968bb82 SHA512 0d9a02bb1979574379451b38d790a58479fa438cbb5ee657058a7259b7e5cfa441854ce8bde11ed8cfedb06adb1e6361164d6bbb258466586cb5fa9cdff852c0
diff --git a/app-text/dvisvgm/dvisvgm-2.3.1.ebuild b/app-text/dvisvgm/dvisvgm-2.3.1.ebuild
new file mode 100644
index 000000000000..e2eec8fc99a8
--- /dev/null
+++ b/app-text/dvisvgm/dvisvgm-2.3.1.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic
+
+DESCRIPTION="Converts DVI files to SVG"
+HOMEPAGE="http://dvisvgm.bplaced.net/"
+SRC_URI="https://github.com/mgieseki/dvisvgm/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="test"
+# Tests don't work from $WORKDIR: kpathsea tries to search in relative
+# directories from where the binary is executed.
+# We cannot really use absolute paths in the kpathsea configuration since that
+# would make it harder for prefix installs.
+RESTRICT="test"
+
+# TODO unbundle app-arch/brotli
+RDEPEND="virtual/tex-base
+	app-text/ghostscript-gpl
+	dev-libs/kpathsea:=
+	>=media-gfx/potrace-1.10-r1
+	media-libs/freetype:2
+	dev-libs/kpathsea
+	sys-libs/zlib"
+DEPEND="${RDEPEND}
+	app-text/xmlto
+	app-text/asciidoc
+	dev-libs/libxslt
+	virtual/pkgconfig
+	test? ( dev-cpp/gtest )"
+
+src_configure() {
+	local myargs=(
+		--without-ttfautohint
+	)
+	econf "${myargs[@]}"
+}
diff --git a/app-text/html401/Manifest b/app-text/html401/Manifest
index a8a598ca0188..ebaea293f868 100644
--- a/app-text/html401/Manifest
+++ b/app-text/html401/Manifest
@@ -1,5 +1,5 @@
 AUX html401-decl.diff 469 BLAKE2B 7b7e98352b9650b06fa7c9e792e1538873827ffd8d7c043d45a3035c1c1099be9c2aed632717f959a92b2b5f0dc646104c81f13fe612cbcabb3531afcf3d4b9a SHA512 066d1c3672e2b8fd86a696c511c4eab92c8772f147503a986f6c89d1c33720325d15c22157c81d7f121ee441328b89f73a194d5e7e40af4408b0f9b8e0cc65d2
 DIST html40.tgz 369830 BLAKE2B c6fc0f65a9c65df34f534ce1db3cc53ba6ded4481df78f168c1b05b7e3b81fad7ddf3ee519ff1a901f0256af89285eefb39400ebc5b4089c1a16dfe935c6cf21 SHA512 f7423b55f8a5ad2806555700f450e1f46ba4370d1e47f1332e18b01ecd5a41217fc4426ad29c852b6e17100dc4c0a7add9961df35e87660df0e087ad03e4918e
 EBUILD html401-19991224-r2.ebuild 751 BLAKE2B 88342ff6cbbeb2e0fcd389456bc469ab1c8470ffbad80cb6761f8bfd0a4a94884fbea9a3fb3e418944a08d353b59cc0bfdcc788001924a039b30acb7fc5df928 SHA512 48f9954963d403399bcb63dc18fa24ea36b28fa0d79f3612e504a37139cc3efe4a6a1537d349a9d2c62bef9c5f7542cb6f7359728747e90649145b71d14a494d
-EBUILD html401-19991224-r3.ebuild 770 BLAKE2B 179a7536508b34bbf0da36ad9f0257ada973087719fb0d99641180e41952f9fe61ce8ef5e88d1b3e796245f117766cd5291657d666cd9d20278e0209193a5c21 SHA512 dc50b833445d5901f5a18726cdebbd3c30584c738dbf6b5b00f45072b9dab856385ee9a6ab9ef0862818d132a3a0da17fedf4b4064e47d8e0f735868d0899471
+EBUILD html401-19991224-r3.ebuild 768 BLAKE2B fa0e8462702a729066e2e1f115909ef0a4ae442b19be0b428025d4a799ce0bf7276a5c1afe59d3feffe6707ccd9b1a7010e77f45ad6271c9e947790a5a91ebf2 SHA512 5bea14c5ff1dd2db7a9541cc0985d41279013a9ce6e0177be0b1439213cf0e9c583632513fa5813cf20e598ec6cdf018fd70d7b52cd804c949ca804c22c608de
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-text/html401/html401-19991224-r3.ebuild b/app-text/html401/html401-19991224-r3.ebuild
index c6742475dd1a..fe8aa9d173f9 100644
--- a/app-text/html401/html401-19991224-r3.ebuild
+++ b/app-text/html401/html401-19991224-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="http://www.w3.org/TR/html401/html40.tgz"
 
 LICENSE="W3C"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 ppc ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 DEPEND="app-text/sgml-common"
 RDEPEND=""
diff --git a/app-text/iso-codes/Manifest b/app-text/iso-codes/Manifest
index 1b9b5eb8df68..ac2e7473b4cb 100644
--- a/app-text/iso-codes/Manifest
+++ b/app-text/iso-codes/Manifest
@@ -1,5 +1,5 @@
 DIST iso-codes-3.75.tar.xz 3461424 BLAKE2B 5548307415b45d2a149fa3868521a464522c9a34e19607faea64aec3e2ff68d331872ff7de3c5807f7ae431a489fede42b6b59f068c5f22132aad4a0f1de8f87 SHA512 157899048cec091864ad8a7723314e28a0ccc4a0e1a5c2101bb630baf1a034bf117e38263e3c95e0135ba9d3a4d76635c8201c50a54e25f6af24c87253b8b40e
 DIST iso-codes-3.76.tar.xz 3474728 BLAKE2B b418b7b80d1926e765b65aad4edbd74ad8d37251fda14e3ab0e222095762d54e358de6f8d4a08fde8ae14460fd975a2a541ca6a5a4cf8ef1d777719462b0f991 SHA512 a0f6714a79a52b5dab82a268e85cb2d019ff5255744b88d088dcd7d5a15eb9710876a338a0a5d0f5659b4146bc6cc53d6d3474d621b3dcca7c47afabfc7e0dfa
 EBUILD iso-codes-3.75.ebuild 2426 BLAKE2B e95562582a1d3db51a6d395ab95dd0c3ce2b41f1792b94554ca5aea406e5d44a0dc5e963e5b1b44f4f7e11fa1ec305f5d5337491458c39902599df675b798181 SHA512 51bae9c45a1aa31d5b94326a69f0391825ef558236589122725260e2d61b89bc8a72ebfb512d297bb0e8dca1af44a2aec3597d7ed86ed284d03b291d14aa6858
-EBUILD iso-codes-3.76.ebuild 2435 BLAKE2B 10b1b1595b45cc1a240e5f691d632a74477c82a8fe1c17afb848ac76edced88598501deefce3bbfe3d4d64caf447c58f2ade83c21567023b2e28436ba2ad26ba SHA512 c8e9ffe6e36ddd5c677f4e8730751eb35850641f83b63625d925bed88072e94bf5bf5055f4ddc4de25b2efd7ab181d5b3ae823b26a911b40a0446c94c9f12031
+EBUILD iso-codes-3.76.ebuild 2434 BLAKE2B 21a71e7fd1032e8fb7c701fdd5dc7f7866744a0eb2a269bd842dcb98daa59fbaa8ccec12cee2d95c6f4cf058dc8573c43675c80b814111cf6807f6c095cd7c01 SHA512 da2726bf72085b12a8a5cc9ce332464b43955d9c272af19323453aba78156929defb144eac86cc2875b955f22a26d6c856f8b46a002d1e87fdca22c317917b09
 MISC metadata.xml 480 BLAKE2B 3aefef945cb111095839e8fa8b84757e7f51a9aa8848806911d8c01763ab2d2f1d0c5b31c042f6ee307756e007893f6559c54d74a104caa612c9a6d39b2eea7e SHA512 5729ca31911ea7dad748e9f3afdd1f45f9034d783b56a75609101bfdb0a204bda8a078e7d251e89731091726062c4ac962e000ec7a898cb66ff787c8f2308d4c
diff --git a/app-text/iso-codes/iso-codes-3.76.ebuild b/app-text/iso-codes/iso-codes-3.76.ebuild
index c2b562449314..6c517bfddf90 100644
--- a/app-text/iso-codes/iso-codes-3.76.ebuild
+++ b/app-text/iso-codes/iso-codes-3.76.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://pkg-isocodes.alioth.debian.org/downloads/${P}.tar.xz"
 
 LICENSE="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 ~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 ~x86-solaris"
 IUSE=""
 
 RDEPEND=""
diff --git a/app-text/jabref-bin/Manifest b/app-text/jabref-bin/Manifest
index 47130a9bf077..57abe714fb92 100644
--- a/app-text/jabref-bin/Manifest
+++ b/app-text/jabref-bin/Manifest
@@ -22,7 +22,7 @@ EBUILD jabref-bin-3.4.ebuild 864 BLAKE2B c698510211d73ecff97a4d16767c3a32f34273b
 EBUILD jabref-bin-3.6.ebuild 866 BLAKE2B 2b8611a87d1179e8d639d5877cc572c77f03f373531a3af98c95d81baa47ab9edce616f418cee9e11c2ef78b6b982a3b0239b7cddc3b63a31e06cb7eaf40414e SHA512 cfa723738a369055005f5f29bd96b1148cece86feea5cb0e543a2d1e879dad5be9f9e3ed99029dd2bbf6568ac699546dd49371671e1ebc24b7c53255f207a945
 EBUILD jabref-bin-3.7.ebuild 864 BLAKE2B eb19455996533923d59e5be9db0af51b235896d02e936c1cf265c9d56681f93af74572b3be1abea8633533e79bd9e59fef72cb3b596886e05167fceb84e028bf SHA512 de433c0159c235682089415e190723c35cf43d103f3057751dee50f294841cc5b274d0f06de63ea875bd2ff84c4765d3fd93a0b170df09822bc785a95e928561
 EBUILD jabref-bin-3.8.1.ebuild 951 BLAKE2B bdc40e7842b802e816bcd75b15ed9415597f88655ce3ba2b064c695d59fea0fcd41ba746aa7097a57529ea74fd6c490c6a4171e014b8c251dadcd78665a00290 SHA512 6694b2a83bcb8830c754b5fe79284dd4936070b2ce0ae65426482fe869390d8534212b6824c39a3be1bc5755d7bc458959185e9ca483f7d2444ec0bd30b8dcdf
-EBUILD jabref-bin-3.8.2.ebuild 948 BLAKE2B e259ffe8b873b9ff63ccca0c8ff7d6b94e10520e28d61a1a071a7839703ea39e82bc73658cc04b3a15b95bbc60ff84f3493124b466dd55295719924528463eb6 SHA512 efb238a6968f7179e77bc8a94fdda4922a312006ecce947eb8e8ca310b6285b282377bc9bafb7461b34cc846c85e0acfefe0b6c1b0e470cb5d121396f46618c8
+EBUILD jabref-bin-3.8.2.ebuild 947 BLAKE2B 4164bbb76ccf38a30159d1302fa1dfc38cb45bfef9c225f4c4251b28a89e4d02928b7c2f7a5cd482f0b683d9502833b9dce1bb48b4b22909c4306efb6f404c4f SHA512 4adbfaf1cd4059428418f0589ad06a6aa44eb1ee57fb82678798f80354a53afaf33ee0384db1453a42fab786bf2e339087c3e176c7dd23e9d327c0423e2a5219
 EBUILD jabref-bin-3.8.ebuild 956 BLAKE2B 171b06778cd69642e253f4d4cb8af003d9f7cf201cc92bfa4aa1be7ea2885f191a2d3ce9a5693aab35a54dba33acf073e0fadc387eb2f0307dcb6eb8387c5210 SHA512 fc4c01169ba38ac8beaece6f2240791eec8c361b0a72bdca2fa26262115ef8d7e5c64b69d8398c21c7ee6d41597c837da6fb1aa3aedeff18f216228bab96de1e
 EBUILD jabref-bin-4.0.ebuild 1237 BLAKE2B 2ef869ac348b75a4557db15cad1983463a40cf7f4b3c51da7bf5bbd08f142c9550def6a9ce2684fc290f3e7b26d41c076080efd9834046ed4ef79075d33994d4 SHA512 dd902f44aa68c67b7eab9696969cfdb03d49e1d11d3c6fe50171fc3044bef73884803c880618a39152e8bed0e94975f6a48b891e9a3a2afe31a54ebf54bb5c18
 EBUILD jabref-bin-4.1.ebuild 1237 BLAKE2B d040db22d73c7ca3629accf0fa7f7eb466d14903ef5e72a1e3359095142ebb19fffca51161c8887a62936ee08eed9251c09d0343ab32c58f755bb3ea3b8aeee4 SHA512 cf0a53545fae8b5787e363e24fa1f3debb7dea1e20bd1a5dd611f59248031c92f8ad6d846317c982652d817835314c85057833ed7a178953bf18d81806880a5d
diff --git a/app-text/jabref-bin/jabref-bin-3.8.2.ebuild b/app-text/jabref-bin/jabref-bin-3.8.2.ebuild
index 64bd1c807cb1..bb4572b0046b 100644
--- a/app-text/jabref-bin/jabref-bin-3.8.2.ebuild
+++ b/app-text/jabref-bin/jabref-bin-3.8.2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/JabRef/jabref/releases/download/v${PV}/JabRef-${MY_P
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="app-arch/unzip"
 
diff --git a/app-text/nfoview/Manifest b/app-text/nfoview/Manifest
index 9b593f936ad4..b674194d4b1d 100644
--- a/app-text/nfoview/Manifest
+++ b/app-text/nfoview/Manifest
@@ -1,6 +1,4 @@
-DIST nfoview-1.15.1.tar.xz 88400 BLAKE2B 4e0f2d6df179a25f7fbf9b762dab70f1331d31fc1fed018e71101171d6bbcce9b67f9c4f4a3c35fbf22ed3123e90934b035290d3fae5a4d396ddc6fdc04ce133 SHA512 e4cf86003b03ae57b8a4e76990df77c7e9e441abd8ab0440385405b0f600a85539a152de5893ebe75797bd96ecb811086c48b1439b9f8719050eb12315f67426
 DIST nfoview-1.23.tar.gz 83337 BLAKE2B d73cd6987bf7929c57e8acf0a24278272ea199bf980756ddb5da9a5eddf7760a8c05f0e48a287ee760d4bf4d2594fb08b43a77cef46d371a746629bf76955e91 SHA512 b94724e130cdf58b911634496c52361d008ebfafab3ac40a76612c4891737d4145596a6badc15fe4228c90c1cd7261e5a892e3e462070ebb55f71332b36345d7
-EBUILD nfoview-1.15.1.ebuild 842 BLAKE2B 7730db4262045788d0528425650fd3ea113616dce208e4432e4d9e8e1b371caf526bead621f6b2832598b5c70d93c125700f123cb4f1c377b65ea9503b7c6bbf SHA512 c84c7011845bcb522c33de62c70d1d02ef8709ed9902dd2d8dd1d13b9af9e559d974c090d7abbeda3672a76feb1948f06d78b3c688b2731631a134b7df40e841
 EBUILD nfoview-1.23.ebuild 862 BLAKE2B da322567922a6ac0ec9c9a968d7dc78c4ffed6c3dd1122de7039008f322784339686edeef48fb902e3eabaca3b7427b753e4a30266e064f569bc6fda3dd9b367 SHA512 1babd9f4ed2ef92cdd94872253a0f3fe70cbd205bea360f1f8341d7ec5341adb940b97248ec8fbfeaffe067864a880fbcf8f45211b1022292b1b5b024671cdb1
 EBUILD nfoview-9999.ebuild 862 BLAKE2B da322567922a6ac0ec9c9a968d7dc78c4ffed6c3dd1122de7039008f322784339686edeef48fb902e3eabaca3b7427b753e4a30266e064f569bc6fda3dd9b367 SHA512 1babd9f4ed2ef92cdd94872253a0f3fe70cbd205bea360f1f8341d7ec5341adb940b97248ec8fbfeaffe067864a880fbcf8f45211b1022292b1b5b024671cdb1
 MISC metadata.xml 457 BLAKE2B fc1b77e74af5461b5ff1e772f60ef2c222f95860b1afb21828aa39d26342c241658e731d80bb937e694ff1195b0a079fb4134e60207539fa799ffdb6cd601c52 SHA512 65cd8b6021811a13d3a319b930afd8a090c5d15fe232e10d403c3ca8258685f6e118a224bdda7e6cbcff17bf72a409f5213a919554d20525c75efca06b1fcfc1
diff --git a/app-text/nfoview/nfoview-1.15.1.ebuild b/app-text/nfoview/nfoview-1.15.1.ebuild
deleted file mode 100644
index eacdccc7a4a3..000000000000
--- a/app-text/nfoview/nfoview-1.15.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-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="http://download.gna.org/nfoview/${PV:0:4}/${P}.tar.xz"
-	KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="simple viewer for NFO files, which are ASCII art in the CP437 codepage"
-HOMEPAGE="http://home.gna.org/nfoview/"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-python/pygobject:3[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	media-fonts/terminus-font"
-
-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-text/qpdf/Manifest b/app-text/qpdf/Manifest
index a4ec791a5d57..9deb636d0d1f 100644
--- a/app-text/qpdf/Manifest
+++ b/app-text/qpdf/Manifest
@@ -2,8 +2,10 @@ DIST qpdf-5.1.1.tar.gz 7662701 BLAKE2B b60c37227cf18c1f1787de3e7428f370d50a11532
 DIST qpdf-5.1.3.tar.gz 7681578 BLAKE2B f49762e7a92d0a638c998ab002bd3f83057fada59631e58e291e3548393419ff9b2050080d66028e2e14c59a2978e7a95045f144c8a61975c38784cacd04b635 SHA512 676cc6db27dcbcdece21cb427c6aae14646389f4000ff111feee8fdbbb03fe715035e5236a08db4137f275a09ed0dda5c80afbdc5093fe7f56b69a0e335ab73a
 DIST qpdf-6.0.0.tar.gz 8344860 BLAKE2B c041fd0a89dcce6275ccd51db62cc4fe37c2ee797d2d19c8924dc12f2a9166d7a918f220ed539045c81284544f061241f1783d6c25a0f63bed534fcef82370bc SHA512 303e3cc77ddb87b9494e26c35e0b45b42f73692054c56a00f2e4f1922633c6ebb45c8684992cd9bf32f03366fcc4cd7e7ec6fb9432d2dbba6e0b24395909b5bf
 DIST qpdf-7.0.0.tar.gz 7053781 BLAKE2B 1abd54a3cdc24c3e56ac81cabaa56be8d2217961abfc026cbd0c0141aea3efb6c75b9daf2fe9f6fc0f09efd224d241fa859bd37bcd972df4e4837318497d774e SHA512 7b52d67b4d2c428a7b0c1cd03b03a23f05d38d7e3c81041079a137919019ea5158f12bf95fdcfcff6b43ffdefe93a85127ced2a363a6b4b380cbaa02a3840256
+DIST qpdf-7.1.0.tar.gz 7097479 BLAKE2B 0d363d9d0b3ca2873b21bacfb2002f3ffa431848402fef5abe0079c9373835d483de1fb10b2b21ad8c9c14bb16f30ee8eb34f2465142f491295cede0790c54a7 SHA512 28c00f0e7e1d89ab8165031b7e741297d472801fd115911b5f970e97f27fb0c463169dad2d59bb35885de5989984bc5f31a9c26be42015c0dba41105ae342726
 EBUILD qpdf-5.1.1-r1.ebuild 1316 BLAKE2B 843ad7e84eebd53fc18232207cc1701d928a69393a701b2fe5ecdade82942403d38146aab292ca96c2ec7873b604c37981c17bb8fe4e6dd6d4e982ad5d2bf259 SHA512 f8803fd52e6f7ee42f364cbde11465b95181350b3e1ab0f7378db844eb9f183723805350347d27a12071c4da6c3f4ab0a604430e5894a6ed0028b1794835a234
 EBUILD qpdf-5.1.3-r1.ebuild 1330 BLAKE2B e331790df4c0ec8e2491e77b1d304c064e23b222aff0a01c15dd06963e8071bf8d03a260773ad27307bf1c3dc84ddf217d5ca28a280b67ab1769500a0d0dcafe SHA512 8ba17da0d59e2fd3219d5edb02d778accd75a6588fda5d218d62755a5e54488c80f513566fec0091a85a19ea55c0e49f74ad17454d9128104f9724d343b27ff3
 EBUILD qpdf-6.0.0-r2.ebuild 1223 BLAKE2B 683ad52c39451760bf7a916c061710161488fbc25ee4e568901ea6e01d65938c39b0802f3859c4d5b8929dcb2df2be5143ebec5c4704d4f94ec11b90b637e9b7 SHA512 9d11d2921dc5a579e9099c33a1b6fb9b3dfc30f38e5c928e91758fb96be0a478f68abb9ed8d41878fca9e34e989c60a92429bdaa9da293fcd3f7f6bc291f1819
 EBUILD qpdf-7.0.0.ebuild 1243 BLAKE2B e0feddfe1ad56e218ec7b493c8885b237224380e43717742d5416a933d221a006e0b074d770759c63bd05e8f2442227bd885c801c1aa15eb16823beef9d25e88 SHA512 d5cafcfa976ec5dea186adef4a5bd1102cfb04dc0844dd2894119446a56a043688c2d341d7785748643150e62e24a7794c57e0817e041e192ee7cc136224924a
+EBUILD qpdf-7.1.0.ebuild 1243 BLAKE2B 99023977c552d4fb2b6d2177f60664d01867a5f5309a79c9e192ac4b8f6c6394649f2bc58717114bcbce15c91031ad00dac38364353c1121901722b7f4240b6a SHA512 5f9e78903502e37430b8b2dda10507fb5527b47dd76aaa1afd56dbf3453ed5a209720c0bed72e0f5c2a8aa055b27403c340b1eeb8c870274e450b9bb055e347c
 MISC metadata.xml 438 BLAKE2B ccb3c4e7dace8650c11418fecc8c5fdd7062692f83c99f60d3b73fd698f1fea19dd429a92014267388d04ea57e00652499768c88aaffd7e0e3f66e53c84f6449 SHA512 4c1aa514207b18e7b4de0585545d1c7b5def7f42be9d43726801f9a9ae7b129b91802dedf4e3eb9f2595a26e3863918c029b927ab42b6aab7ab0130c000ff843
diff --git a/app-text/qpdf/qpdf-7.1.0.ebuild b/app-text/qpdf/qpdf-7.1.0.ebuild
new file mode 100644
index 000000000000..df045305bb67
--- /dev/null
+++ b/app-text/qpdf/qpdf-7.1.0.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Command-line tool for structural, content-preserving transformation of PDF files"
+HOMEPAGE="http://qpdf.sourceforge.net/"
+SRC_URI="mirror://sourceforge/qpdf/${P}.tar.gz"
+
+LICENSE="|| ( Apache-2.0 Artistic-2 )"
+
+# subslot = libqpdf soname version
+SLOT="0/18"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris"
+IUSE="doc examples perl static-libs test"
+
+CDEPEND="
+	sys-libs/zlib
+	virtual/jpeg:0=
+"
+DEPEND="${CDEPEND}
+	test? (
+		sys-apps/diffutils
+		media-libs/tiff
+		app-text/ghostscript-gpl[tiff]
+	)
+"
+# Only need perl for the installed tools.
+RDEPEND="${CDEPEND}
+	perl? ( >=dev-lang/perl-5.8 )
+"
+
+DOCS=( ChangeLog README.md TODO )
+
+src_configure() {
+	CONFIG_SHELL=/bin/bash econf \
+		$(use_enable static-libs static) \
+		$(use_enable test test-compare-images)
+}
+
+src_install() {
+	default
+
+	if ! use perl ; then
+		rm "${ED}"/usr/bin/fix-qdf || die
+		rm "${ED}"/usr/share/man/man1/fix-qdf.1 || die
+	fi
+
+	if use examples ; then
+		dobin examples/build/.libs/*
+	fi
+
+	find "${ED}" -name '*.la' -exec rm -f {} +
+}
diff --git a/app-text/searchmonkey/Manifest b/app-text/searchmonkey/Manifest
index 2ec547a3265e..d279e0593510 100644
--- a/app-text/searchmonkey/Manifest
+++ b/app-text/searchmonkey/Manifest
@@ -4,6 +4,6 @@ AUX searchmonkey-2.0.0.desktop 181 BLAKE2B 43d22f668591663be327cf65ad89223cd35d0
 DIST searchmonkey-0.8.1.tar.gz 364824 BLAKE2B ed107203ee0e9cba1ebe25e84a3dd8ec4db15ba88cf3c9a46354f47c31e2f0b69fe63f171090ad33b440014d815e3ef51ac3f3a77f7bef5f5bf83f42d6b7772e SHA512 9a07031fe629ef3b910c252b179f0ba33e83750b25a632631bbd50531632f8d77b0943cef87ba0f854afb590274e45c9eaf45d3cb51dc55b2faffe1a45fe0d87
 DIST searchmonkey_v2.0.0.zip 491726 BLAKE2B 92f7995ebd4eb99411732c19954844a19541defe8e4fc1f03d88a70c702b22fe47953c23065184d93d9c433ae0f1fb62bb80a7e415f6bc9b2e598ec0798b486f SHA512 bde6560c58ed2b0295fdbdf778e947926c08ab9e70ab4fde4e4fc170353a7301d5c598669975654dede88faeb367627f05ee144a7ab18443db43b2f4f7396ba3
 EBUILD searchmonkey-0.8.1.ebuild 596 BLAKE2B 93df4ce68fe15c558935445d7f09ccce14c49cdfe1bd488f9f2cabd3f11046d8ba2c14a96f7334093f0d71a7507295eace55f5211505297edd2efb0593d0bbf7 SHA512 a786f6a20842e53f1cf5559239332c05bbf6dbc1e09787561b84c7b6d1e2e00a252f64362828af87525b78fc58a552ec9557138003f3d6593052c8fdc8da0bfa
-EBUILD searchmonkey-2.0.0-r1.ebuild 830 BLAKE2B 555a5b412674b5feb50eadfb102b28e79d9d84665f8fc3d49c9a6310c618641bb521732bcedc93fc50be57157bdceeca9cc8b4910687cd373958f18be1f2c08a SHA512 b8f9336a2e80ab7fb82300e2b8b1c7fc53cf8c8968bbd8b3aa06e134e1eb6ab0f4bded4c59036d9408b7c26fd4798c7f5e7fec2ac93b0c0717b1c5e579c32b94
+EBUILD searchmonkey-2.0.0-r1.ebuild 854 BLAKE2B 9e2495628cca16c9057ddccc112be2acefcb87000216f5a7a2b4cfa624b71ba79608e847f873b34b58bd061365458e1e392bd00ef5c1f52b549a2aca50b0089c SHA512 26a3e0c7816c7620fd1d24643188adc723bd958403951494b40272c6e512a219019e38402be30b1e3945c8412ffb7294ebfede86d30b367ecbad23e89ad7df79
 EBUILD searchmonkey-2.0.0.ebuild 788 BLAKE2B cf9ecf05aca4d1834ee9f256cf8ea33c23823c900642f847fef4fe99e2946af572b13d5cfed0e812cc14fd7369e244eebd6ff7de4dde4a46ee1e79fbbd4b94e6 SHA512 1b7da549c0daca9fe0011bf29a06541cb9a96e825ada079fc975943a2a698d18bbc70783738ccc982e56e59e850058f1ac11e63facb52ca02e1783eadbf5b7e7
 MISC metadata.xml 249 BLAKE2B b6668ba96cceeea8cf4167cffcc7f4990174935426c5b2b30652260baa0abc1bc2b9c2f7f13afedee9b94eed2addd7864100e6a67d4dfec5e2eb33a4043764b3 SHA512 0dcb7f72ef6733582eca7f8af4e2e7b2852c3f9a97035940d003b6edca4830cf59b469bc919ffd89e1c64270c0a73b51c9eb7e0c70c190c81ccf3fa994ad7bb2
diff --git a/app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild b/app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild
index 34061ebf5259..917331f46e39 100644
--- a/app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild
+++ b/app-text/searchmonkey/searchmonkey-2.0.0-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils qmake-utils
+inherit desktop qmake-utils
 
 MY_PN=${PN}2
 MY_P=${PN}_v${PV}
@@ -31,8 +31,8 @@ PATCHES=(
 	"${FILESDIR}"/${P}-gcc6.patch
 )
 
-src_compile() {
-	eqmake4
+src_configure() {
+	eqmake4 searchmonkey_2_0.pro
 }
 
 src_install() {
diff --git a/app-text/ttf2pt1/Manifest b/app-text/ttf2pt1/Manifest
index c36bae30414b..e8d08ed13ade 100644
--- a/app-text/ttf2pt1/Manifest
+++ b/app-text/ttf2pt1/Manifest
@@ -1,8 +1,7 @@
 AUX ttf2pt1-3.4.0-man-pages.diff 1441 BLAKE2B 20257cf4dc9499641378ed32494577eb0a09dfe485acd7ff92d6e1f620651f07b5ad6fc928158a1bd9935fbae470f673b0acefb1ced83f29911982ddd32109e2 SHA512 af4d6a11db15fc7113bcd3872682899400de01cc97169d0027fe4457c8c9abf02c8b7f93c0ae5783ab05964c4816087118686f3e8195a0ff4d6b5eae41df3b0f
 AUX ttf2pt1-3.4.4-LDFLAGS.patch 933 BLAKE2B 278e8baf471727bb191b4cea97691982f454e978dc1d8533ba35d10cb979c107bba8665f21123a3cd8ab75db0e7efd76032ce60045dc05abcc4219569608d0d5 SHA512 b0d292828a71a3f4668e7ce3d177b45030fd7739b9a10fc37ab6788f2a34e4bfdcb2730086592ca5b17071c34b1b3e448642e6fcdc721e5f6e8c0b67511859bf
 AUX ttf2pt1-3.4.4-Makefile.patch 2911 BLAKE2B f155d19c1a60a524c18f33b09a0c1c73b2cf7b0d2ded90eaa8b23cbc861cb7eb888f77ee6a1217ae2f6043835ebb3bdaab7bc67238d5d6504e6c412738340891 SHA512 a1bb5f9f2b7517d09bf093b12ac99bfcc517546568fce395aad430de06128b3f3d62e153bdcef249738392676bc21a3e26cbdd1a42203093c56ce8ee035757eb
-AUX ttf2pt1-3.4.4-freetype-2.5.patch 626 BLAKE2B 4b380f2b05c9e72016cb6f76e7832fdf20256976e13ae7a365d330343be8f717c0b5374b457f9bdfc705f49121ecd9b399a92399ef7f571fe0c3786238c0f74b SHA512 41c137dc87a1c5c38469d6faf9cf5349a4ae8677ae9640ce7707df191acb91c85ad82eaf485238b1864c20556301436c5e0133af67529a9cf136285e09d344bc
 AUX ttf2pt1-3.4.4-freetype.patch 378 BLAKE2B 03adca507ae8b2556c20dd32c73a302bcb7d5793cb040c706a1e6d86de9f3eb55e8df85a578a2a9fa4cbb3216d50129d33548a7b3472bd7df5417e6a0f6b9b8c SHA512 93cdd2cb660a9416d30189e0ef1e14c97ca686efa2902d8617aec585040ff74b7bea6354296a99600096d1c73acda085217264d5d07e716f2d90a457ea4e9669
 DIST ttf2pt1-3.4.4.tgz 230547 BLAKE2B 58904765afad396692263d9f50017d299828ae847a254bf6a580a0a259dcd03da3d9a97fe370a53a936e70188dab3c96cf0f0ab9069474eef92b9fd31862e455 SHA512 ff2b41b0d54c2feb8565c4bcf9fbc2ce799aa6228815c2787e26127f6c0ca380114b3ab7a12fa50a52279a3452bcb91dbad5c661e83078f25036f69a4d1cf014
-EBUILD ttf2pt1-3.4.4-r1.ebuild 1108 BLAKE2B 4209a42dc590ddcdc38244ddeff8f5f0d94940c857e4cccd4072d4805b60445788f3e78e5b10704661628650a626938e0721b8ca113fd48e8cee05056e53250c SHA512 85018e09079c1fccf23ad97287372d0a9faabd0229a8349b3761880ad8073c088945e2e51df8ba3cc0d5cc2623f2f9ded4decd803d3d90e8b941b0646cab38d0
+EBUILD ttf2pt1-3.4.4-r1.ebuild 1062 BLAKE2B 77f768d23a2b22649425a746d2b993a28951090569566a298fbd0b37bfaa0a1ea18c7ca2b540c0636f40fab385db85b8babb334ddedaae4521801643c38c640d SHA512 b57372e8fde2440219d85eae0898775c2f73115788a7f0e168dc4907b5aa97b45e10a88d80d1c1c883fff989b071fbe90b506d078d9546b9874ddb046ff77088
 MISC metadata.xml 315 BLAKE2B e2eecb62a8d7f8a509b9b09a251e32bf3129a9c5205ea5574271fb6660226d14f4a1870481b053690d9794cef6e239051a05075586ec7e38ff6bd5219e9d537b SHA512 2061dd88c2b81b9ac8c6f55bf10f39908f457741f14b4e949563b9195a3e5a09724ed585569acd5426bf0f95d740abdd1a4a61301f970814c7cf6e45f960a9e3
diff --git a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch b/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch
deleted file mode 100644
index 613da6c7339b..000000000000
--- a/app-text/ttf2pt1/files/ttf2pt1-3.4.4-freetype-2.5.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-diff -Naur ttf2pt1-3.4.4-orig/ft.c ttf2pt1-3.4.4/ft.c
---- ttf2pt1-3.4.4.orig/ft.c	2014-07-02 14:19:32.000000000 -0700
-+++ ttf2pt1-3.4.4/ft.c	2014-07-02 14:20:22.794538869 -0700
-@@ -13,11 +13,11 @@
- #include <ctype.h>
- #include <sys/types.h>
- #include <ft2build.h>
--#include <freetype/freetype.h>
--#include <freetype/ftglyph.h>
--#include <freetype/ftsnames.h>
--#include <freetype/ttnameid.h>
--#include <freetype/ftoutln.h>
-+#include <freetype2/freetype.h>
-+#include <freetype2/ftglyph.h>
-+#include <freetype2/ftsnames.h>
-+#include <freetype2/ttnameid.h>
-+#include <freetype2/ftoutln.h>
- #include "pt1.h"
- #include "global.h"
- 
diff --git a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
index 624146104adb..ed543c6808a4 100644
--- a/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
+++ b/app-text/ttf2pt1/ttf2pt1-3.4.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -22,7 +22,6 @@ src_prepare() {
 	epatch "${FILESDIR}"/${P}-LDFLAGS.patch
 	epatch "${FILESDIR}"/${PN}-3.4.0-man-pages.diff
 	epatch "${FILESDIR}"/${P}-freetype.patch
-	epatch "${FILESDIR}"/${P}-freetype-2.5.patch
 
 	sed -i -e "/^CC=/ { s:gcc:$(tc-getCC): }" Makefile
 	sed -i -e "/^CFLAGS_SYS=/ { s:-O.*$:${CFLAGS}: }" Makefile
diff --git a/app-vim/Manifest.gz b/app-vim/Manifest.gz
index 2203280c7846..b0d89824eb1f 100644
--- a/app-vim/Manifest.gz
+++ b/app-vim/Manifest.gz
diff --git a/app-vim/ctx/Manifest b/app-vim/ctx/Manifest
index 0a86c8a6d51e..f27d46659c98 100644
--- a/app-vim/ctx/Manifest
+++ b/app-vim/ctx/Manifest
@@ -1,3 +1,3 @@
 DIST ctx-1.17.tar.bz2 4391 BLAKE2B 2e6ba12c1f416e7de10bc2b6fbef79cc0b4fd3d3e80820034db3b327730b8927afbc26fee4d93b96cbaf510d8642a4ccf95b6b13cf8d83d6d05de3deecc0238e SHA512 35839f005cec56baf90ecbf46ce28530f9d3a18d8a538323d3f1d2134fa392a9595d95c3258c9ce2320381a69b1fb4a61b2ad2cd9d4c581e75bea378dfe7e13c
-EBUILD ctx-1.17-r1.ebuild 434 BLAKE2B 0a9e6c7d5e3808f8b846d7d97221075a9df80fb6b7842dcd79cac7755daf26b066682535c96305dbc5a431c2b1426707a8ecef5d0639f3ea630be61793bc5ecc SHA512 0bb9506805790e0df7bb8b0c391f6527eb88a0d5fd80ad50044bb32cbb87d88df24cccf4dea015b25692c08cbf762f696261f6deca0f419ccecbc888c588a678
+EBUILD ctx-1.17-r1.ebuild 477 BLAKE2B dec530b3b2934fe23c02c445bed0ee801a9ad4dada34b63707b944391106cf2020a1703032072953d9beefbf1aad2440ce8562539363965c42eb903791d583d1 SHA512 2944924f6795b7a9f510f5685fffb2bf04152d21056210f429345fa84aa786536524a9222163af334cbad2161f0d00518763faed4d9388b89465936653fb13ec
 MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/ctx/ctx-1.17-r1.ebuild b/app-vim/ctx/ctx-1.17-r1.ebuild
index 0077c3235165..3d0faf39b45b 100644
--- a/app-vim/ctx/ctx-1.17-r1.ebuild
+++ b/app-vim/ctx/ctx-1.17-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,8 +9,11 @@ DESCRIPTION="vim plugin: display current scope context in a C file"
 HOMEPAGE="http://www.bluweb.com/us/chouser/proj/ctx/"
 LICENSE="GPL-2"
 KEYWORDS="alpha amd64 ia64 ppc x86"
-IUSE=""
+
 VIM_PLUGIN_HELPURI="http://www.bluweb.com/us/chouser/proj/ctx/"
 
 # bug #74897
 RDEPEND="!app-vim/enhancedcommentify"
+
+# See bug 591068.
+DEPEND="app-editors/vim[perl]"
diff --git a/app-vim/gentoo-syntax/Manifest b/app-vim/gentoo-syntax/Manifest
index 4644316564be..39ac9a94ed36 100644
--- a/app-vim/gentoo-syntax/Manifest
+++ b/app-vim/gentoo-syntax/Manifest
@@ -1,6 +1,6 @@
 DIST gentoo-syntax-20160530.tar.gz 18950 BLAKE2B 0e769cb4d67ebf1b4299a1aa0dc1bc1ce942a9e6b4f3528b5499ff83ffe9d165697576901c5ba9cca52de6e26abd0298f1f7a5383cdc0c8ca1dff0de2945080c SHA512 38881c5f16499eb053eb7a5514f6324b2a161f1392a044db0bbaf0cb71a0f17e1edebd4a685ff856a78525fbcb8c6267daa2503cfbc6f94d841cf3f6a25045bd
 DIST gentoo-syntax-20170225.tar.gz 18939 BLAKE2B 7586b45791e74e69ad6e0607bc0a4d52eba4747a6c4d9933d43db1196ceb57ac6317279c9e86f77c71bdb7379828dd96fe6d63a2933a3660f1639faf1b6df5d5 SHA512 2c01577910eccd413b85c094dbd12bf8445e2f560be1fffc4a4c3130b32587f9c298d8442b5cf12bd7d2950ab8c9e5b95a72f2f41c42c6dc939ffa2c26fd71d5
-EBUILD gentoo-syntax-20160530.ebuild 1847 BLAKE2B 532451b45163f444c804c5edbb47efce5adf033a63d93e83e0a057c5cc52f18dc717ea20bc3bc931e890cbb126fd1987b3bfd9fa91318a9da7f207c5124b252e SHA512 bdaa924cf1b710e067539ed8ba1c39b43736f2f0bef813366c2894392e76a9724d09edc615412c62aafa364826fba9e3087caae6bf1c382e8c9ec6f4f13039aa
-EBUILD gentoo-syntax-20170225.ebuild 1863 BLAKE2B 68df1c420823d3dd0612fbf3cc3ae7b3d0ee9e5d67adeb1ef723e49674502baa352ab310952eb54ba2caf244bcc0e06233754827909f377abdc5e8df26633e13 SHA512 e5178f85e526f5410eff419f776ba8e55f340cccb292330cc48cc37c846cbb1847fff673dbc4662663a8c10488b66780213ce34eb34c4d001934bf89ff3f6e6a
-EBUILD gentoo-syntax-99999999.ebuild 1860 BLAKE2B 231b6989cf6cfd451814822e795e9bd9c67f31a879347301e07498f3a44f3a33cf3d514d39ea0b093fea4068e741d096b1702bcd3ebc48fea4698bfadb26fc63 SHA512 b5db61773f98d50a4c4ab64ee72d50ac98d39de249fec9c3c063a763e58bdf47e0a4f31b71b3dee3ead53cc847b6a0301232e75e440f1115205e2900809e4365
+EBUILD gentoo-syntax-20160530.ebuild 1820 BLAKE2B eabdcb7fbc25268799eb049c11a7ac6a489de50040c57827c73003352fdcce106ae55ee57e852b83304c80123ca0b71097efb6b4d07f3f98b79626997869c6c8 SHA512 5c63d97c5ad6e25008f538354ad713addff603f143744ce1e29a97e52734613b655f0e42b91cb1b612edabbac02f85033378596a854b3d21ef61b3da2087d9f6
+EBUILD gentoo-syntax-20170225.ebuild 1836 BLAKE2B c521e9949cca70d5f703b205427eaca56634b08cb53ced075943d89ffaf2b74f2a5a8309b60cd443542c142b1f43293ede9c15b73d0be4e04bfa9356088cb7b2 SHA512 c07cf07fd077c16843a72d58bb2ca7b126da3a84aa3e6cbe680678a2a4eb95a9f4bb3daf5556d08b91f83ea0f1bb082d406a0e2fcc2c1c03b816928e438faf6f
+EBUILD gentoo-syntax-99999999.ebuild 1833 BLAKE2B 8bd9926b0f6a9e44d23ac64c8fdde9e1dc65c3345e9822c58bea5bc1366a585a495872bfdb95b9d9dfe5bf49ba7b380d2015c3e8673e3743bfbd5b5bcf618491 SHA512 f224fd65fbf85b7c6b5a6d23731fb2d492e1d5322035025d05eb536a868ae8bb03818c2cbd439ecf5f465d18cc960973bdf84511af121af8505a6b31e675a07b
 MISC metadata.xml 446 BLAKE2B 63902fa0fb1552a989ee9d53d36b535802ac65b468be2b74c472ae655107ca9de2695c1dd51ec98ebecda9c437caf32892560792d399a26c3814f0208212e7cc SHA512 2dc59075bad043ed183529af7484ab54e718774c275ce38e3b96af6b0461b8cf8d704dbcf37cb4aa7fb9dce2db3eb62075ff984ad7ac11fedf3f0bd2a582635c
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild
index 88e778acb9e3..601277b128f6 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20160530.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ else
 	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
-DESCRIPTION="Gentoo and portage related syntax highlighting, filetype, and indent settings"
+DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
 HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
 LICENSE="vim"
 IUSE="ignore-glep31"
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild
index 310a359bcce1..971f4b78aac2 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-20170225.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ else
 	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
-DESCRIPTION="Gentoo and portage related syntax highlighting, filetype, and indent settings"
+DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
 HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
 LICENSE="vim"
 IUSE="ignore-glep31"
diff --git a/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild b/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild
index ec3e1171dfe0..1d2447708cfc 100644
--- a/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild
+++ b/app-vim/gentoo-syntax/gentoo-syntax-99999999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ else
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
-DESCRIPTION="Gentoo and portage related syntax highlighting, filetype, and indent settings"
+DESCRIPTION="vim plugin: Gentoo and Portage syntax highlighting"
 HOMEPAGE="https://github.com/gentoo/gentoo-syntax"
 LICENSE="vim"
 IUSE="ignore-glep31"
diff --git a/app-vim/haskellmode/Manifest b/app-vim/haskellmode/Manifest
new file mode 100644
index 000000000000..c5f2a9ccb219
--- /dev/null
+++ b/app-vim/haskellmode/Manifest
@@ -0,0 +1,3 @@
+DIST haskellmode-20101118.tar.bz2 21637 BLAKE2B f64278a4d6d892068d1de85b0d19892908a5b841485cde2af419777637db353364882af76a84e406bd01c5f9d8967ef43b44edb5e40ec6b2762aa6d97975045b SHA512 c1882766c08afeda9aea9ddd072e6107f5615ee5a0916d029170ad38097a2fa7dce72bc2429618ac3889afb8d1de9ab53ddaf5beff45f873f9eb5a57b04bc6aa
+EBUILD haskellmode-20101118-r1.ebuild 1445 BLAKE2B 52e43c4142976322d081749290e635adc845dcaa6028904cbbcb8208542d7369d3abcb2188f037c7be98cfe4249ec49b5ea7e93d872e542ace97cecc27d03bfa SHA512 3861b96202de4c74315ecec6d9aa3bf32d67995db51898a74e4573427781964c4930b01f647f0ff10da1ceece70aa351b537c2c8d575ef106ec95896ee37f9be
+MISC metadata.xml 249 BLAKE2B 7ae6eac3ca23edbcbaa6aee682bb4aec155e3166f169eef8e4400e59fa56113ecc3593680d55cc57f08a4a718963dd3d0bb804bd1e8771ed60a4bebaae9db281 SHA512 4051dd059d975d2e1799125f7defbf5a62a168241d8b83d83710592efd60808800951c4fd6da1294044d7e7ec6b757b8d50593fd076696f826dec761e99645c7
diff --git a/app-vim/haskellmode/haskellmode-20101118-r1.ebuild b/app-vim/haskellmode/haskellmode-20101118-r1.ebuild
new file mode 100644
index 000000000000..00f065cc2c85
--- /dev/null
+++ b/app-vim/haskellmode/haskellmode-20101118-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIM_PLUGIN_VIM_VERSION="7.1"
+
+inherit vim-plugin
+
+DESCRIPTION="vim plugin: Provides IDE-like features for Haskell development"
+HOMEPAGE="http://projects.haskell.org/haskellmode-vim"
+SRC_URI="http://code.haskell.org/~wwolff/haskellmode/${P}.tar.bz2"
+
+LICENSE="BSD"
+SLOT=0
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	${RDEPEND}"
+
+RDEPEND="
+	dev-lang/ghc[doc]
+	net-misc/wget"
+
+VIM_PLUGIN_HELPFILES="haskellmode"
+VIM_PLUGIN_MESSAGES="filetype"
+
+pkg_postinst() {
+	vim-plugin_pkg_postinst
+
+	elog "You must set 'g:haddock_browser' to the path of your preferred browser, and"
+	elog "depending on your setup you may also want to change the default value of"
+	elog "'g:haddock_browser_callformat' (see ':help g:haddock_browser_callformat' for"
+	elog "full usage info). You can persist these settings in your vimrc file, for"
+	elog "example:"
+	elog
+	elog "    let g:haddock_browser=\"/usr/bin/elinks\""
+	elog "    let g:haddock_browser_callformat=\"%s file://%s >/dev/null 2>&1 &\""
+	elog
+	elog "To enable GHC compiler integration, also add the following to your vimrc:"
+	elog
+	elog "    au BufEnter *.hs compiler ghc"
+	elog
+	elog "The first time you load haskellmode, you must generate a Haddock index. Do"
+	elog "this with the command:"
+	elog
+	elog "    :ExportDocIndex"
+	elog
+	elog "Consult ${HOMEPAGE} for further setup and usage information."
+}
diff --git a/app-vim/haskellmode/metadata.xml b/app-vim/haskellmode/metadata.xml
new file mode 100644
index 000000000000..5c000c763084
--- /dev/null
+++ b/app-vim/haskellmode/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>vim@gentoo.org</email>
+		<name>Gentoo Vim Project</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/app-vim/slimv/Manifest b/app-vim/slimv/Manifest
index a261e591f6b9..f9e59c3fa877 100644
--- a/app-vim/slimv/Manifest
+++ b/app-vim/slimv/Manifest
@@ -1,3 +1,5 @@
 DIST slimv-0.9.12.tar.bz2 614025 BLAKE2B 8740e905a12b28715f953fecfdde3c7d6b4eeb74fc190c433bdb7120b3a6af5d5c9c2ced3f57a43ab8b9bd1402cb15462892343bb621f8b56453d98a909ff882 SHA512 7ccf617780c5d6b8d25738546cb9df6986b4409748a5938e8d9112b057d34626a6b8525fb8622db06d0f300d6ec38f7513ef2c0e49df3bcd89614888887ca057
+DIST slimv-0.9.13_p20170910.tar.gz 634493 BLAKE2B af7963e1d1b60b20294c935ecd076220777eec333b4e91bac82a111b727ce71c312c347b865f9e0c9072c0f94b40dc920b15feaf10f8683e1bba7590a177e62e SHA512 562e08866d62a6af5c20064a4533da7f0577ceb43391fac59acc0bb9c76319e3520c951c325277edbb2d0461fa227b91456c54ec5d9d1e3bca18d344f3e9a5e2
 EBUILD slimv-0.9.12-r1.ebuild 864 BLAKE2B 31173c739b2abbe3b8edc08c8d050022585e7fe83f30253b78f4c3d05b6685b76363cdc633928a847cade32d054ea22a2d5e099332c122d309cdabcaa4bf432f SHA512 2c656b80d4483b47e24da86c17725ce03915a8066e95cfbc62ef93c376116599d09bf032a417d19ae1bf2777352e00e7fbffad5d2c9cf91ca7a4de4d72f6c938
+EBUILD slimv-0.9.13_p20170910.ebuild 947 BLAKE2B c632da6482da46ade19f40ea95da46f565a533d325e8163e228f4cb91f32964c2e7452b9dbb2dac09708444b13a5c8a4e881d7a40b5f61fa546bc0b93c85c27e SHA512 a16dbe08471b6fe3b291d71c8389477367f55d07c3d57c08dfb344093dbec3ddf5ff0bd361ac36e1063b957ca3f2dcf1b9a59171083c4621aa676465c17f537a
 MISC metadata.xml 1220 BLAKE2B 7d60a456299acdd198b51276a1016fec37007bdb6220efaa786889b0d046de73d14724e2a8bd5efaec84e0c850ff69bdaf344bbedcafa132a0a8c0c45fad051e SHA512 11c6fb3a83ea65ea97e57e70b24d9e011d48fb456bff15ea8b501e0dab767f73c78ae1c63e662423599252dee9969c1983b17fd1505533b3ee26f3afde2a3b29
diff --git a/app-vim/slimv/slimv-0.9.13_p20170910.ebuild b/app-vim/slimv/slimv-0.9.13_p20170910.ebuild
new file mode 100644
index 000000000000..78e20a7742e7
--- /dev/null
+++ b/app-vim/slimv/slimv-0.9.13_p20170910.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-single-r1 vim-plugin vcs-snapshot
+
+# Commit Date: July 10th 2017
+COMMIT="acf9b30be71c54db4f4875d257b905941ca69ed8"
+
+DESCRIPTION="vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL"
+HOMEPAGE="https://github.com/kovisoft/slimv"
+SRC_URI="https://github.com/kovisoft/slimv/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+LICENSE="public-domain"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	|| (
+		app-editors/vim[python,${PYTHON_USEDEP}]
+		app-editors/gvim[python,${PYTHON_USEDEP}]
+	)
+	${PYTHON_DEPS}
+	|| (
+		dev-lisp/abcl
+		dev-lisp/ecls
+		dev-lisp/sbcl
+		dev-lisp/clisp
+		dev-lang/clojure
+		dev-lisp/clozurecl
+	)"
+
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+VIM_PLUGIN_HELPFILES="${PN}.txt"
+
+src_prepare() {
+	default
+	# remove emacs related files
+	rm -r slime swank-clojure || die
+}
diff --git a/app-vim/wikipedia-syntax/Manifest b/app-vim/wikipedia-syntax/Manifest
index 6e08c2665b76..46718e7ee462 100644
--- a/app-vim/wikipedia-syntax/Manifest
+++ b/app-vim/wikipedia-syntax/Manifest
@@ -1,3 +1,3 @@
 DIST wikipedia-syntax-20101113.tar.bz2 3463 BLAKE2B ee37c972eaf884e6c5130356638c7309481f4e37b7c08056770d9600e35ef67b1480fd0b8f4eb68a10df9caf8f4152e325d501d752e799eb5b43de8f5b012ce4 SHA512 e0e52d4cf6e6e5a3f6cb32b0dc22c91c6b3b58292f1e0d67cb4de4ed2675d7f6bbb069d37e6a59b0cfad201c082322e3cb5300639e39447bbcda22d99c88b4b4
-EBUILD wikipedia-syntax-20101113-r1.ebuild 501 BLAKE2B abc0fc9b5e0c160d8d6bf0257a9c3f3ae062d64767fab859944a3f72de804c9e8fb66ed3ba66db35669346fde0701d31da3e140e29f9e86229773c2066841662 SHA512 13b9c316e4e5c3a935232d0e2a54cc205439f6f73be93fb57037c4e6e8c1b82bb380db589ed50e0aaebbb763fbfc5daf95d051c9697b2b7a03b3749dea895a41
+EBUILD wikipedia-syntax-20101113-r1.ebuild 502 BLAKE2B 966545aa0d4669bdaf237ee1dc37a5d03480895e12934d0ee7cfa827f7a1f440cc18d2d543bfc2856151d7d5a3bd80e0a2d24b72b3c06b49681d38a99ddea7c7 SHA512 6a2dde4868eb2ce282f7b43896d26acd4ec9eb8001391d3a4ef322960c687c38b0fe346003f21ed3857c42118e36c20c8dffd7b67e0d01f3cb6062a28802a2bf
 MISC metadata.xml 441 BLAKE2B b7ca0f393018de1391ced7bccaee3b2e1a57f148e9afc2305c6aacad8bd2f2bbf7fb787008598274e595017f6150c66eff622f58923a9baf5647ec5dd1155d35 SHA512 46bd57e33bc8214c4823ea84d1cebe83a55e7bc7b01e67d88fca2bbc3bf2e2eebad2041a76b6a70702e51bd934723b5a337f326ab33970a534b15e46c2177c45
diff --git a/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild
index 2d5a786a30ae..200a7be789da 100644
--- a/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild
+++ b/app-vim/wikipedia-syntax/wikipedia-syntax-20101113-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ EAPI=6
 inherit vim-plugin
 
 DESCRIPTION="vim plugin: Wikipedia syntax highlighting"
-HOMEPAGE="http://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim"
+HOMEPAGE="https://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim"
 LICENSE="CC-BY-SA-3.0"
 KEYWORDS="amd64 hppa ~mips ppc ppc64 x86"
 IUSE=""
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index b7248769231a..263e83f8ead7 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/glibmm/Manifest b/dev-cpp/glibmm/Manifest
index 2fa6d5cc63b8..f4799d0e81ea 100644
--- a/dev-cpp/glibmm/Manifest
+++ b/dev-cpp/glibmm/Manifest
@@ -3,5 +3,5 @@ DIST glibmm-2.52.0.tar.xz 6450592 BLAKE2B 2ea123bd193c7a745f52b2357c620fdaaef34c
 DIST glibmm-2.52.1.tar.xz 6451164 BLAKE2B 740178b51a2263ecc4778833fa6f2fd3913cdfc4e93b1a732a1b0ec9d43eb4ed60ab6bea48e02081d75a3ec1f98a149ebff47ced54dcce07e7ae011b2d20452d SHA512 702158762cb28972b315ab98dc00a62e532bda08b6e76dc2a2556e8cb381c2021290891887a4af2fbff5a62bab4d50581be73037dc8e0dc47d5febd6cbeb7bda
 EBUILD glibmm-2.50.1.ebuild 1636 BLAKE2B cedaf300eff88a5df1e9b758ba425ad29547642a5c345715a5196b8904f1f5dba0b5c85fd7d5424c2044c9832cf817758cb0086d9deb92484484c1316a4f417b SHA512 d8c11ace8919ff16e950798269d88f83bdde55377f66ba34e47947acbb856273b42bae549393055997ce02077aaf281b1238f6a2a2d4c706d24293d9b64317d3
 EBUILD glibmm-2.52.0.ebuild 1645 BLAKE2B 8698e80fbb0f777d63f2d6b6a4fbd9b80d3b6d014c53bb43984562bc583e32971a4ae4d6caac344b7ffac37e48847a9a61d4db98ef5d227741f95bca09e1cdae SHA512 903a9087feab8a973851471b0dbfbe485b2b1f7e208982c8113980b5f33fbef8b47a2aaf2a3999404c7a80ed2f95664ca0a57f873da0bda97fe3ee1c0b10762a
-EBUILD glibmm-2.52.1.ebuild 1645 BLAKE2B 8698e80fbb0f777d63f2d6b6a4fbd9b80d3b6d014c53bb43984562bc583e32971a4ae4d6caac344b7ffac37e48847a9a61d4db98ef5d227741f95bca09e1cdae SHA512 903a9087feab8a973851471b0dbfbe485b2b1f7e208982c8113980b5f33fbef8b47a2aaf2a3999404c7a80ed2f95664ca0a57f873da0bda97fe3ee1c0b10762a
+EBUILD glibmm-2.52.1.ebuild 1644 BLAKE2B f973185893d2af512d93465d87867bd4b6a79c58a635bc59ee932c3c89edea5377751b5e8021dc85ba8ffda32c6f413b6e09bc6d917e7d89976708787c6a4266 SHA512 c7a4b720415a27c0c1f317d34ad0f137367e9ab6a8474d9157c8eaec79490a92e9e26cb4aa0de2782a972740a13b8808874818b5a26090c5efa3ce0f1ceff578
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-cpp/glibmm/glibmm-2.52.1.ebuild b/dev-cpp/glibmm/glibmm-2.52.1.ebuild
index 6b4fa6640641..b21f9d9017a3 100644
--- a/dev-cpp/glibmm/glibmm-2.52.1.ebuild
+++ b/dev-cpp/glibmm/glibmm-2.52.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ 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-db/Manifest.gz b/dev-db/Manifest.gz
index b0cca40e2146..54e8d4e42228 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/etcd/Manifest b/dev-db/etcd/Manifest
index 289e68187c27..fe875f78fae1 100644
--- a/dev-db/etcd/Manifest
+++ b/dev-db/etcd/Manifest
@@ -5,11 +5,11 @@ AUX etcd.logrotated 104 BLAKE2B 3126c99db171af177d6d6368e7e53f3e5e07b9ae2926ff12
 AUX etcd.service 304 BLAKE2B ecffe9889f9530bf7172638a0273736abba2b3ea5c5540b5452d26fbaec17ab9c138db86b543c3c88fd3d16ce79487eb2c31ad7bbfb0c5b9cd11eede9b99bd2d SHA512 0074f77a17afe2bb4145f12a6eb312caa3e08cfe8bf35856b79d091ad8786c4223bd91c0a865e789ee9ba180f2672b31721742bb32efd0cd383bc747eb926961
 AUX etcd.tmpfiles.d.conf 76 BLAKE2B e5aa0ca42dd579e9c2ac8c6bdfce83f87ec79ce64d10e20b61ab3df45918747f588b9246085fec925bb39b772e061628aadd030a23a59b65a2fc2243eca1a7f9 SHA512 7324b74dcfe050dd7fbc318ca3ce9b5d58bce8fa2ce2d2d771664ef981c834375f7cbfebcb630cd61dab2a3f6bf6c3733ad04f752beadf7bb6fedcc80ff682ce
 DIST etcd-2.3.8.tar.gz 2206562 BLAKE2B 754930b4b5f0e90386b2b4765a9dbb6790ae509a81d3430c3f7c2c828d90318db3b01a2faea0c7075078096ce74302f2be7444245047534749f49d13a927851e SHA512 4268de32797cab23e9e47784d31d5abd6982068c53d3cc9735a06719740dba45b73f4e067cbc7aa8aef5ca7c56d8be067f1076685ac82f64012b760d8b7f2bfc
-DIST etcd-3.2.12.tar.gz 3046578 BLAKE2B 7b7a071c6856a7f1b5b7ceb68a4efbac74fde6ed1211dabda7d715ea79cd4dc9c10b0f1345d70b8a21e52cb3ac6adfc37c232ea28ff88e5f401212b5a8610d73 SHA512 b672a35ba62efccffa09be6b3d2a84b99e8abcae87093539c705d82e13c0f985a9f07a3d885af7386595f12d433756176db107739749c301e7e5d096e85d018b
 DIST etcd-3.2.13.tar.gz 3047049 BLAKE2B f0ac987aef60fcc28636cfb60d5f4e00daee29a3d5167900599760090c3fa3d7932abb6224df5fb66ea5bdbc29a9ce7f7263a0e81522853ab190be94a6551ebc SHA512 4f3c5856ecf9e8a725d0ef80bb584e7b2edaf7215635a5c74fe32b175ce9f8d07ba57685586dfd79b893d04641d4169382d22f2eea442efc1112fa91c8175d45
-DIST etcd-3.3.0_rc1.tar.gz 3357505 BLAKE2B e9008dfc5b88e7aafcb0db08e09ac40a25b3c877ec6865e6ae73162f65bc75af777ab5e3822130269b19acba1472f8c7cbde48b70d29c7a0936618c6ee13e753 SHA512 1a3fc95b1a4f5a85c956fb3a8558ae2deaa116ff2efe32ef9fdca0e503f356b1477e3f9c19be6d1a3b7b992d030abcf9b9eb251b5c37c64f78a4fbbcd406872f
+DIST etcd-3.2.14.tar.gz 3047100 BLAKE2B 5b956042542e7daeec3985f0dbd02b2766ca27287b55b0e1fd67c4296103ca9bf05b2ccc0e93640949c85e8099503b5a22d36c2f03d9904762ae1bbb59d35ac4 SHA512 f48cdb368906b36e7ce80c60933b0e9bc4415104c31f2da9346940f040febf27dbd9109e7f659a281c7038cadfb02b0dad614685a15ff46c87c600471c5de432
+DIST etcd-3.3.0_rc2.tar.gz 3358540 BLAKE2B 8df7b2bbe84c5440c1b778107e7817def6b7a14a8568e6c1d7b5eba5479cf58ad6901482937df149b658a7e06844037cad95b57196c23810b309ae638c8961c0 SHA512 4c9513fbc599b218072bf441a6a37e622554df1597e18d0b72efab3f85d8ffb2b21d915a78289a865de68bc25e4401df15f291521f3dd22d19c2ae37941c0e4b
 EBUILD etcd-2.3.8.ebuild 1379 BLAKE2B a6bff7dcfef244a2de25f4bf9168eb41552e394edf4a5e573a5b7dcea580debc3a87008b9d77d717b31b0fe27dcc08cdee76f855865455cde2fd26c16aee00e4 SHA512 ea3065641cac36b9011238603479967c1de5ab6f0ccb61dbc54b751879ff239b43065034b17045eb9467e1870878e4837af88c922f9034899da1359b69be98f3
-EBUILD etcd-3.2.12.ebuild 1475 BLAKE2B 362f159043caf3e4eeb86dc6f986d20944ee0f6dcb056348e3cfb2ea91d7ac2e3cf8b7cc9f9453046e17fd1613edc6e327c0b21c77d523664a79926058b46bc0 SHA512 b7b1a31797590cde253eb3df3d891620c812456159aeaf5fb0ea332b91517b898604d7c57c3c78c9515ee2e72750794450c40e54a1852ea0a5dfda9c0d346fad
 EBUILD etcd-3.2.13.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
-EBUILD etcd-3.3.0_rc1.ebuild 1501 BLAKE2B 6bcbc8b5feb259c84a1e46ef368e2a787fb7cf75638f157f91955f0a04aa68cf129a07d6ad3684024fd50ecedd78ab9d05f9dc44109e7c42e06b0bef4c4b5fbd SHA512 cfb2878fe80595c53de400d553eeadf2917fc8f9d4b1143de18d8d0ab0d71f602bebf74a38d81f7541911c5f1892ddbd46cf94db2f80a5371e83d76eb727d064
+EBUILD etcd-3.2.14.ebuild 1475 BLAKE2B 4cbf762bd7dc082d11b4ef984e27673921a5a44e7cec9f8284d1feda234662352497512edc84c2ba9c29b743b481a9f06fe8b32b14695273d8fa97956e460e76 SHA512 dc2cab07f90c4c181b0453b7a15b66df3c270c63872843317838d29b985a0c9a0905b7ce0a054df2015991337bccdee7bfc920e599b17142e231f0a0aa8d9f5c
+EBUILD etcd-3.3.0_rc2.ebuild 1501 BLAKE2B 6bcbc8b5feb259c84a1e46ef368e2a787fb7cf75638f157f91955f0a04aa68cf129a07d6ad3684024fd50ecedd78ab9d05f9dc44109e7c42e06b0bef4c4b5fbd SHA512 cfb2878fe80595c53de400d553eeadf2917fc8f9d4b1143de18d8d0ab0d71f602bebf74a38d81f7541911c5f1892ddbd46cf94db2f80a5371e83d76eb727d064
 MISC metadata.xml 614 BLAKE2B be58143e8f3c7adfefa4be2af02a57738eb30bad4ccc63bb7756585cc71b5d40a705d0f16d61fe263f3858e53b965e3611386dcea04bba985a0bb09eb95231f0 SHA512 92fbd483e5a757d09c07c392cc6d54a5448b6ca02177fbc48ff9f1b4f558af4755e4590e3d7192dbc3e5a32d5bf797289a7b1067e585dd295e3e890b88af9cb2
diff --git a/dev-db/etcd/etcd-3.2.12.ebuild b/dev-db/etcd/etcd-3.2.12.ebuild
deleted file mode 100644
index c4f9f1d45765..000000000000
--- a/dev-db/etcd/etcd-3.2.12.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit user systemd golang-vcs-snapshot
-
-KEYWORDS="~amd64"
-EGO_PN="github.com/coreos/etcd"
-DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
-HOMEPAGE="https://github.com/coreos/etcd"
-SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="doc"
-DEPEND=">=dev-lang/go-1.8:="
-RDEPEND="!dev-db/etcdctl"
-
-src_prepare() {
-	default
-	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
-		-i "${S}"/src/${EGO_PN}/build || die
-}
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
-}
-
-src_compile() {
-	export GOPATH=${S}
-	pushd src/${EGO_PN} || die
-	./build || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	insinto /etc/${PN}
-	doins "${FILESDIR}/${PN}.conf"
-	dobin bin/*
-	dodoc README.md
-	use doc && dodoc -r Documentation
-	systemd_dounit "${FILESDIR}/${PN}.service"
-	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
-	dodir /var/lib/${PN}
-	fowners ${PN}:${PN} /var/lib/${PN}
-	fperms 0700 /var/lib/${PN}
-	dodir /var/log/${PN}
-	fowners ${PN}:${PN} /var/log/${PN}
-	fperms 755 /var/log/${PN}
-	popd || die
-}
-
-src_test() {
-	pushd src/${EGO_PN} || die
-	./test || die
-	popd || die
-}
diff --git a/dev-db/etcd/etcd-3.2.14.ebuild b/dev-db/etcd/etcd-3.2.14.ebuild
new file mode 100644
index 000000000000..34692b679e18
--- /dev/null
+++ b/dev-db/etcd/etcd-3.2.14.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit user systemd golang-vcs-snapshot
+
+KEYWORDS="~amd64"
+EGO_PN="github.com/coreos/etcd"
+DESCRIPTION="Highly-available key value store for shared configuration and service discovery"
+HOMEPAGE="https://github.com/coreos/etcd"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="doc"
+DEPEND=">=dev-lang/go-1.8:="
+RDEPEND="!dev-db/etcdctl"
+
+src_prepare() {
+	default
+	sed -e 's|GIT_SHA=.*|GIT_SHA=v${PV}|'\
+		-i "${S}"/src/${EGO_PN}/build || die
+}
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 /var/lib/${PN} ${PN}
+}
+
+src_compile() {
+	export GOPATH=${S}
+	pushd src/${EGO_PN} || die
+	./build || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	insinto /etc/${PN}
+	doins "${FILESDIR}/${PN}.conf"
+	dobin bin/*
+	dodoc README.md
+	use doc && dodoc -r Documentation
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	systemd_newtmpfilesd "${FILESDIR}/${PN}.tmpfiles.d.conf" ${PN}.conf
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${PN}.logrotated" "${PN}"
+	dodir /var/lib/${PN}
+	fowners ${PN}:${PN} /var/lib/${PN}
+	fperms 0700 /var/lib/${PN}
+	dodir /var/log/${PN}
+	fowners ${PN}:${PN} /var/log/${PN}
+	fperms 755 /var/log/${PN}
+	popd || die
+}
+
+src_test() {
+	pushd src/${EGO_PN} || die
+	./test || die
+	popd || die
+}
diff --git a/dev-db/etcd/etcd-3.3.0_rc1.ebuild b/dev-db/etcd/etcd-3.3.0_rc2.ebuild
index bb257b8fde56..bb257b8fde56 100644
--- a/dev-db/etcd/etcd-3.3.0_rc1.ebuild
+++ b/dev-db/etcd/etcd-3.3.0_rc2.ebuild
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index 6ff6405b9f04..64c67c07e1b8 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -34,7 +34,7 @@ EBUILD mongodb-3.0.15.ebuild 4561 BLAKE2B 85e994c18b57a0278059eb0e2e141842b551a9
 EBUILD mongodb-3.2.12.ebuild 5129 BLAKE2B 5587e9f109bc55d58d5157aed301fb61c8bc088d7bad7fc386d9e34b228f05a6fcdc79f4d2201ded1de0d178eb721600322992b6f0e4ec174cc85ac44decf81a SHA512 28de831886c3531c441658cdc7a29cea3b20f6aa9208c5658d4ad71269b6ff359954118810a9e845d567f54a54449ebc20a446f46da3d4694b5395fdf9f822dd
 EBUILD mongodb-3.2.13.ebuild 5129 BLAKE2B 5587e9f109bc55d58d5157aed301fb61c8bc088d7bad7fc386d9e34b228f05a6fcdc79f4d2201ded1de0d178eb721600322992b6f0e4ec174cc85ac44decf81a SHA512 28de831886c3531c441658cdc7a29cea3b20f6aa9208c5658d4ad71269b6ff359954118810a9e845d567f54a54449ebc20a446f46da3d4694b5395fdf9f822dd
 EBUILD mongodb-3.2.16.ebuild 5180 BLAKE2B 79f825055c4491535e1e4405af86b58650443885a6ac7e65e53f6739465be60bca9abba10ccc803cecfe93b1bf2645970f9a4e97b5dec72309ed12ddd4f1f350 SHA512 9d0a8bac5e2aed1803df8d23ccf126a56194d03f715e86adb4fda36a82fd176617c5c599c1ac7fbfdbdfb8d6c7c63496e34400a9dc5ed75cd6d84ca023d58ee1
-EBUILD mongodb-3.2.17.ebuild 5339 BLAKE2B 44abb9bde7a946e9eb09002f0ea4c84e6cfb7161a8ad6624881268fe00d9e5d125a0d5a0dc0815d4f759e5d6fdc2160bbc88c9317848d15e551e2b165f5e1733 SHA512 bb163c16d8fceff96d1c199ee41e43ad91892a2442ea370c50c15484d80625057b5ac36e516deb0daa25325a74aeb37da7c19e0a97e3ce2a769c77933521622d
+EBUILD mongodb-3.2.17.ebuild 5338 BLAKE2B fd327b1c5bb85e833782839e07b3379a103f0545fb9852cb06d7f6f0b3548b921dfce227d1882a1e448a533c043718c778e9141ec5715805a24c9e2fbf199fa1 SHA512 a439c32b20a81d1c8e199c8a6928aa75479562e6b33c0d7b50797181226a093f571a1caaab102569a9a308db18a73c51558657ccd4bcb1d7e137eb22fb363c4e
 EBUILD mongodb-3.4.10.ebuild 5240 BLAKE2B 1e1897fe9f4d929a7ae9b720aad33819cee29776b5ed34c502e421b3454daedd11bb009437e5316cfb0bf5f3d2d3f563f5c34ce946ebab26030ef96e91b1602a SHA512 001ea14c326133a4d462ce4b25db9318376f86279cdcd9edf7ce6e9f8ee4ed642576e4a0a622cda55fd31360912fdc2aa3a77068503b7dc039ca05b7abd9aa89
 EBUILD mongodb-3.6.2.ebuild 4442 BLAKE2B b62187502656f26136a95ec54db456e87cb2149305c4c5f6c0e4fe4f988c847b3909855d7f536093e7d4d4eb304d5e0322a25fff54d51a378511bbb95040e749 SHA512 3da494650e9126d3287b8dc04876bc8f8b95e49cba2ea3dc7dcad7016e43bc6062f64552e223c88c274312304b98526161151d2bf0e93a8701e6706324da8b0b
 MISC metadata.xml 1112 BLAKE2B 59da7a768ae87cb8ea3a539b40c27707b8aca5bdfd6f3acfcddca4d27a354aa5ffb13b68b7d69b57553d26d3b47860e186c5c43a38122df4712d0cc98ec1f690 SHA512 39b9bd8afc1c79382130c691154eac4338810fb4069406482648d32fd2aefd5d3697c272321d300154be2e4d37ac10f1372c62687d9c41ca0d3682b0152a53c4
diff --git a/dev-db/mongodb/mongodb-3.2.17.ebuild b/dev-db/mongodb/mongodb-3.2.17.ebuild
index 979e0dfa8c93..bda8f3b4e588 100644
--- a/dev-db/mongodb/mongodb-3.2.17.ebuild
+++ b/dev-db/mongodb/mongodb-3.2.17.ebuild
@@ -20,7 +20,7 @@ SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
 
 LICENSE="AGPL-3 Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="debug kerberos libressl mms-agent ssl test +tools"
 
 RDEPEND=">=app-arch/snappy-1.1.2
diff --git a/dev-db/pgadmin4/Manifest b/dev-db/pgadmin4/Manifest
index 60b1f09be8ba..e7a0aa7fc7ed 100644
--- a/dev-db/pgadmin4/Manifest
+++ b/dev-db/pgadmin4/Manifest
@@ -1,5 +1,5 @@
 DIST pgadmin4-2.0.tar.gz 24988176 BLAKE2B 96e942d5001b1d590fb1b642933c665a13bca5429d3a3e74eefe4a8090c76515cc08b656ebfea3a170b4fa6077d7086fbffdd5fddfcb517be08fd4ecc20052ab SHA512 463e95a341dec74ac0a08a647af1cbe83b514b0595b8469ab9c7b5335e24604e082b906d530aa735fef7b08c58d8a8a6df3edf5dc65402f6521165f1cbb72f67
 DIST pgadmin4-2.1.tar.gz 27842212 BLAKE2B 26c12dff8e2e5e37dd2911f6eb582a0f706d73490c8d93e83b07b7537fc201547d095d4f34181d2502bbc29b2741614adabf876b7e6ea3ef5f555eab94caa240 SHA512 02bc122ae53db595a1fd395e634fc4d0891f024a2e5e341c81b306a8c1d07bc18e5673cda440c7ba56754be4902ae4441010db0140132352e12b8986c8c0f47c
-EBUILD pgadmin4-2.0-r1.ebuild 3430 BLAKE2B fb80fbc920e092ed3b39f58f0c080f41e6a358e573112f42da9db4c728a8bbec37f00a61be0eaadd19e607aa3c5b79841db80ff689404a102a51bc3ac28b118c SHA512 10d50efb96498eb3abb76943ab2a678c9b3a39935d628906a6a07b9b9d666ab6648eed4b2c4d6ecd0b4a61664dc4cf25cdeb4abc5fc55c2915a87d40e4f0975a
+EBUILD pgadmin4-2.0-r1.ebuild 3429 BLAKE2B 18e38ce8554d4dac7e4ac486ee68b205a075c582557b3830202c94d61b894382f051d86d5cf406d6e508fc487b5b9e53dfbfcd6a89a988f7fd687b8af5660cc9 SHA512 89aece639bc0455151cf20e3adcff92ca04c56e9d0370bfd7ae4291ecf5a458c33d7e1219279162908fcd7ebe84fa1623232d5aeb12eafdf488196646e788690
 EBUILD pgadmin4-2.1.ebuild 3432 BLAKE2B 150010a6b6abbd2dae6a362883a24c1b2a13a62301489ef4a6073801de25e7c6b9792beb542306393c8fe1b598dcb2125bef88e03020de0a61688edb76a78578 SHA512 493c026a3bc156a92f5253ac96aa30891d8c644463196ab603daed5cfa9536fdb99e786dd07cfaafa31b1eb782040e6711d9e8a541211aa905e57227309843fa
 MISC metadata.xml 266 BLAKE2B 9d5988ab45f9939f9be5ee7f4b7a9950a3d62252aa0d3e6c953265467428c59fb8c05b2bb72085431b7aa9fc18d31f2b3273e8fdb33443d786b2237db697b7e2 SHA512 9f85990c7ce6a1de5c1067e4781af18bede2d3bd02963a7b2927766b70dbe98d3fb63bb01e19b1cf6e2b77038d9788bf38155b3cc33f9e5ff8430b10a4006325
diff --git a/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild b/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
index 932530d0a98c..0696264af76a 100644
--- a/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
+++ b/dev-db/pgadmin4/pgadmin4-2.0-r1.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="http://www.pgadmin.org/"
 SRC_URI="mirror://postgresql/pgadmin/${PN}/v${PV}/source/${P}.tar.gz"
 
 LICENSE="POSTGRESQL"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 SLOT="0"
 IUSE="doc"
 
diff --git a/dev-db/pgbadger/Manifest b/dev-db/pgbadger/Manifest
index c55c2935acca..137852b1b237 100644
--- a/dev-db/pgbadger/Manifest
+++ b/dev-db/pgbadger/Manifest
@@ -1,5 +1,5 @@
 DIST pgbadger-9.1.tar.gz 742409 BLAKE2B 34b2b9e8582755edfa4a284a926032b4534b962f5e80be17b0efbf4b4c7f367cf9b588831d0f1e0e8142e7d6d5fff2d5733ee06e405b2192d7f01c91cef69df6 SHA512 e3841516dd56ea0aeae397c8264302881df3b07a86063f7813f593ba817a4f3417559b88e2b9e23fec811d3dfd716589f56092be106960e88d1800a94d3d83c3
 DIST pgbadger-9.2.tar.gz 745128 BLAKE2B 63e7d60992e903a136d4f91422a378a6adc5c0477e69ae1cae3d4c1940dc02517f0b6f16d0fa7c5fe0ea365851807dc800bfaef0e95c546d6c4eb4afe0e2d09d SHA512 c99636fc03e3e1c1cf4c8c034e58e2152ec1118954d4fd9bdfa782d7781eee308cdd7450c0bcca6f5936c173b3780c9362fccc8cf79f5b0fffc895f73a322c9e
 EBUILD pgbadger-9.1-r1.ebuild 438 BLAKE2B f8fcbb93e32dd050365b68f2abf3a6b8b32b8e5e7759e227f39c4c221c2940495c04ca9967b392f5fd473fd316a202fee2e0450760dd83b399907475ff6b8199 SHA512 5d918d0ccfa4d49096693d3dc62caf95bb9a38015afde5565aa43fb23b1961030feb4ec942a1ba957d75f42e63b2a3079aa6cbdf399eeb88393f3ae183ba729b
-EBUILD pgbadger-9.2.ebuild 438 BLAKE2B f8fcbb93e32dd050365b68f2abf3a6b8b32b8e5e7759e227f39c4c221c2940495c04ca9967b392f5fd473fd316a202fee2e0450760dd83b399907475ff6b8199 SHA512 5d918d0ccfa4d49096693d3dc62caf95bb9a38015afde5565aa43fb23b1961030feb4ec942a1ba957d75f42e63b2a3079aa6cbdf399eeb88393f3ae183ba729b
+EBUILD pgbadger-9.2.ebuild 437 BLAKE2B 51ec9c61888f6e01e9d1b4222166268162d8b8b9a6d57a9ed5e9054244a9c34edde5f0edc913a00fe164f57501c525253867df4f8c1b5cea7539f7070a231539 SHA512 9fd59dc534af5fa16a90f26b0953c5e1c606a873c800a9105dfa403e8372f11bd97840730488229a1f1d6e67ff7e27d58b247972480e15486151e988c3ca5078
 MISC metadata.xml 413 BLAKE2B 9b4f24620b42d2cf5befbaed7d52ed2e03d4619ebb547d36e207a900fe481a825a5be0a6fac073d7b278076ced053ae9a3c4b5d05597e5fb4d7ea66c1bff7988 SHA512 6bf32dc50ecd2d51d450413500b00773177109ab3ad26d74b458ec902973fa38542dbc65e65fbbe103b4be63589f61c2b9a6ab6ea5492b1954142afc5c2f8f93
diff --git a/dev-db/pgbadger/pgbadger-9.2.ebuild b/dev-db/pgbadger/pgbadger-9.2.ebuild
index 9e674e7b549b..16ecc3a80b96 100644
--- a/dev-db/pgbadger/pgbadger-9.2.ebuild
+++ b/dev-db/pgbadger/pgbadger-9.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/dalibo/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE=""
 
 DEPEND="
diff --git a/dev-db/phppgadmin/Manifest b/dev-db/phppgadmin/Manifest
deleted file mode 100644
index 2b34c9c07258..000000000000
--- a/dev-db/phppgadmin/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX postinstall-en.txt 162 BLAKE2B d08f1f1064e8f268fe92ee622d0b5a756e20d80a6376abf1bfc7e8bb88c90d7b3c1b7c3c3291d3189791cca9766feb05b9831ddcba2e84f69e295f7048d440e7 SHA512 3aa9e4b58ffd97cc9bc990e0ca8444e8be012fb56859b28705e7ed3d5ffae74bcfab19c55e415785c9f09fabcc20ea5a493ee2f03fb380a351c02fe958231bd8
-DIST phpPgAdmin-5.1.tar.bz2 583620 BLAKE2B 6c21b127db6a7d8508ce4ab2e12ed11db568aaf903955d19f6cd9548908c321ffa276b87d1cb828286fb32a9eddbfe86b9a9671937639720cbecaa2bdbc7a2b3 SHA512 3a1eebfc4e07a620ea3ec5d65e1fd1f07cb19f12db470f163430ded20542107c828cebbd5d5ae23c470fbe5aa0e2358b8c4d3ba66834009a39ac74440cc751c0
-EBUILD phppgadmin-5.1.ebuild 943 BLAKE2B e2065187f74fa39c95a60904bd771dee99e16e1d77570624b4eb7823f12319a760f6ae052076d592068b26bbdf3535e1213db8cba563419c597d78ea2d4913eb SHA512 9dc11c40cdbdc05779d9a7cbd16350925c574f5b191106854ac81636ddc4549be7a9a682a9054b7a7aced600a79fb7d4bedeeaaafa59aa325bc6fc07745acaef
-EBUILD phppgadmin-9999.ebuild 913 BLAKE2B 24125893a3dddf588cd829de21ffd1eb36eb6f0f05d2bfcfd0cb6aa6bfac786305ea432abf0a8131f7ead4d91a3c8e70308996688b59600c2fc233011ee76d1c SHA512 fc09d7d7e42e447514b57df9434326e1a0bcdd691ccb8c1958c5fdff195b0c10fdcfe5f7d65f4eb8d2b4a578f41887491200c6e1694d0012bc324df2f91760ba
-MISC metadata.xml 471 BLAKE2B bf3d67816bf702b302a122dff0f2643fb9244fba961d863c3844fe6efb2de4a13912bcf5477075b0c96ffa675d6fbcfe1169bb1fdc5c353a650121ffdcf5ef9d SHA512 c77ad7f8013618aa1775c023bb166792ddf7824b53315d4b9c36b140ea4b1985c1530dc50e38c14948ea5aee124d0823ce782d59b12da320757db249dddb535c
diff --git a/dev-db/phppgadmin/files/postinstall-en.txt b/dev-db/phppgadmin/files/postinstall-en.txt
deleted file mode 100644
index 003fe5003bbd..000000000000
--- a/dev-db/phppgadmin/files/postinstall-en.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Make sure you edit ${MY_INSTALLDIR}/conf/config.inc.php
-
-To use the reports database, you have to manually execute
-psql -f ${MY_INSTALLDIR}/sql/reports-pgsql.sql
diff --git a/dev-db/phppgadmin/metadata.xml b/dev-db/phppgadmin/metadata.xml
deleted file mode 100644
index fc6f76702327..000000000000
--- a/dev-db/phppgadmin/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>pgsql-bugs@gentoo.org</email>
-		<name>PostgreSQL and Related Package Development</name>
-	</maintainer>
-	<maintainer type="project">
-		<email>web-apps@gentoo.org</email>
-		<name>Gentoo Webapps</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="sourceforge">phppgadmin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/dev-db/phppgadmin/phppgadmin-5.1.ebuild b/dev-db/phppgadmin/phppgadmin-5.1.ebuild
deleted file mode 100644
index 7434f1c78238..000000000000
--- a/dev-db/phppgadmin/phppgadmin-5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit webapp
-
-MY_P="phpPgAdmin-${PV}"
-
-DESCRIPTION="Web-based administration for Postgres database in php"
-HOMEPAGE="http://phppgadmin.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 hppa ppc x86 ~x86-fbsd"
-IUSE=""
-
-RDEPEND="dev-lang/php[postgres,session]
-		 || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_install() {
-	webapp_src_preinst
-
-	local doc
-	local docs="CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS"
-	dodoc ${docs}
-	mv conf/config.inc.php-dist conf/config.inc.php
-
-	cp -r * "${D}"${MY_HTDOCSDIR}
-	for doc in ${docs} INSTALL LICENSE; do
-		rm -f "${D}"${MY_HTDOCSDIR}/${doc}
-	done
-
-	webapp_configfile ${MY_HTDOCSDIR}/conf/config.inc.php
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/dev-db/phppgadmin/phppgadmin-9999.ebuild b/dev-db/phppgadmin/phppgadmin-9999.ebuild
deleted file mode 100644
index 8e5e78b13e74..000000000000
--- a/dev-db/phppgadmin/phppgadmin-9999.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit webapp git-r3
-
-DESCRIPTION="Web-based administration for Postgres database in php"
-HOMEPAGE="http://phppgadmin.sourceforge.net/"
-EGIT_REPO_URI="https://github.com/xzilla/${PN}.git"
-
-LICENSE="GPL-2"
-KEYWORDS=""
-IUSE=""
-
-RDEPEND="
-	|| (
-		<dev-lang/php-5.3[pcre]
-		>=dev-lang/php-5.3
-	)
-	dev-lang/php[postgres,session]
-"
-
-pkg_setup() {
-	webapp_pkg_setup
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local doc
-	local docs="CREDITS DEVELOPERS FAQ HISTORY INSTALL TODO TRANSLATORS"
-	dodoc ${docs}
-	mv conf/config.inc.php-dist conf/config.inc.php
-
-	cp -r * "${D}"${MY_HTDOCSDIR}
-	for doc in ${docs} INSTALL LICENSE; do
-		rm -f "${D}"${MY_HTDOCSDIR}/${doc}
-	done
-
-	webapp_configfile ${MY_HTDOCSDIR}/conf/config.inc.php
-	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	webapp_src_install
-}
diff --git a/dev-db/pspg/Manifest b/dev-db/pspg/Manifest
index f9d8c6cdb5a6..0a15371bc44d 100644
--- a/dev-db/pspg/Manifest
+++ b/dev-db/pspg/Manifest
@@ -1,7 +1,9 @@
 DIST pspg-0.8.0.tar.gz 850508 BLAKE2B 2f2fb7f094f72f0b5d1c959ab73a355ea2ced155fdb64adef21eb70c4991b057e31688128f50db2d6a84ab850b57ab59d50c0dd5ba06998af11ff3a5479cc9bd SHA512 758d47e041f4c7c91ad2033fb95e6d33a27b6f896077dbcb287331496e47740c31c6ba6bf7ea01ad6c1a3c3d4c5e525b268795a16f9c819f4d489d3e98fa3092
 DIST pspg-0.9.0.tar.gz 853226 BLAKE2B 7fc73a02557991c24892f47f09a4402fea691047a41ed91e0b4d3fac8fe2fbfc02530615d1123288b641dba7b1db8ba524156351e494a37ca7072853e1f028ee SHA512 a752570ab1a7bca5d69c602a2e8bc0ec92a6ce405b7170bc1a25ed2ae29b0e69fa7833979ccbb5bd1adbaad968067928f26044eef902069edfe662812e9d3edd
 DIST pspg-0.9.1.tar.gz 853229 BLAKE2B 791a8d05ac549b869a3d31578277709f17a50b9aebf3ea84ffb30199ebdda8faae6828e4f5068880fc1e74d57d88086bf363b1825789d4968ed77087561a5435 SHA512 40fb07153c36e2e170ddd1fda18a9c2e663e7995367c2ac30e136f65e07d36f812bf69f886767fa71588d548d90c47c442c0503fdc775b5f61826e60672d9d54
-EBUILD pspg-0.8.0.ebuild 389 BLAKE2B 965a10bfaeb36e9e5436d3870a109a71a763310e8ba2b1f2e2027c33def5af549b7c3d4a1ea3204bd174fdedd84ce9b57739a7f0a33f0e79a1928a3552c3532a SHA512 036103ff39c94b193a5d0dc24ba9d646d658003e843383d825dbbc2eebb71a775bc5c0c20bdeefc8d193fd874a2b9277c110e2387d6de0590561e9b2186e1f47
+DIST pspg-0.9.2.tar.gz 855891 BLAKE2B 0e0a992e5885ca4b2e058d19df2d9c7eac862e1a45e8d80f31df33ab2f3c02616c67cc528af6a52225db938a0c1f27352e13c7dfd01b15bda908bbf3ee9ef128 SHA512 8ad31a5e744db96bec7cfea7d128aa4ac3b44ab51c3dd1d0661178c1d139571a955143a3ccfe6556ce2a215ec193a45224720794da5d2af1e93beb2fa713aea4
+EBUILD pspg-0.8.0.ebuild 388 BLAKE2B 17032d0dadfe6fc68d7df37ad154e6c783ee9e41f336f3a4e9800081ea5e2f8bb7dc7b31ef8958e7007e8eb3dc60d113bfabe956157e3143756424789d92e7e4 SHA512 98a5917e78c393fd1cb81c5b1fa81e91038f3307ce668102656813834e085d0321cf14ac7dd91fbf6999a344894e6b7581ad7a0b507cafa607a3dedc28a8b29d
 EBUILD pspg-0.9.0.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
 EBUILD pspg-0.9.1.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
+EBUILD pspg-0.9.2.ebuild 389 BLAKE2B 30ebc1a109cc694a1bcb8f612d36a51570d7df89cd5c55e6142581783e6afb958512c5de4c1bc446828c36acc3c6788da001c98ee0d60a1153ff454b693bf381 SHA512 3c62b0fbaacd4be5248cd7101cc91511f9bb321a0437b65e17848d1ab30338d1de64d674d43feb4c8c33513c8b4215545b3548994167eba20e9860955a2d3e6d
 MISC metadata.xml 298 BLAKE2B 40abb765b052aa2cbbf749c54c686f1c98968cb1af2e93c149bfbfe6244d3c17e827189d7a1da90a566016758bfbed63b16ad0a0328725349748d1b18b2437b1 SHA512 167896d1d92ccb4b171cce16d63405369a9e28b0d01c12b2ed94fcec1f982892e179c007287fc3386e1c00393d6570a2ae9e8efe9420e53a82308426075d5c89
diff --git a/dev-db/pspg/pspg-0.8.0.ebuild b/dev-db/pspg/pspg-0.8.0.ebuild
index 9b90eedb3e06..41c42740c924 100644
--- a/dev-db/pspg/pspg-0.8.0.ebuild
+++ b/dev-db/pspg/pspg-0.8.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="sys-libs/ncurses:*"
diff --git a/dev-db/pspg/pspg-0.9.2.ebuild b/dev-db/pspg/pspg-0.9.2.ebuild
new file mode 100644
index 000000000000..9b1b64baa6d0
--- /dev/null
+++ b/dev-db/pspg/pspg-0.9.2.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="A better pager for psql and mysql"
+HOMEPAGE="https://github.com/okbob/${PN}"
+SRC_URI="https://github.com/okbob/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses:*"
+RDEPEND="${DEPEND}"
diff --git a/dev-db/psqlodbc/Manifest b/dev-db/psqlodbc/Manifest
index 1fbbf10b1e5c..11d0663435e8 100644
--- a/dev-db/psqlodbc/Manifest
+++ b/dev-db/psqlodbc/Manifest
@@ -1,5 +1,5 @@
 DIST psqlodbc-10.00.0000.tar.gz 914115 BLAKE2B 3f1753a43b4707c0cb723df756b3d9a0177452231fd950a7bec4e5fc35bcd03012f64d2e0b64c1f7cdae375d2ff9211272537c6a76e044fcb3ac277752dff9a5 SHA512 95898b0030778f2f002b0820180de7261387cd7161231a000523ab84f3aa106436a4e6598b40936ab313a5cf578657548f833f58791eba50160c40be4ef3d275
 DIST psqlodbc-10.01.0000.tar.gz 915109 BLAKE2B a09de8218dbfbacf7972fc02c02863891ed65d19b86217a646aa0176ad7a8b962da83bb5036ad11b819a583409e4d1f3ce257a0457838000bc9cc060753c67b3 SHA512 1c5b9732a9c7e7bff0fd0a04cc7f0b45db9150486a2c3a8a96d85fb55e9296a80f12ee652cfb7ff54700e7dfc10accf9e5420b7ca798df31be51f997bbda88aa
-EBUILD psqlodbc-10.00.0000.ebuild 684 BLAKE2B 041e34ef73f41f34b75bdc4dc8227b9e21b39388ccd5d3506129a7d880d90b7b595afab17756e4783749ac99863fee7416f597e3871a4600c497e5fd50de2fa5 SHA512 62e2bde253fe3718b48a8e62eabc7d634568c2047e750f98addfd6c297cde3395a460d69b97e64551aa89e8c0008bb39b10bec8f224ec38e587bb1aea4c743b8
+EBUILD psqlodbc-10.00.0000.ebuild 683 BLAKE2B b1b6cfed09a623b54cc90f9263cef4d00a5b33774b10b71244a9ea24409f63652a3dfae75ce74fb88598df448b79378a701cf955d146f0445f1d5520b3e0c4e2 SHA512 06690e24fba494ab0b113a21e4e63304e75afef392e6fe7a6396e43359ee924821fdbedd23d05ec303069ddf432fdcc58880bd9433aa5035f01c66077155ba60
 EBUILD psqlodbc-10.01.0000.ebuild 684 BLAKE2B 07f0532b350973ec74283caea9f698980e90bb3448d7611805b2847c2c44b1ac13fba5beb7fc833bf04d7f042956fbfd8ac69a147c7c3e64146ab9ffce46a282 SHA512 2ea7c9c760d05f9e4f981d7ee410bc1e668994ed4971a421a8c3059b2f8ab741c3ecbc905d08861d5f66e09d4fb0f39c6851030e72eaec36c3d631fa09d9fb95
 MISC metadata.xml 366 BLAKE2B 9ec9629e72aec8407fc260e061f7bfe22f4ed13c6a4a99ddfffbd16eeac41cc09bcbe10045f6e4cba92d7ced6a874b09b7a7614aedd7cd45afa6e03e096f869e SHA512 a6aa6cbb188fa2ed889ecb69c60b77d33c52ee69a5e9b3c20d8faf9bd9616d33f592c85bded3351fb099b6424e2f7728ee11fb1114121604ceacd9e7e0a13f7b
diff --git a/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild b/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild
index 0db49481b159..f85303f96164 100644
--- a/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild
+++ b/dev-db/psqlodbc/psqlodbc-10.00.0000.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="http://www.postgresql.org/"
 SRC_URI="mirror://postgresql/odbc/versions/src/${P}.tar.gz"
 SLOT="0"
 LICENSE="LGPL-2"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="doc iodbc ssl threads"
 
 DEPEND="dev-db/postgresql:*[ssl?]
diff --git a/dev-db/sqlite/Manifest b/dev-db/sqlite/Manifest
index 83574766c5ad..49916ec1b4d1 100644
--- a/dev-db/sqlite/Manifest
+++ b/dev-db/sqlite/Manifest
@@ -19,6 +19,6 @@ DIST sqlite-src-3200100.zip 10575637 BLAKE2B e45bad50d728e749c258546dd75a9d647ca
 DIST sqlite-src-3210000.zip 10577695 BLAKE2B 21f110d4cdda95864a39b9b9b65985d29e1409ed38a9bda692d33dde845c115476cd77dc3b9cd1b7359ff383dc3050cbf0437b113ea128392aef50dd3b778d46 SHA512 3a054422da80d750fd5ab297f9d2728f4e7b55fa790a72d55da8c381835571992d56b349e50d4680b04c9e2e44d6fa83009c2df3ffa045f43ff9059bb8736894
 EBUILD sqlite-3.19.3.ebuild 7627 BLAKE2B 4f3594d70cb165202bb07f9796d184999a65ba675921435b248c7c93103402601510246b0ceac250128fe50f555cfce4e77afb868d96403991d872f3ff2a8763 SHA512 9b689a4fd1897c8ebdb4c726c7377dbc3a53445539d93d443e208ccf007f0085b7179f8821a2eb0b15bb4591b5dd00747dc54fb0a1971bab249b905f49e2b31f
 EBUILD sqlite-3.20.0.ebuild 7632 BLAKE2B e3878c30f7c1ae5d80be12aa59d2a76efd7fd1b25553495b687016fe060223011a7882ac7b018fc5ab87b89746b10844ba3d92fa4677b63e3365c7046b77ba8e SHA512 0429db119f90a2292eb5ade11f55acee08a68be38bd37e4455e686e5431d1d04475f860fa459d4746e7404123869ebf2ec75fb956d57cad06b49037f25ab8eed
-EBUILD sqlite-3.20.1-r1.ebuild 8088 BLAKE2B 1adae68ebe8d19759edbc0ad114d59cd5b19f52c4afc71f4f854fa6ac06faa143c5e2dce09ce3061e3aa6f2032d008773f28d7575288db29949205e3af1f3006 SHA512 2945a24e8d8bd2d0c3c79ef21a5a1a6cb10a2319c1771ea4329edae59291acf7079dec17b10d9c1b092279f64ed44104ee0b2811e904468309f40af26814e190
+EBUILD sqlite-3.20.1-r1.ebuild 8084 BLAKE2B a3b39bdca770597dc3eb540788e832e7665bc05712d5835a749d5bb8c406a1df083a3f99dfc26192f6148a0ec6f209edbf1b7ca0105eeb343ea4391cfb86e9dd SHA512 b6bf063b4d0ffa604f82ec2f07d31279217373f356785adc2e103f3cd54b4b39cf39197d4e09107b53212d52f3f9cc6c3f95cba886216804954bdfb32b36fe50
 EBUILD sqlite-3.21.0.ebuild 8470 BLAKE2B 62d2932eca2597f08a81279f4fd49f3c602ed59a5fe898b5398edf29a00621fb72fbfbf6458dd8d2525ac2bf3435bc5cb411fe4bb21c4a1a83bf608ce93edff3 SHA512 a240c8b818c0b55b57f5ba3498f1f3938efaa6ba773cce310dc1c18d3256f48bb3cd1ad3b7ba124d5d1b245b61955e523f33ed460c496612d84c4783931762c0
 MISC metadata.xml 745 BLAKE2B 967f5a809e007354fac9d750f068aaf552aac8503f72d20c57dfd0f85dbdbf620209bbd9646cb2b79cfc5f2a40917422c4925784d54220f61132d70ddd414d53 SHA512 06ed7007e3ded9f29fadc70c583e9795a8ab5c27578159bb060b39c0cf7de6b4bca06ff0ceeab6710c50db96a44c976c52af2352ee7928211a46d5eca071b849
diff --git a/dev-db/sqlite/sqlite-3.20.1-r1.ebuild b/dev-db/sqlite/sqlite-3.20.1-r1.ebuild
index 1b773f5bbd2f..9fc8af5cc324 100644
--- a/dev-db/sqlite/sqlite-3.20.1-r1.ebuild
+++ b/dev-db/sqlite/sqlite-3.20.1-r1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="doc? ( https://sqlite.org/2017/${PN}-doc-${DOC_PV}.zip )
 
 LICENSE="public-domain"
 SLOT="3"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc icu +readline secure-delete static-libs tcl test tools"
 
 RDEPEND="icu? ( dev-libs/icu:0=[${MULTILIB_USEDEP}] )
diff --git a/dev-db/unixODBC/Manifest b/dev-db/unixODBC/Manifest
index 8c18568feb6e..8ba58cd102b2 100644
--- a/dev-db/unixODBC/Manifest
+++ b/dev-db/unixODBC/Manifest
@@ -1,6 +1,7 @@
 DIST unixODBC-2.3.2.tar.gz 1849173 BLAKE2B b16f6fb122036c8307b8e140f4987544f29ab7e78fe90005db3387d0aa64e6a52c616fe97c36ef24c71fc2a78712d3346bc8b38065ce59bf3c8ce9aefe43f44a SHA512 31d705bf3dcaff6707d5680235b34e4d265a084b1de9e1b2ed3bbee1e1dfefdb4437fe3e1736b84e446d1927ec7622296d9e9b129052cb35f4b63b0bd79ccd13
 DIST unixODBC-2.3.4.tar.gz 1830660 BLAKE2B 19b3b932e66ab2fea5645d9723592d881d86203fcc93a1a34bdc9d24fbb7fa606a0389b37988606ac60da71f378327380a32d4687dba16e784c9cdf0fd9b5fdb SHA512 34799777c95539905d4bbe60ad2b83631a31a68483b6be96dba25f80fa2fff4624ba170078097c942f2206873776d179d7d02a340598c4627f8723eb6f083a26
+DIST unixODBC-2.3.5.tar.gz 1633390 BLAKE2B f7c70740471b0c6ff298f2377a3895efbf160764adc4f607dfb65de2873ea3a39a2852399feaca50fc389875e20a10b3cd0389ba9e9f02d0548312d8063f5af5 SHA512 94b5ebb887571f4fa801ae4305cd6cb4eb0d03682fac1eb0422cdd13b046b077e60bff8286c578b0b5e291cfbc0bc8695495e39c3713858d2eeb7b38459397d5
 EBUILD unixODBC-2.3.2-r1.ebuild 1639 BLAKE2B 3b3f31abe25597d857d7d55c95b704d391f8eff23b122a6f9e5b059f5c79cb73cdcee62f45dc8f89ee95c2c8fc4663adc80f0962094acc2ea445c91318c136e3 SHA512 20437b1f5e7786457fa65c301466cbb8ff0403213e9c72612d1f1f30f7716b2c4215cf88d420f05b3c7f40ccd966a39a7c191402d816a622856c05094565473c
 EBUILD unixODBC-2.3.4-r1.ebuild 1667 BLAKE2B c81176f8e0d13fbdbfd5623baf8b61e3dfa32e26652afd62a1b0831c57fb4a3238742a45ace747b3d65a265e8269840104d4b95a1c99b450e18c26971ea802e6 SHA512 287b75081ca3d83fae7014d59c5afd5aad806662a23bf4de8bf198f263dea5c7f93798e6a75947af2a3e10c832c2180fe13741136b6fcf2583a5f4e132ab509e
-EBUILD unixODBC-2.3.4.ebuild 1729 BLAKE2B f37b5a2612f2f6b229c6ca86d8a0e67a1ce4cdb120f14ef2843c849f034849f743306f6fa9ea495b6f68dcf3b7e7d95ddf3c72c359cd0173751c04ff051658d5 SHA512 a5b810d7acc4bd3a53d4d9584fc3bbc6de7c59904a5d7e3f21816d7e045ad8910fdbeb8b670bcd3d9e3cb1cc3a49be84f49dbcc389500963df1422f9ae08a071
+EBUILD unixODBC-2.3.5.ebuild 1773 BLAKE2B db134377e56f2fb30be44ffc5253bd2532825b9a73dd7a3be06ae706f339a6734a39398776f3616249146abf15eb9275f8065500cf2f14c2ca0e72a8b485ad98 SHA512 ebe2585e62f101da036faf9b1f6036e878cf06fc22112ef1b41e286fdef690edb00b5a9579003143a54b1466102421317fd47abde3b6cbfceabb383817ae18cd
 MISC metadata.xml 366 BLAKE2B 9832224237ae18987939d9c0f657c6666114a5ce41af09a3a5a423d666ec70d9c5cd4fec1d82134b68e2e96b1a3e390977a0cd95001d325465d75b2b9b311d64 SHA512 e47157f178b585272b5c11682cef0c7b7dec227ded178d3427e91632f754db869deb72a6c1b258dfc90f6760028d3045d1e703874ae24111f8deb9db629b8c29
diff --git a/dev-db/unixODBC/unixODBC-2.3.4.ebuild b/dev-db/unixODBC/unixODBC-2.3.4.ebuild
deleted file mode 100644
index 50a05677ae7a..000000000000
--- a/dev-db/unixODBC/unixODBC-2.3.4.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
-inherit libtool multilib-minimal
-
-DESCRIPTION="A complete ODBC driver manager"
-HOMEPAGE="http://www.unixodbc.org/"
-SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+minimal odbcmanual static-libs unicode"
-
-RDEPEND="|| (
-		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
-		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
-	)
-	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
-	>=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
-	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
-	abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )"
-DEPEND="${RDEPEND}
-	sys-devel/flex"
-
-DOCS="AUTHORS ChangeLog NEWS README"
-MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
-MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
-
-multilib_src_configure() {
-	# --enable-driver-conf is --enable-driverc as per configure.in
-	myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/${PN}
-		--enable-iconv
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable !minimal drivers)
-		$(use_enable !minimal driverc)
-		$(use_with unicode iconv-char-enc UTF8)
-		$(use_with unicode iconv-ucode-enc UTF16LE)
-	)
-	ECONF_SOURCE="${S}" \
-	econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	use prefix && dodoc README*
-	use odbcmanual && dohtml -a css,gif,html,sql,vsd -r doc/*
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
-}
diff --git a/dev-db/unixODBC/unixODBC-2.3.5.ebuild b/dev-db/unixODBC/unixODBC-2.3.5.ebuild
new file mode 100644
index 000000000000..eb5e0216e655
--- /dev/null
+++ b/dev-db/unixODBC/unixODBC-2.3.5.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit libtool ltprune multilib-minimal
+
+DESCRIPTION="A complete ODBC driver manager"
+HOMEPAGE="http://www.unixodbc.org/"
+SRC_URI="ftp://ftp.unixodbc.org/pub/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2 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="+minimal odbcmanual static-libs unicode"
+
+RDEPEND="
+	|| (
+		dev-libs/libltdl:0[${MULTILIB_USEDEP}]
+		>=sys-devel/libtool-2.4.2-r1[${MULTILIB_USEDEP}]
+	)
+	>=sys-libs/readline-6.2_p5-r1:0=[${MULTILIB_USEDEP}]
+	>=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}]
+	>=virtual/libiconv-0-r1[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	sys-devel/flex
+"
+
+MULTILIB_CHOST_TOOLS=( /usr/bin/odbc_config )
+MULTILIB_WRAPPED_HEADERS=( /usr/include/unixodbc_conf.h )
+
+multilib_src_configure() {
+	# --enable-driver-conf is --enable-driverc as per configure.in
+	myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc/${PN}
+		--disable-static
+		--enable-iconv
+		--enable-shared
+		$(use_enable static-libs static)
+		$(use_enable !minimal drivers)
+		$(use_enable !minimal driverc)
+		$(use_with unicode iconv-char-enc UTF8)
+		$(use_with unicode iconv-ucode-enc UTF16LE)
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	einstalldocs
+
+	if use odbcmanual ; then
+		# We could simply run "make install-html" if we'd not had 
+		# out-of-source builds here.
+		docinto html
+		dodoc -r doc/.
+		find "${ED%/}/usr/share/doc/${PF}/html" -name "Makefile*" -delete || die
+	fi
+
+	use prefix && dodoc README*
+	prune_libtool_files
+}
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index b9de3a11174d..2027965cadfa 100644
--- a/dev-games/Manifest.gz
+++ b/dev-games/Manifest.gz
diff --git a/dev-games/vamos/Manifest b/dev-games/vamos/Manifest
index c0d47950aa54..1af0067e4bbb 100644
--- a/dev-games/vamos/Manifest
+++ b/dev-games/vamos/Manifest
@@ -5,5 +5,5 @@ AUX vamos-0.8.2-fix-c++14.patch 554 BLAKE2B 4b45082dee29de037d9e6bfffb025b0f3cc9
 DIST vamos-0.7.1.tar.gz 1681074 BLAKE2B 6d7c132fc65d1ba59c12d98699e82bd4d6029c0f6bb88e2c661d14ab602dc3aa0fe15b30cb8cc70d5b4c7e81f9d5a27c96b53f450098fb164806618d0ed7d35b SHA512 7560911e12636a4c530b6eeedc942be7121e39312d58f736a72d3b7fa2f632c962e9ccf714709f8f2e4335fa6d718f6870e7ba9e0c84f55c572e7915b4bf03e2
 DIST vamos-0.8.2.tar.gz 2148278 BLAKE2B a8afa661295bd646c0ee1d826dcee452f9788ecea7364116b0026f4950286280ef57d1b0179cb51b5f54c2788ca66f16b97bbc07142e0c92468638ebfbd81975 SHA512 bbc5b71790983b3db60c633f21b15b86c232a560f05ddc407c805d5bc39cf7a90bf556b9c59b4683a187961be755b1578a0a02b8b42599c6a634bd0f5936e880
 EBUILD vamos-0.7.1.ebuild 887 BLAKE2B 36d4484d093b3b7dc8c378d3282ff5d47f2067fcf891a4db51a07c4aa5de8509f6243295374c0aa9ff85ab0938d1db5217754750dac335f4fadb4a9bb4de0249 SHA512 785311b6f0e3fecfbca8b0151fbb8ca2981c880d8eb2776deea9114faa4dda9acffe21eb87ab9225296c9c82ab3359e732a4f9e44e09c4c6efb42dbab8328fda
-EBUILD vamos-0.8.2.ebuild 1166 BLAKE2B 9e23949733baa65a884533df5c5604fa2f9df485ffd43af946755f7b5e775dc93065ca6306d7ce144454a56dee35f9dc6c2fb3d72dcb1e840cb72abfc574901c SHA512 260c7eb011f3b7f66c800930592077ef7f91e9e7c9267825307d3075333ecfde78d334f98f922d745e9d4660e0c06f90c7337671dba7798aaf471d73cc935097
+EBUILD vamos-0.8.2.ebuild 1165 BLAKE2B c314032cf5cb0d7d6e1bc0bfff5dd0ed4ba3d9a270f5f15e51dfaa7a9a97cd801dacbafbea29655af6caaba9d17db36a10dea9de52ed8b5d172bece4ab5e8403 SHA512 8c69a29b33e0f0937b18978905b713d91540aa270a06df19eee7d27eabcc558bdde7e423a321ec5ba2ec43bc4018ae48ec0a06cdd94a6b3e10fcc04fee3e7565
 MISC metadata.xml 328 BLAKE2B 2c3269c4159fb3bb89b8e5c119844f960236e72bbd22915a44b901293d040f8c3e65d28e0a84e0075ed870bfb7c52d919c9aebd3456e93c7ed9ed2e2f91d01f6 SHA512 698c72452fe860f88cff1cb1de6a46902e02fe685081693c2dacbd5c9843fe717128cb9a706849adf19359bba1f809863fe62d569e776649bf5f8b5190663cb4
diff --git a/dev-games/vamos/vamos-0.8.2.ebuild b/dev-games/vamos/vamos-0.8.2.ebuild
index 60687c852c86..aca3461fb149 100644
--- a/dev-games/vamos/vamos-0.8.2.ebuild
+++ b/dev-games/vamos/vamos-0.8.2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/vamos/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 6becc34db457..efb202618ffa 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/moarvm/Manifest b/dev-lang/moarvm/Manifest
index d2ba230b0b85..cec284b25af4 100644
--- a/dev-lang/moarvm/Manifest
+++ b/dev-lang/moarvm/Manifest
@@ -3,10 +3,12 @@ DIST MoarVM-2017.08.1.tar.gz 4440494 BLAKE2B eb9406a80a636308cf912d20a7cfe72db13
 DIST MoarVM-2017.09.1.tar.gz 4579930 BLAKE2B 5c09f468338b23208ae8d5a331b2b4dbaee72d991446fc75a03bdc848096509c3e32cbac0dd868ca760ae376a70bfb557d890efb1bb44e55fe7d6396eb29ebd6 SHA512 c7b675a3894a2b58d15eefb52519b6b7e4519561525b6095327ab7621e29c3ea3c077c625bd48123cd514b4e32d2e7cbdb3861319d3e32de134d7f8475540fee
 DIST MoarVM-2017.10.tar.gz 4789334 BLAKE2B 842ee5040d64b8398a24436c34f673b7b43cfa7cdfb809d05705742e7c20ea9fa7426c0183ceaf0c3e6f8a06d5262bc632160d7bfbd9143492f1ea46e1cb6381 SHA512 f79e60b22615cbbb5b16d4b810c864f7cbc2c36e73769b132b84edb03e0d975da6f7db153492a3101c86946d728a21af6225d61e752e36557c2c6f1bcd91859c
 DIST MoarVM-2017.11.tar.gz 4797567 BLAKE2B a8178c4b639b8e6876fe2d904ebb8a3cd34f5f04d5f6092ce8fa65383c88f4af7ae72ded46981b556573439cdc32131fe569e9bd3c163f316574c1ac037dc583 SHA512 93666c66835701b4a7bb25478c1e5a8019362ad0de387f58eb921fa35230566149906386ae1f8280a163d94a86544d4441029812ad177b62a21d64b2638e01d3
+DIST MoarVM-2017.12.1.tar.gz 4761355 BLAKE2B 91426378e5a651c56bd6871a044733e3efb587a3c743385d07f3ff5f4de4682780b69dca130d149deef3192ea16d69a4665f57e5620bbee237fb70a6d3e9433e SHA512 aaa57fdf5b65bf0148e4409d044ff28b0755bba7a663046f99f4be55f5a0f466e76a883445da39e2c79cc7f76b27455fe775686a19204866bc8c1569008e2c37
 EBUILD moarvm-2017.07.ebuild 1475 BLAKE2B b9ca271b78afab4ebc5e5f05ed13e3361cf96267191dbd8e80ba4c6923d945a1f136376439b890d60ee8345caa782c0baed9fee94a80e15302c258702c2eba63 SHA512 76b99f341f78085656bc196d97ca66ff170b590f6e7e06fab95ef02244d393b6083a217463bffdf389682b823ca7af684b9bba2fcabfd1632901639beab8763f
 EBUILD moarvm-2017.08.1.ebuild 1426 BLAKE2B 314a707b0a9e3a6498a9ceb2311c5a87134b3edfc4ace686279d57bdf9dbeb151b4bfe2dd7a9971409c21ba43cab4ca1175c6ebe207e1cad966cee1792354fa2 SHA512 cf0f2f323900463ad479168d743d0a3a2a71615fad66cee346fb8d2db5246cdcb0db1397cbdf5abfdec6677bdc032b0842c2dec9f144cf36e8619b0232644fd9
 EBUILD moarvm-2017.09.1.ebuild 1364 BLAKE2B d74a03ae2d73153d175a24c4c356e7ae51ff63c83eea59cb1e71f3c089d1b4c1185f8abc7d474e449dd28aeeedcb8e9cbf382ef7989b3c2eabcc84b10ed280de SHA512 87012068940d3d746c3dfbe42bcda9c32d61ead0016bd0edcbe14aa1ae58e5f7365ec5a5690e4f2a5863635e3566eed986b2aa751ac6c8e3434b629df92cd044
 EBUILD moarvm-2017.10.ebuild 1364 BLAKE2B d74a03ae2d73153d175a24c4c356e7ae51ff63c83eea59cb1e71f3c089d1b4c1185f8abc7d474e449dd28aeeedcb8e9cbf382ef7989b3c2eabcc84b10ed280de SHA512 87012068940d3d746c3dfbe42bcda9c32d61ead0016bd0edcbe14aa1ae58e5f7365ec5a5690e4f2a5863635e3566eed986b2aa751ac6c8e3434b629df92cd044
 EBUILD moarvm-2017.11.ebuild 1364 BLAKE2B d74a03ae2d73153d175a24c4c356e7ae51ff63c83eea59cb1e71f3c089d1b4c1185f8abc7d474e449dd28aeeedcb8e9cbf382ef7989b3c2eabcc84b10ed280de SHA512 87012068940d3d746c3dfbe42bcda9c32d61ead0016bd0edcbe14aa1ae58e5f7365ec5a5690e4f2a5863635e3566eed986b2aa751ac6c8e3434b629df92cd044
+EBUILD moarvm-2017.12.1.ebuild 1364 BLAKE2B 1b219150b6093edc5452ff2f7294af49fb4378c305115c882444768c3cdbfb82de7b2a2151fc88f41641ee0094ea5158d78776b271d51b40a37978b1ee2c11db SHA512 f8ef6139b8940e3d10b378df80331088866723343f094b7b9772fb45ab203d2dc4499974c614269790831057c953a9d1804dcb9c160d740c68d6a14f316f7795
 EBUILD moarvm-9999.ebuild 1475 BLAKE2B b9ca271b78afab4ebc5e5f05ed13e3361cf96267191dbd8e80ba4c6923d945a1f136376439b890d60ee8345caa782c0baed9fee94a80e15302c258702c2eba63 SHA512 76b99f341f78085656bc196d97ca66ff170b590f6e7e06fab95ef02244d393b6083a217463bffdf389682b823ca7af684b9bba2fcabfd1632901639beab8763f
 MISC metadata.xml 1033 BLAKE2B ab51966874191d7f6d2638766477e3688d68cd91c40231d22232801186d142b693d3668fe4a08baa41d7f7ea6783cc7a47fd1ead7610249f80d8054740fa0fd8 SHA512 a0b21dacbdbf3d269e575ca18127e9d512bf2f23f71dcc8ba8b1e4f54c1274a5e37c1e3c609e78e11fdab7100523cc11420e20d088f531794c7f3f96a42432ac
diff --git a/dev-lang/moarvm/moarvm-2017.12.1.ebuild b/dev-lang/moarvm/moarvm-2017.12.1.ebuild
new file mode 100644
index 000000000000..405febb3308d
--- /dev/null
+++ b/dev-lang/moarvm/moarvm-2017.12.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic
+
+MY_PN="MoarVM"
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/${MY_PN}/${MY_PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+	S="${WORKDIR}/${P}"
+else
+	SRC_URI="http://moarvm.org/releases/${MY_PN}-${PV}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/${MY_PN}-${PV}"
+fi
+
+DESCRIPTION="A 6model-based VM for NQP and Rakudo Perl 6"
+HOMEPAGE="http://moarvm.org"
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="asan clang debug doc +jit static-libs optimize ubsan"
+
+RDEPEND="dev-libs/libatomic_ops
+		dev-libs/libuv
+		dev-lang/lua:0[deprecated]
+		dev-lua/LuaBitOp
+		virtual/libffi"
+DEPEND="${RDEPEND}
+	clang? ( >=sys-devel/clang-3.1 )
+	dev-lang/perl"
+
+DOCS=( CREDITS README.markdown )
+
+# Tests are conducted via nqp
+RESTRICT=test
+
+src_configure() {
+	use doc && DOCS+=( docs/* )
+	local myconfigargs=(
+		"--prefix=/usr"
+		"--has-libuv"
+		"--has-libatomic_ops"
+		"--has-libffi"
+		"--libdir=$(get_libdir)"
+		"--compiler=$(usex clang clang gcc)"
+		"$(usex asan        --asan)"
+		"$(usex debug       --debug            --no-debug)"
+		"$(usex optimize    --optimize=        --no-optimize)"
+		"$(usex static-libs --static)"
+		"$(usex ubsan       --ubsan)"
+	)
+	use optimize && filter-flags '-O*'
+
+	perl Configure.pl "${myconfigargs[@]}" || die
+}
diff --git a/dev-lang/nqp/Manifest b/dev-lang/nqp/Manifest
index d5bc1ccc5493..5ad3deb55edd 100644
--- a/dev-lang/nqp/Manifest
+++ b/dev-lang/nqp/Manifest
@@ -3,10 +3,12 @@ DIST nqp-2017.08.tar.gz 3718841 BLAKE2B 85e9e6450201af32dd89cfff4d85ecfd9fbbf0e8
 DIST nqp-2017.09.tar.gz 3724208 BLAKE2B bcb1c8eb18d09945949100e077e753e3a4dc48e4e3e2f26fbe12f1fd69d079daa0c62ffbe8957b1539d3d81beadb8b2f1216b3b57def458f786cde8882795421 SHA512 a932f6d5ea24ad1857339cd5d7314f75b5bb08628df63e180c3675e0e5a8d04fe12add1cf2d04c55e0454bc4c0e5e59cfd57f793c242dfa2459f06ae8a2097cb
 DIST nqp-2017.10.tar.gz 3768260 BLAKE2B 3058235d81948383429f7fa8ec5a1ceca098192051be176b82a17213da9eba0ee17995524ec267c945baee4f69b3afe7f0ca3ac74af6eec8b1fbb5872d467530 SHA512 fd43e1f7d768de58aae98afc031ad5fa5d28e767bac4f4acf913b356c107035c98c6551ad34f17f7a7a76269f96905882e348e5f821d7edf2cf7ffbee50798bc
 DIST nqp-2017.11.tar.gz 3771211 BLAKE2B 816c521b0722479d385fc00511fc1f6b5472c03ad21a58f4dca9b61f5675b240d9aad2f1bb0e50de9c76d9da396f21d92adcdbad113aba5c112b26d427d2053a SHA512 913b287e7a6a36ee618c10958fa5d521c8e35202784bfde4353ae0704e5af5915249cfcb36fe3de96fafe890eaa571545d6142ce99f07eadb1fd34929ee95524
+DIST nqp-2017.12.tar.gz 3795477 BLAKE2B cf50ec801ac2d7e30588a2c7d1109d5d360deab4e51fe329c78a681cc5cfb418532faed82aa4eeb8eeded409913baacb9204273b305831f7d50fb587c08fb5cc SHA512 0255747ab1719c5a1b084cdb47d2c3fc08bc6ac2f081e67297c7b72e723ce7c3ecf3c51d096cb9e0d370e8907ea8b233c03a3d484dd16d1feef5db3cb1138137
 EBUILD nqp-2017.07.ebuild 3607 BLAKE2B 500ec67ee59bf28c46e41c1220afc99a7ecf15ac638abec21d79b6837556fa2f145b975e425b322af0561853c65c319054f202c9aae856fdebed0d48f567d8b2 SHA512 a2e2a0e191fed3ebd86c256e70c67cdb6cf037120e7b2395beaba0db55dac14f7bf830002abf32cdc71403f243f71deb345d2b921ce61302a5151e89477afcfe
 EBUILD nqp-2017.08.ebuild 3611 BLAKE2B 8ad194ebd4d744affa19df84d800637d5a486cd8b9f87be496d1328d80a62ccf82f78a5567775e3e6a7eeeef9f8abbc16f5143c5ae49eff12988b3a40d727568 SHA512 42f9651aa22042a571e77c13c9e5b46402cc4ff7cc71579daca171cecee7c7250eab476825693a5921e1edd66f44987b9bc096e046e570037ab2144fceab01b3
 EBUILD nqp-2017.09.ebuild 3611 BLAKE2B acd8500829423373c89bfafa1389f5559494d2fa6abfdffd0881924cbda52364c4dbbdf742a1b591512fa689e799e2b360d1e1725562020f1e4e2026b376a750 SHA512 8271504114f3dca61e290006077957063d624b8a967c0c67a8b32fb28e217e5ccc895f1d63d4a95fc10e491962b86fd70ba7a420643a988788da2f30bb032edc
 EBUILD nqp-2017.10.ebuild 3607 BLAKE2B 500ec67ee59bf28c46e41c1220afc99a7ecf15ac638abec21d79b6837556fa2f145b975e425b322af0561853c65c319054f202c9aae856fdebed0d48f567d8b2 SHA512 a2e2a0e191fed3ebd86c256e70c67cdb6cf037120e7b2395beaba0db55dac14f7bf830002abf32cdc71403f243f71deb345d2b921ce61302a5151e89477afcfe
 EBUILD nqp-2017.11.ebuild 3607 BLAKE2B 500ec67ee59bf28c46e41c1220afc99a7ecf15ac638abec21d79b6837556fa2f145b975e425b322af0561853c65c319054f202c9aae856fdebed0d48f567d8b2 SHA512 a2e2a0e191fed3ebd86c256e70c67cdb6cf037120e7b2395beaba0db55dac14f7bf830002abf32cdc71403f243f71deb345d2b921ce61302a5151e89477afcfe
+EBUILD nqp-2017.12.ebuild 3609 BLAKE2B 795b4e2004593fff7df1cd1348862e4bed63110c84ffc95d055d0940b60330ba6f421a46681c885e5d4802e512f55c9a555d46ef73ad6448fe327514857fbc77 SHA512 6246e11f2c71d5f438313f3594f8659ea6d88631ee6e3d03079a5b985be3630465dcd46aabec11c7a49f22a77f1148dde4cf59352c6703f7036942bb55877e69
 EBUILD nqp-9999.ebuild 3607 BLAKE2B f4c87264d989c591b3ae834e455b7bb84d14bffdf667a553ae5709d4a2340eb9450331f6077956460c94095f211dd7af33431e6c6fc8bec7f19bec7555c86e4e SHA512 c0be49582eb04c3a80b4a9191ee121018adb177fbd379083231c9157eb8fb051d447f0e1c5a05214f40d52c30fabedb7d2a72dfca7625239822f1a6119dba68e
 MISC metadata.xml 747 BLAKE2B b635e6983ae4f77695acc0c8770d252d5d60dbb2aa8650002e68e768051f67251177ad760573c4c842b6ab297ee1ac68d1c01151dc599873e6a3a751b8d25a03 SHA512 b86ede9a0dc7587f24308ceb470666aeabf7cd96f2da4afe05195a2b74c1836826ddf269a6ed00f0bfb190c9b241a4d500940afa9060913b8f724989b20a68e2
diff --git a/dev-lang/nqp/nqp-2017.12.ebuild b/dev-lang/nqp/nqp-2017.12.ebuild
new file mode 100644
index 000000000000..2770ae13aec4
--- /dev/null
+++ b/dev-lang/nqp/nqp-2017.12.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-opt-2 multibuild
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/perl6/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/perl6/${PN}/tarball/${PV} -> ${P}.tar.gz"
+	inherit vcs-snapshot
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Not Quite Perl, a Perl 6 bootstrapping compiler"
+HOMEPAGE="http://rakudo.org/"
+
+LICENSE="Artistic-2"
+SLOT="0"
+IUSE="doc clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="java? (
+		dev-java/asm:4
+		dev-java/jline:0
+		dev-java/jna:4
+	)
+	moar? ( ~dev-lang/moarvm-${PV}.1[clang=] )"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.7 )
+	dev-lang/perl"
+
+pkg_pretend() {
+	if has_version dev-lang/rakudo || has_version dev-lang/nqp; then
+		ewarn "NQP is known to fail compilation/installation with Rakudo and/or NQP"
+		ewarn "already being installed. So if it fails, try uninstalling both"
+		ewarn "dev-lang/nqp and dev-lang/rakudo, then do a new installation."
+		ewarn "(see Bug #584394)"
+	fi
+}
+
+java_prepare() {
+	# Don't clean stage0 jars.
+	einfo "Cleaning upstream jars"
+	java-pkg_clean 3rdparty/
+
+	# Don't use jars we just deleted.
+	sed -i -r 's/(:3rdparty[^:]*)+/:${THIRDPARTY_JARS}/g' \
+		src/vm/jvm/runners/nqp-j || die
+}
+
+src_prepare() {
+	MULTIBUILD_VARIANTS=()
+	use moar && MULTIBUILD_VARIANTS+=( moar )
+	use java && MULTIBUILD_VARIANTS+=( jvm )
+
+	multibuild_copy_sources
+
+	# This will pull in conditional java_prepare
+	default
+}
+
+nqp_configure() {
+	pushd "${BUILD_DIR}" > /dev/null || die
+	local myconfargs=(
+		"--backend=${MULTIBUILD_VARIANT}"
+		"--prefix=/usr" )
+
+	perl Configure.pl "${myconfargs[@]}" || die
+	popd || die
+}
+
+nqp_compile() {
+	if [[ "${MULTIBUILD_VARIANT}" = jvm ]]; then
+		emake -j1 \
+			-C "${BUILD_DIR}" \
+			THIRDPARTY_JARS=$(java-pkg_getjars --with-dependencies asm-4,jline,jna-4) \
+			JAVAC="$(java-pkg_get-javac) $(java-pkg_javac-args)"
+	elif [[ "${MULTIBUILD_VARIANT}" = moar ]]; then
+		emake -j1 \
+			-C "${BUILD_DIR}"
+	fi
+}
+
+nqp_test() {
+	emake -j1 \
+		-C "${BUILD_DIR}" \
+		test
+}
+
+nqp_install() {
+	# This is the actual reason we need multibuild.eclass.
+	# We need to distinguish the install procedure for MoarVM and JVM backends.
+	case "${MULTIBUILD_VARIANT}" in
+		moar)
+			emake \
+				DESTDIR="${ED}" \
+				-C "${BUILD_DIR}" \
+				install
+			;;
+		jvm)
+			pushd "${BUILD_DIR}" > /dev/null || die
+			# Set JAVA_PKG_JARDEST early.
+			java-pkg_init_paths_
+
+			# Upstream sets the classpath to this location. Perhaps it's
+			# used to locate the additional libraries?
+			java-pkg_addcp "${JAVA_PKG_JARDEST}"
+
+			insinto "${JAVA_PKG_JARDEST}"
+			local jar
+
+			for jar in *.jar; do
+				if has ${jar} ${PN}.jar ${PN}-runtime.jar; then
+					# jars for NQP itself.
+					java-pkg_dojar ${jar}
+				else
+					# jars used by NQP.
+					doins ${jar}
+				fi
+			done
+
+			# Upstream uses -Xbootclasspath/a, which is faster due to lack
+			# of verification, but gjl isn't flexible enough yet. :(
+			java-pkg_dolauncher ${PN}-j --main ${PN}
+			dosym ${PN}-j /usr/bin/${PN}
+			dobin tools/jvm/eval-client.pl
+			popd > /dev/null || die
+			;;
+		*)
+			die "Unknown MULTIBUILD_VARIANT ${MULTIBUILD_VARIANT}."
+			;;
+	esac
+}
+
+src_configure() {
+	multibuild_foreach_variant nqp_configure
+}
+
+src_compile() {
+	multibuild_foreach_variant nqp_compile
+}
+
+src_test() {
+	multibuild_foreach_variant nqp_test
+}
+
+src_install() {
+	multibuild_foreach_variant nqp_install
+
+	dodoc CREDITS README.pod
+	use doc && dodoc -r docs/*
+}
diff --git a/dev-lang/rakudo/Manifest b/dev-lang/rakudo/Manifest
index bf04565da80e..8d79c7b3d6f6 100644
--- a/dev-lang/rakudo/Manifest
+++ b/dev-lang/rakudo/Manifest
@@ -4,10 +4,12 @@ DIST rakudo-2017.08.tar.gz 2992885 BLAKE2B d0edc01d0950fbcb8d1e3dd61bd4838e6d07a
 DIST rakudo-2017.09.tar.gz 3006759 BLAKE2B 22df3775aed16bf404a2f1bf716c22989c7cd0e22c3000cfccbcde6525ba5a7dd94814be35d6106590d3ccb54c8b2748aeb202c3e372fafba84e4c7dcbc8db6d SHA512 6ae257430436586a519cc411771c5a19c3bf6aefcb5b02cd1751184ccd8f2fe860ce33c53421ff1fd48a598f27532932a1754407fb0f6a1861da0808c5876b9b
 DIST rakudo-2017.10.tar.gz 3049348 BLAKE2B 7e017635a6807d25b0c62c312db5c86199cca1f7d405b7a55b09cfdff922e67b63df66cafd547bc555c4adaf146a8cb2eeb8de5110e844042721f24e4efe9e95 SHA512 f3832a5dcd0048a7d9018c46e8430245b3d6565516d61f4dc57ff06d5dbf38afab7b9a4791a0f88ef4422899418f3ce550e5271cef668ab74804f898c8c5faaa
 DIST rakudo-2017.11.tar.gz 3063336 BLAKE2B 781c2359c93e25e1a0429ea509923b0ca76a6a7a2e7d467ff9fc08eb4cfd915ef37641242db9cf92c725b74938b4555f111f4ccdd2af75b46450767f58517994 SHA512 6cb36938e1d395e5271939fed69fb0e2ebfccbf738a7d2cfef620853dfbc157efad4aa802f3c3fcf5d232c291ae0ab21f5bb65c7a17d8a5857c143e7e8976fc3
+DIST rakudo-2017.12.tar.gz 3076450 BLAKE2B b97fa774a307486d7af830478d031cef64f3d4ae95192c8d99f1247e349ebccc83dfd3e864d3c829722b9388d6c9ca667ef55f42c8df86cba10278ff9affbc23 SHA512 0c7870ea90bc219cc27c4ea6130ef6e46172d0cd8da3d0b49dc8c8585cddc87a004dfa945075254a6bca3005d7bc68f181c79e229084f97e532ad086c512bf44
 EBUILD rakudo-2017.07.ebuild 1616 BLAKE2B 024370e68e2f6a4b2ece691428af8c3e92456dd8b89660cf50e5d5c93551e3a57241860a28c458be9b509f7c8c2119c4cf92040c6ebd7aa2780d780c72d2a737 SHA512 74d525ad581cc02093f6a21123b841a1cd3cfe23f176e40cbcf161e5ceefdc81791fcbbeaab3041380b882a430e5c65cc339a64b6c6d117e726137e61f683e78
 EBUILD rakudo-2017.08.ebuild 1616 BLAKE2B 024370e68e2f6a4b2ece691428af8c3e92456dd8b89660cf50e5d5c93551e3a57241860a28c458be9b509f7c8c2119c4cf92040c6ebd7aa2780d780c72d2a737 SHA512 74d525ad581cc02093f6a21123b841a1cd3cfe23f176e40cbcf161e5ceefdc81791fcbbeaab3041380b882a430e5c65cc339a64b6c6d117e726137e61f683e78
 EBUILD rakudo-2017.09.ebuild 1616 BLAKE2B 024370e68e2f6a4b2ece691428af8c3e92456dd8b89660cf50e5d5c93551e3a57241860a28c458be9b509f7c8c2119c4cf92040c6ebd7aa2780d780c72d2a737 SHA512 74d525ad581cc02093f6a21123b841a1cd3cfe23f176e40cbcf161e5ceefdc81791fcbbeaab3041380b882a430e5c65cc339a64b6c6d117e726137e61f683e78
 EBUILD rakudo-2017.10.ebuild 1616 BLAKE2B 024370e68e2f6a4b2ece691428af8c3e92456dd8b89660cf50e5d5c93551e3a57241860a28c458be9b509f7c8c2119c4cf92040c6ebd7aa2780d780c72d2a737 SHA512 74d525ad581cc02093f6a21123b841a1cd3cfe23f176e40cbcf161e5ceefdc81791fcbbeaab3041380b882a430e5c65cc339a64b6c6d117e726137e61f683e78
 EBUILD rakudo-2017.11.ebuild 1616 BLAKE2B 024370e68e2f6a4b2ece691428af8c3e92456dd8b89660cf50e5d5c93551e3a57241860a28c458be9b509f7c8c2119c4cf92040c6ebd7aa2780d780c72d2a737 SHA512 74d525ad581cc02093f6a21123b841a1cd3cfe23f176e40cbcf161e5ceefdc81791fcbbeaab3041380b882a430e5c65cc339a64b6c6d117e726137e61f683e78
+EBUILD rakudo-2017.12.ebuild 1616 BLAKE2B b83769b34c5694702fafce86c5d78e2ae0a9afc1f4834c33b78500851ff99c83a3b5e72653a2108911a89b9386683948ff813edaa5cf1f7455065370860671b2 SHA512 7226e37e3c2299582065d8b9a06211bc7f69c5b1ee824cdf2cccc843f5be7d76a50aa3e00506f99d01db4d32d0ef617c2ed4ec324eccd3ed3fd1ae9053f0d392
 EBUILD rakudo-9999.ebuild 1714 BLAKE2B e74244497b591e490e774d82492e16c05e61546cc7071a776d7002e22f32608f138456423edab6c7aabde9dd6c84b414c42343c4dcf45725a8ae021b5eb1d5c0 SHA512 06451f51ced45674984aada066a94a268bafdb858172330a041b47196c2caae91af4263cee68171f34a8f89933f59b5517d54c456ff24a2b7e76b61e238bf56d
 MISC metadata.xml 626 BLAKE2B a4703502a1adeec04aa03fabc5b093138866102fc4b21fcca60730671d29b3f1eb48afce5f7bbcbbf31d06d5af557e03f0cf20f9f6fcbacef172d7970ceb5d8d SHA512 8ab071e74418a4782cf11c870bda3dda2656c0e1961e05edcde9776f4ad1eb18a07af9f2dc3fdfd5970f3d51f63bd342956c0afbfb79ccdd7f6e9d30403824b8
diff --git a/dev-lang/rakudo/rakudo-2017.12.ebuild b/dev-lang/rakudo/rakudo-2017.12.ebuild
new file mode 100644
index 000000000000..b442d4008798
--- /dev/null
+++ b/dev-lang/rakudo/rakudo-2017.12.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit java-pkg-opt-2
+
+DESCRIPTION="A compiler for the Perl 6 programming language"
+HOMEPAGE="http://rakudo.org"
+
+if [[ ${PV} == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/rakudo/${PN}.git"
+	inherit git-r3
+	KEYWORDS=""
+else
+	SRC_URI="https://rakudo.perl6.org/downloads/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Artistic-2"
+SLOT="0"
+# TODO: add USE="javascript" once that's usable in nqp
+IUSE="clang java +moar test"
+REQUIRED_USE="|| ( java moar )"
+
+CDEPEND="~dev-lang/nqp-${PV}:${SLOT}=[java?,moar?,clang=]"
+RDEPEND="${CDEPEND}
+	java? ( >=virtual/jre-1.7 )"
+DEPEND="${CDEPEND}
+	clang? ( sys-devel/clang )
+	java? ( >=virtual/jdk-1.7 )
+	>=dev-lang/perl-5.10"
+
+pkg_pretend() {
+	if has_version dev-lang/rakudo; then
+		ewarn "Rakudo is known to fail compilation/installation with Rakudo"
+		ewarn "already being installed. So if it fails, try unmerging dev-lang/rakudo,"
+		ewarn "then do a new installation."
+		ewarn "(see Bug #584394)"
+	fi
+}
+
+src_configure() {
+	local backends
+	use moar && backends+="moar,"
+	use java && backends+="jvm"
+
+	local myargs=(
+		"--prefix=/usr"
+		"--sysroot=/"
+		"--sdkroot=/"
+		"--backends=${backends}"
+	)
+
+	perl Configure.pl "${myargs[@]}" || die
+
+	if use java; then
+		NQP=$(java-pkg_getjars --with-dependencies nqp)
+	fi
+}
+
+src_compile() {
+	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" NQP_JARS="${NQP}" BLD_NQP_JARS="${NQP}" install
+}
+
+src_test() {
+	RAKUDO_PRECOMP_PREFIX=$(mktemp -d) default
+}
diff --git a/dev-lang/vala/Manifest b/dev-lang/vala/Manifest
index 1f32e55a756b..7cca37fe5de2 100644
--- a/dev-lang/vala/Manifest
+++ b/dev-lang/vala/Manifest
@@ -3,5 +3,5 @@ DIST vala-0.34.9.tar.xz 2783952 BLAKE2B e90728075ac546e8abc125886182abd5fc357be5
 DIST vala-0.36.7.tar.xz 2854668 BLAKE2B 2fcb528b26a56ee9f9d362ec1891c873ee26580132c052554a3d021fea32c0cee6dc6e8c6419f88798f5066a70d54084757893b2d46e3b286b441a51a4169c92 SHA512 7a6daac5be72240ae998b2c26e240a8b6bbc44c8bb6a036357fc0419cd7b40e14ea76c8125eb49a8d252627425613512410ba7868eb579b13d299e2ff0f4082b
 EBUILD vala-0.32.1.ebuild 730 BLAKE2B 9450d1f91714a86dedd803aafcfbb5aa744416e3c65792b566975b654cd96c9537be76c72c40ce041c38c01a4733abd4859274f0f56c5895efb37297c168aff3 SHA512 398bbcbedcce2e1dabd2c86d0c770f78bd380833e117d07196872e732a7763213747996ef5a44a68d4bac52f0a30de6f4361620acfaf3e87b1278771d02cfbbd
 EBUILD vala-0.34.9.ebuild 730 BLAKE2B 4103e7fb4100c296d33f2d101a9abde439f055937a6198517626f2f2c2c1acf73dc4b495f23d71b4130ae561c1b1a5930b87aa3abd99f1d95b1c3d0ef02754ca SHA512 c8b77206bb700f239dd7900b2dcba92be66a817292945f5e4c497e60eff6560ab12236f5ade4ffa4d868f9292b709e782de16d3ee7b890d8fe4ce3ceafd062b8
-EBUILD vala-0.36.7.ebuild 822 BLAKE2B 29abd8f141edf688132a4a71de0d52a5e4a523c7892592ba885e697c877e8e525738a4d4cedcb08e6e19ab5b471146db20cdba1f52366807f03a07558d234d86 SHA512 6071be0ef45009914e22d54f6f860f3f77ef1d7d5338d1743eac455863a26eaa2f7bb740e72bc84e4d8edd208f180001c58553a79acae9d17baee3e38f62f27a
+EBUILD vala-0.36.7.ebuild 821 BLAKE2B 66c6d93ea11592d03c79be3ff0fb972634c19acf2f9c7d7df25ef4ba5f91b07d47ebcf126713d9ed4253e02971e67ce1a0d4961bcee05dfe5c7d463a4ba54784 SHA512 f43316e9aa5495000d792da18f580d943b18979851fc666b841b8fb37262265f8d2b4cc6f60d696602555fa8c05e0bd58bc3eccca1bd6312fa6fe27577bc13d6
 MISC metadata.xml 255 BLAKE2B 51dc9e0030d68ac68f075bb4a7b4c5f42122c16f354e10463d7338e652b272b26fa1eb12a144ed4a00d29a020af4df19029d909b4591162347184b1684402c94 SHA512 1970039db79f50391650a9fea933485c6102d1165946ab8efe9395403a02f49d4b17c2942795282469ac7c0306e7353002dcbaa797fb1060982b31ea3540b98b
diff --git a/dev-lang/vala/vala-0.36.7.ebuild b/dev-lang/vala/vala-0.36.7.ebuild
index 6b41e12db525..90fe79037567 100644
--- a/dev-lang/vala/vala-0.36.7.ebuild
+++ b/dev-lang/vala/vala-0.36.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ 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 ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index d9a308cb0a05..1806911b756b 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/atk/Manifest b/dev-libs/atk/Manifest
index efc9ddd5e2c5..6909eb8c4ef8 100644
--- a/dev-libs/atk/Manifest
+++ b/dev-libs/atk/Manifest
@@ -1,5 +1,5 @@
 DIST atk-2.22.0.tar.xz 745572 BLAKE2B 4764a6044446de8e08b54c47400727268ca68e676aa36c01877f2b3f973614a40f209406b649f0e96f4a5b75be883ce67ac3fbf20ac0c58adfbaf3509caac312 SHA512 af3f6197eb97de869ee706f19564449b02c1444c413e5418323e4bf4c8cf1d98c7c8baa25189f6879d63606d4bc75f33799cb901f4697c087e868bb9a5643cba
 DIST atk-2.24.0.tar.xz 748972 BLAKE2B f9db7e35322cf4a1df5171c812c83eb935ba44b0167b20ca9a951109c00911392a48db88fac02a12074de4d9f458656f946e8bb7611e1d11cc0de841986f8cc7 SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962
 EBUILD atk-2.22.0.ebuild 1428 BLAKE2B 09fcdbf9c0360b4028be8ffca418f4e83a839fade16e3d1a67f34b9a43ae87ab6f4b44e6f5c363f6fef074ea2d822ed3bb14b58c656dc294426c82d968db98c8 SHA512 64ed9a17da2175f795a0abce2ef28d246f242990962fef66002fab227d5553bc89ca4dbdb779c2a29a1c59e34f3f04260f8669405a9cdd166b76cf2dd9ae6652
-EBUILD atk-2.24.0.ebuild 1437 BLAKE2B 1ddddf7d3ab81dcb4d1aba4792ab001a49ac54a6b58802c927ccca3b5b905117b1c76cc897c4b51ffff1d99bb9183cb1e33016a438c797577498c0e33fb37d1c SHA512 81bb0275c12a2338559ee180b43b82b85bec05e65c88119bac0df70716548e7037607824022c40e213d5f129787c6a25f08098327d962af9ae6acf6cf9985a60
+EBUILD atk-2.24.0.ebuild 1436 BLAKE2B 6fdbfc3b082a98ace9d812a5d5c78c4a6fe62387f374075da111559dce2f7090e21f1b6d7aac1cdc97c71d5c4d3f5b75f3d9ab8cffb900247563d5d0eba981a6 SHA512 860386ce7d41042c3f0aa68060357bfaceee10366df77bb5012000e4e70d6687a30e2d8e9a9c09c238957c70dcafb4eeed125552c1d2f97702f9cd69740c1514
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/atk/atk-2.24.0.ebuild b/dev-libs/atk/atk-2.24.0.ebuild
index 08f8c3c3323a..d35db91b40a9 100644
--- a/dev-libs/atk/atk-2.24.0.ebuild
+++ b/dev-libs/atk/atk-2.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="+introspection nls test"
 
 RDEPEND="
diff --git a/dev-libs/boehm-gc/Manifest b/dev-libs/boehm-gc/Manifest
index bb60ecd4ec24..04f6e4177c33 100644
--- a/dev-libs/boehm-gc/Manifest
+++ b/dev-libs/boehm-gc/Manifest
@@ -9,6 +9,7 @@ DIST gc-7.2e.tar.gz 1291186 BLAKE2B 8c320aac2d9deb8fcca2e93622aa122f96c4152d2b18
 DIST gc-7.4.0.tar.gz 1060884 BLAKE2B 66bcf7b42591c0899d069c475e0278792173a157c442d45574720d4b8565b660b39cbb0e7aee412c0ec54f1b3527ccf16b96421cadcca9bca18796ae2a69f9ab SHA512 7421dddd963a4eeb3d0c2efd486dcf842793e81385c9a87c38265137626822566c98920d9d6a9423c1dbeb067fd7fe8aeeead2d7bb7083f6056b6288410e1032
 DIST gc-7.4.2.tar.gz 1082597 BLAKE2B 5ca30e786a995941fdf2d803d201e7263bdd7d9974a71f672ff259c75ee36dc5d499a614334e570100ddbcb25fd06176f48429b64bad95fb218c35ba584ad4c6 SHA512 2e21516addf268780641ee55c0cb3ecc2d96fa963faffee5beadcade9c6bf1ee49ee1a75b076b5d49ddde7c839fb94f4c3623ca8412d14c2a5bf6ca30d424a72
 DIST gc-7.6.0.tar.gz 1111751 BLAKE2B 84780ffbd087aeddfbab7b5c9de05aac18f8e3ebbc174e3a0ffec295d8288ecce33f1ca6a44eaef168e1433d696a38a664fd6abecae006e8179bc453b278f5c3 SHA512 511e8c01287b1ee9dbec87f0573377de77038b7af053a3f33afed9b3ffa30e2402d6a9bb0ca4f4b81cd808209b47b5718d498cff3de6632a057fe03fad51fc43
+DIST gc-7.6.2.tar.gz 1119725 BLAKE2B d74fbabcc298e7673ba4d23df9fa7a8cd2895b0925dd26a2b2090d7fef0044af4dcb693357de8cb30ff7e4b9708c00259224f40baac13ac178adf44c09c0dd17 SHA512 7b54812903929b0d5d1d696beac54629a7667997b41ef45299373bc18b2153d5755286b25e11cc90ffc572239e52a02900927bc60b0ad3593162b8c8e259fd50
 DIST gc6.8.tar.gz 756879 BLAKE2B 8a56c4f7b23e79862aaa6fc505a56ea9a8ed53b9f3aedc8cbb57c37f0fabe040abe22096a8893b7f7b1ff1267bff37101e3dfbbcedab380afe0abff02b98fe14 SHA512 69a9554d2d213392512d4ce41ec8c4993557e65c2b3dc4f568ac18695421cc08b7677c25f9a0ce03e94fb5e68a298fcac7ed09fb90007a2c998ff6ef78d3c651
 EBUILD boehm-gc-6.8.ebuild 1090 BLAKE2B 8aeb1528915bd4c1f78f058590e0c55284bd6e0c188dcf47dc52aa05fd68af9505972885c0f09ef972ff2c0ad8710f68ac2fc41980c7048cda715ca059690b99 SHA512 912df525bfaaa5b767e5774e68f059058d50a060a02a99605d5a204153c22610ba872334e93eee64281c68582aa1fa54e2da1d72d6a82c0d83d89e61062939f3
 EBUILD boehm-gc-7.1-r1.ebuild 1148 BLAKE2B 7b832a50dc99f3451af49eaa91b8d9d0b488bde2e451383df22b4a2556bf587503551784e0346f376116399610a3682702f4376d6d92e4db6f03f447caeffb22 SHA512 0f9e1d20c7de2df47ccbe487fd94ce674ea34b41edb089bb6d746e5de2c3e4ae16efb5900f02b1b477380917f274d946c3d1f7e70150bbf803b1e69bf615cd04
@@ -18,4 +19,5 @@ EBUILD boehm-gc-7.2e.ebuild 1333 BLAKE2B 398be6ccb9df21a385df0bc45f0502db6e2f098
 EBUILD boehm-gc-7.4.0.ebuild 1226 BLAKE2B 0702a307fb72a751d6592505dcf17a6595f5d18b5b986600a2bc98441e742c47b4ea9c42028ee6e83ba695875322b3f9cef787f526153a0a91327001fb0fb26a SHA512 346a736512c86d9d07aa35aeca5a56e5958dd6af7614b6f3fa475bc4db51cf2dda42e5ba7b392e61d0f89b12d8ca1048e71da5e4b4047390be15682f34e720a3
 EBUILD boehm-gc-7.4.2.ebuild 1200 BLAKE2B 0962764eb6158acf2106131b136860b6e02f6aaefd1ca19436d21c4d3a9e2e3c6e37b77a7db3fe11d4fa009b9f461cccba28d19d22196cc5eb89e5dacb31cb7e SHA512 d90be5a47509d83927c355c44f79e301f1fc62b198e984d132ca385519f33ab2aa5e8cb1b0e6964d3312ad0e27d49b9b8c68cec639d0a231b092461f0f85112b
 EBUILD boehm-gc-7.6.0.ebuild 1245 BLAKE2B e3d6bfd09f64e71463de90fbbd0cf27f5746c75e8e616315d044b44b5eee79b42d8ce23a0e9e582d702cfb2b8c13414054cddafcd6e7e873cb695bed21f5f97f SHA512 ec4606af16ad4332a5260506c773dcdf8384580cf9aaab4b59758fb9886164fed65f763d527b54f6b23b331b86952ab0f153a7705348c6b46264007dd410d53e
-MISC metadata.xml 361 BLAKE2B 840d97a189bdb65e7535a5e487a3081af6bd6f7cf3dcb0c1f00f3f9d3ef14891b1520922de81d261393e031e2b5eb21cc3a787042b086de4f8d6bfe0d1f62b64 SHA512 90f2837ff1c7ad2fc38cddadbac5e3c18ab17ee99bf30ce491d9581493a52b73463cdb4db86becb4b6b1123e3871c157431330e400931f85eb7e1f96231915e8
+EBUILD boehm-gc-7.6.2.ebuild 1266 BLAKE2B a28c5effa656c6f93f8c7133e11a70538b02040f623041259b6ba22e868112b2aa580015a98366d4c0f7c0eeec867be42b7227cbae0aa944cdb2fb64eb76a5a6 SHA512 645884c81bca9022e8bf1278eef66af48cc062dbe3abce8c4000ebc10b3474b88ecceff1379c54676a8210078dc39ea7f6c0552372c229804a55088f63426a76
+MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/boehm-gc/boehm-gc-7.6.2.ebuild b/dev-libs/boehm-gc/boehm-gc-7.6.2.ebuild
new file mode 100644
index 000000000000..53b5655f24f9
--- /dev/null
+++ b/dev-libs/boehm-gc/boehm-gc-7.6.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib-minimal
+
+MY_P="gc-${PV}"
+
+DESCRIPTION="The Boehm-Demers-Weiser conservative garbage collector"
+HOMEPAGE="http://www.hboehm.info/gc/"
+SRC_URI="http://www.hboehm.info/gc/gc_source/${MY_P}.tar.gz"
+
+LICENSE="boehm-gc"
+# SONAME: libgc.so.2 libgccpp.so.1
+SLOT="0/2.1"
+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 ~x64-solaris ~x86-solaris"
+IUSE="cxx static-libs threads"
+
+DEPEND="
+	>=dev-libs/libatomic_ops-7.4[${MULTILIB_USEDEP}]
+	virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+multilib_src_configure() {
+	local config=(
+		--disable-docs
+		--with-libatomic-ops
+		$(use_enable cxx cplusplus)
+		$(use_enable static-libs static)
+		$(use threads || echo --disable-threads)
+	)
+
+	ECONF_SOURCE=${S} econf "${config[@]}"
+}
+
+multilib_src_compile() {
+	use sparc && emake src/sparc_mach_dep.lo
+	default
+}
+
+multilib_src_install_all() {
+	local HTML_DOCS=( doc/*.html )
+	einstalldocs
+	dodoc doc/README{.environment,.linux,.macros}
+
+	# package provides .pc files
+	find "${ED}" -name '*.la' -delete || die
+
+	newman doc/gc.man GC_malloc.1
+}
diff --git a/dev-libs/boehm-gc/metadata.xml b/dev-libs/boehm-gc/metadata.xml
index 3c4cdfb0b599..e396f3755977 100644
--- a/dev-libs/boehm-gc/metadata.xml
+++ b/dev-libs/boehm-gc/metadata.xml
@@ -1,10 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>patrick@gentoo.org</email>
-	<name>Patrick Lauer</name>
-</maintainer>
 <maintainer type="project">
 	<email>toolchain@gentoo.org</email>
 	<name>Gentoo Toolchain Project</name>
diff --git a/dev-libs/check/Manifest b/dev-libs/check/Manifest
index dbd030c3a8b5..4cd17e9fadde 100644
--- a/dev-libs/check/Manifest
+++ b/dev-libs/check/Manifest
@@ -1,5 +1,5 @@
 DIST check-0.10.0.tar.gz 769119 BLAKE2B d5e256bef4aa010322844ce748e620ce884658d74b14e1ea5b0e1bbd4565ef7b0cb7b86d315a36f7a5e4d225e40f242ff9730790bd55fc036757b4296396d153 SHA512 82103a98382c41cf16f172ded66c0399d3da6eceb6728aab11120c028e8796f6d545a98dc4aa5f76ee68c0bfd1f842a4dd371f5d670c8ba84ce4209812bf1ac5
 DIST check-0.12.0-github.tar.gz 281127 BLAKE2B d7dc89c10022594a37e9a4bc6b9fe1e8f355af864a5012c292cc3f1152e9e3e9be01fa34b39e5168f65650e540f36dbc8195952908a871d1c111283429f2f538 SHA512 f7b6452b69f999a90e86a8582d980c0c1b74ba5629ee34455724463ba62bfe3501ad0415aa771170f5c638a7a253f123bf87cbef25aadc6569a7a3a4d10fce90
 EBUILD check-0.10.0-r1.ebuild 1797 BLAKE2B c9b32128d72949401929cbc304025f3aeeb6ddcca7c5674f757dc53c5c90c99cf0729976db4df4c64341ee8b71d4511298e648897c761dd6bc3c9ada0bdb2adb SHA512 b178160a81d6df74c7ef10f8d4658c6e12759a2b7b416d7c7e724d83a83212b67dfebcf41b15942dc7dc6f1e5b6270463b2088825a84c6c945b8c535151f1881
-EBUILD check-0.12.0.ebuild 1690 BLAKE2B 890751c8b6b9c9f56b69004073b40e774c1e03f116f40c0dec044671a1c8cc4eb40997a6021477b2aa7418b792625ac408e430f416e616489868b0f55ca9b059 SHA512 781f2f097f11f462e6070c095d8366e02ecb11f5f73e8f274826192171ad715d4b7e903b71630d0b8ab1b2613c9304345703052dc72c4f83dbe2a033dab453bb
+EBUILD check-0.12.0.ebuild 1689 BLAKE2B 6646676ea73259dc48f183abebf75265605c251f859a6a2d5140f43176e70d06593cbf9131e7d7d3f628cb6a458e84491d73369976a52083d4741e24196fb3b4 SHA512 fa218ab9cd4958c00dae5755a56ab12e4d285461427bd684880a7e047cfda247fb5cf2ee8916d6b8d760fab105bfd52089605ca9f42c236a5674253ed7f321a7
 MISC metadata.xml 363 BLAKE2B 5cdadc9ead8f98c8a417954ff38f8c32a79ee2d0b12171204239305d66e69247758ed237b45e369cb6aa40e4bd56777f74296baecee6eb571801f61e3ddf730c SHA512 b025f88785c7d2f4eb01ccc5f9730c2ef81171fc94a01802f7832088eb20aae42aff7cf4ecd89c3de6e87cf583f873fe5ed9dc4c7fab9f124ce3ebc8441ccfaa
diff --git a/dev-libs/check/check-0.12.0.ebuild b/dev-libs/check/check-0.12.0.ebuild
index 6f9ee0d01c50..b959e47a7fad 100644
--- a/dev-libs/check/check-0.12.0.ebuild
+++ b/dev-libs/check/check-0.12.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/lib${PN}/${PN}/archive/${PV}.tar.gz -> ${P}-github.t
 
 LICENSE="LGPL-2.1"
 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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs subunit"
 
 RDEPEND="subunit? ( >=dev-python/subunit-0.0.10-r1[${MULTILIB_USEDEP}] )"
diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest
index 6157b4a93885..56722ffce7ea 100644
--- a/dev-libs/glib/Manifest
+++ b/dev-libs/glib/Manifest
@@ -4,5 +4,5 @@ DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f7655
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 DIST pkg-config-0.28.tar.gz 1931203 BLAKE2B bafdd4e838623965c6bd454421ddd9051fc43fc29948e1615b49fef463c3c3a18807aabe6416f96cfdf58d6b1c9e114d77f97bd985facee7c14284a8a64a768b SHA512 6eafa5ca77c5d44cd15f48457a5e96fcea2555b66d8e35ada5ab59864a0aa03d441e15f54ab9c6343693867b3b490f392c75b7d9312f024c9b7ec6a0194d8320
 EBUILD glib-2.50.3-r1.ebuild 9657 BLAKE2B 06c6a853452de29191c26a1c829b85226035baff514402fc343d31ef348a7c8677dc3cb74ce118cc7ab4457918b4f238e2ba4776c500a8165d7bf65bbc12cea6 SHA512 9e53494a817602c1c23117b9dbbd9365436540b331a258a705414699434b168635f14ad8d9eb08144f7989c72789593d55958c430adaaa8a384c36e02bc812ee
-EBUILD glib-2.52.3.ebuild 9570 BLAKE2B 4787d1efc36d72a267cabc5cdd87b27696916f2b3120d07f62307fedad4f2b3745f436c0828e68fba586a3ef07514c9de75c5b3561cb5a6e5ce1d02193c5b740 SHA512 c6d4c0c12811cde6a756898451b477786b7893464bdacc1e61680e442f017f7966e2e2c3a433bcdb7890eb0bef8f0ce2e76c48577aeb72e1fa5a72a655478f19
+EBUILD glib-2.52.3.ebuild 9569 BLAKE2B 99a227e161d5e546b5391a0fd45c88d899dc1b401f75f2bb1f63ace244cb57a2ff39207bf810f7464822de626a85ea35844f1a71655ef6236b7aca9c20d3da18 SHA512 d2811fc17d6080af30e7824662338df170156083978b9d2d77ee0d75d46d987dcd168182680e8a5ed8d52e0ea7f5d20f637d205ec44426fceae1d99fc82bbf2b
 MISC metadata.xml 978 BLAKE2B 75f0c12ff1628b7c345b1e85c6baa041973f11555aa520348ca6f347d2241ee0fc9bc26891b25bd34ae512dbaf761b5382d93f094dc0c4ff9a76c3ec852c9583 SHA512 8087f80cbbffb14930b50178559cc4dbde999d4e123475beb04e2d0a25e64b24ee5ab8523f1df1839e82f74272b40cd9a57b78acf34fd64f8b4723bed26573c8
diff --git a/dev-libs/glib/glib-2.52.3.ebuild b/dev-libs/glib/glib-2.52.3.ebuild
index 9a6308e1e3b3..e687ae9a7a4d 100644
--- a/dev-libs/glib/glib-2.52.3.ebuild
+++ b/dev-libs/glib/glib-2.52.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # Until bug #537330 glib is a reverse dependency of pkgconfig and, then
@@ -27,7 +27,7 @@ REQUIRED_USE="
 	test? ( ${PYTHON_REQUIRED_USE} )
 "
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 # 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/gmp/Manifest b/dev-libs/gmp/Manifest
index 7c66f4940ac9..5be5fc2d9651 100644
--- a/dev-libs/gmp/Manifest
+++ b/dev-libs/gmp/Manifest
@@ -19,5 +19,5 @@ EBUILD gmp-4.3.2-r1.ebuild 1709 BLAKE2B bb324827b9adfae3ee2487c750f6c719c4c17fbf
 EBUILD gmp-6.0.0a.ebuild 2898 BLAKE2B 686c7a179e4c99ad6d16102fe099f0cbe5e9b0eb332e78f2bab0af3bd2655b54164b923ecb2ef3b29271b2ee40906549226f56a0d8ad1478561a959e2a011e41 SHA512 ed70ec49d63d4f8ac3af1d36c197eaa5022e368018dc1516d771a94e0248d81192e49bdf4f78c80f1571683b8a00b4be63c4cbb76f883e8aebac7f2d8bcc766f
 EBUILD gmp-6.1.0.ebuild 3024 BLAKE2B 620c9736cff9449cb6c5797403c87ada6050958d7a87402569189c5d8a3b68704083c782634117d7612ecb603eb7c4845f3c2524f9df12f5c6fc801b6dfa5f1a SHA512 6b2aee7149e8fb461d9477f13a7377f14130c63bd28205f05862926aaa8925b6b229fcdd4a1de83c48b09f4b54fb2afd760503e990aab4e217bd3b745b6d7943
 EBUILD gmp-6.1.1.ebuild 3037 BLAKE2B 8cfc4baa641684d7924f28f63eb59d44e5b01e0fb554fde4712209a7edbc512dae2c87bc5deccc0f2a899b39ffb91f70f2b8058a362320ee234426a0bf3ff79c SHA512 6b5dc4ef6ca38c816274f104ce6a55e5bb938ab396ca9b98ce7d3263e51f78cad321a81ca7af166b0284c94d77c0b588ff75cad0f1e9a6d5069ded4971dd57e5
-EBUILD gmp-6.1.2.ebuild 3294 BLAKE2B e657ad818aab0d1f8d062af46f3085a4653f16b53b5d2d2a38da5a618579c6efc39e73f3e33c0fe44b272e99850824cdef46051f8ade2d496c392b1738082dbd SHA512 f504ddae4b5c6804697dd0c7e2b961937ac7fe14ed27591fd7870814fd7e799aa0f073e3a35be05988fec83d2762d80584c202a39494ccc563bae684e6f13b31
+EBUILD gmp-6.1.2.ebuild 3289 BLAKE2B ae46e1e5667b78a2dba22da77d7142e1c83d84bd6a90ce3c0c1223a146537574c59abc0a3ed70d0b0c07b98c146db174da72eb1250583e6bb9248b2cc3b80e40 SHA512 4ad67c318ec5bb9180cb96ec52a28346a7e4518c62bfe03812a06308de01c4d3ef92021f4691dc9bd592748d1bcefac38f09e7d436227b92e00b21f73b3abd1b
 MISC metadata.xml 501 BLAKE2B f72cb10582beb651fddf6d5abe85920d6f8c9d7a87b82e6778a641bc75202213432105da5cfefbdcd9d343180cca7f2f56638f27c9e059d68afa92d6ee0d6665 SHA512 bde33c241d1e7026e86e7a445bcd929f8a2f6d2dc7a0e71994f2130459910a0ac51d6d3d8cad0fd45baea0d0a38c818348d2427035ef393ac6343ee993c95dd7
diff --git a/dev-libs/gmp/gmp-6.1.2.ebuild b/dev-libs/gmp/gmp-6.1.2.ebuild
index 9134d5cfa90e..1b8a6200d992 100644
--- a/dev-libs/gmp/gmp-6.1.2.ebuild
+++ b/dev-libs/gmp/gmp-6.1.2.ebuild
@@ -18,7 +18,7 @@ SRC_URI="ftp://ftp.gmplib.org/pub/${MY_P}/${MY_P}.tar.xz
 LICENSE="|| ( LGPL-3+ GPL-2+ )"
 # The subslot reflects the C & C++ SONAMEs.
 SLOT="0/10.4"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+asm doc cxx pgo static-libs"
 
 DEPEND="sys-devel/m4
diff --git a/dev-libs/gobject-introspection-common/Manifest b/dev-libs/gobject-introspection-common/Manifest
index d2431f7c8442..eb72fd7643e3 100644
--- a/dev-libs/gobject-introspection-common/Manifest
+++ b/dev-libs/gobject-introspection-common/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.50.0.tar.xz 1415700 BLAKE2B 7707d0affc35e60d272312debd429a96a578cc6ea4e889244a0a1dc34f23e3b686cea06076427575fa620f570141e173990ed12649cb669808141dab1fdffb19 SHA512 cb108cf3d49743e1686fe4ae99f2360799bc8825ad97bf0b97e097b3f89e2771079593de0f497a9e5b9cff892f6fbf870834a6c4d13f11bcde99162e9388ecfa
 DIST gobject-introspection-1.52.1.tar.xz 1384292 BLAKE2B e1176bff177d7b6deee3e93159425a176d8056fbac2af5038950b7bc4486785ca988fc4c8c4d6a069b2bf623092e57f096aea37bbb9a767adaa695ec8f0db4e6 SHA512 878653ffa80c064c73453ea2878a977e52f0d6a0b2123bee8c3429379366f9da3e9fd991fad0dda170d74e4241314ea6c5120f5988e68fad4bfe9c333d11389f
-EBUILD gobject-introspection-common-1.50.0.ebuild 1035 BLAKE2B 0b837985d04987d92bb2de0523250ff4f0b714c916d9336481c09fc370f537a61d107cfa5b59734617381c75b9b023a325a3ea97289a3b056d1544cf0296c5da SHA512 ed05d2eafdfcd439270c8a144a927c6fcdc6c578ab8a0c3406cedf75c543a173155a35638e371131fff37322393ec67d9c0d47cbf8c80ba02daef3bb82d6dc8b
-EBUILD gobject-introspection-common-1.52.1.ebuild 1044 BLAKE2B b043878ec7a9e39b82ccd1942c4e52ad000e643263986d2adaf8a561545e0c113b7eaa54805570a44fcbc5ac3889925317950353bcecb223eefd5a4cc63b2de4 SHA512 fbecfc05887f313ab478cb1a69aede351e9defc80798596a745265a3f7ec6cc35279cd1ca5b3eb1f7bc0a3612a5a4d41fe7e2d2da9e2aee5c23d0c748456dad3
+EBUILD gobject-introspection-common-1.50.0.ebuild 1032 BLAKE2B 88bf89cee40bdfe0e69efe0126f65dca0133903ae4756c336494799c7a3a1b8093f7f2483560c627482d0a5dae7ec41872969c1322c0dc117df389f4e74c3424 SHA512 2f026c9d91e6300594e43499235d9fc563bbffc967cd91ebe7c7582ce173d717d10bc18a906086ac57eb82e5446c18288f091daf8a622b2e5a5bc033c70b5058
+EBUILD gobject-introspection-common-1.52.1.ebuild 1043 BLAKE2B 184cfc2276944784d6e7f0194c6125fdf26634cd5ea70a098d2295448442f5effe102d617c84412673ae4485f0ab9d0dd0decbe3d4343aa3c08b7010413be2df SHA512 b26689ce383c952d11a95643458c647800aa2008a9538c8fa0a23d26d12e152c702a8ec892ed0be0979437750ea3a7122f73396becd24010c9744efc4c9cda05
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.50.0.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.50.0.ebuild
index 122e7411d902..20201297a09b 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.50.0.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.50.0.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
index 54ee9ab692e5..4e8cf7754f7f 100644
--- a/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
+++ b/dev-libs/gobject-introspection-common/gobject-introspection-common-1.52.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GObjectIntrospection"
 
 LICENSE="HPND"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RDEPEND="!<${CATEGORY}/${PN/-common}-${PV}"
diff --git a/dev-libs/gobject-introspection/Manifest b/dev-libs/gobject-introspection/Manifest
index c6477536f7e1..8e97f9b42a92 100644
--- a/dev-libs/gobject-introspection/Manifest
+++ b/dev-libs/gobject-introspection/Manifest
@@ -1,5 +1,5 @@
 DIST gobject-introspection-1.50.0.tar.xz 1415700 BLAKE2B 7707d0affc35e60d272312debd429a96a578cc6ea4e889244a0a1dc34f23e3b686cea06076427575fa620f570141e173990ed12649cb669808141dab1fdffb19 SHA512 cb108cf3d49743e1686fe4ae99f2360799bc8825ad97bf0b97e097b3f89e2771079593de0f497a9e5b9cff892f6fbf870834a6c4d13f11bcde99162e9388ecfa
 DIST gobject-introspection-1.52.1.tar.xz 1384292 BLAKE2B e1176bff177d7b6deee3e93159425a176d8056fbac2af5038950b7bc4486785ca988fc4c8c4d6a069b2bf623092e57f096aea37bbb9a767adaa695ec8f0db4e6 SHA512 878653ffa80c064c73453ea2878a977e52f0d6a0b2123bee8c3429379366f9da3e9fd991fad0dda170d74e4241314ea6c5120f5988e68fad4bfe9c333d11389f
-EBUILD gobject-introspection-1.50.0.ebuild 2095 BLAKE2B a093c460ad984cdc94283cc0139cf82e3321790bdf6087c078280082125699dde0d48c66daf431932cca5b124e28f78667ee59303c01e6da062076dedbf70eae SHA512 c65cffdbae089ce2c106fbc3749271546d9ae963672097711119a06ec79544f0e1ec6ad26894dfdb53be30ff1802e775d6d27f4c6e3da647a0597c3cb0822ea2
+EBUILD gobject-introspection-1.50.0.ebuild 2092 BLAKE2B 92e733407ea06a272049437950950d24f42a90757c4368a4e634833df2b3502c1ebc9c57297fe9b7972d2d96fc57b0b247afd624d6468a697d59bd53fbde958d SHA512 559b28837ba8826dba5b258cd3c6a1723174fbf2ec2609c002677aee0fb2bfde431fc9f18b20f888c483fd4f4980b386bebd7888f5eda1c150b2f80b002297d8
 EBUILD gobject-introspection-1.52.1.ebuild 2108 BLAKE2B 8982d7764f8d5db73c3d90a67fcd16d19c4fb4e29ef19a844346bdddedd8300ff4380fb5353f0d179d879967f10b544ba2ef4a42c7cc8693b6b23bd496fa1c9d SHA512 4b66bfac6b53ae55d8ab4561ebac77aab96366060bb8edcce80104e1fa1d16350f01164b945fd37e3e4b6235105b66ce49d214046f0499b39804fe67b369ea61
 MISC metadata.xml 367 BLAKE2B b69aefd2ddda2f8e216d449de9ca13a5a8c473353b291bc5093ec2f6f3ac3346dc9fa25c85a64f15950813d9d6dfafd356a234c748436edb7639f37e95c71151 SHA512 1430924bf7430f4a409d6c3335a52b59567d5972440068e53e637d6c71486ef3e606ed9043184dfc168d731909e11c769042d2846e137312cd0ee0ce6f52e431
diff --git a/dev-libs/gobject-introspection/gobject-introspection-1.50.0.ebuild b/dev-libs/gobject-introspection/gobject-introspection-1.50.0.ebuild
index a0d69d3fade5..96dcb938793b 100644
--- a/dev-libs/gobject-introspection/gobject-introspection-1.50.0.ebuild
+++ b/dev-libs/gobject-introspection/gobject-introspection-1.50.0.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
 	${PYTHON_REQUIRED_USE}
 	test? ( cairo )
 "
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 # virtual/pkgconfig needed at runtime, bug #505408
 # We force glib and g-i to be in sync by this way as explained in bug #518424
diff --git a/dev-libs/ivykis/Manifest b/dev-libs/ivykis/Manifest
index b75f9886e9ae..62d4e340d957 100644
--- a/dev-libs/ivykis/Manifest
+++ b/dev-libs/ivykis/Manifest
@@ -1,3 +1,3 @@
 DIST ivykis-0.42.2.tar.gz 653885 BLAKE2B e4a5310ce6fd15aea79091edd56221f77c64a68472fa9bd44715da8c21b4b54f55c2e8c886491afcb8c206107b78b20cd7ad727a96690e8c718f2a2aaeb32aac SHA512 0a166869b434668219c379a8acf7b2da17cb1e29aef74f9dde869a322d3b34e36c84bd67800f7fb234a29bf9372061329189f02ab6d7f85bb2622b4c43185270
-EBUILD ivykis-0.42.2.ebuild 360 BLAKE2B a432cc5d87e501cf44a16ece4434153a931c51a8f2bb7a328fbfa08920b3f6be7eddcf21cbc3c6df284c0fed29a9d8073b5d4c55375ba454506c6d58b30d2b19 SHA512 b9bba4cb3f5c6775535ff34536a04a1cb960a8b3ac53ae7bea83c28db2d81bd574d42b5baaf63ac50b16e1e529131dcfb7fd97ea89b394e7fbffcc252a9ec12e
+EBUILD ivykis-0.42.2.ebuild 359 BLAKE2B 56c5f21008abbf3fb139ba4ff28dabc6ec2f2190883fbddba81ea798b8c27b6eb1d6c749e211309c87769e246d52498e80ca7583269e861cbb367e1773532d0e SHA512 e8753fae8039c04db156dceeb89182604990a64e452e3856016bef688c05004fd1ab5ee23f033b8abdfcf871b1bf3b9c7b5e6e9e2ecde84c8a211b50124b579d
 MISC metadata.xml 462 BLAKE2B 64b01c11fccd36c0d1c027c8c904ea843adcd233cea786bac604d81044929f420a64ceb9b6a713bfea8637710899254981b44213ac3832173b556026d51b2ee9 SHA512 70b8289fc39f3a8132f8d85577c8795d9ae44fc72934765fa12226f147b43d28472afa77d9a39e65d48d123dfc9a69f509090956317258de3e3cdf8f95a03e9e
diff --git a/dev-libs/ivykis/ivykis-0.42.2.ebuild b/dev-libs/ivykis/ivykis-0.42.2.ebuild
index e4cc425e4469..a351861a0cde 100644
--- a/dev-libs/ivykis/ivykis-0.42.2.ebuild
+++ b/dev-libs/ivykis/ivykis-0.42.2.ebuild
@@ -9,4 +9,4 @@ SRC_URI="https://github.com/buytenh/ivykis/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
diff --git a/dev-libs/libatomic_ops/Manifest b/dev-libs/libatomic_ops/Manifest
index 8b5162604890..887e6a9a8be1 100644
--- a/dev-libs/libatomic_ops/Manifest
+++ b/dev-libs/libatomic_ops/Manifest
@@ -14,6 +14,7 @@ DIST libatomic_ops-1.2.tar.gz 183780 BLAKE2B bdd1a8e6195f50336b6680841d403f4c181
 DIST libatomic_ops-7.4.0.tar.gz 455143 BLAKE2B b13cd06bdc0715097ca1759594f24435f8e80b707fe77d1f8be1824b3be7bc992c98df222450dea1facba4da8877a0ac0752a6e82881781d68779492f8b273ac SHA512 3a2f6eac7c5f0fe0abaf8650047b8ec1c9c5abe732982a294a2afa920b588e17d64cb9f05a44be31b8cca9e52cc5ac79a26e1779bf60169c228344df4bbe86a9
 DIST libatomic_ops-7.4.6.tar.gz 479437 BLAKE2B fe3199df827a170f328997bc24cc2b717d5df8704aa90e4db5b82add5861b2a08f5d60e6b35491cfb656f086d489749a73dbff6507b30aa5c5d350cf07b03649 SHA512 29c6f937aa5d21343741aa0661aaf33ec9196b7784b7165d40dd87ce7bf8a7691f5ba94040663f078465ded1935ca01bb829a4b56b190f9db63cc141515d9819
 DIST libatomic_ops-7.6.0.tar.gz 493177 BLAKE2B e1f8ce79de18192a5dbb2dd5834928fb8a385cb1d2174186049a269e1329ed32adb975bf461e7d29a75332916719d4f3197a30a1839221c6ab71249f17e9be98 SHA512 58f1f1df94ff33bda5833af2e3a6a4af120ccfc0cec0fb15e2db24341e2ffd5a6436169cb4e7dbd96a6cb0431c1295dc4b5270d4b01806e470bacadc902720fc
+DIST libatomic_ops-7.6.2.tar.gz 496917 BLAKE2B a59ecc1053df8a5ae2fe9aab5c8e18c09e33c2c477425ccc0919c87d01538ef703547b2ebb1dc9f1606e76c9d48b123a4cdd496e7e05c694da8778e9c83ec1cf SHA512 9149c9328ec22ab80469892b40c135f20b6cf6edff63b8de6f16ab0b209f40d1420ad012a40c80009dfb4cdc826feb72fa826d6abf61211516aabcf463c17fe4
 DIST libatomic_ops-7_4_2.tar.gz 115132 BLAKE2B e08622dddc3baab17576a893f893898ad4d09bb994b680641b98edc3da7eb2cbab4ccd45a02c4e7f6d4d500c3866f1e7c0354bb692eeaf4784321356cfeacfbf SHA512 3d06d5de930a369dd2af4413d8f573993eb927b45941ae8eba14ada91abd34a6baf31e1030d1ef6aa02bd6a2d8d59f9f306dd8dda6a68cf552a2745041111b2e
 DIST libatomic_ops-7_4_4.tar.gz 115469 BLAKE2B a76fc56937f2c6ae129ee249214f7bdb3277a90c349f2713d14b1f11c7dcede9e6a76390ca329969e585f3ce105ed3883c1d37a3f12795abbe62e58ca5387e7c SHA512 2c1a773c61b5fecab467746e872f7eb1541c1f6770d2055d0440dac461294e896ff73460097a73c932ad07d6c44eb820ebfd039e5d87f1699d518498da6fa25f
 EBUILD libatomic_ops-1.1.ebuild 498 BLAKE2B 665cab9f62cc635e38f89baafb7b58e5b99ce7b29f015fdd6e29c371c321f01eae9a6b351b7d20d3d9b62632839f5c14996055383ce7d76abeae6147e2b719bc SHA512 b21efa7ad6d44343edad2414d1870b9d3e5eb8aab02afdd1cc531f38c6f7d0d5dc972ff76fc9f893214b2cc3415390c8b865b1021bc2e143135bcba86632d7a3
@@ -27,4 +28,5 @@ EBUILD libatomic_ops-7.4.2.ebuild 776 BLAKE2B 79d5e3cccafa859895ebafdfb1ebe669d2
 EBUILD libatomic_ops-7.4.4.ebuild 796 BLAKE2B 9e4dc567935a1036a4d08f10efa416ab1c51ac60a15827810a0a84391a1e860bcacf738b30d41d28148da31e4bb4adcde1dbee50c9dcccf9abd925913f592827 SHA512 d04052e866852e0810f4e05537a37a7bea25cef0aac2c1035093079401ebd0fd0e146418cd0c825e438a27604c008238617c69e5df7c50aa49ba134d80ba7d21
 EBUILD libatomic_ops-7.4.6.ebuild 659 BLAKE2B e5417d2158a4f43f4f471a4ede787ecbe82c164af9cf0a9cc2a1792d0414a81f6ffa5f72e834f3d75714477edb247a2702bff0f15a6cda7afa647556970cb68c SHA512 24f438b90aad521994e6cdf4ae195b7bd5bbdc65c66d3f49daade0131c69952ffa2538d10acd01b55517dc94057a0704919c172e3adc10ca49fbb598e2976d99
 EBUILD libatomic_ops-7.6.0.ebuild 650 BLAKE2B 097e7ff302e2dea88181cb379246a2eea38bc8e638500b608359f52e00be14acf8fcd532277d41406a877e6988255ca36e3b50adc204fc657da67af7d22792b8 SHA512 1d4d27e888b82f36770c301e7da6d0cde3f22a034139d5ac5d1b2ae85268fe78eb9338992d8144bc90f2f56cf0716e8fd1498af617e0c3d9c780b42585a67e9c
+EBUILD libatomic_ops-7.6.2.ebuild 661 BLAKE2B 1f61944836bc735e327f9086ecc10621ed8e60d2426c086d774db56abcef07cdbf98a4d88aac485bd0ec7aaad585081422a7810a84cb4fb9078159aab82ce26d SHA512 ac75f27f0324f245873d7395fb119242a0d677ce32b5aa9d0b7824305cffd6b5f986a8b5addb7ee6098ae9f795aeb4765157a3a815b810b7d9817a9f348205ad
 MISC metadata.xml 347 BLAKE2B c8fa80a777d85e172d52bd7eae6523981b9fcc79fa8d6cb7378960adda45dd6489def86930704bb845e64437ff33b39f5401cda0d11ed021342235c7020759e5 SHA512 7a4acee1ccb58c4694e9100d556046c55f508050f6e09dc3d4dd509db9eb747b94eca152e1e98c2ebacd8b8c9c75c362426ad9545cac490f959ec16464f809e5
diff --git a/dev-libs/libatomic_ops/libatomic_ops-7.6.2.ebuild b/dev-libs/libatomic_ops/libatomic_ops-7.6.2.ebuild
new file mode 100644
index 000000000000..a34dc5c6c63d
--- /dev/null
+++ b/dev-libs/libatomic_ops/libatomic_ops-7.6.2.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit multilib-minimal
+
+DESCRIPTION="Implementation for atomic memory update operations"
+HOMEPAGE="https://github.com/ivmai/libatomic_ops/"
+SRC_URI="https://github.com/ivmai/${PN}/releases/download/v${PV}/${P}.tar.gz"
+
+LICENSE="MIT boehm-gc GPL-2+"
+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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf
+}
diff --git a/dev-libs/libcec/Manifest b/dev-libs/libcec/Manifest
index 010d7238b5dc..0fe648eb6e59 100644
--- a/dev-libs/libcec/Manifest
+++ b/dev-libs/libcec/Manifest
@@ -1,5 +1,7 @@
+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
 EBUILD libcec-4.0.2.ebuild 2112 BLAKE2B a489f01bb2d2f4e4429a45cdf55d53afba13222b4e371380e47f90613831f600f3b92a269589eaf932abdf5503822a936e20f7255d909b8a37f77f504166366d SHA512 5bb45988de38b50974c2d52053733c0861cb2416957a83208178b620cd9938ac0af4e5fc8467d0c0c9e9049214e61fae3321effd89ea203c84303b604b5b6a7d
 MISC metadata.xml 662 BLAKE2B d87a9b256eb1cec65184415c8172819e8ffd47f38da6ef0aab46c0b8c40ff09b6b365d4051d44d2fee46a4bb0a7c0fbc0a87d92a171e92961b6f6b7a50d5868d SHA512 5abf50f31e2a18c7a5fce12414dd74efab13be9ea00a70b84384de8f95722f327d7446f51369b7feb33616bc0ff182cbbb7dd0be2855f5b54aee4e3c69dbc59e
diff --git a/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch b/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch
new file mode 100644
index 000000000000..673c6f86c972
--- /dev/null
+++ b/dev-libs/libcec/files/libcec-4.0.2-no-tinfo.patch
@@ -0,0 +1,25 @@
+--- libcec-libcec-4.0.2/src/cec-client/CMakeLists.txt
++++ libcec-libcec-4.0.2/src/cec-client/CMakeLists.txt
+@@ -27,8 +27,12 @@ set(cecclient_SOURCES cec-client.cpp)
+ check_library_exists(curses initscr "" HAVE_CURSES_API)
+ if (HAVE_CURSES_API)
+   list(APPEND cecclient_SOURCES curses/CursesControl.cpp)
++
++  # tinfo
++  find_library(HAVE_CURSES_TINFO tinfo)
+ endif()
+ 
++
+ add_executable(cec-client ${cecclient_SOURCES})
+ set_target_properties(cec-client PROPERTIES VERSION ${LIBCEC_VERSION_MAJOR}.${LIBCEC_VERSION_MINOR}.${LIBCEC_VERSION_PATCH})
+ target_link_libraries(cec-client ${p8-platform_LIBRARIES})
+@@ -44,6 +48,9 @@ if (NOT WIN32)
+   # curses
+   if (HAVE_CURSES_API)
+     target_link_libraries(cec-client curses)
++    if (HAVE_CURSES_TINFO)
++      target_link_libraries(cec-client tinfo)
++    endif()
+   endif()
+ 
+   # rt
diff --git a/dev-libs/libcec/libcec-4.0.2-r1.ebuild b/dev-libs/libcec/libcec-4.0.2-r1.ebuild
new file mode 100644
index 000000000000..f52629d16720
--- /dev/null
+++ b/dev-libs/libcec/libcec-4.0.2-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( 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/libelf/Manifest b/dev-libs/libelf/Manifest
index 6a883a133e77..46f60de6cc1a 100644
--- a/dev-libs/libelf/Manifest
+++ b/dev-libs/libelf/Manifest
@@ -1,4 +1,4 @@
 AUX libelf-0.8.13-build.patch 1358 BLAKE2B b0a6ea3d29cc508da873b9dcb9c99c171e01d47df4f6c753434f9da04f18aa56314df089fd2dfebca320645a99fa474359f731d315d51989041ccdc4eb997460 SHA512 7971ef661c058d092c7d5c89649c9abdec1b9fea45bb71f442d5a671a754f793b54674a7665614551067733f1c415c4e05be99c7714d78488eb19850a409f98c
 DIST libelf-0.8.13.tar.gz 148529 BLAKE2B c0364d6a155ec1590c8ef0754ff0989144d2331e99eb2a5208d80259229904a72328733460675e334ce6b26123f1c92d28d5fb9aea1acdff3ea7a16f4b572a09 SHA512 d2a4ea8ccc0bbfecac38fa20fbd96aefa8e86f8af38691fb6991cd9c5a03f587475ecc2365fc89a4954c11a679d93460ee9a5890693112f6133719af3e6582fe
-EBUILD libelf-0.8.13-r2.ebuild 1451 BLAKE2B 417681df74e2609e35f703ea217d37b90ed85a838b70f7c6a567b58c9ae1b1a2f664fc341e20ab6fa0006ef522148fe09bf29cb776e568b7de0da6f49f0405e7 SHA512 80fa0e402aa21ed72ca4a96f945aa07cdf1f7e5e7dcaecd09d8d43a8dbcaa4fd6b80e687c4d13474a064a326d007c43ce652969d3323390343df69d2e3fd7efb
+EBUILD libelf-0.8.13-r2.ebuild 1451 BLAKE2B 9d5f1c7704eef3a9ccb9ed321de155b43417134410e07db1ea83b0ce0239d0c67db80afe7c7e62eb102c098c33648229607932b7ec73ef97d843bcdb3707f0da SHA512 a99347713b4f8b865dfcc5ded8cf70101320477a124ef7db6126dc2250bbba362869cf1d94f2440725761219f13a64ddfa5de30a451ec2c577788cf8fab26891
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/dev-libs/libelf/libelf-0.8.13-r2.ebuild b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
index dfdf04f54581..824e777d1270 100644
--- a/dev-libs/libelf/libelf-0.8.13-r2.ebuild
+++ b/dev-libs/libelf/libelf-0.8.13-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ SRC_URI="http://www.mr511.de/software/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -sparc-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug nls elibc_FreeBSD"
 
 RDEPEND="!dev-libs/elfutils
diff --git a/dev-libs/libgcrypt/Manifest b/dev-libs/libgcrypt/Manifest
index af31b360aeae..08c6ff339cbb 100644
--- a/dev-libs/libgcrypt/Manifest
+++ b/dev-libs/libgcrypt/Manifest
@@ -7,5 +7,6 @@ DIST libgcrypt-1.8.1.tar.bz2 2967344 BLAKE2B f259d08427f76238576e3897a821d457b6f
 DIST libgcrypt-1.8.2.tar.bz2 2966534 BLAKE2B 1a0768dc1c4fc64913256575ec9ebe77fe8c4297c648972c93865271f0a18e60954d2f37c264bad5f1941b5e80753f34349ded9626e5c26ab469cc076da9ac2e SHA512 1e8c414f95bf6b50e778102ca7c1b3b1f30d8320826d9fff747a0a098ef85499cdc3e6de736853b9cd4e5dadda35c7c0a291e13643dcac5eaef44f2ddc7a6c09
 EBUILD libgcrypt-1.5.6-r101.ebuild 1819 BLAKE2B d8c7173947450abfd72f78cedd5b0f0575d1a0395e12009cae295ffacfa1198fd2600cdd9251e7c7c4c92fc1ab01966899d15e64136278f293e374077728fe05 SHA512 c6f34489fa52dd333fcbcbb3ece2c0256e59653a7461e0531802ac477a19ef1cbe69266349e18ccbbe6b1cf98bff792c40e47594a644c26ce2360d29e251356c
 EBUILD libgcrypt-1.8.1.ebuild 2238 BLAKE2B a6a1e54c878ecf18df7ce4c056c51a16ce333ce5cc4433dfb1e2054a3d70a2d8cc75d7a582473e84aad89cb2850118d8752cb223823f685803ba5140c82bc110 SHA512 8dcaaa3df574949a55f0c33d853d95f393ee856dabc0ccf4ba0fffeffc120cf7a96ba94f3a8cfb4d40654fabfd2f67f551515754c7bf348c25c4e16d80e73bbf
+EBUILD libgcrypt-1.8.2-r1.ebuild 2285 BLAKE2B 46f8f6f3841033464d5e09a2b7bfcc41769f89ba16d97a494c327db33187d96262a1a67d7be4cb5ac0d08d37fb43adbcdaa60988ea719a11108c808e39c10127 SHA512 d08951c1cc5656ef775ac5c34a78422131b9cf8f53f5787a96828356ffd9916927a9ab4cc7f6463be250af946444ded929f8077bee460e306d1ffde12e5eef44
 EBUILD libgcrypt-1.8.2.ebuild 2251 BLAKE2B b6b3e62d0d7038aefbd4ea52842b1ba02009f9fa129887963e2e7b044740f21e89d0b3099a3f1cc1c7bd6ca471a70dd7aa55139747d2403b64eb4af65fbfb40b SHA512 5e456df4f4466967b2f638d8c870134e85ddeca04e5a8b4186959b2cebb236454997ca881c4e009288e18cf544bb50a155d473e3b588b22b035d1b2f394b4a24
-MISC metadata.xml 352 BLAKE2B 75bb4d471f7b82b6cfe614d5c2ed226df087792ed84803ce4b011c5ad0a5a1548a87c6ab4c17ffeef53eb64bdea262fda4f89d27c38950ff1ced736b38d7df59 SHA512 3817eb6ad931ab0ee363ed7f8612b08a44c0d02e7abb9d0734452c289350c9909ca4208acad01c54a3f1b260417c400f4692e37b34113c6d618680d41796e2d0
+MISC metadata.xml 436 BLAKE2B 63494d2110caa2744cb7e2a43bb1622cc1709698a914bcda9958ee6fb9f8e5c5cee94e5cc9ce744a6638650e6bb78a0cea719a7afad53868513a15314ebb75f6 SHA512 953eb7a141dadcdb8f4c997924169a5e9dc5ce9e86a37b3171417f3825fad7763891ddf71cf7f05e36e2c39c534474dcba3e958b06bfb0f384d0ddf26afc10e4
diff --git a/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild b/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild
new file mode 100644
index 000000000000..1fada65b5173
--- /dev/null
+++ b/dev-libs/libgcrypt/libgcrypt-1.8.2-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools flag-o-matic ltprune multilib-minimal
+
+DESCRIPTION="General purpose crypto library based on the code used in GnuPG"
+HOMEPAGE="http://www.gnupg.org/"
+SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
+
+LICENSE="LGPL-2.1 MIT"
+SLOT="0/20" # subslot = soname major version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc o-flag-munging static-libs"
+
+RDEPEND=">=dev-libs/libgpg-error-1.25[${MULTILIB_USEDEP}]
+	abi_x86_32? (
+		!<=app-emulation/emul-linux-x86-baselibs-20131008-r19
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
+	)"
+DEPEND="${RDEPEND}
+	doc? ( virtual/texi2dvi )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-uscore.patch
+	"${FILESDIR}"/${PN}-multilib-syspath.patch
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/libgcrypt-config
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+multilib_src_configure() {
+	if [[ ${CHOST} == *86*-solaris* ]] ; then
+		# ASM code uses GNU ELF syntax, divide in particular, we need to
+		# allow this via ASFLAGS, since we don't have a flag-o-matic
+		# function for that, we'll have to abuse cflags for this
+		append-cflags -Wa,--divide
+	fi
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--enable-noexecstack
+		$(use_enable o-flag-munging O-flag-munging)
+		$(use_enable static-libs static)
+
+		# disabled due to various applications requiring privileges
+		# after libgcrypt drops them (bug #468616)
+		--without-capabilities
+
+		# http://trac.videolan.org/vlc/ticket/620
+		# causes bus-errors on sparc64-solaris
+		$([[ ${CHOST} == *86*-darwin* ]] && echo "--disable-asm")
+		$([[ ${CHOST} == sparcv9-*-solaris* ]] && echo "--disable-asm")
+	)
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+	multilib_is_native_abi && use doc && VARTEXFONTS="${T}/fonts" emake -C doc gcrypt.pdf
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+	multilib_is_native_abi && use doc && dodoc doc/gcrypt.pdf
+}
+
+multilib_src_install_all() {
+	default
+	prune_libtool_files
+}
diff --git a/dev-libs/libgcrypt/metadata.xml b/dev-libs/libgcrypt/metadata.xml
index 46f4637bdd41..9b7e9f273f57 100644
--- a/dev-libs/libgcrypt/metadata.xml
+++ b/dev-libs/libgcrypt/metadata.xml
@@ -9,4 +9,7 @@
 		<email>crypto@gentoo.org</email>
 		<name>Crypto</name>
 	</maintainer>
+<use>
+<flag name="o-flag-munging">Enable O-flag mangling during build</flag>
+</use>
 </pkgmetadata>
diff --git a/dev-libs/libinput/Manifest b/dev-libs/libinput/Manifest
index 00efaba070e0..226570fb7ec5 100644
--- a/dev-libs/libinput/Manifest
+++ b/dev-libs/libinput/Manifest
@@ -3,5 +3,5 @@ DIST libinput-1.8.3.tar.xz 941832 BLAKE2B cf6464d68387cca23d0f70eaceeec8b453c53f
 DIST libinput-1.9.4.tar.xz 472636 BLAKE2B 692a23047cb0b54d14763b34ce3ce1414101d0097dce10d237ec32a67f29c31cbf2928681084f7561e072e555c932f0e3bc54cfb0ecbcdd0d823426806e357b6 SHA512 302f9497ea9ffb2163c643e9ca2f0a773ea141f6fe0a3aa3d8e86eb11a5d11e75d858b1e679ebfd3f913c645beac059cfd356b37c4ea17a8853068f79a740a4b
 EBUILD libinput-1.7.3.ebuild 1535 BLAKE2B 6d99e610dda382651bed647c29ee8073d14879ec2fa83f22e724ff294018cecc78f16799802974aac29153924c15f922d42d188e9199eaee60a81282be840d0d SHA512 00505995c95da87e936d1473548efb1d52fd1a593e659aec308e38f937fa391a3a092f2b7e2c1c564e9be9ce506cc021f1c3f590bc5bc39623dabd1e6758187c
 EBUILD libinput-1.8.3.ebuild 1544 BLAKE2B d2fe752951be5a015ec92f907c7cf5ac2739f35c51bafcf26e2381f3d22e8a14a6bc21c3697f02e0a0684c27dc1cd4379b5390d1df9b8a083b7405f7b31b2c5c SHA512 a0a3a0aaab446d72eda57a04d8af10d5d35f54f4c47e6ee5f9c209fac3682d3d83392ef546255026b5ce774d76d33d06bf940c55da4ade4fe33ae10e9dc0968a
-EBUILD libinput-1.9.4.ebuild 1444 BLAKE2B 59041221521a92dc1abfa25be4017f3da7229cdaa67e4d6f1eefc9af97c34beebe871cfbad1620d0472582fbb9fd28c7a86bf6f2ab5e290c27564d7a38cbc3da SHA512 93f60d74e38dbaa5e075348c7ed7174a61c1461af11d29ce63c82c6bb67a2cb65be454d9a843ffed3f9adbb4c231cad13b312a4ec5bb9e24131885b7db732e6d
+EBUILD libinput-1.9.4.ebuild 1443 BLAKE2B d689a81fc0ece5e1c2f5894d34c23afa5a67b59b507a5be7c3df5473fb9d00c34120e01fb58071c51d23b5ce23852f761d3b590f0a7d994271fd963fca4710d6 SHA512 6b64f1203035b11da6aeb8cd26b237227d0ea7b771a4e449f06858781ee9c45ca2caefc285d57cd7720d6c26ac0fb1a07a798e4475b5aab193486ab812675d85
 MISC metadata.xml 340 BLAKE2B b555474c5acc545a4a81d86b590620ed4eab35e091d012d740f3d0f08add99bc0b5d09db251c03e1191df719135c92251d98849944fe41f76336526a96f9ae7a SHA512 04b1dc52c0db95a09aeb061ea0bc579f83ad5971dcdb20cf61bb08ed37bf56999f784db75e6ec2b6cd47e57976c7e0651ffb040b052dd0f5ac8e1a679bee8c09
diff --git a/dev-libs/libinput/libinput-1.9.4.ebuild b/dev-libs/libinput/libinput-1.9.4.ebuild
index 89bf24d7c505..12e536901563 100644
--- a/dev-libs/libinput/libinput-1.9.4.ebuild
+++ b/dev-libs/libinput/libinput-1.9.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="MIT"
 SLOT="0/10"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86"
 IUSE="doc input_devices_wacom test"
 # Tests require write access to udev rules directory which is a no-no for live system.
 # Other tests are just about logs, exported symbols and autotest of the test library.
diff --git a/dev-libs/libmowgli/Manifest b/dev-libs/libmowgli/Manifest
index d5b202ea4279..9458cf9bfb80 100644
--- a/dev-libs/libmowgli/Manifest
+++ b/dev-libs/libmowgli/Manifest
@@ -1,6 +1,7 @@
 DIST libmowgli-1.0.0.tar.bz2 105929 BLAKE2B f22af94e1d5693e92544e9c177f56caf7fcbbf3f46a254e1e6982ba0e6f41443bcf70d1b944cd68e7eea7a0247dd478777afcebb5db80742312149f52dd86bc4 SHA512 f3f7f9a527cb3f6f24c23d0585b55509d8721023c670df9e59a7f5667d4e12caf17ed71773cd1283a3ebfada465824653f654aa29d857c076875d36b2a824313
 DIST libmowgli-2.1.3.tar.gz 227742 BLAKE2B 9ef5c30880644247df3c98dabbd87694d0a7c92e7de0c44a73842d4c5bbc7f19a32db24acc52b27fe5f204b1f74a5c730c64edd1e8edd23bc320e4c0dc4a554c SHA512 bf976cf8b8bf0efaf7565230f42147adcdbe993339f58f907f5005eddf178d936cffb6cdbba59e38813854f30414856a1b9f8bdc972ea2f59cb08987ee336533
+EBUILD libmowgli-1.0.0-r1.ebuild 496 BLAKE2B 21f1302141156e4addc1ccf3981b8022e1567522b080c55d3619856ebc877b1ed5544ee356b923ed7900981ee964eca7f00c577b32021bded45abebfc58acc1a SHA512 93adf0dbe03050733ec4408d1ddca8bc8f51e803e3f0813ca8f106490fc70fbd649c575a89a93d55b37154310e2ac5006bd81809e75b921373cdd02bcdf32672
 EBUILD libmowgli-1.0.0.ebuild 592 BLAKE2B 8ecd3367a72255f72f4d1f33898fdcb6f6e668d1b6ff04866b2f8eca7660d508ca17e7f175da3b32e37d99dc7f21eafe26bfcd5ce5a3715d2bbcc6e74a316209 SHA512 9d9ea4ee4239c5c8be7fa37e653afc06a7d61fd2561b6dc7940e39af689cc1e6f64ac774ef00c6f2c3c8a95b6d47fc41c5d5ed64fecb7472b74b6e2ae2169567
 EBUILD libmowgli-2.1.3.ebuild 801 BLAKE2B 295cf5e587db6db974e4e6e6d85ad2f049b1ec2b03477ed7f6c9f7dcf3b92023c54736c06a31a97fc94c88a175cd3b0011c4639dca4fba04a9865e496b219c48 SHA512 800bf7527324edf31827105316ce965abae9dcb9e283ab4c3810af13ba74e41fc9a5344646991fce235504588563c23282a15d6c079d0e246117dba9033e4759
-EBUILD libmowgli-9999.ebuild 605 BLAKE2B 986896d6abd75d660d69f86a3822ef95d0626a1d4159970b2b58045b63b1c46866250b59b4467e1216d54cc74664e15790e671ab9a130d908bf0ce58d3d3528c SHA512 635c00a5c1ac8f50ab4f9dff6a1be4fc3e82ee73ca8eead7c553a4f961f65f332f04756328b878b678d4835c763974f8d2588a966679a6113d92fa95c80034bd
+EBUILD libmowgli-9999.ebuild 608 BLAKE2B c6dedd277c9406c534b97383d19a58a4ed461c49e96877deca89b02354ad43473a00b51e460e25c52f97323dd36d0a70100ffae2e68b4e07d4d09841f49dd390 SHA512 e4f523ef69e89ffa039494816d20cc552264d0f3fbbc054a198a5697f88aed24b3b8a812febd5eae00b5fd94ddebdcf82c7962d88b44a6ccfbfe80d6cb69f821
 MISC metadata.xml 364 BLAKE2B 3cf2dc0b9b8e9e25f34ed1e94214c05479d25ac7bb560680efec14ef19f61eef74c5edeffa9538c241ffdb7fe86bae4ee6c0865887e26f54e16cc5f064fb277c SHA512 dd547ca4323b0a3ed2d731ab482159ffdb22158bede172abcebff3460e20f284088659311c954919ce5f87e3fe6f90acce3c635612b7e0ca43ddfd85bc608843
diff --git a/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild b/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild
new file mode 100644
index 000000000000..f6bf87c430b5
--- /dev/null
+++ b/dev-libs/libmowgli/libmowgli-1.0.0-r1.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
+HOMEPAGE="http://atheme.org/projects/libmowgli.html"
+SRC_URI="http://distfiles.atheme.org/${P}.tar.bz2"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE=""
+
+DOCS=( AUTHORS README doc/BOOST )
diff --git a/dev-libs/libmowgli/libmowgli-9999.ebuild b/dev-libs/libmowgli/libmowgli-9999.ebuild
index 5450f37c16c5..bae567fb341c 100644
--- a/dev-libs/libmowgli/libmowgli-9999.ebuild
+++ b/dev-libs/libmowgli/libmowgli-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,18 +6,21 @@ EAPI=6
 inherit git-r3
 
 DESCRIPTION="Useful set of performance and usability-oriented extensions to C"
-HOMEPAGE="http://atheme.org/projects/libmowgli.html"
+HOMEPAGE="https://github.com/atheme/libmowgli-2"
 EGIT_REPO_URI="https://github.com/atheme/libmowgli-2.git"
-IUSE="libressl ssl"
 
 LICENSE="BSD-2"
 SLOT="2"
 KEYWORDS=""
-RDEPEND="ssl? (
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:0= )
-)"
+IUSE="libressl ssl"
+
+RDEPEND="
+	ssl? (
+		!libressl? ( dev-libs/openssl:0= )
+		libressl? ( dev-libs/libressl:0= )
+	)"
 DEPEND="${RDEPEND}"
+
 DOCS=( AUTHORS README doc/BOOST doc/design-concepts.txt )
 
 src_configure() {
diff --git a/dev-libs/libunibreak/Manifest b/dev-libs/libunibreak/Manifest
index cb87cb1a1fac..b362928c5820 100644
--- a/dev-libs/libunibreak/Manifest
+++ b/dev-libs/libunibreak/Manifest
@@ -1,3 +1,3 @@
 DIST libunibreak-4.0.tar.gz 629403 BLAKE2B 067d09bd48c5381ebef1f3a0ca488732e216234e45977d5c2eee181c9c98b435a7e4030fb5bdbd83035a7937c2107ec05f78dc33158ec64297511d24e329f03d SHA512 43da73f66fabd8fdef444c5a06ad1800464a0aeab590938522d6c19973950a242f2ccc0575a93d10d87bdcf82610452117ac081ddb73f47271a8c2a65897e11c
-EBUILD libunibreak-4.0.ebuild 1205 BLAKE2B 34d64d523e8f19a07fb9d4ef314f9afe3b01c84ee3454830f6a571d1bb551600d082b6b50eff9ffef8ea55bde9e820c87d072352427ad6a5e5cb142ee2c2d6af SHA512 1a6779b3e587a3c284a78cb50078eb4e5f6bbbd56a53642466309fe10cf4a335530beb102e72d2101f3cca2cb04c79db38f319ea02fd48a8fbd99619363b831d
+EBUILD libunibreak-4.0.ebuild 1273 BLAKE2B 294318b062e76c0e00e19ed5157a3bd20b5c09f917c078d477aceade4356a5af5f9f06e3a067e952d68260e2fab643fb111cd6f7fd74411e32673bd9ef085c91 SHA512 d00edd34a1ec3602db7febd3fea89d690ee08203fcb3157a338157b33b4e982bab05aa30645f3b7a4724ae4c8eb04df28691b51d8b72ffa7d6fde56592eef80f
 MISC metadata.xml 614 BLAKE2B 9a68d6b1935c236312fb74a18fe8d417c8e11970be97aad071d04b5a2c57cd18df55e2b48a855ff81a3287636af6afb4abf1ab0fa84c6391c013500f65585061 SHA512 bb9c9c2b2264cbb2c7596146c1be2b51a1e0d710432b86b3f68dd7fe9832abe7aa68ffe7806e58b6e4d044d269f86a533b1b9bc437eb5cb80bac39027989e62d
diff --git a/dev-libs/libunibreak/libunibreak-4.0.ebuild b/dev-libs/libunibreak/libunibreak-4.0.ebuild
index ec0bccd245fe..75c158e6afb0 100644
--- a/dev-libs/libunibreak/libunibreak-4.0.ebuild
+++ b/dev-libs/libunibreak/libunibreak-4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,6 +13,9 @@ SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86"
 IUSE="doc +man static-libs"
 
+# Tests require internet access to www.unicode.org
+RESTRICT="test"
+
 DEPEND="man? ( app-doc/doxygen )"
 RDEPEND="!dev-libs/liblinebreak"
 
diff --git a/dev-libs/libxml2/Manifest b/dev-libs/libxml2/Manifest
index 74a6f54fe092..8597558cf53b 100644
--- a/dev-libs/libxml2/Manifest
+++ b/dev-libs/libxml2/Manifest
@@ -25,5 +25,5 @@ DIST xsts-2004-01-14.tar.gz 2761085 BLAKE2B 41545995fb3a65d053257c376c07d45ffd10
 EBUILD libxml2-2.9.4-r1.ebuild 6888 BLAKE2B cad917e8d19e16fcb5736b39be4760f976b9aa20b320f6bd486c455192eb3c3e6bbf94c8742691a34ebc399f9b6ae42804871319ed99be075f126fa97f9de5d0 SHA512 3bfaae862504766bbe9c673046e8eda870d309173f9ec43cc7ad1649c34f9115b7be71e4b6cbb6fd38d01d57cbb10137ea23482c4e517c9f056213a16c974b29
 EBUILD libxml2-2.9.4-r3.ebuild 7671 BLAKE2B 6e8054440bf2dd8387f689513e834c42bf643e60c3f270f5aa9d128fb7e3d30ee04f90e20b6f2ff37b525c23ec6b62d5531dcc6ffadae59bf73a81e0721ebc49 SHA512 ce3cd2d3db2a4f489f9024cbe8c7d343fd94b1b8736debbe98084ebe76d828cb1e236169b9ab114e7278c886d58814835f4639b865bf198af528cc681236fa54
 EBUILD libxml2-2.9.6.ebuild 6378 BLAKE2B 189a86bd8a949429e0908b46c8f9f2262a8ac33986b4134c61353edf3f5aad5f536ae34d1482db68917564ac944eec1184df134af3254df9ad20d1ab848ce348 SHA512 52dc4ecb3fe1c468273b7170f310275a27edbeca1a32b5eb9d37f181be08d2643fff0dc75682a8f6c71d6ab88a7650c7170b6c268dfb19818f8c8a41f4f4a732
-EBUILD libxml2-2.9.7.ebuild 6378 BLAKE2B 87b3a4353bb5ec93642122e5b042620ef980ca4b8060af2d4c1d8ab9ed55559c11aa495c038e2fc3f77d1a17c0c4f853f7991180d95c64aa74682006883c1cf9 SHA512 7c072e202140707b610a6ff9cf9ae988d546ef0ed186d7a8f7e63b4141ed92b7390301cb232d993e620ede2e4e86d272ad15af3cfe21e1da44876c3c1ca64531
+EBUILD libxml2-2.9.7.ebuild 6377 BLAKE2B a3a79d53a81e8ecf87088c7cbd279513c502f63cefe8e61f3bf44bd341b7677b76cb8c8d7cf018e655da1e710c47d843696b8c844ba36beeac722ed9d72b97e7 SHA512 7fead70c2282b9f093e19b844d6ae91f61aa5d430cdeb4fbd2094fc675437511583e1c8f38b586cbcf0549c555a3bed577ff8454864108d016553324320b0d5c
 MISC metadata.xml 347 BLAKE2B 0593bb4362c2ed60dbe07c41872832992f9b993a4c155cddf82ce362f1ddd4c8eb9fa00e5b4457e9a24b22b697d92ef55dde231918fa0e6bdac0a736fce37f66 SHA512 6a094316da6ea1fb160b539788923a2dc01d7ef6304f924f628a438714663a51c8d1adaa97800516a64055a8adf6999ae2899b5a976db680967dcc298e22444d
diff --git a/dev-libs/libxml2/libxml2-2.9.7.ebuild b/dev-libs/libxml2/libxml2-2.9.7.ebuild
index 24cea539bb64..8716bcef9202 100644
--- a/dev-libs/libxml2/libxml2-2.9.7.ebuild
+++ b/dev-libs/libxml2/libxml2-2.9.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug examples icu ipv6 lzma python readline static-libs test"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/dev-libs/log4cplus/Manifest b/dev-libs/log4cplus/Manifest
index d2580cc38655..ca9b8f463198 100644
--- a/dev-libs/log4cplus/Manifest
+++ b/dev-libs/log4cplus/Manifest
@@ -1,6 +1,4 @@
 AUX log4cplus-1.2.0-fix-c++14.patch 897 BLAKE2B c4067272e84b2e442ef61c5468734ee985a9931171e7651242e79029dd6c5c6a9aae03fb9aa9a3ec9c1d391763c7acc7d57c794904636a261b2ebefda4986fe4 SHA512 9771a43add0af52417d67f54c991d637928d5f8340e90a786f2e9714cbc206e4ce6e7cc55face0f2ed0ed2c34e0a52bd922fa11978b85ffa48f02235df7c2de9
-DIST log4cplus-1.1.3-rc7.tar.bz2 562969 BLAKE2B c67365a3e12b037014b9ec876b5725d74cd3856fa92aacb084dc3fad8557eb1b5c49a77fb5abf0833ee99bdcd646fea1f09bbd14fc7aa8b574ff396424195cfc SHA512 6854a966dfd5a2b807778e34957ea33c43a340b8be71a1a989941ec6c6fdc22d181dc2f0bb0e87910c77417a9f5c4f07d4fbd8f13eadffe82adef10a1e00ef02
 DIST log4cplus-1.2.0.tar.bz2 629119 BLAKE2B f1b4629f7b6184b3f34f9d702c17487e113548cba46f5a25bb0f4972d7f3ce207310b25c94abea8cc1360591f7d0ac3d466075e584f25ce1968fee9d5b5c543a SHA512 2c3f16645051a230f9ec9a6ac689421efc4b51d5f40cb772e552bd199d2ad13c39d7e577cc63d51617555941412da166a6cda8861ee219154a953d9926aae626
-EBUILD log4cplus-1.1.3_rc7.ebuild 1693 BLAKE2B 5cf2c0d0b6e8d4a110e7a9c2555184d05e037e7ab5d996267841314acb0668cf173237363db44a65a863cb3277e2ff72358ad5d582b9a72748bf24773d8e72bb SHA512 39023966bd1b696e5c8d7a7739f7323b78eb60018869bfb59698cf51abe5ebe3577fcc65c5dc0e0b3ac53666839360db60d9ccb8ab63a996bd7f7700c366e66d
 EBUILD log4cplus-1.2.0.ebuild 1593 BLAKE2B d8b6eeea0ca194e78461cdee7ac8d695d5a2265c7e7c25447adcc72db328b48672089ae1c96e6dbb32702be1edd1c7ddb1da4c5df41ca75b51db2efb9cd05271 SHA512 63614e3b68805a4f01b710f6c56a82e4bfffad86477e2e326da6c27fde9361b7a0c70562708b17b446c12196a5502490e50ceecadcb8a3079d20391c5b9ee1b6
 MISC metadata.xml 749 BLAKE2B 896a9b8fb91d74d3ddcad1b2d775ad65cb0de33a16961fd96096ba7ab59cf624a83a01c13f1263f17eaeb8ee578474fe067ac1e13d2a0f991b1988081c325ce5 SHA512 9fd7d13a36875f50fa784dd61b775cda0834d8e76302b9e6a6fec6e843131b869831ce4d9eb5c93c6b3eb1c58bf3514b4d5b6c3ac9bf70c95cd877d28b29fa96
diff --git a/dev-libs/log4cplus/log4cplus-1.1.3_rc7.ebuild b/dev-libs/log4cplus/log4cplus-1.1.3_rc7.ebuild
deleted file mode 100644
index 3f533325b5ea..000000000000
--- a/dev-libs/log4cplus/log4cplus-1.1.3_rc7.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="C++ port of the Log for Java (log4j) logging library"
-HOMEPAGE="http://log4cplus.sourceforge.net/"
-SRC_URI="mirror://sourceforge/project/${PN}/${PN}-stable/${PV%_*}/${MY_P}.tar.bz2"
-
-LICENSE="|| ( Apache-2.0 BSD-2 )"
-SLOT="0/1.1-9"
-KEYWORDS="~amd64 ~x86"
-IUSE="iconv test threads working-locale working-c-locale qt4"
-REQUIRED_USE="?? ( iconv working-locale working-c-locale )"
-
-RDEPEND="iconv? ( virtual/libiconv )
-	qt4? ( dev-qt/qtcore:4 )"
-DEPEND="virtual/pkgconfig
-	${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	if ! use test; then
-		sed -i -e 's:tests::' Makefile.in || die
-	fi
-}
-
-src_configure() {
-	econf \
-		--disable-static \
-		$(use_enable threads) \
-		$(use_with iconv) \
-		$(use_with working-locale) \
-		$(use_with working-c-locale) \
-		$(use_with qt4 qt)
-}
-
-src_compile() {
-	default
-	use test && emake -C tests
-}
-
-src_test() {
-	cd tests/ || die
-
-	local t
-	for t in appender customloglevel fileappender filter \
-	 hierarchy loglog ndc ostream patternlayout performance priority \
-	 propertyconfig timeformat; do
-		einfo "Running test \"${t}_test\""
-		pushd "${t}_test/" >/dev/null || die
-		./${t}_test || die "Running ${t}_test failed!"
-		popd >/dev/null || die
-	done
-
-	if use threads; then
-		for t in configandwatch thread; do
-			einfo "Running test \"${t}_test\""
-			pushd "${t}_test/" >/dev/null || die
-			./${t}_test || die "Running ${t}_test failed!"
-			popd >/dev/null || die
-		done
-	fi
-}
-
-src_install() {
-	default
-	dodoc docs/unicode.txt
-
-	# package provides .pc files
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 64a8097791b5..32e86542301c 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -6,5 +6,5 @@ DIST mpc-1.1.0.tar.gz 701263 BLAKE2B afd9fefe687b7cd3c3a483e183f366348e34f58f5d7
 EBUILD mpc-1.0.2-r1.ebuild 993 BLAKE2B e079992e59b38bcfb8d1c24653d525b33830499ba76aa6d464fc844060de1393a09931fa8404d5b4a9aff077865bfad24200868852731dde8d3e9e5e9f94a659 SHA512 43c6c7cd7c33293b3539eab725f245da896516bb447b5e750549b9bf7f63b65477d2bc72ed5ab6fef015556a59cf7b606240253472079376cde92818d8fffff6
 EBUILD mpc-1.0.3-r2.ebuild 1117 BLAKE2B df2cb9956c46f6d1ec89787b83c4b44fb701f55b9e37d3b90a1478e827f6e10aa72d799bfada27ce20925f8572ca666a159d05b323bb66e0d2ec17d2f1dd933e SHA512 91fa1174924b6fd6cb8e7a3e3f3255bfa3d44b39c61973ab647f23c6509a3356b8b7d34f572cdd17d01516ef5fd39e00eada1192d761a96d7cd609289abb2e10
 EBUILD mpc-1.0.3.ebuild 1005 BLAKE2B c7282174e4d3b5efe19725581d0b6070551be9a1c401aa2aeada18e73c2b6222bc5c24696eecaa0181e5b2b3765c520247f5be87add1e263a975229ff81a9f9c SHA512 c9186aa7715afb1404f193c7aa6e5852dd655bdf1a8b5b267530d81019378232e23f481cc326af000e16dd06162f167d55e2a5c4ed2176150a8e124113af09ae
-EBUILD mpc-1.1.0.ebuild 954 BLAKE2B 7471acab67086676197c8a59899b92f907a6e19e5fa758c74262814907b61dbf5a76dbab0e3fe93013a4e2e1dd3c3d0eb34e06b9a6e10c11d09eedfdec12aa94 SHA512 8286594f6f70fa318ae02d197985c58f7ece7667dc17280b57ceb3c478f3bde8ea4599477b8514c13a0233c5dd4ec941372a0c121770ef6c877516b1874dbdee
+EBUILD mpc-1.1.0-r1.ebuild 974 BLAKE2B 9e5ac0b8b2f1c202e74178895f1e1304e9a6096213bb53a4af6b72df78a8572756c645014c475dc183e39c12f1e5b104afb5a400a0ae3a0fe8c0b268d901c9d5 SHA512 5fe4bec5e049c1e1c71d8797a2d96c09f88dcd47b2449d06535e1b63e96d35f70403412adc536302611fbce362dbff734de2aab9beeb55ae1d9d35c45bb0ab65
 MISC metadata.xml 261 BLAKE2B 0f1375874fe7e8b88a61f27f69fb353b86a45aa39838c0f7a3137b5d5a5e6c9cdfca1cd43913e15545c14466603066eed331d012b1073a72a5634aebff15b9ce SHA512 31c9514d1798d2ab9ad46006c8e85222798c200a7466568170da1587d99144d2fabb8e5056b723710d19cdb1d5482d93eff479a8caa77f00e93aa46861ceb05c
diff --git a/dev-libs/mpc/mpc-1.1.0-r1.ebuild b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
new file mode 100644
index 000000000000..dbbfae8d3a7f
--- /dev/null
+++ b/dev-libs/mpc/mpc-1.1.0-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit multilib-minimal
+
+DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
+HOMEPAGE="http://mpc.multiprecision.org/"
+SRC_URI="https://ftp.gnu.org/gnu/mpc/${P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
+	>=dev-libs/mpfr-3.0.0:0=[${MULTILIB_USEDEP},static-libs?]"
+RDEPEND="${DEPEND}"
+
+multilib_src_configure() {
+	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+	einstalldocs
+	find "${D}" -name '*.la' -delete || die
+}
diff --git a/dev-libs/mpc/mpc-1.1.0.ebuild b/dev-libs/mpc/mpc-1.1.0.ebuild
deleted file mode 100644
index 2ebc852471ef..000000000000
--- a/dev-libs/mpc/mpc-1.1.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit multilib-minimal
-
-DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
-HOMEPAGE="http://mpc.multiprecision.org/"
-SRC_URI="https://ftp.gnu.org/gnu/mpc/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-DEPEND=">=dev-libs/gmp-5.0.0:0=[${MULTILIB_USEDEP},static-libs?]
-	>=dev-libs/mpfr-3.0.0:0=[${MULTILIB_USEDEP},static-libs?]"
-RDEPEND="${DEPEND}"
-
-multilib_src_configure() {
-	ECONF_SOURCE=${S} econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	prune_libtool_files
-}
diff --git a/dev-libs/mpfr/Manifest b/dev-libs/mpfr/Manifest
index 3fa96aff53a4..03751e7b2492 100644
--- a/dev-libs/mpfr/Manifest
+++ b/dev-libs/mpfr/Manifest
@@ -12,6 +12,6 @@ EBUILD mpfr-2.4.2_p3-r1.ebuild 1507 BLAKE2B 1dee9bc908cb086e91478f7522540625be4e
 EBUILD mpfr-3.1.3_p4.ebuild 1826 BLAKE2B cb2c4252b7c1c5dbc39b147f5d109a2b40f67cafe7fc9f9e410e25ffaab929774df3870996fcd95e52cecaaf7ed3eb99b1ef9f743f13f932c18e184a8ea48fbe SHA512 3e0c9ae63c66de33c1a4afc69f1790d1e6a1728ce15b9bc7d06d53510c1fa0bbf068fd7c527de3b37dd2916adf3e324d305f6578958d6b3b19284183bde47759
 EBUILD mpfr-3.1.4.ebuild 1655 BLAKE2B feffc8a44671a6a4d3fdee5e7bb4b30a679cbf5960c3eb9ed83a0b8b0985e4e8ad6e7bc7394f075dddb9f06185318028c048fe967cca2bc910c704ac20ac5f1e SHA512 6b9f4b4a769e485fa0fccdcb7af0d79c18c9ef22c197c19f11a721dcb039399f6163458520e5d3744bc9d13209eac7c83ba339b9a2d0aa6589740475c828ccdf
 EBUILD mpfr-3.1.5_p2.ebuild 1715 BLAKE2B 8deffe623eafe5b560cd336e5e7b2db7bd064f7ecefcafa20f79dfde0eaff7943ae8aedde69a159ef5117371875daece701a509a0e18c7b3fbc7b779ee9feac1 SHA512 d4706305aaf08f64ad52a9573f724a637f8b5972e7e36adf8ef3cbc77d41a241127f175fea584bc2e5558f487a17aea8d31fbca12ca337a624357f38d4fd70b9
-EBUILD mpfr-3.1.6.ebuild 1639 BLAKE2B 7c1beeb915f4aec01c005ba27d6703268b7890eea4e3bb1d4a207009b350d5b72cf304c391dd95ce70c5feb81890376c4f14a6d8df3ea68817ba37adc0585358 SHA512 32c2c9cea50d4d4b19af36c7cabe9a2b329fcc7c6f245ceaef78c77e89d6ba94bb99c5e3ff20cc87f6e4814b993ead058a7dfe38938a598d83e8e99c705173a8
+EBUILD mpfr-3.1.6.ebuild 1634 BLAKE2B 4ed44a10ae9776d884362a4f25d353f7ffc01a17db64081c9d60bd3f05569cacfff6969b714a618cd0fb66fd63699c3c67e5d4a87f316e45e40e9eedb186d833 SHA512 b662b8f50470a86a1f943f425c87f3ddba345b9e9b612b043911232379aa1c5837f287b122a6edfa4011bda3c81e9200aee21216e9dc8c2740c16be737b7eb9b
 EBUILD mpfr-4.0.0-r1.ebuild 1734 BLAKE2B 374e288ec1e303177c0c36195b05304c5304a8e78679747d38689ec3cd8f09c3937706b9570b832221f1d7be8ce42146d77587ba8e25318f26d99cb2538a03d5 SHA512 17802798613c3e906c9542ba420e2be1dbf0cce8219b3c5e16fbabf3652caf60b9ae30f8e94d543f650dbcb984502a7eda9f61f8b4d9edec12e6ac4cf090a59f
 MISC metadata.xml 257 BLAKE2B 468bd91200194cf2104205cb18f54d629954ed0d86d85a5d3e90af1942eb199d777a0ebc17d1f610f69326d3e0caa686255709f165466f5e0a675380373b30f9 SHA512 fd85d9cf15f6b7db96e4d184e32ae6f1503a5b70cb4cb1ce930ba13a1d5d4c4b24971781e95b7f3f9ead58b31760f84c368bc6fa2a793b4b5baf78259b047ff1
diff --git a/dev-libs/mpfr/mpfr-3.1.6.ebuild b/dev-libs/mpfr/mpfr-3.1.6.ebuild
index a2c7917b755f..dc2f051943e8 100644
--- a/dev-libs/mpfr/mpfr-3.1.6.ebuild
+++ b/dev-libs/mpfr/mpfr-3.1.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.mpfr.org/mpfr-${MY_PV}/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0/4" # libmpfr.so version
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="static-libs"
 
 RDEPEND=">=dev-libs/gmp-4.1.4-r2[${MULTILIB_USEDEP},static-libs?]"
diff --git a/dev-libs/sway/Manifest b/dev-libs/sway/Manifest
index 34e4770ce060..520d4e8e58c9 100644
--- a/dev-libs/sway/Manifest
+++ b/dev-libs/sway/Manifest
@@ -1,7 +1,4 @@
-AUX sway-0.15.0-json-c-fixes.patch 11281 BLAKE2B 85da7be6f1179c6177f982048da54eec994a0266f1f351ea17c63aebca18d43aa7d9693dbe2d4e10270d1d33a895caf6ed111a0737a677783d090feae33b6944 SHA512 29ffd1a613f43d0dc706c2cdc3196691dffb7cf1f855a42cb638492d1e563068db9f0d6cd65a722677f0657c8d110e84373c22e603fb819fb64d1767813dd11d
-DIST sway-0.14.0.tar.gz 5376243 BLAKE2B 9990db2d0a17831ac55669236533737a3422a8cb8faa338acae3e897586e410bb95f83f395462332889886be148d0151cad5465bce7786bc8e1a1aa3ceba721c SHA512 2c2e45ddc935504bd240288386662d05f284eb0d540e05b6e56ca577e9b1f2303929b9659eaa3cb99b8cdadb60bd1bfa4104624bf2574e41365e1b3df5361410
-DIST sway-0.15.0.tar.gz 5394917 BLAKE2B 40b12e4c276bda3f6364f1a8d9f55604535632ce0186c0706ff6020bc6ff1b8f5b4b560ae52d281f5cc549547c7f1455bcf30e9b854db26b231e68e648819905 SHA512 2ac448f16cae83563b4ed7039b355c238cdf45bf16af58002c56781fbbac640a5b61b2fd05eb8bcfea5cc06a65707a48e093a68e80be44c14cf1d5d0a9410331
-EBUILD sway-0.14.0.ebuild 1906 BLAKE2B aba3a6e43bf908e01ef087b407fe6396bb2fe8212ce6d72398aa0828ce64de2a5f75b0b204a0ad2fe2a254a174577158857c5816754102e4eff58305d5546ff9 SHA512 1f9d9f4706d2334f04d088330b977269cbf917c0a9e5e2c99b311ec29127c8daa88d69b27a3e4002729d42a5ee172deada44c5e307a9e4496d7dcbc84355545d
-EBUILD sway-0.15.0.ebuild 1988 BLAKE2B 6e3899699af109735744ad82c3378de89538d0c64facc80b8e019d7ef15c876384a5d52e1a3dfd26b55a2425b30af9f9c3b38447b4faec249871b85088a5d826 SHA512 cf97d366c9de0de7edc7f162c39b41dad039b5105c61e2577915d9e80578a050f9d83053bcdf1826e2e80e1600c1bd9e74b28ec2f19d06a0637b421698727ad8
-EBUILD sway-9999.ebuild 1936 BLAKE2B eb363ec691e8b51714a497a27decdb685de670c23215e9070a753a37a39c170213d70604248c2881e773d95f514b696512dd03533bee98fd700071829023328e SHA512 6712f338c32dc43f67d28f7cb560c2190544922a092cfe91e9d1dfdc7b2f0d0b66c106d765931e44008094d548fd380e8a7ec45fcd30df683958525519ea23fd
+DIST sway-0.15.1.tar.gz 5395223 BLAKE2B b5803f6858f2fa9e70fef75f888970c05cf0ccb4f69ea520ec5121b683780d9ad7bd182ae9d1d4f53612e71a70c594e063a5adf94246318cefce67576e202253 SHA512 5a972fb58ab7f352f206694299832f7bcbeb053419ac47504041dccbbb55433a8de8ec06e3fa38aab259694f1a2042d2a2f920db16cb32dfcc1ac5344017de09
+EBUILD sway-0.15.1.ebuild 1922 BLAKE2B 569906ec2fab72a4d908de4dbd56817a01818bed1b8e086dd0c1fa72fc34545ad970e0ebad05f2eb54a8e3c5e53f5ae4bf379ad6d07b9475c5b0981ee95a75bc SHA512 0635bfa7e9a0e86d2a7e968f2f8d43a2e98ea76942e19990a4d94a2cd54c333d1cca8994a933701cf527a7bb19fd0b93f1ec061e9180e383fe0dcc77557f8485
+EBUILD sway-9999.ebuild 1889 BLAKE2B e324f60205740a5dcf1440bad7baf4a18d21bcf08eb3ecba84d608bc63873bb3245b5f5f2833fff29fc67d0f6def64d3d4c372bebb18a32621ddd202b8da45cf SHA512 36de11a38d5efc324d6bb77f34d26dcb2d05bfe0b1e1b4ef489ffe4e6d99a153368595d4db5d4a36d3205ce42f822781273bd331b0c65301982bd800a4a9d5c2
 MISC metadata.xml 1756 BLAKE2B 98c5ea811df7218a945de7d8ae3891692ae7fa137f320ab316f985c99ac288ac62fe006879cdd539f48ea9207a953434f3a5dbaf815f32a40a5c7ff73376c594 SHA512 c66066c76ea1c1cbbdf79664fdd123d22a681e82bfa5c3ffe92ae12fd6fd4adaf51d12767b3ca4e2f88405df59a386e7dfe8f9f5a8fd382918b7566f6461d27a
diff --git a/dev-libs/sway/files/sway-0.15.0-json-c-fixes.patch b/dev-libs/sway/files/sway-0.15.0-json-c-fixes.patch
deleted file mode 100644
index 1e43eda62e81..000000000000
--- a/dev-libs/sway/files/sway-0.15.0-json-c-fixes.patch
+++ /dev/null
@@ -1,370 +0,0 @@
-From c6e12368a531dd4bbb0778c9a1dd5d3fb935c197 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
-Date: Thu, 14 Dec 2017 01:30:54 +0100
-Subject: [PATCH 1/3] Lift restriction on json-c <= 0.12.1
-
----
- CMakeLists.txt | 2 +-
- README.de.md   | 2 +-
- README.el.md   | 2 +-
- README.fr.md   | 2 +-
- README.it.md   | 2 +-
- README.ja.md   | 2 +-
- README.md      | 2 +-
- README.pt.md   | 2 +-
- README.ru.md   | 2 +-
- README.uk.md   | 2 +-
- 10 files changed, 10 insertions(+), 10 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index dc521570..bd12b191 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,7 +59,7 @@ if (LD_LIBRARY_PATH)
- 	add_definitions(-D_LD_LIBRARY_PATH="${LD_LIBRARY_PATH}")
- endif()
- 
--find_package(JsonC 0.12.1 REQUIRED)
-+find_package(JsonC REQUIRED)
- find_package(PCRE REQUIRED)
- find_package(WLC REQUIRED)
- find_package(Wayland REQUIRED)
-diff --git a/README.de.md b/README.de.md
-index 701cc34f..293ffe70 100644
---- a/README.de.md
-+++ b/README.de.md
-@@ -60,7 +60,7 @@ Abhängigkeiten:
- * libcap
- * asciidoc
- * pcre
--* json-c <= 0.12.1
-+* json-c
- * pango
- * cairo
- * gdk-pixbuf2 *
-diff --git a/README.el.md b/README.el.md
-index df39364f..eba97b9c 100644
---- a/README.el.md
-+++ b/README.el.md
-@@ -53,7 +53,7 @@ To username μου στο Freenode είναι kon14 και θα με βρείτ
- * libcap
- * asciidoc
- * pcre
--* json-c <= 0.12.1
-+* json-c
- * pango
- * cairo
- * gdk-pixbuf2 *
-diff --git a/README.fr.md b/README.fr.md
-index 47b6c410..a4ff7cb9 100644
---- a/README.fr.md
-+++ b/README.fr.md
-@@ -55,7 +55,7 @@ Installez les dépendances :
- * libcap
- * asciidoc
- * pcre
--* json-c <= 0.12.1
-+* json-c
- * pango
- * cairo
- * gdk-pixbuf2 *
-diff --git a/README.it.md b/README.it.md
-index f5e0d8e2..ded441c3 100644
---- a/README.it.md
-+++ b/README.it.md
-@@ -56,7 +56,7 @@ Installa queste dipendenze:
- * libcap
- * asciidoc
- * pcre
--* json-c <= 0.12.1
-+* json-c
- * pango
- * cairo
- * gdk-pixbuf2 *
-diff --git a/README.ja.md b/README.ja.md
-index 2e8f9bfb..94b4ce9d 100644
---- a/README.ja.md
-+++ b/README.ja.md
-@@ -46,7 +46,7 @@ Swayは沢山のディストリビューションで提供されています。"
- * libcap
- * asciidoc
- * pcre
--* json-c <= 0.12.1
-+* json-c
- * pango
- * cairo
- * gdk-pixbuf2 *
-diff --git a/README.md b/README.md
-index 29e8a674..eeca9f88 100644
---- a/README.md
-+++ b/README.md
-@@ -61,7 +61,7 @@ Install dependencies:
- * libcap
- * asciidoc
- * pcre
--* json-c <= 0.12.1
-+* json-c
- * pango
- * cairo
- * gdk-pixbuf2 *
-diff --git a/README.pt.md b/README.pt.md
-index b5ca132f..e35849ec 100644
---- a/README.pt.md
-+++ b/README.pt.md
-@@ -62,7 +62,7 @@ Antes de iniciar a compilação, instale as dependências:
- * libcap
- * asciidoc
- * pcre
--* json-c <= 0.12.1
-+* json-c
- * pango
- * cairo
- * gdk-pixbuf2 *
-diff --git a/README.ru.md b/README.ru.md
-index 4035b0fc..1551caa0 100644
---- a/README.ru.md
-+++ b/README.ru.md
-@@ -55,7 +55,7 @@ Sway доступен во многих дистрибутивах и наход
- * libcap
- * asciidoc
- * pcre
--* json-c <= 0.12.1
-+* json-c
- * pango
- * cairo
- * gdk-pixbuf2 *
-diff --git a/README.uk.md b/README.uk.md
-index 2e107afc..c8520e4b 100644
---- a/README.uk.md
-+++ b/README.uk.md
-@@ -62,7 +62,7 @@ Sway доступний у багатьох дистрибутивах Linux (а
- * libcap
- * asciidoc
- * pcre
--* json-c <= 0.12.1
-+* json-c
- * pango
- * cairo
- * gdk-pixbuf2 *
-
-From 8272a9bae0d288b479c517dde3e831ea3889dc7f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
-Date: Thu, 14 Dec 2017 16:44:18 +0100
-Subject: [PATCH 2/3] ipc-server: Acquire ownership of referenced json_object
- properly
-
-When adding a referenced json_object with an unknown lifetime to
-another json_object, it must be done with a wrapped call to
-json_object_get() to acquire the ownership of that json_object.
----
- sway/ipc-server.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/sway/ipc-server.c b/sway/ipc-server.c
-index b560b930..80f4e5d0 100644
---- a/sway/ipc-server.c
-+++ b/sway/ipc-server.c
-@@ -1126,7 +1126,8 @@ static void ipc_event_binding(json_object *sb_obj) {
- 	sway_log(L_DEBUG, "Sending binding::run event");
- 	json_object *obj = json_object_new_object();
- 	json_object_object_add(obj, "change", json_object_new_string("run"));
--	json_object_object_add(obj, "binding", sb_obj);
-+	// sb_obj gets owned by the temporary json_object, too.
-+	json_object_object_add(obj, "binding", json_object_get(sb_obj));
- 
- 	const char *json_string = json_object_to_json_string(obj);
- 	ipc_send_event(json_string, IPC_EVENT_BINDING);
-
-From 02da9c4e7cafb36083566e511cc7913d8922aaa6 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
-Date: Thu, 14 Dec 2017 17:14:47 +0100
-Subject: [PATCH 3/3] Adaptions for API change in json-c v0.13
-
----
- include/sway_json_helper.h | 16 ++++++++++++++++
- include/swaygrab/json.h    |  2 +-
- sway/ipc-server.c          |  4 ++--
- swaybar/status_line.c      |  5 ++---
- swaygrab/json.c            |  9 ++++-----
- swaylock/main.c            |  4 ++--
- swaymsg/main.c             |  4 ++--
- 7 files changed, 29 insertions(+), 15 deletions(-)
- create mode 100644 include/sway_json_helper.h
-
-diff --git a/include/sway_json_helper.h b/include/sway_json_helper.h
-new file mode 100644
-index 00000000..66f9cff1
---- /dev/null
-+++ b/include/sway_json_helper.h
-@@ -0,0 +1,16 @@
-+#ifndef _SWAY_JSON_HELPER_H
-+#define _SWAY_JSON_HELPER_H
-+
-+#include <json-c/json.h>
-+
-+// Macros for checking a specific version.
-+#define JSON_C_VERSION_013 (13 << 8)
-+
-+// json-c v0.13 uses size_t for array_list_length().
-+#if defined(JSON_C_VERSION_NUM) && JSON_C_VERSION_NUM >= JSON_C_VERSION_013
-+typedef size_t json_ar_len_t;
-+#else
-+typedef int json_ar_len_t;
-+#endif
-+
-+#endif // _SWAY_JSON_HELPER_H
-diff --git a/include/swaygrab/json.h b/include/swaygrab/json.h
-index c1093ef1..c0bd8587 100644
---- a/include/swaygrab/json.h
-+++ b/include/swaygrab/json.h
-@@ -1,4 +1,4 @@
--#include <json-c/json.h>
-+#include "sway_json_helper.h"
- #include "wlc/wlc.h"
- 
- void init_json_tree(int socketfd);
-diff --git a/sway/ipc-server.c b/sway/ipc-server.c
-index 80f4e5d0..e10445cf 100644
---- a/sway/ipc-server.c
-+++ b/sway/ipc-server.c
-@@ -15,7 +15,6 @@
- #include <stdlib.h>
- #include <sys/ioctl.h>
- #include <fcntl.h>
--#include <json-c/json.h>
- #include <list.h>
- #include <libinput.h>
- #ifdef __linux__
-@@ -25,6 +24,7 @@ struct ucred {
- 	gid_t gid;
- };
- #endif
-+#include "sway_json_helper.h"
- #include "sway/ipc-json.h"
- #include "sway/ipc-server.h"
- #include "sway/security.h"
-@@ -724,7 +724,7 @@ void ipc_client_handle_command(struct ipc_client *client) {
- 		}
- 
- 		// parse requested event types
--		for (int i = 0; i < json_object_array_length(request); i++) {
-+		for (json_ar_len_t i = 0; i < json_object_array_length(request); i++) {
- 			const char *event_type = json_object_get_string(json_object_array_get_idx(request, i));
- 			if (strcmp(event_type, "workspace") == 0) {
- 				client->subscribed_events |= event_mask(IPC_EVENT_WORKSPACE);
-diff --git a/swaybar/status_line.c b/swaybar/status_line.c
-index 87e90caf..e3cc0bf4 100644
---- a/swaybar/status_line.c
-+++ b/swaybar/status_line.c
-@@ -2,8 +2,8 @@
- #include <stdlib.h>
- #include <string.h>
- #include <unistd.h>
--#include <json-c/json.h>
- 
-+#include "sway_json_helper.h"
- #include "swaybar/config.h"
- #include "swaybar/status_line.h"
- #include "log.h"
-@@ -70,8 +70,7 @@ static void parse_json(struct bar *bar, const char *text) {
- 
- 	bar->status->block_line = create_list();
- 
--	int i;
--	for (i = 0; i < json_object_array_length(results); ++i) {
-+	for (json_ar_len_t i = 0; i < json_object_array_length(results); ++i) {
- 		json_object *full_text, *short_text, *color, *min_width, *align, *urgent;
- 		json_object *name, *instance, *separator, *separator_block_width;
- 		json_object *background, *border, *border_top, *border_bottom;
-diff --git a/swaygrab/json.c b/swaygrab/json.c
-index 286085c3..f0e8fa90 100644
---- a/swaygrab/json.c
-+++ b/swaygrab/json.c
-@@ -50,8 +50,7 @@ static json_object *get_focused_container_r(json_object *c) {
- 	} else {
- 		json_object *nodes, *node, *child;
- 		json_object_object_get_ex(c, "nodes", &nodes);
--		int i;
--		for (i = 0; i < json_object_array_length(nodes); i++) {
-+		for (json_ar_len_t i = 0; i < json_object_array_length(nodes); i++) {
- 			node = json_object_array_get_idx(nodes, i);
- 
- 			if ((child = get_focused_container_r(node))) {
-@@ -60,7 +59,7 @@ static json_object *get_focused_container_r(json_object *c) {
- 		}
- 
- 		json_object_object_get_ex(c, "floating_nodes", &nodes);
--		for (i = 0; i < json_object_array_length(nodes); i++) {
-+		for (json_ar_len_t i = 0; i < json_object_array_length(nodes); i++) {
- 			node = json_object_array_get_idx(nodes, i);
- 
- 			if ((child = get_focused_container_r(node))) {
-@@ -83,7 +82,7 @@ char *get_focused_output() {
- 	if (!outputs) {
- 		sway_abort("Unabled to get focused output. No nodes in tree.");
- 	}
--	for (int i = 0; i < json_object_array_length(outputs); i++) {
-+	for (json_ar_len_t i = 0; i < json_object_array_length(outputs); i++) {
- 		output = json_object_array_get_idx(outputs, i);
- 
- 		if (get_focused_container_r(output)) {
-@@ -131,7 +130,7 @@ json_object *get_output_container(const char *output) {
- 	json_object *outputs, *json_output, *name;
- 	json_object_object_get_ex(tree, "nodes", &outputs);
- 
--	for (int i = 0; i < json_object_array_length(outputs); i++) {
-+	for (json_ar_len_t i = 0; i < json_object_array_length(outputs); i++) {
- 		json_output = json_object_array_get_idx(outputs, i);
- 		json_object_object_get_ex(json_output, "name", &name);
- 
-diff --git a/swaylock/main.c b/swaylock/main.c
-index c2615951..7b7dd601 100644
---- a/swaylock/main.c
-+++ b/swaylock/main.c
-@@ -3,7 +3,6 @@
- #include <xkbcommon/xkbcommon.h>
- #include <xkbcommon/xkbcommon-names.h>
- #include <security/pam_appl.h>
--#include <json-c/json.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-@@ -13,6 +12,7 @@
- #include <signal.h>
- #include <stdbool.h>
- #include <unistd.h>
-+#include "sway_json_helper.h"
- #include "client/window.h"
- #include "client/registry.h"
- #include "client/cairo.h"
-@@ -584,7 +584,7 @@ int main(int argc, char **argv) {
- 
- 		for (i = 0; i < registry->outputs->length; ++i) {
- 			if (displays_paths[i * 2] != NULL) {
--				for (int j = 0;; ++j) {
-+				for (json_ar_len_t j = 0;; ++j) {
- 					if (j >= json_object_array_length(json_outputs)) {
- 						sway_log(L_ERROR, "%s is not an extant output", displays_paths[i * 2]);
- 						exit(EXIT_FAILURE);
-diff --git a/swaymsg/main.c b/swaymsg/main.c
-index 2f9cfb14..0ee7c76f 100644
---- a/swaymsg/main.c
-+++ b/swaymsg/main.c
-@@ -9,7 +9,7 @@
- #include <sys/socket.h>
- #include <ctype.h>
- #include <unistd.h>
--#include <json-c/json.h>
-+#include "sway_json_helper.h"
- #include "stringop.h"
- #include "ipc-client.h"
- #include "readline.h"
-@@ -149,7 +149,7 @@ static void pretty_print_version(json_object *v) {
- static void pretty_print_clipboard(json_object *v) {
- 	if (success(v, true)) {
- 		if (json_object_is_type(v, json_type_array)) {
--			for (int i = 0; i < json_object_array_length(v); ++i) {
-+			for (json_ar_len_t i = 0; i < json_object_array_length(v); ++i) {
- 				json_object *o = json_object_array_get_idx(v, i);
- 				printf("%s\n", json_object_get_string(o));
- 			}
diff --git a/dev-libs/sway/sway-0.14.0.ebuild b/dev-libs/sway/sway-0.14.0.ebuild
deleted file mode 100644
index 4f0d30aa0e11..000000000000
--- a/dev-libs/sway/sway-0.14.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="http://swaywm.org/"
-
-SRC_URI="https://github.com/swaywm/sway/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wallpapers systemd +tray"
-
-REQUIRED_USE="tray? ( swaybar )"
-
-RDEPEND=">=dev-libs/wlc-0.0.8[systemd=]
-	dev-libs/json-c:=
-	dev-libs/libpcre
-	dev-libs/libinput
-	x11-libs/libxkbcommon
-	dev-libs/wayland
-	sys-libs/libcap
-	x11-libs/pango
-	x11-libs/cairo
-	swaylock? ( virtual/pam )
-	tray? ( sys-apps/dbus )
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/asciidoc"
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bad CFLAGS that upstream is trying to add
-	sed -i -e '/FLAGS.*-Werror/d' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-swaybar=$(usex swaybar)
-		-Denable-swaybg=$(usex swaybg)
-		-Denable-swaygrab=$(usex swaygrab)
-		-Denable-swaylock=$(usex swaylock)
-		-Denable-swaymsg=$(usex swaymsg)
-		-Denable-tray=$(usex tray)
-
-		-Ddefault-wallpaper=$(usex wallpapers)
-
-		-Denable-gdk-pixbuf=$(usex gdk-pixbuf)
-		-Dzsh-completions=$(usex zsh-completion)
-
-		-DCMAKE_INSTALL_SYSCONFDIR="/etc"
-		-DVERSION="${PV}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use !systemd && fperms u+s /usr/bin/sway
-}
-
-pkg_postinst() {
-	if use swaygrab
-	then
-		optfeature "swaygrab screenshot support" media-gfx/imagemagick[png]
-		optfeature "swaygrab video capture support" virtual/ffmpeg
-	fi
-	if use tray
-	then
-		optfeature "experimental xembed tray icons support" \
-			x11-misc/xembedsniproxy
-	fi
-
-	optfeature "X11 applications support" dev-libs/wlc[xwayland] x11-base/xorg-server[wayland]
-}
diff --git a/dev-libs/sway/sway-0.15.0.ebuild b/dev-libs/sway/sway-0.15.0.ebuild
deleted file mode 100644
index 4763bcbcc74a..000000000000
--- a/dev-libs/sway/sway-0.15.0.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils cmake-utils
-
-DESCRIPTION="i3-compatible Wayland window manager"
-HOMEPAGE="http://swaywm.org/"
-
-SRC_URI="https://github.com/swaywm/sway/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wallpapers systemd +tray"
-
-REQUIRED_USE="tray? ( swaybar )"
-
-RDEPEND=">=dev-libs/wlc-0.0.8[systemd=]
-	>=dev-libs/json-c-0.12.1:=
-	dev-libs/libpcre
-	dev-libs/libinput
-	x11-libs/libxkbcommon
-	dev-libs/wayland
-	sys-libs/libcap
-	x11-libs/pango
-	x11-libs/cairo
-	swaylock? ( virtual/pam )
-	tray? ( sys-apps/dbus )
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/asciidoc"
-
-PATCHES=( "${FILESDIR}/sway-0.15.0-json-c-fixes.patch" )
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	# remove bad CFLAGS that upstream is trying to add
-	sed -i -e '/add_compile_options/s/-Werror//' CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Denable-swaybar=$(usex swaybar)
-		-Denable-swaybg=$(usex swaybg)
-		-Denable-swaygrab=$(usex swaygrab)
-		-Denable-swaylock=$(usex swaylock)
-		-Denable-swaymsg=$(usex swaymsg)
-		-Denable-tray=$(usex tray)
-
-		-Ddefault-wallpaper=$(usex wallpapers)
-
-		-Denable-gdk-pixbuf=$(usex gdk-pixbuf)
-		-Dzsh-completions=$(usex zsh-completion)
-
-		-DCMAKE_INSTALL_SYSCONFDIR="/etc"
-		-DVERSION="${PV}"
-	)
-
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	use !systemd && fperms u+s /usr/bin/sway
-}
-
-pkg_postinst() {
-	if use swaygrab
-	then
-		optfeature "swaygrab screenshot support" media-gfx/imagemagick[png]
-		optfeature "swaygrab video capture support" virtual/ffmpeg
-	fi
-	if use tray
-	then
-		optfeature "experimental xembed tray icons support" \
-			x11-misc/xembedsniproxy
-	fi
-
-	optfeature "X11 applications support" dev-libs/wlc[xwayland] x11-base/xorg-server[wayland]
-}
diff --git a/dev-libs/sway/sway-0.15.1.ebuild b/dev-libs/sway/sway-0.15.1.ebuild
new file mode 100644
index 000000000000..53a06086e793
--- /dev/null
+++ b/dev-libs/sway/sway-0.15.1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils cmake-utils
+
+DESCRIPTION="i3-compatible Wayland window manager"
+HOMEPAGE="http://swaywm.org/"
+
+SRC_URI="https://github.com/swaywm/sway/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+gdk-pixbuf +swaybar +swaybg swaygrab swaylock +swaymsg systemd +tray wallpapers zsh-completion"
+
+REQUIRED_USE="tray? ( swaybar )"
+
+RDEPEND=">=dev-libs/wlc-0.0.8[systemd=]
+	dev-libs/json-c:0=
+	dev-libs/libpcre
+	dev-libs/libinput
+	dev-libs/wayland
+	sys-libs/libcap
+	x11-libs/libxkbcommon
+	x11-libs/cairo
+	x11-libs/pango
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )
+	swaylock? ( virtual/pam )
+	tray? ( sys-apps/dbus )"
+
+DEPEND="${RDEPEND}
+	app-text/asciidoc
+	virtual/pkgconfig"
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	# remove bad CFLAGS that upstream is trying to add
+	sed -i -e '/add_compile_options/s/-Werror//' CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Denable-swaybar=$(usex swaybar)
+		-Denable-swaybg=$(usex swaybg)
+		-Denable-swaygrab=$(usex swaygrab)
+		-Denable-swaylock=$(usex swaylock)
+		-Denable-swaymsg=$(usex swaymsg)
+		-Denable-tray=$(usex tray)
+
+		-Ddefault-wallpaper=$(usex wallpapers)
+
+		-Denable-gdk-pixbuf=$(usex gdk-pixbuf)
+		-Dzsh-completions=$(usex zsh-completion)
+
+		-DCMAKE_INSTALL_SYSCONFDIR="/etc"
+		-DVERSION="${PV}"
+	)
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	use !systemd && fperms u+s /usr/bin/sway
+}
+
+pkg_postinst() {
+	if use swaygrab
+	then
+		optfeature "swaygrab screenshot support" media-gfx/imagemagick[png]
+		optfeature "swaygrab video capture support" virtual/ffmpeg
+	fi
+	if use tray
+	then
+		optfeature "experimental xembed tray icons support" \
+			x11-misc/xembedsniproxy
+	fi
+
+	optfeature "X11 applications support" dev-libs/wlc[xwayland] x11-base/xorg-server[wayland]
+}
diff --git a/dev-libs/sway/sway-9999.ebuild b/dev-libs/sway/sway-9999.ebuild
index f7250762bfe6..da318f9247b2 100644
--- a/dev-libs/sway/sway-9999.ebuild
+++ b/dev-libs/sway/sway-9999.ebuild
@@ -9,32 +9,31 @@ DESCRIPTION="i3-compatible Wayland window manager"
 HOMEPAGE="http://swaywm.org/"
 
 EGIT_REPO_URI="https://github.com/swaywm/sway.git"
+EGIT_BRANCH="0.15"
 
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS=""
-IUSE="+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wallpapers systemd +tray"
+IUSE="+gdk-pixbuf +swaybar +swaybg swaygrab swaylock +swaymsg systemd +tray wallpapers zsh-completion"
 
 REQUIRED_USE="tray? ( swaybar )"
 
 RDEPEND="=dev-libs/wlc-9999[systemd=]
-	>=dev-libs/json-c-0.12.1:=
+	dev-libs/json-c:0=
 	dev-libs/libpcre
 	dev-libs/libinput
-	x11-libs/libxkbcommon
 	dev-libs/wayland
 	sys-libs/libcap
-	x11-libs/pango
+	x11-libs/libxkbcommon
 	x11-libs/cairo
+	x11-libs/pango
+	gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )
 	swaylock? ( virtual/pam )
-	tray? ( sys-apps/dbus )
-	gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )"
+	tray? ( sys-apps/dbus )"
 
 DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	app-text/asciidoc"
-
-PATCHES=( "${FILESDIR}/sway-0.15.0-json-c-fixes.patch" )
+	app-text/asciidoc
+	virtual/pkgconfig"
 
 src_prepare() {
 	cmake-utils_src_prepare
diff --git a/dev-libs/vala-common/Manifest b/dev-libs/vala-common/Manifest
index ba4eecfb65c5..f39788f22ffa 100644
--- a/dev-libs/vala-common/Manifest
+++ b/dev-libs/vala-common/Manifest
@@ -1,5 +1,5 @@
 DIST vala-0.34.9.tar.xz 2783952 BLAKE2B e90728075ac546e8abc125886182abd5fc357be5138bfea1ed058f41bf07968e55e032469cc068cefdb6a4d53f1c029ca7e728c57b00f6b9845e32c4410e8258 SHA512 8128dfbb50d0db2317feb4a358310de972ecb6f4dccaceb4d55cf3a024f4d83422e3137c92238e1a0a0b4766367ad307909a1310445017c71944ac30fc68d01f
 DIST vala-0.36.7.tar.xz 2854668 BLAKE2B 2fcb528b26a56ee9f9d362ec1891c873ee26580132c052554a3d021fea32c0cee6dc6e8c6419f88798f5066a70d54084757893b2d46e3b286b441a51a4169c92 SHA512 7a6daac5be72240ae998b2c26e240a8b6bbc44c8bb6a036357fc0419cd7b40e14ea76c8125eb49a8d252627425613512410ba7868eb579b13d299e2ff0f4082b
 EBUILD vala-common-0.34.9.ebuild 2533 BLAKE2B 6cd8150927a49de7daa2d3a6394b72ad7e06b33a1459eea21b52e1fb751b7095d5b731930af9d22647e5767bebd5d028b3aadbdb9d6c6e097999c1c17e566907 SHA512 798a4ab1f0d5b22ee2a3cd259e89a52ef6b122bb9605f1cbcf346f8aba5bdfad4c49d9ac1c19127e3244b011ad914173123a3418121a7c2ece32c8970169c9de
-EBUILD vala-common-0.36.7.ebuild 2542 BLAKE2B 115fde004f43b28050b2ba90f834b3c06c953bc29b8c7581920cce6d876ea5f80ff96bc57b0b7a05e953a773631ee15419d97359e80a4ec80000943f3eebab2b SHA512 dc92e98e84d726421ff40e073ca8218257d2edfedb3d1e45fefdbf1c8a030e27dd4b85bebf5a472e74a93a4bd0e03d5ce5d1e07151965101401590cb2f6306d0
+EBUILD vala-common-0.36.7.ebuild 2541 BLAKE2B cffdda23ff56daf041e15a2db5d40e61b381ea9182bbe2f41041aac4841713171ccaa22a53923ce141203ea7d3516daf82235687f54011eae2327a996827f462 SHA512 3987a2cb08b7087b760969383f39a90cc685f96a6e9607f8bd359fa070afb48cc23b1e98b193ecd1d49e92ae9459518274aaa342153eb3993b3e561b63385f68
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-libs/vala-common/vala-common-0.36.7.ebuild b/dev-libs/vala-common/vala-common-0.36.7.ebuild
index 01ce4db1896f..e74a03d313de 100644
--- a/dev-libs/vala-common/vala-common-0.36.7.ebuild
+++ b/dev-libs/vala-common/vala-common-0.36.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 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 ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x64-solaris"
 IUSE=""
 
 # Previously ${PN} was part of dev-lang/vala
diff --git a/dev-perl/B-Utils/B-Utils-0.270.0.ebuild b/dev-perl/B-Utils/B-Utils-0.270.0.ebuild
index 11c13002b831..8c2312c38bde 100644
--- a/dev-perl/B-Utils/B-Utils-0.270.0.ebuild
+++ b/dev-perl/B-Utils/B-Utils-0.270.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Helper functions for op tree manipulation"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ppc ppc64 x86"
+KEYWORDS="~alpha amd64 ~arm hppa ppc ppc64 x86"
 IUSE="test"
 
 # needs Scalar::Util
diff --git a/dev-perl/B-Utils/Manifest b/dev-perl/B-Utils/Manifest
index 76d0512983c4..237a457f1d16 100644
--- a/dev-perl/B-Utils/Manifest
+++ b/dev-perl/B-Utils/Manifest
@@ -1,3 +1,3 @@
 DIST B-Utils-0.27.tar.gz 74612 BLAKE2B 4bac004543111890385dc0ba59fd73f25f4d3aea169c243487144deafe99c114f9783b4271570f3c2f40566f73767bc414818396d786c46d8b9fae9977c18b0f SHA512 a896476f59a424fa9062c5dfe6431493c020e51746fa7f7b4c7fcdb109d1c0fa252292b891263d676884f064db95f16958a5d2ed5981dc5997436dced6579e74
-EBUILD B-Utils-0.270.0.ebuild 568 BLAKE2B 059ef3b1a0c7003acedec94a6697eec69382162f7af9ba3db7b2ae5016ff6887171d27c712a28e7bc17ba0442f13f68493c5a27d2f96b961d69172338122dca6 SHA512 a996c3f6b3a0736e869c9f65620aff396bdf1afc7ba6bab42b96fbf58ae1f7236aa2ab0e0f8f9c3ad2860155fa2485293df994c02dd86c2042c25e0304802622
+EBUILD B-Utils-0.270.0.ebuild 567 BLAKE2B ccb80f33919ac3d990f31123c83aff38e9d07fa44508fd52be879f6a8ae514a063e4582e7675e1b07c3e1093984cc2582f27ff7e9db5a71969ca717f964612a1 SHA512 cb51453d0130791612a71c4ebc16ea4186a62efb3d75a3aa0b38160f1cdf373fafc10cda1b54444e0162399e7d76cccc184806fcc23bde9ee88d907ed9779017
 MISC metadata.xml 516 BLAKE2B ce01b0c9312075c7a18827aa76d9d2a20a22fc5145b50613873bf41c823342861a2596f01d32afc2ec18b7e54f3fb8fa8198927e8af2165efbf18faee0e1e98f SHA512 56897978c780a0a89075476786016ed76832a25d724f88c0f99f209ca57c8785f3db65a9f13aeae8f9af57e8c13018d7c35d52f1dd744bd0fd12846c68bde53c
diff --git a/dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild b/dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild
index b4fa55d31d77..b00dd1b55eb6 100644
--- a/dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild
+++ b/dev-perl/File-ShareDir/File-ShareDir-1.104.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Locate per-dist and per-module shared files"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-solaris"
+KEYWORDS="~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-solaris"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/File-ShareDir/Manifest b/dev-perl/File-ShareDir/Manifest
index 10db20d476ac..f24fa555ae74 100644
--- a/dev-perl/File-ShareDir/Manifest
+++ b/dev-perl/File-ShareDir/Manifest
@@ -1,5 +1,5 @@
 DIST File-ShareDir-1.102.tar.gz 11973 BLAKE2B 4c3cdbac49f40f49204112a809f6fe2f31f612a2895271971bb7390c765e9a106cb729e2a85ea084eb99f895692b05e820c4f8cf3f978c70f2b70495870720a8 SHA512 c0be506a31317f6c56a7a28d4187a9bff8adb2f2a42ebebdf2171f345b7c2f0a98cef9393acfbc5f9a7d971ffe42fdedeb48a13248025880dcf3356d84fb7188
 DIST File-ShareDir-1.104.tar.gz 20500 BLAKE2B 567327d46e5ecde5c3ca8044c6ff7af5b502ba88a35eb3d697f73732338991e0402b1d1143f8ed364a4d76162996344bd0bebf91695e2242be3b0d8185ac2f23 SHA512 0fbe1a1b822e0de324fd05c7cc230a1022e74eb7ae9ec66281b57d2c4144a600f34395cfbfa08218b64a88cc2bbe3ab94abb6339cc65aef19a82191e1ba2ed52
 EBUILD File-ShareDir-1.102.0.ebuild 582 BLAKE2B e116ae04d1a45ed512ae8a1b0be3f57ced7e9b3509f43f36c2a1ecf65f4852debe3c6e5ea3e6105a1563bb874a6890de4f76d9d5f25d46959921d7a63a0da2f0 SHA512 a82a9e0e41729ef68dd417e64192ab32de1fca405d4b7eb7ad7b7496efdedbc6bd9c555b57b7bb3f149cea331ae43ba6767759071f0ca42c53e74360c23ec21b
-EBUILD File-ShareDir-1.104.0.ebuild 583 BLAKE2B 7694e7510849741b80580f69eacb77448e60e6b798c197e42e756a45cf94b4d0fc02f0a0abe08fd5c1358d1af5a91fc063d21ccc5111c9ee50eb1258224ec8f3 SHA512 5d2a34b2cd440bd1bf90875a86d33c768361bd3b79c894bb43a8311ba573c57c4bd516eba8a9c4fd974c97e8f7c7d21cb8eb1c8f3bdba7e916858a687d4ee4cb
+EBUILD File-ShareDir-1.104.0.ebuild 582 BLAKE2B 01aa6a6e6d7d6cbf529805d93195a062405979e02f6afbb1d226a0c031a2ae4c3355217eb06a01053ee625e8fc724cd0ccb511410559a48de29e8a54086eb711 SHA512 0c724848f215fae2ce852a77190b2c9907d0603546b975f8f35bee01a53b3a779accb0bd436caa49ae7909911cbb1c3428551b4cc31bc2c26e55a9a9de7204f1
 MISC metadata.xml 398 BLAKE2B 393f7f6723e23146e3c509b6fe955eaaed1800a4fd5b07bb01e793a4f4fa4045e75bb9e8fa19a7fc3ee424ef4e890465fdfb1d33079fb05771c8ce3b6ea9a185 SHA512 f13082c7aa0e876a02c76e56d91d53fcca5e0bf56b4b32c8219a4f18349287d07ad93f61bd2db22b213a90312534112fbe2d7cf493dbbc91633ef63115bf72f8
diff --git a/dev-perl/IO-All/IO-All-0.870.0.ebuild b/dev-perl/IO-All/IO-All-0.870.0.ebuild
index 3a81d023742c..18f72e18d4fc 100644
--- a/dev-perl/IO-All/IO-All-0.870.0.ebuild
+++ b/dev-perl/IO-All/IO-All-0.870.0.ebuild
@@ -11,7 +11,7 @@ inherit perl-module
 DESCRIPTION="unified IO operations"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86"
 IUSE=""
 
 # needs Scalar::Util
diff --git a/dev-perl/IO-All/Manifest b/dev-perl/IO-All/Manifest
index c269a8b05dd4..0c7c9024bfe8 100644
--- a/dev-perl/IO-All/Manifest
+++ b/dev-perl/IO-All/Manifest
@@ -1,5 +1,5 @@
 DIST IO-All-0.86.tar.gz 78648 BLAKE2B fa3a9a6d8828b1de5990585c4b6178ff28844bc01845c3e42b56142340d9e4df400f54f6d2c35048bcfd0c338681dece6b906141c70c57ebacb1541a7d294da7 SHA512 3bf2f1caae19d10905d8c959b88e0ef43703b3cd0fb389060fd6a6a0bba4d6b24a92b8d2568f4bbfca6b7614270adb7131225a7b7f9394b26467bdb780a16a0e
 DIST IO-All-0.87.tar.gz 77819 BLAKE2B 7a02816bbca80465bd1f40317a97dffbcc52e92ef767aa9e38987b59e8b14bd1d1a0b77dbcc2e4defeb3d44a46fa749b111bdffdc3b3efdc4217e3e52e290280 SHA512 bd8cb6d44db51a9a140209223f016e48acd713ec03ced1b9c02933fd88c6363926635dae033b20905201b13e8186b8bcc3f428d4d85cd187fc68b777cd197267
 EBUILD IO-All-0.860.0.ebuild 429 BLAKE2B deffb4bda7b191cfd732d8a8bbde68267459cb668bca9b263024d64abf45889b29c29d641b436bbcd841395bcc529a286110a2ce91ff3834598fa9fa64df98b8 SHA512 82c28f009f9ac1850d852528b39dd3aa18f86e62b23bd519f10a37b50d142a67cc88396598d2224644b004ed101adf40b3164da4c8fb121897b978d920fb5584
-EBUILD IO-All-0.870.0.ebuild 403 BLAKE2B c96695014d29ae996d36ef60b8f6255a86e60b2e1f412560becc110314739de7b0a0c283936a982acf42ee3ae2a91835a8649a6b39ef7b0dbee5525be8ee7a87 SHA512 43a1aa240388bfb5ca487a02d36a1580d0e8ccf664653aa658fb5108ea8bcbd16a92373b2fe0693907fb34fbc502445b677537e610c33042b5b8fec62e932d96
+EBUILD IO-All-0.870.0.ebuild 402 BLAKE2B a88ef637c3a4ef135443460a08f7f6177c4f77143e62a23fb6dd36948b53ba2b185da1b617ccfd025f4e05f84a6302179a4483002aecf0fa8809a54281adea76 SHA512 e9e764b0850b5001fc8478791f16529a67fadd99b938b736d6eb99e0f1712774b123af7288fab764ba838ce4b4f6c42abe76a4a408c519f157539811c82f7450
 MISC metadata.xml 1111 BLAKE2B 2b1e83f614fdfd4599c6d3e81367fd4ca4cb0988b1bbc06a7341c253d3bd1b7acaabace540c16802c1874ba2b4f85edec4c0df24da436a5b33aa6691055aa645 SHA512 bebf7616b2651f704d1f26fcbab1d555bd49984ab7dfe56dbc3214a8ad927f39283af51e7be5bc54094f83352eab855a2e5775945ef2fffb8e41503868e61abc
diff --git a/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild b/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
index 9439ca075eac..b69e58875454 100644
--- a/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
+++ b/dev-perl/LWP-Online/LWP-Online-1.80.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Does your process have access to the web"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 # https://rt.cpan.org/Public/Bug/Display.html?id=112728
diff --git a/dev-perl/LWP-Online/Manifest b/dev-perl/LWP-Online/Manifest
index 53e0e4b92206..03f8647937e9 100644
--- a/dev-perl/LWP-Online/Manifest
+++ b/dev-perl/LWP-Online/Manifest
@@ -1,4 +1,4 @@
 AUX 1.08-no-network.patch 1029 BLAKE2B dcd74d51a01bdd61d7ac6ca89f9198c57141168907d51179fe7d4dfb461b3aaa725a0493e25ed807095bab5c7e0cc97b2ec5d49fc6afb01d924dcff1fec57e2f SHA512 1bedc7075021fcf7e8be1fbe972ce26f39af5ac2b46ccad96697ae05ac87f6bb8303e78c4c2b67f096ec22f39265a95ff5d86a64b13f9d364ae608593f0bc0a1
 DIST LWP-Online-1.08.tar.gz 32250 BLAKE2B 4696ef7d50498b5373bd52568afac5876aa7afbe41ca6fed0029274bc0b52e05b005179fa520a63c2e43e9ba78df0dc1e99a2011f4ff13915f2cad829e706064 SHA512 2b255f60ee6521757ce3d49cc0720e3985ff17e3db7b7868ced6a9e1c5444dc067c80b7d34dbe7be9679c134f3de1dbe0e9421a1a20ff388c812aacd1d964497
-EBUILD LWP-Online-1.80.0-r2.ebuild 847 BLAKE2B 7e0f4a7f04a03deadd206c70654e06dfc3e1d4c586df3a702bd2595688f657c157baa9c5c57772b1ca0b628d74a491cdc10b984dbfe573c5cbff640191a7e882 SHA512 11e30fc2777b02bf80038a56b3f92dad895785dafe69b28158c193ce19444b25f4143a2fb1fa5a15690af7607d2bb1ef0a3767fff92117165c2b98fa424e315a
+EBUILD LWP-Online-1.80.0-r2.ebuild 846 BLAKE2B 3a6ec9767188271b7a93fda66fe922e278bcd6c0c9c66ed9147d681f2c0724239001a3b941425b5b762f01cb1b799d7bc06a9cad7731a52848f92b505616e904 SHA512 54a001129aaf37b3d585f8511a77a6ef0b9381871d3e12e3092199d7317a065d0103b901eeac16daa540ff8d8eaddfe8e2505eda3c5e3fbea15c6cbb66d0b158
 MISC metadata.xml 506 BLAKE2B 8946eac364e58e9d3965e0baa455a1b09fa28a77a6b021c52ce9fe168f172591142f2ff69a8a0988adaa6fb2b1e6ed63b428e8d5e4262628dc0b76583a55d859 SHA512 d8ba13433a74f5ce01cbf7f8813d5694ccafdd1eb5e6eb52aa37e5e5ead36063c782e777c791cc740850e69af6543b2122d7e714afa173b1748a9d40861ec7d4
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index a1c5bc28c5cf..59a7a1806e9b 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Module-Info/Manifest b/dev-perl/Module-Info/Manifest
index 6d4c35f6e9cc..31f369b5e1e2 100644
--- a/dev-perl/Module-Info/Manifest
+++ b/dev-perl/Module-Info/Manifest
@@ -2,5 +2,5 @@ AUX Module-Info-0.370.0-no-dot-inc.patch 1712 BLAKE2B 12fe239524234df13130fab8f6
 DIST Module-Info-0.35.tar.gz 55112 BLAKE2B 2daea2eebc46244e8f5b145313256c3bf1f9294a40d2d2ed7cd4dfb835d267316a47e90a945c980404faa820f807a7fc9205ce9300bfe6ecf89ff5e49baf8c1f SHA512 87d68f575f97db8579675a8187cf746e74409266c0ac9454ad41380e6e0ee9566632d368098c0b00b54128aacb27bc43c774ea78a047964bb6a14f6a06c681aa
 DIST Module-Info-0.37.tar.gz 42864 BLAKE2B 63d41a5d54201a62bb98cc4b40f03bfef3173a26282561972aae8b5d54d4d4a1e6fa9359d35d76a420edef8553fb5ade4bf4b52889686131bd19d22035f95e89 SHA512 4a9fb295c6a0b7ac701543b292804ce880129b883da7d8f27b255a198e28dc105b11753330c2861241e65898f726a1127c7daf46af09361e3713bdcd5b89227e
 EBUILD Module-Info-0.350.0-r1.ebuild 440 BLAKE2B 9a3ac23ed64c1f0401567b5193ab24ba353a206c05b846817858e00537dfe8a1d81753e85bfa11535ebf6a207de2f7fe8c70c15dd329cf1ffe51cf9506cec169 SHA512 8ee2bd60b51563ddb027bcbd745412887ec29a8d7a7d0913d5e017c1d913a810d29781c8f1ccf409832f34d8d08fc4612a7bc31fd13e2616b4564c22ac49b1d1
-EBUILD Module-Info-0.370.0-r1.ebuild 580 BLAKE2B 8b07176830e0423a25e09822ee7123d2a7bc8cb175f121ca0d10b5446e9b2791d68f17ad3432bb27c48e9655d50cf95aeb5f1bb7a3860c609976c850d4088f11 SHA512 629e2aac9bde1965699f5a2cc424feed5e59a06851a981bc0882fbb65d8c7c3991f544e19cea1521c4214d962f3a833b7fc6927f9225258ee7c6bda221dee8d6
+EBUILD Module-Info-0.370.0-r1.ebuild 579 BLAKE2B 319acdcbae691b8bd737abe7beea0ab6a43479491b903c09aee0a2215495103708e802475a2ba5127e3aee938501c5ea383765ec18c5cec2ba1a6ac105f296bb SHA512 1c768f3cfd1db7b5971b6d268c18c60f13b8fa488519ac673c576710ba97234ef8e9e1004d1036b74c8c9707e6bcfa26a26c2a10343e25a589f6d959c9662d7a
 MISC metadata.xml 657 BLAKE2B d33b4d78a2660a458673a0769654da2033d8d83fb249e7a0bd31fa92563d36885b2b2bc0707e6c3a3a98059896f7e931874d60939caa444bee0245f8005f05a8 SHA512 7cc7f77e2a7946fcf3bfe2fb5cf9ec7c566cb78d869d68042d674edad9bbe741206d41af65e9535bcc8f8586dbd9daacda47622cf87d86c151b87f4e556930a7
diff --git a/dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild b/dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild
index f34c2cb869a5..924add297fd9 100644
--- a/dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild
+++ b/dev-perl/Module-Info/Module-Info-0.370.0-r1.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Information about Perl modules"
 
 SLOT="0"
-KEYWORDS="~alpha ~amd64 hppa ~mips ppc ppc64 x86"
+KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Module-Runtime/Manifest b/dev-perl/Module-Runtime/Manifest
index 21f32d52a182..151815e82b6e 100644
--- a/dev-perl/Module-Runtime/Manifest
+++ b/dev-perl/Module-Runtime/Manifest
@@ -1,5 +1,5 @@
 DIST Module-Runtime-0.014.tar.gz 17396 BLAKE2B b62636aaf0c3f05e7e99079409292d66cbb56f04ecb7b310e2351e89c952044a2a039a7134e1411ff96d4729ca8da835ed02cc8ad4d139ec5f1db52eb78b3bac SHA512 5431d9aeb092bb357bafed4e4cf216e9eda4bbbdd0c27547a1729adbb2f6f5a114ac25580a814f2d07844d6b742b9df3ca8d5972668bcacab2f791d617c1d32b
 DIST Module-Runtime-0.016.tar.gz 18275 BLAKE2B c8b3d71deb7cff7817fb154c3b2d88eee79f56d10bdee0d41b880097dcec72a7eb0dc9db4b760d09463b3ff78139e1cd3b5bf3b1f0005d1e044e1858028832cf SHA512 64a362ee897646173dbbdd8794f863d93379d45d7ac20d3ae890d77b4ec3f5e36aaff66c41b4a6a33b28bf492216283528755550ab09e466ceafb4f0cfbaeb9e
 EBUILD Module-Runtime-0.14.0.ebuild 601 BLAKE2B e58c5a228707dad7784af15ddd94436f0d449bc5c7ec16956a856844d779fb4b9707eeb9a76250f4d97fc673eb5bd9b9361f329cb86ef29d05e94548e62d80f8 SHA512 a18777f7ed1b9c97a0e5b29b40b8382c221b7ab75b27eaa88c44762cd1db92cd56fca224dc013a44a37d419b362a1c870befc97d9ddd84b00851363b730e9e55
-EBUILD Module-Runtime-0.16.0.ebuild 585 BLAKE2B e34459cec7f29c2849ecf3365c07bec9f210336cb9045dfdcd4cac34f692fab1066d845a097d7ff7afc1fbc6a7314fc27e377e011aa78a72f2ef403e8deff227 SHA512 ce4e9231b731cabb2663fd1d13c085af3777811e7dff126b80004039829eca72f7da2c2aac0a05e34a58fc2fd27bd899d08cdcdd2de14ac7d81fe8a7c1801ac7
+EBUILD Module-Runtime-0.16.0.ebuild 584 BLAKE2B 3cf4847d45c3b373e67a995863f4e2bb8f50a7d40779195a96ddb56a9ae959c27cf282bf87bdc6a06a81d8da02a4437ee126cf9b1ef7c69fb99686f0ffb623f0 SHA512 5b9064ee63f7496586385f7df79165bec8c8d2c7a82183fde97f1c685f61f302f1a03f1ed287e7f56fc2c32b0d420ec0fdceeb272926c1312af079a73de234e9
 MISC metadata.xml 424 BLAKE2B f46423f84511442d70c4f2ff264e6f901ea40badd762c37c047d0e7568afa1fb6ecee6ba3a790f7963c99a5421dfc59d74a7e1ed067f13afbf8b746d9d6d654a SHA512 99a0a6e1014cb85c49d4e1131f808d0ad362c0627cfe1a21116b4fc75462ed67d16e0069714f38a8cf52f1ac2366fae192d99d9139b8ece470e12e71800ab4e5
diff --git a/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild b/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild
index 3eda6d5d46e1..91c2b2af03e0 100644
--- a/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild
+++ b/dev-perl/Module-Runtime/Module-Runtime-0.16.0.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Runtime module handling"
 
 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 ~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 ~x86-solaris"
 IUSE="test"
 
 RDEPEND=""
diff --git a/dev-perl/MusicBrainz-DiscID/Manifest b/dev-perl/MusicBrainz-DiscID/Manifest
index 57ec2d45a950..557c54f50d32 100644
--- a/dev-perl/MusicBrainz-DiscID/Manifest
+++ b/dev-perl/MusicBrainz-DiscID/Manifest
@@ -2,5 +2,5 @@ DIST MusicBrainz-DiscID-0.03.tar.gz 5343 BLAKE2B 3891c41a97417a68500351f3880032b
 DIST MusicBrainz-DiscID-0.04.tar.gz 6907 BLAKE2B 1dc163515af1818816d223da5090dec67cf1102311370de0658d15488d5551207b27f8b817727f3ddad2a64f3f792cf1e094ace460fd3db7d4eb1b06fdeea18d SHA512 ccf93205f3485fa19e22cee079b2615326384513dc773f5d242216b680317d2d35d3a2421e46bc17651d8d7797a4d01bd3c2c0ae603a1d1e550ac2a558163125
 DIST MusicBrainz-DiscID-0.30.0-patch.tar.bz2 412 BLAKE2B 6371693ee495ef40300cca7f88f285ba6485ac61e828551470342fceb85a4ef1ef8ed99afbff179f274325ad0299686db62dc3e8ef5337b85addd2f7c1ccb458 SHA512 79163ba28285676f585af2be0a12a6210a8869c57cad5bba1ec42121f9e1dc351ac2f51b9a702133a71fbaf1d3207e8ea153564f838ffc5d39b60268af7bf726
 EBUILD MusicBrainz-DiscID-0.30.0-r1.ebuild 1096 BLAKE2B 838964e1992cb74076ea8081cf84a3a316e1074acd97fd71a308a77058c4aae5d8eb4fc86b0d6e966d6aa6b0b4da1d7b68d57786580fa86cafc5effef6b4c25a SHA512 9903a29e4ebe6a8148cc10385069f46773842516000ff32588db9299641038821376d6541a4632641d9cb6af127b094d205c2b00c765dd61dd079b29ca87ac74
-EBUILD MusicBrainz-DiscID-0.40.0.ebuild 580 BLAKE2B 05a00ca386601c1f6f1e68b77a786f8d218cea33f2073595942b6137aebf8c2e79076b65cecbd42dcb60079c42f1152ec2b36985288c61e821f5e928a96483c1 SHA512 a78b4ccd48f595f54add57a840d9902ab8bd7ef5c4933fb586192aad0a93bba45339a78189555c732cf6bd549a74777308727a795c3ddc69d189bc553a94cb2e
+EBUILD MusicBrainz-DiscID-0.40.0.ebuild 579 BLAKE2B cbba3ae85760cd4e71d523afade87b62058dc1e36ec967f034339b43d441aa9837c7caefb67584b2fbe5be5512afe5b91d84586b25d6ebdad01d1e4d969f4ce5 SHA512 b6918ef3437dd1fe03b3a8674835d22863a65fe1ceb627532f3fcbc5504a08ddca1a4aa9581000a06b41ae75e921525fd9eb1f2e5334500fdadf5465c35e4e67
 MISC metadata.xml 492 BLAKE2B 3ea020fcec3b8e63b6682663083245bab92cd839225445a54846848c437633863da5e8daaf198568223cf92e316aed6e1ef42fdefc0c30576cb51a1733768de5 SHA512 5afc9a1138a6390f984ad75a34134c3d2eecb0d72ef663d51987d822945f40f6d756fce4efeb1bca1e44003bf837ba50d77dc91d3f37f3b03bf3cd69ef2989f7
diff --git a/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.40.0.ebuild b/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.40.0.ebuild
index d17681df6e9a..460ee3de2bfc 100644
--- a/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.40.0.ebuild
+++ b/dev-perl/MusicBrainz-DiscID/MusicBrainz-DiscID-0.40.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl interface for the MusicBrainz libdiscid library"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ppc ppc64 x86"
+KEYWORDS="amd64 ppc ppc64 x86"
 IUSE="test"
 
 RDEPEND=">=media-libs/libdiscid-0.2.2"
diff --git a/dev-perl/Net-Daemon/Manifest b/dev-perl/Net-Daemon/Manifest
index 81033b2e0bb1..277f8ce97437 100644
--- a/dev-perl/Net-Daemon/Manifest
+++ b/dev-perl/Net-Daemon/Manifest
@@ -1,5 +1,5 @@
 AUX Net-Daemon-0.480.0-perl526.patch 941 BLAKE2B 04ef7335f9ddf52c4ddb3f0e3d9b0ec37306af001541299cf12888097d1985e9f5ab61f268ac5522a1ed826cfd7c7570cd1c7798810fd1403761ac95935f32ea SHA512 5ddd7f00a608481ac63a53c7856ad8cb58b5dd61529ccbf2739e921c491a73098e32ef6408bfaed69891dadeb820a57dce406a773c23f4b78e6396ff801a32a3
 DIST Net-Daemon-0.48.tar.gz 29513 BLAKE2B a5fe8eeb01a463ebfd7b274dea2d0b9a8e633588e35576ad24b5e40a4b06ff5f1321bc01bbfb63ceac8d8e5c9e85d15807dde3c5cb18b21e53da6d84ca24a999 SHA512 85bc280adc0de6be8ebd64771732f83299018edd06441cf96c438914a16c3805918805cde07bae4fe92caa86475ad35cabfc1edfccff117dcce7f5dc8b137bba
 EBUILD Net-Daemon-0.480.0-r1.ebuild 499 BLAKE2B 6b6a66a3d24833bf3865fabe2eedb490c9b8b2f001f9398b2c70e53c772998ca5b70d9d12fba6930831fd302482887a0845f5ac4f56e3272b7e3439f30b90fcf SHA512 9bf797c0bc838d548b3ee55625ee30ad295e669988ded651c65271c7edc9c70740dc403e4537305467e856b7c2fb099a51161933430bdcdc3641f2a82f249458
-EBUILD Net-Daemon-0.480.0-r2.ebuild 645 BLAKE2B a493fa859fc243f0e007951adc10b1d1c3204228d4469845f596b04deadc7c9d23245a3ff1f4ab4ddeeafed9b74572edc627a7ec876241300512bcd17b4b92b8 SHA512 afc2f1733a3cb617a8b6e7e4eca9622bd3bfb69a679e4af881400a8457c0549e160214dba6bd4bd2f78aefc9bae8b91ab07aa85884320694cd26a8995c817b8c
+EBUILD Net-Daemon-0.480.0-r2.ebuild 644 BLAKE2B ecca6780d81c85772ce1cb9f45972e4d9ea809b7955313b0a70743c5b944084d8ee606e48b409d16fde453369834a0124d24763742ab93703fb47e97cfa665b2 SHA512 d4fc8176cd234f8dd189d1e75b9c3e81f3a2e0e717acb38e1355e44426cc673c26f78720d3e254276902b465388f364c435edabd3a1009d505dba3bca9a29e39
 MISC metadata.xml 660 BLAKE2B 89b846cf8d8e9eefa29886106ee0708ed034e7135f43c621e76d25f860c36c34dffc5348a9af7badf3114e93e331596f93113b8d1a8f09586f29630440d5f735 SHA512 abb2535a1bed81484e691e65d2282bcd2243ba65d5b7d09592397a88e32a98bb255e1b822ba91e0fe4109be6aa7d7036af2db731d8119ebeabbeae5e4e9d78e2
diff --git a/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild b/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild
index eb64fddb92e6..7d8ee86a0bb7 100644
--- a/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild
+++ b/dev-perl/Net-Daemon/Net-Daemon-0.480.0-r2.ebuild
@@ -10,7 +10,7 @@ inherit perl-module
 DESCRIPTION="Abstract base class for portable servers"
 
 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=""
 PATCHES=(
 	"${FILESDIR}/${P}-perl526.patch"
diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index e33e68d56ed7..dcb50553c814 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -6,5 +6,5 @@ AUX Net-SSLeay-1.82-respect-cflags.patch 902 BLAKE2B e95a0c49ba70d820ff419a2ef7f
 DIST Net-SSLeay-1.81.tar.gz 396631 BLAKE2B dfd0f14bbeb3196009d7e597c0c933dbe9cb7f9d4591ae62adc94a94d1b67d6e108992c7053defcea9b0c6dad90be3b26c1d53cea9e87a09016964d09fe2c5bd SHA512 8d4b72ede74ea22cf2ed681a8441f40965331cd5d4442c19677cf5bc7c1e61ed1e50d0f3a4f1b272428485bcc132ec99b0c75344ca43e8a34a9dd15539719f55
 DIST Net-SSLeay-1.82.tar.gz 399194 BLAKE2B 0c8aeb3085b102b71284266904ee88a8558070644aaa6dd0c5f78db0bfccb0e7456c8ba62a549d7ab245a02ddc7e856bc326d503f63268ee0761290e41b97e4d SHA512 758c41f4916a55b5085167e5c6a2732a5ee70dbeb8f42e791cd957957ba4a59f724c072d3fa50a6b42ae3b22cf3ecb8738c3f8963990a7030117b73c2dcc0716
 EBUILD Net-SSLeay-1.810.0.ebuild 1522 BLAKE2B 7bc2b3b63caca3ba9b6c9583ff2cf845b5e957cf318380f7af5cc2501d297123577a71c350b8ba2eae9ca321430560990f91a9b4e589c56fa66ce34f8a994c2c SHA512 36e994c8445ab80c13fb337edf27963d7368edb6314893679cf37a3682714ab4b51899beb89d348cdbf2df4b0d19f2e881021c8d344ba8cef04a97b4954df773
-EBUILD Net-SSLeay-1.820.0.ebuild 1558 BLAKE2B 0d8bd071be48d0599f0b94895fd82680d824f7c58cf517cf3082163ede8f7630977eac1ff7d84a793d837a8941a0ae3c387e246d01bcae2f8bac1d20f5a6ffd9 SHA512 4aabe6ef92deaacdb0f1eb111e1d4ccc82b6a91397015422cf47e0aee86423dd5b2c1401a5723ff99b5d2d4ea4e7a5756e43fa2ab626e7450ffcf8ff3829f489
+EBUILD Net-SSLeay-1.820.0.ebuild 1557 BLAKE2B 3bd30f174f8337359f99c88d71a3c24eec008dd5321d0dc18a943bc2bfa6c1163a5ddf777b9a066c7760d003b019e65c9acb57ef70c0ef8c5cd869aeb49d8897 SHA512 29047c45e29cd8169f324950035910dede58eebece1e9ac17fd43c738af879d21f0f56f2de2867b8b52a9aa6d1e8733a7dcc434d04fa61a02edbf38a82682ffe
 MISC metadata.xml 458 BLAKE2B a1f463c2ae637ac0ce9708d85768747073cb613831fad5454e72801618889ce2a96a5b6393aa06df0d0a34a05ef3ddb3aaad00fa1647ec8bde8a5aa1b65a6e90 SHA512 1502d6c58c7345b12fca3555c3bde82403f0a7bdff6d253a31c4b5b82bc981127fb2bab9e03d47d50963c3cf70533ec8ceebc025b71fe9127bdc294f092d955b
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild
index c0845e4899a3..710aa1166f4f 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.820.0.ebuild
@@ -12,7 +12,7 @@ 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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="libressl test minimal examples"
 
 RDEPEND="
diff --git a/dev-perl/Net-XMPP/Manifest b/dev-perl/Net-XMPP/Manifest
index a0f1bab76fea..0e4b97771437 100644
--- a/dev-perl/Net-XMPP/Manifest
+++ b/dev-perl/Net-XMPP/Manifest
@@ -4,5 +4,5 @@ AUX 1.05-no-network-tests.patch 1569 BLAKE2B 68d736865c0f727c03b64ef1dc8654a903f
 DIST Net-XMPP-1.02.tar.gz 121653 BLAKE2B 70b9ec321740e2d4076fc22ff8860092e3831c0e1fe15c3ec0008bc2a22b4d2c1d1f226d72c204390fe5740174b290bed9ef4c8396e6a9380f90bcef8f04600e SHA512 7a373e627de7e909ef50d6525b438dd7f094c7e6ad3cb66fff6087048fe9b127e376cf45d1621e55deec2c59fe043ff19f180d0b264fa1dd0c392701dfc43497
 DIST Net-XMPP-1.05.tar.gz 103876 BLAKE2B 5ddc98125b26518c59aa4ab39a974b9cbf1575bd59bb66d5329a43e1d5c3d150f34cc93f545f2cd56846e7b4e46142c47aff7da9b279181a02a57bf95ff1757b SHA512 cdd5474fcbdf7ff6c7d1247f9828f5dfb1828c258af366a831bab8e5faab423b73aa16c34228818526ebcc3180ef0ccc52d6e6cb61e2fe689458b87ec7fab699
 EBUILD Net-XMPP-1.20.0-r1.ebuild 865 BLAKE2B c07fc635aae1a08efb3cf10cb50fd284cb8906316842d3f2d5041d80a712d378616a3c1625091c9640ed198c355f45a670640d6328c23ddd8e0f35aeb1cdead9 SHA512 91f46ab81ee85801eae1f83fd8216309a82fff77ed69f0e7058d21a5b4bedcb630e9c69eaf2998af99414b0abc2b3c876f2a0b1d219af92a484ace5e6b5100a3
-EBUILD Net-XMPP-1.50.0.ebuild 755 BLAKE2B bf8a1ea2746d0eac89b438ccd92c95815b252fe57104862740da24a5e0b095927c353527cacf924c221403121eafb66684edd33c579d43365ea98181d01541cd SHA512 fb5d8733dec03027c6dc98bc22f19197350bab4809187d4911fec7a3f6dffd5ecbbf85dfac4391315b8352c77bd2302ee72aa121b4631b9f1312f9a210475a23
+EBUILD Net-XMPP-1.50.0.ebuild 754 BLAKE2B 6c2c0c724b3de3f8cf6fad9017cdc04bc14142745c8d8760ab51b545c6bbc0277c8dcdfb4c87b236be692df2a04642d7784673cac2c6ba6719aa2d64564e6969 SHA512 e1e9a5bf421e515cad6dc696c41cd1564d7298416ae2480016eb505facbd9fd42388de975b35dae4e6d129d467ac100b46f2f6baede6897bccf9e7fb0e191933
 MISC metadata.xml 1305 BLAKE2B 2ec03661e185b80764b28cce46f08bef4817cd3c1b2244b8222c1f5eb507afd77e143d7605b38cdf221639b8b1f13a959bf42dfce3da0cb0857e3112913f74f8 SHA512 4a016ed35a0d553609a3ce69b71095c00064f39a1960dad6bf53da42d3d9e65ee4fa7256128b5af2ca40779a69b28ea02286b6b0427a9692639fa8575c9068bd
diff --git a/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild b/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild
index dcfe767964f0..58e619f77551 100644
--- a/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild
+++ b/dev-perl/Net-XMPP/Net-XMPP-1.50.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="XMPP Perl Library"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="test"
 
 RDEPEND="
diff --git a/dev-perl/Specio/Manifest b/dev-perl/Specio/Manifest
index 348a8cf41da8..c4ffd2bdab61 100644
--- a/dev-perl/Specio/Manifest
+++ b/dev-perl/Specio/Manifest
@@ -10,5 +10,5 @@ EBUILD Specio-0.320.0.ebuild 771 BLAKE2B a1e4a2ae6a049399eb7f1a9134a0ffccaa94103
 EBUILD Specio-0.350.0.ebuild 874 BLAKE2B 30ccca96ed9e66b5cf478efb3e54c99ecd1fe5cabbd4d9c7196e0b003ae82054d84046a8af3eb600f76829837992bfac64891e08a4ad494b5db68e925f96c2cc SHA512 d0c32a83e6e5b5c844ebfc8c505baf8d8767e05628f96d2d1824592da8e0771cf547f007e37f4d9fe14e4b1e70f592b9ed04a2cfae73d1a6fa44e7141f2a5d64
 EBUILD Specio-0.360.0.ebuild 874 BLAKE2B 477f368aebe6932d6e2cee9dba5537675117ec6248edd18383f0eda4c733805951806063acf318c4f83b6dfe23b4b630e83406742f319a0f5438762a4f12bde6 SHA512 5b40f2a854757d340e417bb19bad20a3997cb9ff6a25173beb969c9c16fd3a6785022286e7ae44a2905d3949c2d9b6a46d3ec7643dc0341f2276bae48ebdf3ac
 EBUILD Specio-0.370.0.ebuild 874 BLAKE2B 99ff4c2b38f8e5ee62f72df126292b900974daeaad56ce8c3869b6abec8010a6ee40bfd6a078e232706167f5d2da81bb1baefce1d93df1f15b7d91de59880b6e SHA512 466f9c353a8fe8d4eb2949283b0a723a28fba17922c57a9f688ccec8af97b24e025f9993508895e8fd94ec7a13f3f5832f2027d9668c46db58bfa47a2587db44
-EBUILD Specio-0.420.0.ebuild 893 BLAKE2B 9d9f3399b8715950cc2302e9a0c84e949451effc993f48424bdef46ff9a1b19e4a04b659f1a7e7204873a9da00e8d94e690cfad559a915e9612fa851e8ec3eac SHA512 6defe945377600c208b0e4c2c027e3ee2dddbe0a841538eb43329f6f5914ddcbb31d37d96ce8310c92bae6915b07fc26d49e61d2a6f7a0935d534152205d04dd
+EBUILD Specio-0.420.0.ebuild 899 BLAKE2B afffb7047631ffd78c0e0a23ed027295514a02abdfb9401e517464e590d2847047b00bffd53e526bae45ad5dbbd4803c8e81faabbc79b205d7d0750db868e85c SHA512 45612233c9aa10dca6b072098e42dc8e725a79b16d5626431b6b2e62829bd601f49f5d1e5d7e514fca6351514731ebb5a847b80a7517308ad63eb956a57addc6
 MISC metadata.xml 3181 BLAKE2B b9c67b2ca34c1b6e169f856c59731f884558f46dbabd5313093597283cfa507443c7745c4dea004cda322c5bf7a89862cd531d3570a610383d5a4e1cdaafd589 SHA512 fa6cedfa101b23b99f854562aa4f914170afbf027e1657a8338e19d5bcbcf4db5370d44062f1df1bbf4b9090051264baba5ebd18c79fb9c2c608d4a931aafc27
diff --git a/dev-perl/Specio/Specio-0.420.0.ebuild b/dev-perl/Specio/Specio-0.420.0.ebuild
index bb79cca66ecd..6a85bc24f801 100644
--- a/dev-perl/Specio/Specio-0.420.0.ebuild
+++ b/dev-perl/Specio/Specio-0.420.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Type constraints and coercions for Perl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Quote/Manifest b/dev-perl/Sub-Quote/Manifest
index a6c2d1b55bbc..69bb8cf1d324 100644
--- a/dev-perl/Sub-Quote/Manifest
+++ b/dev-perl/Sub-Quote/Manifest
@@ -1,5 +1,5 @@
 DIST Sub-Quote-2.003001.tar.gz 19131 BLAKE2B 20ae1ffacd8f2d582cac67671ece00ce34cad0fd28ec9e76effa26a07fc655bbc4ecf9ba2bc814eaa0325ac9ae0fd7fb4617d91e5c69e9442513ccc98d574985 SHA512 cd24460e52b68955a460accf673a58235c8f846285a01862198bbb4f6c5718f2977e615099da7eb54a41d76ae75fd7167c7d682c14f6819e65c83f163189dd49
 DIST Sub-Quote-2.004000.tar.gz 20363 BLAKE2B 0697f2a0a9aec799161289bee34f991fc86eb59e23a72f300f207ba80608d8f96653222dd8fb2393085cf052b875e9861bf6f34f9c099d1258bb36a0db3d63f5 SHA512 222354896728154da7bfc6ef9d4562430ab250b1e1169330f63b43eef01527785c1c8559c5eb77a8d42484187be74a9ff97b325bb2404a205a6d4b990f8656c5
-EBUILD Sub-Quote-2.3.1.ebuild 566 BLAKE2B b911b90d9fcb352f89bc6a7103573c75d60e1931ec87bf31e60e283dcb2314176ca90af21266abc403df201b0ddc1873d6e50cf9d22d36f47e2142c1e52cf102 SHA512 acbe1494b9a913c11191eecd21e97c0bbb71763870071dfc423f21658669282befd02df8bd0f28c3e618c09dd501600293018282cf0cfdaf8ba8668755a8c393
-EBUILD Sub-Quote-2.4.0.ebuild 563 BLAKE2B 7f9449faada93d9b5c640615c3f6bc8d393492a733ba8539929f94406771a41d9787154ad90ac3261264e4ad0189cfffb72e2adf4a60285608234dd29dc34bd7 SHA512 e54b0774569bfc9af012607f27fb331de5f39551d0dea567685fc8151a50e1ce59241516262a5f14475bfdb899b5e02c7203804f8504fc341e9c0575eebad0e9
+EBUILD Sub-Quote-2.3.1.ebuild 572 BLAKE2B b68029bc3d9ed497c9bda56265b28599eb7ab3069504381995957059f2ade40b3d6c4f935d3ad25a4de46f39abe5e30361a2b7d794001db335196a0e6ac67f9e SHA512 52312e7e175a3638ad4b8e64d68ab66f50d4198159bd4e11e2f6aa7537ae7960c270b9e483aa770769e6ef82f2483b2b7c20ebaacea442d4c69202754cc272d5
+EBUILD Sub-Quote-2.4.0.ebuild 569 BLAKE2B 493c678a39912fc74229526bee9932701b0f747d6b5cf3ba35e449f03408d3c65c5fe5dd3eeb1a8bb3c8428c232c69424de95b0410206be166ba07ff2e88c2ce SHA512 78023ecea3f43e52dea0fbb25d5e1dcc1cbf107be00b715b590cb58c9d8384437a3fa3b86350eeb2c5d4cf4e8aa763b316f420d74c88b05070b8d0e8b6046694
 MISC metadata.xml 447 BLAKE2B b414878a42aceb8390f1de47f02ff23dd6ca3ed337074f06c252824c968d933023dbba655430ceab71406ede17a30fd2b3d8b376a1159425116c2898b316d182 SHA512 b3147fbe7cfbafec109ef47574f27a5d3f49558f55ac6b9d6ee52c56c2701b26114209f0f675e32de3eb253b375719d2faed0ffdd4087ab49b3e6c9d0cd1237a
diff --git a/dev-perl/Sub-Quote/Sub-Quote-2.3.1.ebuild b/dev-perl/Sub-Quote/Sub-Quote-2.3.1.ebuild
index bca4beeda06d..1ca55129d04f 100644
--- a/dev-perl/Sub-Quote/Sub-Quote-2.3.1.ebuild
+++ b/dev-perl/Sub-Quote/Sub-Quote-2.3.1.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="efficient generation of subroutines via string eval"
 SLOT="0"
-KEYWORDS="amd64 ~arm hppa ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild b/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
index e78283161c39..2dda200f147d 100644
--- a/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
+++ b/dev-perl/Sub-Quote/Sub-Quote-2.4.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Efficient generation of subroutines via string eval"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="test minimal"
 
 RDEPEND="
diff --git a/dev-perl/Template-DBI/Manifest b/dev-perl/Template-DBI/Manifest
index 463a06681a51..a54ad82d5c04 100644
--- a/dev-perl/Template-DBI/Manifest
+++ b/dev-perl/Template-DBI/Manifest
@@ -1,3 +1,5 @@
+AUX Template-DBI-2.65-no-dot-inc.patch 1147 BLAKE2B 596c41017d8f737626144020761d5fc04f5e4cc9c0f9817d016f70463dfab28f92ab6e4743e7538eea6940a6e9f24312a922b2a77055c269f2db78f79eaf9372 SHA512 27f519bf33c1741db9de6400b24cb2f32341803ef7bfb115b0fc0dd38b01e17bded6ea34ed03366616505610cb8b419d1e051f29f3b0c930da8bc95fe338a187
 DIST Template-DBI-2.65.tar.gz 15681 BLAKE2B 43c4b7219c34dc59e54463f78afeb5c2152de0a71f1c5b0640364b7b46a6d62819022156b116b38a5c9630ae7fd41b9be6557ec368b15030320ce923e183d985 SHA512 8abbba6e799ee75a62d9f6d72f6314a4044ada849cb47a10bac204aa40f67d62ef41fac44f7fcc17f0a608fc24a3c0baeb9b4955a2d589008283b9eaae06aca6
 EBUILD Template-DBI-2.650.0-r1.ebuild 481 BLAKE2B d0127b72d6e8857631e3919c72e401ed65c403aea42133eb5d0b710c8f01cebac8261da5ed7577771bcd10120d3e258f823ddce6405004cbe4880e015a267a56 SHA512 d01610b98e95c4bde8b1199ec2993d870dca04fddcea821a99415c7ea4cdec1c5e9e83325fec2b29b384214d17ad13737aaff5ffd0c583d226939bc3152c27eb
+EBUILD Template-DBI-2.650.0-r2.ebuild 521 BLAKE2B 04078e25d9fb7a3cb3fa2b6e4b45ac2bb6a6864d0cf0c9583ddc3b422414185b457fc10deee33d37fcf932751bda06f4435465e129700775ca17852b256a8f9f SHA512 517fcddacae956e8c527bbf12308bf574e4aa4f3f89c1b575246305f84fb54690bab895c195bd9b813fe9b5fbc19dcc8268a0faeb902ee80d952883d802f2a2e
 MISC metadata.xml 557 BLAKE2B ca9c0e53baf009d00ab913ecd10f6b26af78078d0951af357aff6680ec4bf3b59c938d3dd4d9737cbe27b638fc3ead9035f949f8de45d628ddaf70359022b562 SHA512 0fd6e8cd645742b786a40a8218725f6df39b14a8363e3d9c3bdb3db20bd8c0995c2911094d24701e15c23852d1a861de599254991a622e72ba156892afab3114
diff --git a/dev-perl/Template-DBI/Template-DBI-2.650.0-r2.ebuild b/dev-perl/Template-DBI/Template-DBI-2.650.0-r2.ebuild
new file mode 100644
index 000000000000..6f9f1eb9648b
--- /dev/null
+++ b/dev-perl/Template-DBI/Template-DBI-2.650.0-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=REHSACK
+DIST_VERSION=2.65
+inherit perl-module
+
+DESCRIPTION="DBI plugin for the Template Toolkit"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+IUSE="test"
+
+RDEPEND=">=dev-perl/DBI-1.612
+	>=dev-perl/Template-Toolkit-2.22"
+DEPEND="${RDEPEND}
+	test? (
+		dev-perl/MLDBM
+		>=dev-perl/SQL-Statement-1.28
+	)"
+PATCHES=(
+	"${FILESDIR}/${PN}-2.65-no-dot-inc.patch"
+)
diff --git a/dev-perl/Template-DBI/files/Template-DBI-2.65-no-dot-inc.patch b/dev-perl/Template-DBI/files/Template-DBI-2.65-no-dot-inc.patch
new file mode 100644
index 000000000000..803f84123cc6
--- /dev/null
+++ b/dev-perl/Template-DBI/files/Template-DBI-2.65-no-dot-inc.patch
@@ -0,0 +1,40 @@
+From e55f99e77f12ac5ece679e159e577ef91eee0ba4 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Mon, 15 Jan 2018 16:05:06 +1300
+Subject: Fix test failures on Perl 5.26+ w/ PERL_USE_UNSAFE_INC=0
+
+In future perls, CPAN.pm and Test::Harness will no longer be able to
+migitigate this failure mode by internally doing:
+
+  $ENV{PERL_USE_UNSAFE_INC}=1 unless exists $ENV{PERL_USE_UNSAFE_INC}
+
+This fixes this problem by avoiding the need for @INC traversal by
+using a literal path ( eg: one with a / or a ./ prefix ), not an
+"@INC-relative path" ( eg: Foo/Baz.pm ), and breaking the reliance on
+"." in @INC
+
+Additionally, this replaces "do" with "require" to give automatic error
+handling, instead of continuing when the library load fails.
+
+Bug: https://bugs.gentoo.org/623120
+Bug: https://rt.cpan.org/Ticket/Display.html?id=124080
+---
+ t/dbi.t | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/t/dbi.t b/t/dbi.t
+index 7193210..7b6dccf 100644
+--- a/t/dbi.t
++++ b/t/dbi.t
+@@ -16,7 +16,7 @@
+ use strict;
+ use warnings;
+ 
+-do "t/lib.pl";
++require "./t/lib.pl";
+ 
+ use Template::Test;
+ use Template::Stash;
+-- 
+2.15.1
+
diff --git a/dev-perl/Template-Toolkit/Manifest b/dev-perl/Template-Toolkit/Manifest
index bc5ccdd5e44a..36ede4830712 100644
--- a/dev-perl/Template-Toolkit/Manifest
+++ b/dev-perl/Template-Toolkit/Manifest
@@ -1,5 +1,8 @@
+AUX Template-Toolkit-2.27-cgipm.patch 1819 BLAKE2B 06c8fa20721a0d68576b5c8883eb2f0c85af72e84bbdd7bc2deb721576d8ee453dbb0b3ea9e9d770604fb916538b9067f3e3311b176558309160c705068aa305 SHA512 d7927a35a3d287ad2a515cedb01f9f80fa9d23293b694fb03b59b18b159f4c4584b9ce8870d8d4b9c56d9f1c28c624e918332d668c0c375167b44f783229a9e4
+AUX Template-Toolkit-2.27-no-dot-inc.patch 1987 BLAKE2B feaae674dd01ef2d7ae7c1a660c838b69d3b1fcc07b735a66dbab2bb6d27c7ea1916c3bb2855b7f8d566f3516874925ca2a23f20cf2f9258aa1a7bcec8d46f1b SHA512 e7ce9167bc2ecc648efb0e021f1481c63093cb9a8f42492c081200938e075dc272eeaef903e1cd14b4f81407037d8d5dce43f7f04d113dd01c4f24516ce93b19
 DIST Template-Toolkit-2.26.tar.gz 503055 BLAKE2B 1d95cb4ab427621e1648df657ea516183650d05dfcd249f23b38aa8964598090b7ff564017694d070622606d883745a44ed7ce7141c99e11ac785e937a7afbb6 SHA512 97e49392542e240840b44f0d78ea601afb26a6675f76faa9765c158820d596308a7f35057bf347d51a86a5f9134dfd4a02ce7a80b47a98b9bdbca68fff9146d6
 DIST Template-Toolkit-2.27.tar.gz 511172 BLAKE2B 62ffce1fe5679799afff6b3865882c91e70efeb2ec14474f3b49bdf35bd64f7ce4439d5c58ddd73bad26589816d2f24f4691a02c69405fb6b6b604d28edee4e2 SHA512 17f03a01a3d6ab0ef2247c77da15c46d9bbce3e0158172162da6abe47f53c5e7ca041a7c31506bb3a37f31c476ba747f5111c5b1b1d69614a4ce3352927fd4e6
 EBUILD Template-Toolkit-2.260.0.ebuild 809 BLAKE2B d85dcd78014e419981572297a6b79300eab3ff0a1a80bd5d47c7e78a6ac87d4d7f2f670148927bbe7ee2b177b6b61d779ca5f41a9b829e1bd9f5a8bdd96cbc6f SHA512 bbd47bd6183d54dd9437222a235a1ceff4acdbe58c0f90a8afa87a9cf3394ed2c50cb2e7c6ad731dd5872c86a9ade6d77046415e3d50e293b4eaffe963f449e8
+EBUILD Template-Toolkit-2.270.0-r1.ebuild 1047 BLAKE2B 98dd90353748ecb9b3cdf32e65aaf24d5d9b51325423019712cd12ce51e3321141382a0693c9d99ef07108ada932ff70ffbed8a23b418a0c915b4ae4259c1113 SHA512 952147351c2b02b695c4420570fb753d9715c8500a4dd62c0841b28a3118acfbc254df2bbe42f74e511f9815a78b3e14165781279570752705bfc4e2559cfbc3
 EBUILD Template-Toolkit-2.270.0.ebuild 927 BLAKE2B 9affb714afc2b63b8d8e36361c0c0c11d07f13794582fb160f865941b0d5f78e180a7549c6576c8ab716c12ceac69b37b84eb29d91192c42ad2b038ecc17f118 SHA512 9fb01cf3500a543e06ee7dac1fd1efe01d651da5d20deb6bd8a2883b8d6d8b9c0087488e985f7725d3102d8fcbf176ab4dc071f584f1efd37c338ad73245eb8e
 MISC metadata.xml 3834 BLAKE2B 0d0cd7506fc2864b9e26a1d580c53931016006ed82e6a788a474f80b490e780da32e07855778bad14ff4b8c444d8e79f6a42a71013bed0db95d0ba8a14f395b7 SHA512 34d9afc89acd0a65724c1af1f5720b15665fcaf06e25db62210bf8fe7dc7c6e83009c0ba6c346821d320de5587cc678c921d0982d3ca317633a6c049ffeee1e7
diff --git a/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild b/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild
new file mode 100644
index 000000000000..5823e2648c95
--- /dev/null
+++ b/dev-perl/Template-Toolkit/Template-Toolkit-2.270.0-r1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DIST_AUTHOR=ABW
+DIST_VERSION=2.27
+inherit perl-module
+
+DESCRIPTION="The Template Toolkit"
+
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~x86-solaris"
+IUSE="xml gd mysql postgres latex vim-syntax test"
+
+RDEPEND="dev-perl/Text-Autoformat
+	mysql? ( dev-perl/DBD-mysql )
+	postgres? ( dev-perl/DBD-Pg )
+	>=dev-perl/AppConfig-1.56"
+DEPEND="${RDEPEND}
+	test? ( dev-perl/CGI )
+"
+PDEPEND="dev-perl/Text-Autoformat
+	vim-syntax? ( app-vim/tt2-syntax )
+	xml? ( dev-perl/Template-XML )
+	gd? ( dev-perl/Template-GD )
+	mysql? ( dev-perl/Template-DBI )
+	latex? ( dev-perl/Template-Plugin-Latex )
+	postgres? ( dev-perl/Template-DBI )"
+
+myconf=(
+	TT_XS_ENABLE=y
+	TT_XS_DEFAULT=y
+	TT_QUIET=y
+	TT_ACCEPT=y
+)
+
+PERL_RM_FILES=(
+	t/zz-plugin-leak.t
+	t/zz-pmv.t
+	t/zz-pod-coverage.t
+	t/zz-pod-kwalitee.t
+	t/zz-stash-xs-leak.t
+	t/zz-url2.t
+)
+PATCHES=(
+	"${FILESDIR}/${PN}-2.27-no-dot-inc.patch"
+	"${FILESDIR}/${PN}-2.27-cgipm.patch"
+)
diff --git a/dev-perl/Template-Toolkit/files/Template-Toolkit-2.27-cgipm.patch b/dev-perl/Template-Toolkit/files/Template-Toolkit-2.27-cgipm.patch
new file mode 100644
index 000000000000..422cc851838f
--- /dev/null
+++ b/dev-perl/Template-Toolkit/files/Template-Toolkit-2.27-cgipm.patch
@@ -0,0 +1,66 @@
+From e723aeecf60ece32f6a1381f5c026ae08cae9913 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Sat, 13 Jan 2018 13:48:31 +1300
+Subject: Fix tests warning w/ CGI.pm
+
+This currently seems like an intractable problem with the syntax of
+Template::Toolkit forcing list context by default on called functions.
+
+The only real way around this is to either:
+
+A) always use Template::Plugin::Scalar to enforce scalar context
+B) abuse cgi.multi_param to simply silence the warning and being an
+   adult about the fact "yes, this returns a list, make sure you do the
+   right thing with that"
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=100503
+---
+ t/cgi.t | 16 ++++++++++------
+ 1 file changed, 10 insertions(+), 6 deletions(-)
+
+diff --git a/t/cgi.t b/t/cgi.t
+index 023ab5ab..6086e145 100644
+--- a/t/cgi.t
++++ b/t/cgi.t
+@@ -49,28 +49,32 @@ sub barf {
+ 
+ __END__
+ -- test --
++[% USE scalar -%]
+ [% USE cgi = CGI('id=abw&name=Andy+Wardley'); global.cgi = cgi -%]
+-name: [% global.cgi.param('name') %]
++name: [% global.cgi.scalar.param('name') %]
+ -- expect --
+ name: Andy Wardley
+ 
+ -- test --
+-name: [% global.cgi.param('name') %]
++[% USE scalar -%]
++name: [% global.cgi.scalar.param('name') %]
+ 
+ -- expect --
+ name: Andy Wardley
+ 
+ -- test --
+-[% FOREACH key = global.cgi.param.sort -%]
+-   * [% key %] : [% global.cgi.param(key) %]
++[% USE scalar -%]
++[% FOREACH key = global.cgi.multi_param.sort -%]
++   * [% key %] : [% global.cgi.scalar.param(key) %]
+ [% END %]
+ -- expect --
+    * id : abw
+    * name : Andy Wardley
+ 
+ -- test --
+-[% FOREACH key = global.cgi.param().sort -%]
+-   * [% key %] : [% global.cgi.param(key) %]
++[% USE scalar -%]
++[% FOREACH key = global.cgi.multi_param().sort -%]
++   * [% key %] : [% global.cgi.scalar.param(key) %]
+ [% END %]
+ -- expect --
+    * id : abw
+-- 
+2.15.1
+
diff --git a/dev-perl/Template-Toolkit/files/Template-Toolkit-2.27-no-dot-inc.patch b/dev-perl/Template-Toolkit/files/Template-Toolkit-2.27-no-dot-inc.patch
new file mode 100644
index 000000000000..97decd75cb14
--- /dev/null
+++ b/dev-perl/Template-Toolkit/files/Template-Toolkit-2.27-no-dot-inc.patch
@@ -0,0 +1,54 @@
+From 65e7f0e980e64dd0525eda058330cea06379c332 Mon Sep 17 00:00:00 2001
+From: Kent Fredric <kentnl@gentoo.org>
+Date: Sat, 13 Jan 2018 13:05:52 +1300
+Subject: Fix relative path handling in templates on Perl 5.26+
+
+NB: It doesn't seem like the value of "$compiled" is very useful in the
+failure case, as the expectation is that'd have been a falsey value at
+best, or a literal "undef" at worst, yeilding additional warnings.
+
+Bug: https://rt.cpan.org/Ticket/Display.html?id=121171
+Bug: https://bugs.gentoo.org/615704
+---
+ lib/Template/Provider.pm | 20 ++++++++++++++++++--
+ 1 file changed, 18 insertions(+), 2 deletions(-)
+
+diff --git a/lib/Template/Provider.pm b/lib/Template/Provider.pm
+index 6ecb2453..61c3469c 100644
+--- a/lib/Template/Provider.pm
++++ b/lib/Template/Provider.pm
+@@ -562,13 +562,29 @@ sub _compiled_filename {
+ 
+ sub _load_compiled {
+     my ($self, $file) = @_;
++
++    # Implicitly Relative paths are not supported
++    # by "require" and invoke @INC traversal, where relative
++    # paths only traditionally worked prior to Perl 5.26
++    # due to the presence of '.' in @INC
++    #
++    # Given load_compiled never wants to traverse @INC, forcing
++    # an absolute path for the loaded file and the INC key is
++    # sensible.
++    #
++    # NB: %INC Keys are always identical to their respective
++    # "require" invocations regardless of OS, and the only time
++    # one needs to care about slash direction is when dealing
++    # with Module::Name -> Module/Name.pm translation.
++    my $fpath = File::Spec->rel2abs( $file );
++
+     my $compiled;
+ 
+     # load compiled template via require();  we zap any
+     # %INC entry to ensure it is reloaded (we don't
+     # want 1 returned by require() to say it's in memory)
+-    delete $INC{ $file };
+-    eval { $compiled = require $file; };
++    delete $INC{ $fpath };
++    eval { $compiled = require $fpath; };
+     return $@
+         ? $self->error("compiled template $compiled: $@")
+         : $compiled;
+-- 
+2.15.1
+
diff --git a/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild b/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
new file mode 100644
index 000000000000..304b65799f28
--- /dev/null
+++ b/dev-php/File_Iterator/File_Iterator-1.4.3.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="php-file-iterator"
+
+DESCRIPTION="FilterIterator implementation that filters files based on criteria"
+HOMEPAGE="https://phpunit.de"
+SRC_URI="https://github.com/sebastianbergmann/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-lang/php-5.6:*"
+
+src_install() {
+	insinto /usr/share/php/File/Iterator
+	doins -r src/*
+	doins "${FILESDIR}/autoload.php"
+}
+
+pkg_postinst() {
+	ewarn "This library now loads via /usr/share/php/File/Iterator/autoload.php"
+	ewarn "Please update any scripts to require the autoloader"
+}
diff --git a/dev-php/File_Iterator/Manifest b/dev-php/File_Iterator/Manifest
index 4a1de42adc10..2efe7dea2080 100644
--- a/dev-php/File_Iterator/Manifest
+++ b/dev-php/File_Iterator/Manifest
@@ -2,6 +2,8 @@ AUX autoload.php 380 BLAKE2B c033c6550c454dcfffd86c122284a2bdbfc4c5e54087aa443f3
 AUX channel.xml 804 BLAKE2B d6a965a41a220f07e3a0d206bc3359e2649b55d186e7975726c1b0ad344e063ca1fa98cde446078346384e946f6b31f9caaf49cf7c82b4568f697a1ba0d2e633 SHA512 44f5d66b967cff45b87795609e6dd14443a4ce5ae8f3430a281429ba21e834bc3feb7f539fb6cd8349017eb301054a33dfcd7062d58f9fd0c1c7cd1892580092
 DIST File_Iterator-1.3.4.tgz 5199 BLAKE2B 75da70ad638230dd231947e3af26c2570eff367328d2e541fb1228ba531c0f249c931a9185f977dce9e17846e1e9b8b1f9f8d21219291e637b2eaf7805dcf360 SHA512 7117e0e56a9bc533d9f93556366a8026d1e5a9a3894c05551adef6c1e6cd556c1ebf6b96bd98279cb92077b3d8f8d7b7e42f446b39895850e573d0ec511392be
 DIST File_Iterator-1.4.2.tar.gz 4141 BLAKE2B 4c8d9847fa198d444571acdf777020b76e87e09506038c7d7ce732b97c149149bcf22dc25d0af36f041b7930673b05f940df8211c29829e0fed2b3dcfae0ba05 SHA512 295943681853c858e3e1c336c030338c61a74169bd2a619da6fca8c43611e587c6f626fa92799d614bcb0a1f86bbb39895b20f2a389107cedb9660a7e792a243
+DIST File_Iterator-1.4.3.tar.gz 4140 BLAKE2B 89274c6f9b561dbc732d0b81f06b7c34d267ea31d1deb5977eaa16852d87442183221ed6789fd5e09b80ef96811df2ff8ef5da5c764703f5e7a2d5289f582527 SHA512 cea906d6028d9c2dbbb5486198adbecbca87f8b4dcbe12f72b9732ac29cf8eb868a23af7a5bcf2de55e0040a077ab55b016e773d5145f987f7e3f9671ad3ea28
 EBUILD File_Iterator-1.3.4.ebuild 557 BLAKE2B c277c509ecf567cf41bd5abce4f3d560871050e9556687a4ed0cc37eb5bf3f75e9270bf0019ef04ce3b7d4959dd9c91183f6a2799198976cf5284099aabae6dc SHA512 c6ba4224d33ec69a60e59fbb5af78d3b3f675b1840e368518fe39e47924f1293ffe6c5e7d3dde425e6270bf5c3da74fdfafc4af59e49238ebaa9821272cac303
 EBUILD File_Iterator-1.4.2.ebuild 800 BLAKE2B 496eb2ba586ab0f241351770927fb6746bcd7a64b8aec73cf4d2de0ed8c0eecf09c693a72e060c5a2384c1feeac608fe7f0484e45a6d089d89a276532a588b3d SHA512 48aaecf18cfd1d75711a39e12b0c3fc4808145ffc3b6915ea6b3cf56532ad1f7056db08b54e0eadfeff20cec409d8890ed037cf57ee5f8c7b88f42c152f89783
+EBUILD File_Iterator-1.4.3.ebuild 810 BLAKE2B 83e4c6bc9c3c06d9cd3a940be376a7918ac02621c81d900252a31108be98acf5ed094be33984da136c863840eebfa4ae53f229d42750f93ea6f5a4336b859506 SHA512 3a162af76adb1fa170c234f0d06d7fcfe278307a5d1686fe1534d86572abcc44d4fe05410ccd04c9182b7465b68345ac6c3f1b83c8810fb72bb567d065edc4b7
 MISC metadata.xml 349 BLAKE2B ab948322ce2cfa4e40d9b0ac17d435db9e4613000fa05c810860e281615d5b1297f826ec51ed460ba87080508578e2353729843cdd2bf1f4226890413137a911 SHA512 85e7e819b346185575934f4f356d1346534fce0fe1ddcf5e88e855ce40f64c48bf73c1f14085cf0526ee681014943f7524ea79b7d951b66c12e67e6f04c099e8
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index 1a859bcbbd17..2a51713ab394 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/myclabs-deepcopy/Manifest b/dev-php/myclabs-deepcopy/Manifest
index dcbdab7045f0..401396f481ae 100644
--- a/dev-php/myclabs-deepcopy/Manifest
+++ b/dev-php/myclabs-deepcopy/Manifest
@@ -1,4 +1,6 @@
 AUX autoload.php 239 BLAKE2B c67e02841a85ce3cb1cb27286eaf799a8060644d35dad28c9a32462ea4f95b7b0b357369c19033f1408f588e2acd47ac955f99e38928bedacd1430a723dba669 SHA512 d59e462c851383a3e2a487fbdaff75c50c805572c151ca3ce4ca9ae5cba1cac85a76f2a8bb50730caaa76eabc0c76a9f97dd2135008939df874d57cc654d3fab
 DIST myclabs-deepcopy-1.6.0.tar.gz 43612 BLAKE2B 18e3f532043cfbf700230a82772938082611922b9a04c7a99d63f79210e6c6f144521a29356977f4c44843cae6628e0a13fa0a46e0d34cb2e251f138ed60ab44 SHA512 a1d0ce8386172b963bca1e34e0e6d69268177f6aaf5309498780e4f9e43b9126916937e0b422644199b96f46212d0267af9b56993b9ffe295adb5f872c24584c
+DIST myclabs-deepcopy-1.6.1.tar.gz 43589 BLAKE2B e62ed5384bf9d4ad0286189772de8eeb9fed9962cf1d109b9e282c37ceadc885c6850fbed1695de35935b85fcc789a796485f44e97269a556d3498be8b691af4 SHA512 6cf13127401304ff92277c7c433353ecc20764fd5b8db0f8ae8d6767d8d9bc9c2f6b6ed3d68eeca5960357517038062c6f6b82831f433596d0a05cd0cea916d4
 EBUILD myclabs-deepcopy-1.6.0.ebuild 652 BLAKE2B d039342eaaefa03a98a91487e01dd96ab927ea9ba598b8f0c554d503b2f2b82e9aad7b325f57f2501fe5ec061afb2a1b4ea6ce59d0b973d3f6f9c93448fae0b7 SHA512 f9735e4a1005bf3e9bd38618bd1b80fdaf1d903e3eba6310d490c8016ca03886ff7621cb887c67ff18ea620b92874d21f110bf29638dc73f4c1b054743d94f48
+EBUILD myclabs-deepcopy-1.6.1.ebuild 661 BLAKE2B 393c1d2c0f219b24bceeee802e7ec0f09a59eff1854efaf270873378b4dc345a1db340a97620dcaa67b6baf1aefd0c889e81e8f5828559e87233333571fa1320 SHA512 191e347deb345a42903bc4c61bbbc18304e0ee2c6bcb13f4149fedf84c49bd560299aabaef5499e29c0e9ada049a26b37ad1f3f54220b6597b836df42f1aa5e9
 MISC metadata.xml 320 BLAKE2B 7a39e30db8d713926fe221be630c6ff660222d62b47d5b7e561127bc63f522fa813d2ce6ba83276600cc2e3e942e27758e8268d784dd1f3bb36f182c5da3026f SHA512 a4610b9b7fc96287c53bc0501afdded0b917d842e2a263308fe20aab65678c569d6ace0576596e7d4cb75dc3af3b3af2896ac7aeb867237206b7ca3c6c8b30e8
diff --git a/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
new file mode 100644
index 000000000000..6966ccfabd29
--- /dev/null
+++ b/dev-php/myclabs-deepcopy/myclabs-deepcopy-1.6.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="DeepCopy"
+
+DESCRIPTION="Create deep copies (clones) of your objects"
+HOMEPAGE="https://github.com/myclabs/${MY_PN}"
+SRC_URI="https://github.com/myclabs/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+RDEPEND="dev-php/fedora-autoloader
+	>=dev-lang/php-5.6:*"
+
+src_install() {
+	insinto /usr/share/php/myclabs
+	doins -r src/*
+	insinto /usr/share/php/myclabs/DeepCopy
+	doins "${FILESDIR}/autoload.php"
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ca1ad08c8e5e..d1e7656acfc9 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index fa148fe3e89b..930bef99b957 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1,27 +1,7 @@
-DIST aiohttp-0.21.5.tar.gz 529005 BLAKE2B 3dc384147e69dc8af45b18973ca031fff8e2097a5ea0f28838b1bce4a092132bdf08c536acde5d239ded9707c5bec1dc398c82abe7b2a0a4f59d7e209f1fcc36 SHA512 4958d7c58988a95fc5b1e94e4eb7247f59b55e5ba439391c7b072a7ec267491159e1c8c7c6f05e6f7f72e4de5c12784c8d437665c01e6d9fb1e87a3334c1d35c
-DIST aiohttp-1.0.3.tar.gz 499693 BLAKE2B 4d0e48d3c0cb1c6d61ebffdf3686046240449c568695e2285b2789f1e10a504300a3153ca29b9703b9f7187ec574f3bc20bd1109680adaf80b4c54de0576e2fa SHA512 1fd915d04bf978826863c06a3a9ef5c23fd11c3b6a65b71828a7be4301e24421483717af6181319ba8461a22351decda4fb776765d18843e4ab1f436f5319d73
-DIST aiohttp-1.0.4.tar.gz 562803 BLAKE2B 9ce3a3eb7791ff46ec5d8b7fde0699b92db21b4460bfc7eb1b8ed7881be8ceceb956f15b2e47b8335c768152ba330753a4ae62e84daf043d49fc02e064a291bc SHA512 437bed5e5f8729e8809411213cdb8f6a7de08879841c0cc89e88eec6de1883702903ecfb1b8e32ecf3701415fd6757545a0aafd44738681050425d5df44bef56
-DIST aiohttp-1.0.5.tar.gz 563623 BLAKE2B 45c49c8ac1d56f39d2aa87e63185f8d94857d1a00cc1b51d752878a66bfb9451f0a3eb50d69a7a839f9ddfd104cac796be831c47f9880bc0cabcea008a92ba85 SHA512 f6fe77729a54d817046f0cc952d8906524c2dfe6712dd1972d696680fe34310b6dba9a3b48b6e27c52d3fedd3fa0f541a7c1ac45488b3358e39e3768a01749d9
-DIST aiohttp-1.1.1.tar.gz 575872 BLAKE2B d633c1473fb12f485347c03184103d49b31d6574b4e3527715267e039a11919e535568e4076d67a834e36ed3d74ffb31d01b01c88d80c8276246ba08bd052b60 SHA512 38636ce4547688ade569ebfc0dbc62b769379500451954c528cd5dddfc7e6c25e6397a56382959ecd43c85c2f344039f4140bf91551e90b288fbd2aefdc94823
-DIST aiohttp-1.1.2.tar.gz 576160 BLAKE2B b99ac9569ee8eda71b059fd986cbc127a12f64acf76e8c6a3647bb91648fb50ef78005f53a09fa80965598447c2ebc62dbed97a852c8333b17ebac9368d22b41 SHA512 ccba7a8e9a2cebaa0afadcfa927fbe9113577b2c69165cd64d8f1169d6cdb4efca252a228ad8d4780b20fcc94fffb9fa8217cbd0d49cbe9c5560a81e4423be41
-DIST aiohttp-1.1.5.tar.gz 577346 BLAKE2B fe2d716789e123d371ae7a4b6584e4439c3b0022ea1a51e09e2e1c80fe7ee6ca6e2880cc1247f3e53557538e7651eac428f6a40ab0dd6357e859efe42b5f2b43 SHA512 44b1474a64ce150164045f30734da119a1848a3677d885493f99f2d724d20884dac9a24adce4b90017e203fc67b295443f91d14f1af9eb20d657a3cd4b69d747
-DIST aiohttp-1.2.0.tar.gz 589818 BLAKE2B 2973c378e08f70b4e8f30f278a318fa31ad05ce7c200c4768e04a732b22e37e56b8a69114bb68bad4887b4cb5e01bc1bab336ba0263059d33e47b6a58374f59f SHA512 4101f0aad0d6bb8caf931dbd7f9e07bfdaa445796af92c84ea999538c2767f3cd62740ea9c7e07f255eb57b52e967e5343461809a5d5f4e8b12cd4383753bd77
 DIST aiohttp-1.3.3.tar.gz 526273 BLAKE2B 5721479dc2141167118f226b266b504d689fa6708d895817fa448c4ffcdcfd71f5e95c98015d3a0e159d1f8d67232f3ad8a31abbed2532eb60564518df017bee SHA512 39342270f615f7e5e01889ad50ccb60335151e94631007b105acda9930038d2fb66128469ca44043280c9f737130e2361129e2fa1c857a7654a1151b98a19a69
 DIST aiohttp-1.3.5.tar.gz 527432 BLAKE2B 6420ecc1eaa29713643dbe9a05061df5277f10e263469d82a24397fa2ec53cf57aaeac86c22a17f06102bfcc69bfe959b6e00b264d9ef30eb193405f4eb9ea70 SHA512 b99630fa9006163d61e0e010972aee8daad021c5ad0152b04fb6f8b661f18ea03fcfa8d35603ecfcdaef4ecbaff0159b49e2f40164241bb5def48b2847e2d966
-DIST aiohttp-2.1.0.tar.gz 748642 BLAKE2B 1c7cdf3b21a2c85e21df04c350b188eb5843d4b32f5de3781b1bbd785b9394eafd2de00eae2c823bfe62186df25cf7fa0552186d75137633fbeb1d53a00460b5 SHA512 bd8eea366d380b88ba2c88d2aab722cd0970d2239dd0057cf4596f472a1b1bf38aebbd6cc707379ad9b5f901f93a56c1c4dd32584cb2636af0e013aa11388e25
-DIST aiohttp-2.2.0.tar.gz 781951 BLAKE2B a4295936e1fd98ff0cc7a11a6b937f800470708f97107115a7db5be8e6a34b703ad1469c27386daab62d6706600d73f696d511b01c4a200f2c61af336d1f5e1c SHA512 547f7484651aa5df43174cede2537c120ebf10b913ab506cdcbbe8d8702492a9e3374cf772c5d11969ca7a7e3d2602d794e98878ed43d05ae4a8324613138ea4
 DIST aiohttp-2.3.2.tar.gz 841030 BLAKE2B a291baa1c5e915815ec80ea1cbd8434b31f4098eeff20767898fc73d75c6194df4bc2a5d21147a8e5c506f5bc377e79b6e8937ce65b9c73616366f439e542c1a SHA512 e481787fec8c9f21d49978b378fb5ef8c06d06cd7a6625fc36c5d4a035e9047f4ed0e38b25b613f1b685ca40e18c796376750f4ac0970fcd1d72ca7fbe31d13f
-EBUILD aiohttp-0.21.5.ebuild 1286 BLAKE2B 0ae43cff8ff1988a271a7c9223741f2f6b7b9972c333bb10f137564e3b298eddc90b2469f288d2e49fab638dad10e740ed12c7aa7402ee92cbb3ecdbf7da5ca9 SHA512 1bbc7803a1576871d0f7f81407088ce4e7af0b4f8b9efa9118644fbce529da054a8acc3d351d07f5f5d242acda22ddf4fdbcf61c6ff676c9739de33467a8df18
-EBUILD aiohttp-1.0.3.ebuild 1481 BLAKE2B dd55703c814d158bc6396bcb81b5a13bf83a77beab6e1ae162049584881ceeebd67df7895f4fd283318c27115c60405c1706d1e21ff7b734a5df8645f069afad SHA512 3a95a6d6a2cac5bedccec21e7536584fd08862897659a4bc1e4e14217498df0776be24ae399f79bb751a58a36157aaa217c898dca2b08574dd2f9861d3aed91a
-EBUILD aiohttp-1.0.4.ebuild 1479 BLAKE2B 0b8986a768dc5d5aa0c28e8e0a427cfc903c2a21196dcbdba06b2a6dbab8f988aab1aa7ebaa52c2c38d48a408dd2ad2ca0bd00bb12d5afa6573a1746bbe6134b SHA512 bb4bc3db386e769cb4035bb12fe676b43c69224a6269ca3f0da97f8212f90f07428557e9c21215cbafa70085c7f30f45f90bb4fba98a112b77ffb6ac07d8cc62
-EBUILD aiohttp-1.0.5.ebuild 1479 BLAKE2B 0b8986a768dc5d5aa0c28e8e0a427cfc903c2a21196dcbdba06b2a6dbab8f988aab1aa7ebaa52c2c38d48a408dd2ad2ca0bd00bb12d5afa6573a1746bbe6134b SHA512 bb4bc3db386e769cb4035bb12fe676b43c69224a6269ca3f0da97f8212f90f07428557e9c21215cbafa70085c7f30f45f90bb4fba98a112b77ffb6ac07d8cc62
-EBUILD aiohttp-1.1.1.ebuild 1514 BLAKE2B f3eff4c3b53292ed9486fc84f230bdf29522d9c87402beaa019e13868dbb46bbabe44590cc2e446df7b45e45277d99e05ac3a2b677fb6c33942887f1726fdbc6 SHA512 17ee6ef88e3adaa0dc3898c56dae91a1572508bd62a5f8ae53d74951d9c5099e38e8cb624cbab53db32327eb07e0b52db16be6de8e198c777cd6c5bb4aa78ff0
-EBUILD aiohttp-1.1.2.ebuild 1514 BLAKE2B f3eff4c3b53292ed9486fc84f230bdf29522d9c87402beaa019e13868dbb46bbabe44590cc2e446df7b45e45277d99e05ac3a2b677fb6c33942887f1726fdbc6 SHA512 17ee6ef88e3adaa0dc3898c56dae91a1572508bd62a5f8ae53d74951d9c5099e38e8cb624cbab53db32327eb07e0b52db16be6de8e198c777cd6c5bb4aa78ff0
-EBUILD aiohttp-1.1.5.ebuild 1514 BLAKE2B f3eff4c3b53292ed9486fc84f230bdf29522d9c87402beaa019e13868dbb46bbabe44590cc2e446df7b45e45277d99e05ac3a2b677fb6c33942887f1726fdbc6 SHA512 17ee6ef88e3adaa0dc3898c56dae91a1572508bd62a5f8ae53d74951d9c5099e38e8cb624cbab53db32327eb07e0b52db16be6de8e198c777cd6c5bb4aa78ff0
-EBUILD aiohttp-1.2.0.ebuild 1512 BLAKE2B c10b0489155897314b1168a75827ea09713e25fff2551f344b1f32f40eacd71f23390d1841765c8275e9a3925ef2ddad77fae51ff6dc871b09b95e2de2a6f67f SHA512 e02e170a278cf30549e75df5d3c1d025369fe4ba6899815187a16bcb8cc9757deec14dfa8b64e7b4c22945da8d30bdd85e71820b320ae3dcf5a1b9dfd5a2b015
 EBUILD aiohttp-1.3.3.ebuild 1546 BLAKE2B 3fce4cc4595b0628ddeb022a59d06a57ce8700f8fe3c0d9ce60cda37afe0b31de1c91f8a509c49b296a1de78e8ab0dd75863b508e95dabeb17fa4ae3cf86a136 SHA512 8b12d96faa49923a7ad541b5de41dc8cb2aa47ebff0b7203d422f6b0f7fe0ef2ab2dfa2d04e74aa03aed99833c202c3fa99f56fe35e6e762c5bf03dab048037d
 EBUILD aiohttp-1.3.5.ebuild 1546 BLAKE2B 3fce4cc4595b0628ddeb022a59d06a57ce8700f8fe3c0d9ce60cda37afe0b31de1c91f8a509c49b296a1de78e8ab0dd75863b508e95dabeb17fa4ae3cf86a136 SHA512 8b12d96faa49923a7ad541b5de41dc8cb2aa47ebff0b7203d422f6b0f7fe0ef2ab2dfa2d04e74aa03aed99833c202c3fa99f56fe35e6e762c5bf03dab048037d
-EBUILD aiohttp-2.1.0.ebuild 1504 BLAKE2B 9927272ac7c425e23eb9e60a2ba5294efab43906044b02810f24f76daa8836d149208a3f684296bef1a5f78bcfea87a4c3d39551dfbefba6b1a868958fb9c40b SHA512 8206f8ac9e70b3674aebe3ab5dd4e970e97e3ed8cf93cf23e4279a7c0a149e3f536d502b2ef78dea83fde3b0bee2088f2ce8f923255bfe8082f7261f05929f54
-EBUILD aiohttp-2.2.0.ebuild 1504 BLAKE2B 9927272ac7c425e23eb9e60a2ba5294efab43906044b02810f24f76daa8836d149208a3f684296bef1a5f78bcfea87a4c3d39551dfbefba6b1a868958fb9c40b SHA512 8206f8ac9e70b3674aebe3ab5dd4e970e97e3ed8cf93cf23e4279a7c0a149e3f536d502b2ef78dea83fde3b0bee2088f2ce8f923255bfe8082f7261f05929f54
 EBUILD aiohttp-2.3.2.ebuild 1591 BLAKE2B 4e33b62f7938397f65f623760934eae62011fcca2e442a599ee92cc8e51926a53fd91288cd5cea3ba453d2683c0d0642bfc45acbc5b9bb52817049753cbf298d SHA512 5d9bd5ccdb55ad9ce780f94c9e346f9f79cbc53cb76cd18aeefb3624f3c418a5856593f57effe1b7f1765a3cd2ae454d499a7d553f14937f9a23406dc9caffc5
 MISC metadata.xml 382 BLAKE2B 33c21cb992ab7fee92f5d168c28d83e974881218471ed6e0fb43dc12ec9a44c3631ea1037b6512eb39c2d78569fd2997ce48379e580ee22234a27dbfc675a20f SHA512 a66a7d449dae4daae075ad0a2825fd0199af120805c03032b39f418716b61eb300ff21d309d3e9835ce40c7405eb05be89ee26109e186a9a29e986acce322d8b
diff --git a/dev-python/aiohttp/aiohttp-0.21.5.ebuild b/dev-python/aiohttp/aiohttp-0.21.5.ebuild
deleted file mode 100644
index f066ee364797..000000000000
--- a/dev-python/aiohttp/aiohttp-0.21.5.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-PYTHON_COMPAT=( python3_{4,5} )
-
-inherit distutils-r1
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://github.com/KeepSafe/aiohttp https://pypi.python.org/pypi/aiohttp"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-CDEPEND="dev-python/chardet[${PYTHON_USEDEP}]"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-raisesregexp[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="$(PWD):${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-1.0.3.ebuild b/dev-python/aiohttp/aiohttp-1.0.3.ebuild
deleted file mode 100644
index 3bd9cd9de903..000000000000
--- a/dev-python/aiohttp/aiohttp-1.0.3.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples test"
-
-CDEPEND="
-	dev-python/aiodns[${PYTHON_USEDEP}]
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="$(pwd):${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-	use examples && local EXAMPLES=( examples/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-1.0.4.ebuild b/dev-python/aiohttp/aiohttp-1.0.4.ebuild
deleted file mode 100644
index 80182deba751..000000000000
--- a/dev-python/aiohttp/aiohttp-1.0.4.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
-SRC_URI="https://github.com/KeepSafe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-1.0.5.ebuild b/dev-python/aiohttp/aiohttp-1.0.5.ebuild
deleted file mode 100644
index 80182deba751..000000000000
--- a/dev-python/aiohttp/aiohttp-1.0.5.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
-SRC_URI="https://github.com/KeepSafe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2.0[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-1.1.1.ebuild b/dev-python/aiohttp/aiohttp-1.1.1.ebuild
deleted file mode 100644
index ef190393107d..000000000000
--- a/dev-python/aiohttp/aiohttp-1.1.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
-SRC_URI="https://github.com/KeepSafe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2.0[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-1.1.2.ebuild b/dev-python/aiohttp/aiohttp-1.1.2.ebuild
deleted file mode 100644
index ef190393107d..000000000000
--- a/dev-python/aiohttp/aiohttp-1.1.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
-SRC_URI="https://github.com/KeepSafe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2.0[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-1.1.5.ebuild b/dev-python/aiohttp/aiohttp-1.1.5.ebuild
deleted file mode 100644
index ef190393107d..000000000000
--- a/dev-python/aiohttp/aiohttp-1.1.5.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_4 python3_5 )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
-SRC_URI="https://github.com/KeepSafe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2.0[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-1.2.0.ebuild b/dev-python/aiohttp/aiohttp-1.2.0.ebuild
deleted file mode 100644
index e06eb89cf813..000000000000
--- a/dev-python/aiohttp/aiohttp-1.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
-SRC_URI="https://github.com/KeepSafe/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/KeepSafe/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2.1.4[${PYTHON_USEDEP}]
-	dev-python/yarl[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-2.1.0.ebuild b/dev-python/aiohttp/aiohttp-2.1.0.ebuild
deleted file mode 100644
index c19a47198dac..000000000000
--- a/dev-python/aiohttp/aiohttp-2.1.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/yarl-0.10[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/aiohttp/aiohttp-2.2.0.ebuild b/dev-python/aiohttp/aiohttp-2.2.0.ebuild
deleted file mode 100644
index c19a47198dac..000000000000
--- a/dev-python/aiohttp/aiohttp-2.2.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{4,5,6} )
-
-inherit distutils-r1 vcs-snapshot
-
-DESCRIPTION="http client/server for asyncio"
-HOMEPAGE="https://pypi.python.org/pypi/aiohttp"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz -> ${P}.tar.gz"
-EGIT_REPO_URI="https://github.com/aio-libs/aiohttp"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc test"
-
-CDEPEND="
-	dev-python/async_timeout[${PYTHON_USEDEP}]
-	dev-python/chardet[${PYTHON_USEDEP}]
-	>=dev-python/multidict-2.1.4[${PYTHON_USEDEP}]
-	>=dev-python/yarl-0.10[${PYTHON_USEDEP}]
-"
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/cython[${PYTHON_USEDEP}]
-	doc? (
-		>=dev-python/alabaster-0.6.2[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-asyncio[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-newsfeed[${PYTHON_USEDEP}]
-		dev-python/sphinxcontrib-spelling[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	)
-	test? (
-		${CDEPEND}
-		dev-python/pytest[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-timeout[${PYTHON_USEDEP}]
-		www-servers/gunicorn[${PYTHON_USEDEP}]
-	)
-"
-RDEPEND="${CDEPEND}"
-
-python_compile_all() {
-	use doc && emake -C docs html
-}
-
-python_test() {
-	PYTHONPATH="${PWD}:${PYTHONPATH}" ${PYTHON} -m pytest tests/ || die "Tests failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( docs/_build/html/. )
-
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/ansi2html/Manifest b/dev-python/ansi2html/Manifest
index a647aef8aaa2..678c198a279a 100644
--- a/dev-python/ansi2html/Manifest
+++ b/dev-python/ansi2html/Manifest
@@ -1,5 +1,7 @@
 DIST ansi2html-1.1.1.tar.gz 46591 BLAKE2B e2eb3d9b2665fd495ee8591a3cbfebcd1d565edec9f8ec6840bed8303bbc094e71b9371f496f5f479da9d61937fb2e4ac4deb485631c2576bed33bfee731fba5 SHA512 5f08e6e3e89797f23759da7aac8cbd17e86ffcac37af8db8c345423c69744d88a1517cb0f17dc9c366b509b972484d25877cce8c7466a7a463eea24af17133de
 DIST ansi2html-1.2.0.tar.gz 46748 BLAKE2B c5ea7d35640f93562f6098a46dbeff9248e25b6210bfa5e71265d529599eea7713581ef986faa5afefb445492fe09d2170d164a63b2a602c57a79f2c72cbe118 SHA512 3106488da19cd093d7ae2a7499a66baf77877f47da0e497791cea2a63079c184f1d36743e78116b3faf08ab145ca97b5774151114b9ca193020578c8a3bdc860
+DIST ansi2html-1.3.0.tar.gz 35989 BLAKE2B b2f949e2c559b2da91d3095b4d8ac2091bd15aad46b178a01aa59d4c900917e733f6ab3884d9c4c7c46bfa530936339d9b105a0471a09eb7a01693c43e8a87dd SHA512 73d1b3431e22146c4fe18fef4b05413231d79d627c396d67528d0aa1ab07a7ef4bcfeff56829b85d9fe9ad508599b782318911f7b10d6b9a1bc98780e31389d7
 EBUILD ansi2html-1.1.1.ebuild 977 BLAKE2B 55799e5d290f30c6e9e10f10af4d990600b1ead2e63b8bac84b5be5fd75ca08938fcf1229c04647ddde2447db1e9f016f04ed5fea617be740afbfa314af2f818 SHA512 8c19c40da749aa75813b08e479fc316baa63a21d86068094f9f0397872e485348a8c9e252583abb789a8d9de8576870e41f98e4d5e9bbb6dc795bd734402068a
 EBUILD ansi2html-1.2.0.ebuild 977 BLAKE2B 2cdb3a473a4a2a8bd350425edba570f95b9efad7cb085deeafdb3e65bc4a66085864e97b3f3cad267c0cfe5e60d974b21abf77e6a7bcfeb03dd6e7a77249ec3e SHA512 f12ce0f4fb159bcf287d085c99f4f3387c8e667c90faeab5d6a4036191c5aa98fbca498c64e1b1769cf0c9af1d6b556f8900b324e61dccb01997a2671f4bca50
+EBUILD ansi2html-1.3.0.ebuild 1094 BLAKE2B ff36ae5cb519c84847e095715acbc8f796c184bd5ffb84459673a13b5be148a369a8e62a8a8dfbd79a02282441b0600b0f850898ba2b9f5358d0a8540607ab6e SHA512 8fd63d08b0ef65e325a21e0b18fd04abd99a6f15c3bfd7fc3a7e7b5a443148811b7e95c69a0e0c3d3fbd676853fd6193531e771470a486b0ebf200baac0d9aac
 MISC metadata.xml 392 BLAKE2B 13621595cc083a069522c51b4e29b362f7217698c194d5247d73a3acdaca7ca8b13a3afb0e9b0671785ce246219d44bd8511c5ef243111d43067b138635f5963 SHA512 a17684f5bd76762a832cba99a1edcd2b2ebb1abdd27f36528fb4d2ded639b6223f60495c6dd2ee548826f3a2e177238318c02962d2300ace37eaa881e76cf095
diff --git a/dev-python/ansi2html/ansi2html-1.3.0.ebuild b/dev-python/ansi2html/ansi2html-1.3.0.ebuild
new file mode 100644
index 000000000000..e8c9113901fd
--- /dev/null
+++ b/dev-python/ansi2html/ansi2html-1.3.0.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Convert text with ANSI color codes to HTML"
+HOMEPAGE="https://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc test"
+
+# They miserably fail.
+RESTRICT="test"
+
+RDEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/six-1.7.3[${PYTHON_USEDEP}]"
+DEPEND="
+	doc? ( app-text/asciidoc )
+	test? (
+		${RDEPEND}
+		dev-python/nose[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep 'dev-python/mock[${PYTHON_USEDEP}]' python2_7 pypy)
+	)
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	"
+
+src_compile() {
+	use doc && emake man/${PN}.1
+	distutils-r1_src_compile
+}
+
+python_test() {
+	chmod -x "${S}"/tests/* || die
+	esetup.py check
+	esetup.py test
+}
+
+python_install_all() {
+	use doc && doman man/${PN}.1
+	DOCS=( README.rst man/${PN}.1.txt )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/cheroot/Manifest b/dev-python/cheroot/Manifest
index 448cf2f5660e..c2d8cae5b953 100644
--- a/dev-python/cheroot/Manifest
+++ b/dev-python/cheroot/Manifest
@@ -1,3 +1,3 @@
 DIST cheroot-6.0.0.tar.gz 62763 BLAKE2B 0946c01c6a6233dc60ca3dd896c3d1dbc0feb97d5099d88598db340a8812b2be4cb076383c0e39d30cd2c6fd3402e048b716a02e82bec8ce08d5b8fca4b1be0f SHA512 0109fbf3b73ed3f12261eaa3c6d86b6c6b80a1ba3564548ba3288aa6c61a1c08db60886e677991bf7997e6a5b1ec7767a3e06098ec1748453e72c40fda7b82a7
-EBUILD cheroot-6.0.0.ebuild 918 BLAKE2B f4a9fe31319e00bbccb40d389b2b383a5e5f148d0391c920ed6b1b9883465d6aa2f5d27c7592b56786ce95c0daf3f2e464ede74fab40e37b793834ac698a4758 SHA512 f424509c2988cda1a037dd5a4ebffc0edef8419e69842c9299d121d7f6eff84267d0a6ee11cdaada0cbe321b6408ae089f088edd7f0c165e64fc909118da93c9
+EBUILD cheroot-6.0.0.ebuild 923 BLAKE2B ec9450c391457226a1449e536b5c9694488cfa02dfb1c7e51fd6ff04959dba7b115396ded4ba0a93013d5c95c39ff66ab4a8ffb180c3b11e543307ec3420f38e SHA512 cee1e51b2d172505a0e1fee09910fcb7d543048b55c167d433a5d16cc30b5355bcc3d97c6eb4255a53193791f2aa5101fb57a8c975e3c5620c2f53a090248eec
 MISC metadata.xml 370 BLAKE2B df7ec3eb606f1557e048245eca81402f40f9cd9bc4ec8112ecb0085f65530d9a66b952d56f826b2b97733018ec4b4d31c16ac26bebd3a40f3424421255fcb770 SHA512 22ff00c4677bd898e9d88f2bdebabed6a145a9dd33d6276e997c0435c64fc9dfd396a35a88c6facc8a3844187f0b598bfe8606637ea88420a6c33e1ea9765cbf
diff --git a/dev-python/cheroot/cheroot-6.0.0.ebuild b/dev-python/cheroot/cheroot-6.0.0.ebuild
index 75cb6ed3167a..edee3e0ea2f9 100644
--- a/dev-python/cheroot/cheroot-6.0.0.ebuild
+++ b/dev-python/cheroot/cheroot-6.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/C/${PN/c/C}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/six-1.11.0[${PYTHON_USEDEP}]
diff --git a/dev-python/cherrypy/Manifest b/dev-python/cherrypy/Manifest
index bfb8a18861a2..462f2a4cf71d 100644
--- a/dev-python/cherrypy/Manifest
+++ b/dev-python/cherrypy/Manifest
@@ -1,5 +1,5 @@
 DIST CherryPy-13.1.0.tar.gz 687221 BLAKE2B ab9c8f50026e26d171877e4e68f1c5a53fa8519190bcc577e12999cdf8a7f52be37f4ba9ed83a276a9f33676839ec63bff68aa8f9f51ddf15557e09123bf2530 SHA512 c32cf009d6a5b557560a00cde0f47a01ae481c7f60b7f340e5c99bf2d7c757e7c7cbf3ef2f4f71c172057aa09ca332f2d211cc97623ea29ba9f17287c7bc42dd
 DIST CherryPy-3.8.0.tar.gz 433711 BLAKE2B e1b4a554138a61e8c6313c3055723583d812e573a352d67bd5448f799e4f2f22694b800810b53cd041c665e46d9555b471d1da91c252ade96459778d7a5c07fa SHA512 25f84093e30d814c0980f7d77b98492113470c3297c66ee8652e40650757f8e2b7db01bb8de6d7a1ea9b4bed8b764502b1f563ac6f0d082970bc2d46739d19c2
-EBUILD cherrypy-13.1.0.ebuild 1302 BLAKE2B 65dd958341bb4eebe6942497c3cb5a6c7221eb3d20b79374f6c1a273aa75d76b3224a2415dd59c19c30c4c40621bce634da56ef704fbf59a75067e02d6355aad SHA512 d99904873557b3b91825560c962dbcf159c34a64d75fba18107bb65e6583b6ad4fdec19ee60f4d6d218714610ae306dde1c4c6f48c8ed33dd8c7e8b53a05312d
+EBUILD cherrypy-13.1.0.ebuild 1307 BLAKE2B 595b0e151246b7a46af2f6ddc6af41acf57a391a1c3d9efab668f3237e01fe770a98ca0d74161e654770cb9b45a7af4faa16dfa8725cee3c89cb99573d379265 SHA512 738e33a7fbbf4eded1362f184ab5a0a8198cbea3428b7bd30b245dd8c13e879fad0abcf90d41da9d1fbaa6846c012054a149aefacbff034c6ffe01425cc137b5
 EBUILD cherrypy-3.8.0.ebuild 1661 BLAKE2B f3ebb5b8bf5ea529d9a3be6041b93f1490249e88444d718ef095511dea4af4f97c73841bd2301e5b084ce78c6b76b547cbd9ce72351276c6b411d26e4374f51d SHA512 7149cfa87ee95bed2f95e0107425e476155902f411a7261b4b05e8eb002aa3f4730d3c3469aad48ead90fe5838baa14b2e4e441e0d1848e013c88e9e8ecbf195
 MISC metadata.xml 321 BLAKE2B 6636b11693e6e9d09f579bc88b203bd7c41f67222887365de5db2c3aca4c34d8cb2e341f217240ce562f43d60e78221442c12b08f2f7e516c36e06d928a9a995 SHA512 c777da5d545e3d626d663830437ec91a8f228c58734c7df4e4a16f0609904a5ad4613310d2d05b4e8ea89053371ad0bd4f0624137afe54ff6c4f5d9eef734d10
diff --git a/dev-python/cherrypy/cherrypy-13.1.0.ebuild b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
index 984e178f7b05..13a80e2b9df4 100644
--- a/dev-python/cherrypy/cherrypy-13.1.0.ebuild
+++ b/dev-python/cherrypy/cherrypy-13.1.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/C/CherryPy/${MY_P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/cheroot-5.9.1[${PYTHON_USEDEP}]
diff --git a/dev-python/fields/Manifest b/dev-python/fields/Manifest
index 9c804bc066dc..e9d0d79e650b 100644
--- a/dev-python/fields/Manifest
+++ b/dev-python/fields/Manifest
@@ -1,3 +1,3 @@
 DIST fields-5.0.0.tar.gz 36232 BLAKE2B 7e5ebc5b7c76b456acbe02e0b325685776c573dd0715e27402e5245e04f3c54e6e0ac04b8780a50d9b560cb5fbb664bca6a3addc76666f012aa2427140dbf870 SHA512 3d80b9c6a1d0a43568045fc25422b0db783c84e2e3f2be8b1d41b0150f48fef58736d863d06b4562b29190cd6dc2616829faab8e901b7268ac2e9e63e996180e
-EBUILD fields-5.0.0.ebuild 738 BLAKE2B 75a347fbeaab1e4830b7b69c9bd9a9104862ef52738f42364dfed679dd20fe2159a374a56c8318e149783b9f030d0c818f42bd0389072e7d2ed6a4388ab7d830 SHA512 8544ff07c5fe4af53e03aa693b3824c911811152b6b1debfa22d3f00fdd2a608e4f93914e0c689ae77bff9dd39297273ff888e7d8ec65c766b5723874f3f3ce5
+EBUILD fields-5.0.0.ebuild 750 BLAKE2B 80621d904c627c29ebb51f5a2339ea63e45e1b149378cb3b6d8d3d8d16ae1137fd13c892cc0e458dd973e62239b99f12ce946902e0b87904f11785f3a86e25ee SHA512 c43aa4d3d363be6020c9cb13d2fcf28752cc78d3c0494101756983572c3c7104f5c7c7d93cb1f262d4ab035a7029494aa19feb4e9eaf6bec76dd7126aaa6c590
 MISC metadata.xml 336 BLAKE2B 4bec1a37213268f4116b30d5b6db4b43718d3803467423c01ea7c44702c0ccad255d2c0ae6d55469f0e6c6a82a6c4f344000f86989fd820b13513ac4e9d354c6 SHA512 3c055d4cf5070c7535ac37c335f224c0cafbeb68a7bf7677acd06a786b4aff93b5ddeeed3e2514cb999407c21303adf2945561688d5e20148d7e712000f62d0d
diff --git a/dev-python/fields/fields-5.0.0.ebuild b/dev-python/fields/fields-5.0.0.ebuild
index 3475a9e41f48..8df43bdc4bb2 100644
--- a/dev-python/fields/fields-5.0.0.ebuild
+++ b/dev-python/fields/fields-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 DEPEND="test? ( dev-python/pytest[${PYTHON_USEDEP}]
diff --git a/dev-python/mako/Manifest b/dev-python/mako/Manifest
index 5f9678fdb543..983095d26e55 100644
--- a/dev-python/mako/Manifest
+++ b/dev-python/mako/Manifest
@@ -1,6 +1,6 @@
 AUX pygments-exception.patch 1456 BLAKE2B a5cea58cab2dfbff872db7eda2a7753d69fcd0ddc2cc70ac9ba05978beff8fcbf2bd3ea4627639247de5a2e343ee30144216d28b890414a50cfa54b9cd97a73c SHA512 c43f620fe52e1a69e52a14a4ef3a390ff38d6507a53a70b2da0625b3be1941a0f6b2cb23d2ee60a391e78d8062ba2a9c76d8c5ab0556e01c256867dede44ef61
 DIST Mako-1.0.3.tar.gz 565224 BLAKE2B 8c9a6fa10a6a8d5fc87ff75b77b11e411bd79adcab64e3b3b9066ba7010db94d98c7e8e422e1f89a3ff326501eff8dd6129a1af97d131babcd00047b0db19c29 SHA512 1652cb3f7ea6484975c16f914ce9c070e503ff532564f76a048dd316e5eb12ff2b2445f272be55147d4d62b45906d5e14b3799c9136622ed0867a00875a0e52d
 DIST Mako-1.0.6.tar.gz 575112 BLAKE2B c8354faf03ca2b6dfbb82ae96e8b86385630713a0ebb1d592179acaa78e0950a0b013da05da0c079263043a4ce8958e5ec50215c401b2c4fcabfd7f364d92be5 SHA512 15608f2487783ea3a48faf743ee1b8e811adc34281c613e56f1a4548f3c614d1d5dbc943911943a7f8f6d34a962a27387d8fc17862038c1abee2e6c3328a79cf
-EBUILD mako-1.0.3.ebuild 1415 BLAKE2B db5d44fc7c9bbf403be19bc104fc4223bfa369825cc1844049fc782701aea5d4651a8a5f29633846730970baed13d6c240251c0e5ac3f5d77748dd26b5d9046a SHA512 659bbf5a8f48dd5bc8f8a2e5ab2dd3a0c770566c8087304a9b721f8a44aa40f207b1faf6570dd690c936e498619840f8faee9f48437a64c91e23f29e6bf9c125
+EBUILD mako-1.0.3.ebuild 1411 BLAKE2B b47524aa2a916a453f59011f707010f81073639b9a2a67f5ddba14378a04392a90ecaed698284760f56fa23d8e85f888e6179f6203c1694e2850392ab0dc55cc SHA512 e196baf5e28ba989c7d8c5e69229ba1df9c400ef93c712add5a002722eb6690a9d8eb024b21ddb4dea3844419c0940ae487709b8e0fff13c08a3a0669b9233a2
 EBUILD mako-1.0.6.ebuild 1475 BLAKE2B 6d9d05bd252e06d55a49253873386669119ddda25915fe3711518fa525d88de70fce6bbcf6e750bf2a5ab5af2c5479949ed590351ffac1824113e53c6348fc9c SHA512 87c0cf382124cc4df200dc1693241e45fe2c6ef6af1e61d63b07984207c19ab0015783c853a6eb96e23a5e621b1e880e857b08a77e34f1b663f366852fe57013
 MISC metadata.xml 317 BLAKE2B 1b8ed4d3958df0960dda7060ead69fff4ea6f0c6087d99af4ceeeb8d1fae9a88657aec6eb1695ec5f990e48f167e729ce65507080ef0ea5d23617d439621921d SHA512 5df2d87e902b439727d8be3861e626ff798a546f09dbfdd19ee7384dc1ca0474d1b3ff2f638d262217f0105fc2536a3ac2440cc5b1161cb510976bd2ca6d1da8
diff --git a/dev-python/mako/mako-1.0.3.ebuild b/dev-python/mako/mako-1.0.3.ebuild
index 79caccad1dcf..78f35db7bd96 100644
--- a/dev-python/mako/mako-1.0.3.ebuild
+++ b/dev-python/mako/mako-1.0.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/matplotlib/Manifest b/dev-python/matplotlib/Manifest
index a6f2b11c47b4..97f858cd0558 100644
--- a/dev-python/matplotlib/Manifest
+++ b/dev-python/matplotlib/Manifest
@@ -5,6 +5,6 @@ AUX matplotlib-1.4.3-cross-compile-3.patch 2202 BLAKE2B cac5953ba4d075d232f9e451
 DIST matplotlib-1.4.3.tar.gz 49933525 BLAKE2B 40ea29ef7197d364f9caea63904b11231a4f74ca93184de8b1f8c7f78713cf887ea8a6fbee1b3f545c895eb353e0eeb5d65308657a3138986fb080ac44164427 SHA512 51b0f58b2618b47b653e17e4f6b6a1215d3a3b0f1331ce3555cc7435e365d9c75693f289ce12fe3bf8f69fd57b663e545f0f1c2c94e81eaa661cac0689e125f5
 DIST matplotlib-2.1.0.tar.bz2 33051088 BLAKE2B 6a97909a44ca37c3ec09a9e723909bb0169828e56daeec5711220a6caac632d19e77ef2fc042a61cb82760c9750d04753654761a707b6265a038af9c55b91bd7 SHA512 872ff86e989b4e9352663f4abde1768aa05b1adea3e1b234efdb301429d421718314b27950e508d92df8fc9136764b07e8a6861b66512e9695a496993076bb5f
 EBUILD matplotlib-1.4.3.ebuild 6150 BLAKE2B ab34b10ad72a013c9ccae7c6b34b2f624169c44df8a149dde10a6fb5448f928bdfb107e39cc220b54c5460be1645d3bcbf8278a37b20f3906776aa0f2094b715 SHA512 9e6e415962ad4e3699bde4b2e9701ca9141a72bb7d1c9097e3bda541c2d618524eee7a64ddc22a13f2d228c2e32296a4d88592ffb6ecdb366c590f70e01a2b46
-EBUILD matplotlib-2.1.0-r1.ebuild 6045 BLAKE2B 457da44552492b01672102e36370547396b930fa2e5a1b6ec256b732f88aad72a38bd5c5ab42e5e65f103d9e7041f73eeca431789d687adb436ce7e086ce67ae SHA512 65f24a8a7add5579efece30ae04590e57d34a4fb1409621699e991bd3e409f1eee47dee0e30d3cade94755f5dc28a5535404b9f7019a19b3db48011fbee5eca2
+EBUILD matplotlib-2.1.0-r1.ebuild 6173 BLAKE2B 45bda87d10e48cb942e015b518deb5476f40c64ec79a7acca3366f49d70da8036068353a3766d094e00b8108718a8aa67c34cfaa4ab37f2151322c73d8520896 SHA512 e40659b624f307e591c32f9b9f2e9aa181e8a3bdeff45535be07141b4f2657b066ded21de0adea3cdf18903cdb86882aa425a79432a4d906982de776171561c1
 EBUILD matplotlib-9999.ebuild 6396 BLAKE2B e1e7d6415cadc503db5796a8aba507aa6a94f8acb7e529caeac9d71537570293d75293b607d20a33b94a7352fdcec0e2c1de8d6302f981a1cb15d15585991951 SHA512 1a6406602fabea4b12911a89d34e69fed7b418c3127dac5679ebfe706e144aa62c93f3aa19ca832d75fdff0b4f2c5e5029a92ed3e1a8fa6bd61973cedf5504cc
 MISC metadata.xml 1063 BLAKE2B 396b976a60c89ae2b6bb9d365a8234663994f561a99ac0d59385a15245ae245fc09cdb6626b79a63cae53651c39d2df97ea8825016be0ec3bce7d6ad60cd15d5 SHA512 25344a9f8d7ae73f1ec9f493cef17925c94fc4cd44486a9928debbd18ba53010455393e3e97fc70e67a9afae9d6c15b12688af16e5e9f7e090748481969eac4d
diff --git a/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild b/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild
index 37e6b936a7e4..f50fb4db1178 100644
--- a/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild
+++ b/dev-python/matplotlib/matplotlib-2.1.0-r1.ebuild
@@ -34,18 +34,19 @@ REQUIRED_USE="
 
 # #456704 -- a lot of py2-only deps
 PY2_USEDEP=$(python_gen_usedep python2_7)
+PY2_DEPEND="
+	$(python_gen_cond_dep 'dev-python/functools32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/subprocess32[${PYTHON_USEDEP}]' python2_7)
+	$(python_gen_cond_dep 'dev-python/backports-functools-lru-cache[${PYTHON_USEDEP}]' python2_7)"
 COMMON_DEPEND="
 	dev-python/cycler[${PYTHON_USEDEP}]
-	dev-python/functools32[${PY2_USEDEP}]
 	>=dev-python/numpy-1.7.1[${PYTHON_USEDEP}]
 	dev-python/python-dateutil:0[${PYTHON_USEDEP}]
 	dev-python/pytz[${PYTHON_USEDEP}]
 	>=dev-python/six-1.10[${PYTHON_USEDEP}]
-	dev-python/subprocess32[${PY2_USEDEP}]
 	media-fonts/stix-fonts
 	media-libs/freetype:2
 	media-libs/libpng:0
-	python_targets_python2_7? ( dev-python/backports-functools-lru-cache[${PY2_USEDEP}] )
 	>=media-libs/qhull-2013
 	cairo? ( dev-python/cairocffi[${PYTHON_USEDEP}] )
 	gtk2? (
@@ -59,6 +60,7 @@ COMMON_DEPEND="
 #	dev-python/pycxx
 
 DEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
 	dev-python/versioneer[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	virtual/pkgconfig
@@ -82,6 +84,7 @@ DEPEND="${COMMON_DEPEND}
 		)"
 
 RDEPEND="${COMMON_DEPEND}
+	${PY2_DEPEND}
 	>=dev-python/pyparsing-1.5.6[${PYTHON_USEDEP}]
 	excel? ( dev-python/xlwt[${PYTHON_USEDEP}] )
 	gtk3? (
diff --git a/dev-python/more-itertools/Manifest b/dev-python/more-itertools/Manifest
index 817d55026762..c121661f1889 100644
--- a/dev-python/more-itertools/Manifest
+++ b/dev-python/more-itertools/Manifest
@@ -1,3 +1,3 @@
 DIST more-itertools-3.0.0.tar.gz 37622 BLAKE2B dd1806f4359406ac0a57a8eefe8d6c31033177e3f1b4fd297dfcdb525df6bd5725ff16f25abb1957dcb1cacb21bf1d037a3c9def9e9469904efbe2fd336cf5b4 SHA512 575de991b6337e6416489d92b41201536397d84ff41030a2cf09ea57cc994e03dcb4dd19eda321243ceafd49c11271da43a4c4ed5a9261cf771f0b7f8e40345c
-EBUILD more-itertools-3.0.0.ebuild 927 BLAKE2B ff00c65dbe228df221be9e8b3473ef9b18ff076ae4799dd054896a3abfe04633cd371040fe555c45862cabf4cec8c098fc3e8eeb0b936e4e76fad98d04fb4f78 SHA512 17f7d60010f0be40b8ed8b1b5d4643f1b9790444e5f3fd75a01e3195dab2e43233429862680a63c0d505d74b3019f125eb7ac540d35d82a751b6d15557df10d5
+EBUILD more-itertools-3.0.0.ebuild 932 BLAKE2B d6ec11c510198390910ffc62c56bab5b593231c5cd48f654e4dc7394b0a0c4d23341ddaaf458efde82261a0c790d5982585139a3faa6ce8cac7e175ae9527ae3 SHA512 a8a11985e3684e3d9425920cab028e620d917a38041051039661046d4a1f696e619ef9b5e81ef99b4b33c3e77aa21687a93bf0b90e5ef1a690603636819ba576
 MISC metadata.xml 451 BLAKE2B 22dc3c0fcc0e1061f4060b8456e7f8686f40d100af79b6bef394eb1e9111aaa9b7b5762c94bb3b27464739328388dd56f02cb9813860acf23067148f03ef2f66 SHA512 4a22e7394227ddac2669e188e6b77170d41c30054a388def0a4d8ff2ff27de676949f4b8932d8d1adeca6c8570be3733da9983e173dc620298ed0bf3ea365ddf
diff --git a/dev-python/more-itertools/more-itertools-3.0.0.ebuild b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
index 056b7f100063..0f707a6f089a 100644
--- a/dev-python/more-itertools/more-itertools-3.0.0.ebuild
+++ b/dev-python/more-itertools/more-itertools-3.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc test"
 
 RDEPEND="<dev-python/six-2.0[${PYTHON_USEDEP}]"
diff --git a/dev-python/oslotest/Manifest b/dev-python/oslotest/Manifest
index 42792d7d11ff..d0e25f261abd 100644
--- a/dev-python/oslotest/Manifest
+++ b/dev-python/oslotest/Manifest
@@ -1,3 +1,3 @@
 DIST oslotest-2.17.1.tar.gz 32166 BLAKE2B 49922cedc32bebda867c6633118cbd8258a08048c510333d04e0b2f8f5efd4e5dde802bfb8910936dffca76823771d3e83e78528b5fd045ae4380e02f92cf809 SHA512 558d2c220a6b1235112022b495c77881f52895cb720d67090ad096576b4e81044b228bd95b8303779bf8cca2e1205ef912b1fedd1916a34130f4c68ef69fcc0d
-EBUILD oslotest-2.17.1.ebuild 1810 BLAKE2B 0596613272772ab853921abe8e261e998cd836515f1c19810b4ceaf48a03541b9ca7f9da0e5787e0a769f5eb3c961f064308853c991073dec6a28f3366e88840 SHA512 957fe51f09042979f9d65b867b71ba7579a0868b225a75a8490982bbb48ef0896634fd3d2cf18cbf46d4e93990919eff66d6c8fb97797d006161ba0cf9f9d656
+EBUILD oslotest-2.17.1.ebuild 1784 BLAKE2B 4d590b29a50b018bbde9e0e7b92a6b0721ca1200447a9b72c03b377626e795bc74ed808d540c4efea36a11649a55cdd99f76b38cec8eef25713b03668a28857e SHA512 25acabf2fdad54fa764e3bb3911fe479f975bc73786b86e3ec01f2ebda342c385a53add740f557e8913d592dcdb2d6452d947d6b1db86d95ac7278c99b4a50d5
 MISC metadata.xml 828 BLAKE2B a328982018731cc93cda675447ce2ba308e9164e8762df10a267c6b82389a717f16b5ba6d9843503e12a458f3ad5a726ce648f80e9ff781aeb429bd9034632f6 SHA512 48a68782c8ef2a15db7c73f03dbd4670b8ca25a6cfcf0c15d4585a93a75cc4591fb6edb70f7176cd72c97d1205ef8e5e898eafa9fca41ed0b00023bff93f966d
diff --git a/dev-python/oslotest/oslotest-2.17.1.ebuild b/dev-python/oslotest/oslotest-2.17.1.ebuild
index ea3ef000dcb7..63000aeac9ce 100644
--- a/dev-python/oslotest/oslotest-2.17.1.ebuild
+++ b/dev-python/oslotest/oslotest-2.17.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -59,8 +59,9 @@ python_test() {
 }
 
 python_install_all() {
-	doman doc/build/man/oslotest.1
-	use doc && local HTML_DOCS=( doc/build/html/. )
+	if use doc; then
+		doman doc/build/man/oslotest.1
+	fi
 
 	distutils-r1_python_install_all
 }
diff --git a/dev-python/owslib/Manifest b/dev-python/owslib/Manifest
new file mode 100644
index 000000000000..9ca344e738f6
--- /dev/null
+++ b/dev-python/owslib/Manifest
@@ -0,0 +1,3 @@
+DIST owslib-0.16.0.tar.gz 658145 BLAKE2B 8e32de48192579f10515771c1682b1d1319deb8195ff9c0f9168ea82bb30bbc8bcf7c457c794a79b1121d40f3f544624f0a9789b0f6f36632c6457f396fa78c9 SHA512 a468352dfdb62bea1e6189efcc198237cb909051e51782abb15093e328ca7d3d379e88d0466e42c39ce9bc201a3be828a779193666bf9befe8d501355aaddbf4
+EBUILD owslib-0.16.0.ebuild 1060 BLAKE2B b3e7de65c5ef1e71d15d522e3e0c6e8fbf5e99531c3793cf7f4488fbd4875515cf7871d7b92c98828c0d30a004ed200bf9d91d3e40892c5974c3940faa686929 SHA512 38cddc260a591b6b3f70d19a4b4c01dc413b30c7b8e29ba188fbf6567df5945b35c0fbee97557011a057ffc318ff0affe488a9720d213c8634e9e98f1d4e649c
+MISC metadata.xml 451 BLAKE2B 82a1e52487ebd5bc2a728a26c46f8e26a15d5736da20a50fd8be71fcddc088dacfbe178ca2cdb9841418723175c0631455393e5735b78767e58287c1542991dc SHA512 7c41ce77f3d6126a0fc61c39c953f044f94c39738b4fff7c7c38a9da9c972f16957c44d60df9de59d1c03e3c5384582efa3986e7ac31e546e28fb8ad5b1673f2
diff --git a/dev-python/owslib/metadata.xml b/dev-python/owslib/metadata.xml
new file mode 100644
index 000000000000..01e0addb55f2
--- /dev/null
+++ b/dev-python/owslib/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>sci-geosciences@gentoo.org</email>
+		<name>Gentoo Geosciences Project</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>python@gentoo.org</email>
+		<name>Python</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">geopython/OWSLib</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-python/owslib/owslib-0.16.0.ebuild b/dev-python/owslib/owslib-0.16.0.ebuild
new file mode 100644
index 000000000000..905b9c4e1098
--- /dev/null
+++ b/dev-python/owslib/owslib-0.16.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="Library for client programming with Open Geospatial Consortium web service"
+HOMEPAGE="https://geopython.github.io/OWSLib"
+SRC_URI="https://github.com/geopython/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyproj[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	dev-python/pytz[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	|| (
+		dev-python/elementtree[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+		dev-python/pytest-cov[${PYTHON_USEDEP}]
+		dev-python/tox[${PYTHON_USEDEP}]
+	)
+"
+
+RESTRICT="test" # tests require WAN access
+
+S="${WORKDIR}/OWSLib-${PV}"
+
+python_test() {
+	"${EPYTHON}" "${S}/setup.py" test || die
+}
diff --git a/dev-python/portend/Manifest b/dev-python/portend/Manifest
index 71f893fc5e57..8db746976034 100644
--- a/dev-python/portend/Manifest
+++ b/dev-python/portend/Manifest
@@ -1,3 +1,3 @@
 DIST portend-2.2.tar.gz 7974 BLAKE2B 77ffcf02b65f276a5ca1f1bdd76afd54e8f6afcb1c55b6948862017f973772dfe65c9b934ffbc98d2f36f799131d23d4a7128f46e46183010def8936f2dd0bad SHA512 1782132b0dec5b678892190b70ab795b1748dfa17e257b6655fc803f0cf19652725778cd329c3609353f969959501dd11fd2b9726cfcdf2c58689e2ce280c146
-EBUILD portend-2.2.ebuild 708 BLAKE2B ee9adaa3df0eaaa85bd55f935946a96a2a1f17841f71a67a146f0e30202213912b02abf4de8e3dced9345dc4150bec64c462296e58c6c46f14d538e8d9643be7 SHA512 e64f295b03e9287989983da4459f12c993b16aef4e669ebd26f36a6d7b4e4eee120a473520ab37a7d4b72e1f3df282420278104c8fd7105aff673dae01c6bbd4
+EBUILD portend-2.2.ebuild 713 BLAKE2B 8373a2a22b28185f5546ca1d33d75c0e69c7ad7a16e415da3fd2e3904590ecedf25a89a1d41738842920600a5b9ec5c1ae63077d265055fee330081223039270 SHA512 580e2db88eed8356a627af8f9ba9e9483e3009564f01c0498d4e367bc9bdc2d9eb0f291ee5e5d21f95785b56edefe31603e01289fc4a91db6072393bc48e3ba3
 MISC metadata.xml 368 BLAKE2B 3f51a162e0c69485b7fb54960635b24ccb4741cf053ad4ac314f7f45798cc56056a7416e2207b6eb1084dffeb9bed043053eaa2ae5ac3b8d0dec142a47d1fe36 SHA512 269ed8048e3bcf73a693874ab0a6a269fa24169a1a95d9cb5bebad5e87193c443be8883682df973b4a461447ebd6042cdc7a932f81019b0ea53b3da7c566bf82
diff --git a/dev-python/portend/portend-2.2.ebuild b/dev-python/portend/portend-2.2.ebuild
index 4260f3a92b0e..5c7f4e15219a 100644
--- a/dev-python/portend/portend-2.2.ebuild
+++ b/dev-python/portend/portend-2.2.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/p/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="test"
 
 RDEPEND=">=dev-python/tempora-1.8[${PYTHON_USEDEP}]"
diff --git a/dev-python/pyatspi/Manifest b/dev-python/pyatspi/Manifest
index ff8fe1d58d92..24ce0ec8db33 100644
--- a/dev-python/pyatspi/Manifest
+++ b/dev-python/pyatspi/Manifest
@@ -2,5 +2,5 @@ AUX pyatspi-2.6.0-examples-python3.patch 791 BLAKE2B ad8130ef64605915b3124dd268b
 DIST pyatspi-2.20.3.tar.xz 297368 BLAKE2B 47b82bc5fffd513eb9c9be608172df2b434c6696567a7fb9b78393e5e591a88ffedb8d398bc8fc537ec0d8d1e693ce06e9b9f45bd89e3a5465e18ba09fe83224 SHA512 87f9dccb0be1b85ed850abaf28270c2fd5e52a43dcd94e452f650d6aea8a52bb59d9b9e9d4312bd0fe88d549812c1ddbbceb05955687134613ecd6e1b7af4ace
 DIST pyatspi-2.24.0.tar.xz 298228 BLAKE2B a1c989df5431a9fdf0b35c5fa75a12b9c083c6a979052e3a621685feada611f4322195b30bc1f4f56cd35f305087756cded31a445cca07e74262ecd807926239 SHA512 ea0c3e5a5a417c4d494cfe33ccfcca1996f417e51f5ccd3508372a0df636fb186b9940d7832681af9b353aa50a9aabd64c5477fdabbc5016794a502396b3d67a
 EBUILD pyatspi-2.20.3.ebuild 1297 BLAKE2B 3ccef24a4bc566a5c0067ab60a13a484bfb06dc758f365f0910a28d04423d4d4e86b1685ec6c55b7509dbd542ed05011939da2b4cd6c86811b4d294789306be0 SHA512 5dd9c223ad665b88ce9e07cb52d07c5249746a52e702194fcb8a337aae4defcb18899a3a4ba589a93dab5c75c925aea43cb2f635c84a5a30a1a9ef9adc00d97a
-EBUILD pyatspi-2.24.0.ebuild 1300 BLAKE2B 81265fff9b0122b784fa37421cb8e8f536df9b04921e248a84b23aad74d3fdae72457cd4c0a067e7aca79326c7f20d8405825609d7994c631d4f545a9502c00a SHA512 256c66906ffdbe3c9015707f643bef43df1809fd689423c6e3aa6536834640cd6da6b526665947cb7a63eea49e7d2678a33c63bded3fc4ba3167440c5857bd18
+EBUILD pyatspi-2.24.0.ebuild 1299 BLAKE2B f5645673015e85f7ab2bbb2c61639007079093633833e4c5fbad92d88920a494f8f5365e10a32ea7809f5697d7c4b32ecfa423935ffcc1026b3163c990b77df6 SHA512 e76d17242804f1f94ae2a009cfa1a392cce1a89767e93d95896568d1d71ad289a6f7ab5b9e95ca11fe75d8c29fb840a05035c5207bc43b8d92c8a553b98aa365
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-python/pyatspi/pyatspi-2.24.0.ebuild b/dev-python/pyatspi/pyatspi-2.24.0.ebuild
index 48ca4d41ff72..28383dc3283a 100644
--- a/dev-python/pyatspi/pyatspi-2.24.0.ebuild
+++ b/dev-python/pyatspi/pyatspi-2.24.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://wiki.gnome.org/Accessibility"
 # Note: only some of the tests are GPL-licensed, everything else is LGPL
 LICENSE="LGPL-2 GPL-2+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 IUSE="" # test
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/pycares/Manifest b/dev-python/pycares/Manifest
index 61542a8024a8..f6a32132d169 100644
--- a/dev-python/pycares/Manifest
+++ b/dev-python/pycares/Manifest
@@ -1,5 +1,5 @@
-DIST pycares-2.1.0.tar.gz 226838 BLAKE2B 3b08084bc8b5a1b697a3b26836aff0e69c18ae89bd01e9a3c9d542eca284ce6c1b6a0bfc9b01592587624e4cf86d2119a777464e71133ef869fd0063f80ef78a SHA512 189851a9488828eb41bd6adbefd14022ae8470bde98c1d1c21d67992acdf721e6a61c3d8d8b4f85fb420e1e0900c54e53893586d6f80cc822371260fc17e55c4
 DIST pycares-2.1.1.tar.gz 226787 BLAKE2B 26716906e78a3fa16bcbd143f63e633ffe4664706b2230f698ea933c15d057f92a0fedc45927743690e9ef8f84191e40f4215878ff2845fd1fb4bcf91f49b765 SHA512 c3524a49f5abe4222c9371ca269918eecf30a77bd52258187766833b4663be861678ebe6f1cb2f50e824d36e75938162d5528abd5445c477f23fb85c24572403
-EBUILD pycares-2.1.0.ebuild 601 BLAKE2B 5bb203a85359eca2c8a5f3433437b29e765fefaeace2508f1980f9cae69c771964cb0a91041041f01b38d7999d60542ce3f517d571f664c0659253496d0ecfcd SHA512 0dd4415c5a30d67c776014025d106f64701ac6017d86da7fca29b39e8f1a060c7a20d47d09ad817eafc64c2a9f892568fd967acd81ec2b9040b59313afd8519e
+DIST pycares-2.3.0.tar.gz 224941 BLAKE2B 9ab59f8f7294930b5ff97c7340c3f64cd039c4b291b7b33d00da85168638cdfc75552508a72afd91db28c4c1b823a018b45c346a3daf8da15d5160fd691b6c4a SHA512 dc707ab0320e03fb20e728e2e2e52e92ed3388afcf19e4553bc2a15c33a129abee39a9bc423edb7be7113d42989286ab8e8ad48699cc7433a6d8823460fd4678
 EBUILD pycares-2.1.1.ebuild 607 BLAKE2B 507fd8145208974d4ca90bc4f0bc5e31bb3f6e526dff6d045711b28e42a69103e3982e0e466430a6ace70b4969267a842aac6aee61ffe85d7de2e84d30b49e68 SHA512 1c286d7c7a067498fea773a342adb7becceb6497d733af21a57b73c3e8202f0b364f9946d66ebf626fa97deeaf2cfd09e81be99a301403a150ab4a6a1e1a0802
+EBUILD pycares-2.3.0.ebuild 607 BLAKE2B b01f4d3284b657e9c1f6c3b999ad4758558841dd56d7ea32501c8b496f6ed2d46a17780b88162b7f63f981da4e227641d0363fe5aac4020372b6a9e982e1431c SHA512 875531238fcaa2450014a613dfd08d98ef69ea60d411527662fa8b9e877917d5c73c1a247e56bf1770f5162209475d10cb55a0be62cca64010e457ecf96bcf70
 MISC metadata.xml 342 BLAKE2B 673fd0795be11f8ede70971b4313e5b9cee3aec6b93ebdc38f4454f0c6bb024c8128598208a6ba9777f52b584a9faf71f386de2e33aad2b96bba1023c6599046 SHA512 fdd177da9082fc650173331be63823ef6eb8dd195c526c3f5e7a38521f3203fc12ca591ff2ac4bba5fa64aa2ac8a9b419385285991696c9f02dd29bede7784a6
diff --git a/dev-python/pycares/pycares-2.1.0.ebuild b/dev-python/pycares/pycares-2.1.0.ebuild
deleted file mode 100644
index 0da15f536f5c..000000000000
--- a/dev-python/pycares/pycares-2.1.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python interface for c-ares"
-HOMEPAGE="https://github.com/saghul/pycares/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-# Tests fail with network-sandbox, since they try to resolve google.com
-RESTRICT="test"
-
-# uses bundled/patched c-ares
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_test() {
-	"${PYTHON:-python}" tests/tests.py || die
-}
diff --git a/dev-python/pycares/pycares-2.3.0.ebuild b/dev-python/pycares/pycares-2.3.0.ebuild
new file mode 100644
index 000000000000..79fbb935df77
--- /dev/null
+++ b/dev-python/pycares/pycares-2.3.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python interface for c-ares"
+HOMEPAGE="https://github.com/saghul/pycares/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+# Tests fail with network-sandbox, since they try to resolve google.com
+RESTRICT="test"
+
+# uses bundled/patched c-ares
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	"${PYTHON:-python}" tests/tests.py || die
+}
diff --git a/dev-python/pyicu/Manifest b/dev-python/pyicu/Manifest
index f0bf47bcea07..c040da27a64d 100644
--- a/dev-python/pyicu/Manifest
+++ b/dev-python/pyicu/Manifest
@@ -1,7 +1,9 @@
 DIST PyICU-1.9.5.tar.gz 181878 BLAKE2B 519f507ef44ae7dead0b88ae048eb6bc47c0acd069590185cf72e558e3bd9712574e20319c3a5246c1cf0400bc6ccff1a6c7df7ffa4f94d7194f08069440e2cc SHA512 19fb3222a68cc67e92ea4171257d00c9a322f993f1303a4432b5c3c4efda32ff4c2372027cf9f3fd31d3dc3cf3bcbcb957dfa420039591044812f0213684e885
 DIST PyICU-1.9.7.tar.gz 183235 BLAKE2B c5ac7294f7769f3228a00b7bd4608b078355032c6780e2a70dd719de9eb59e0df067b7d332252ae48dda276537e9575c1f7fa9d33a7655e25030051e8e646b57 SHA512 ac4b9fa6e73eac9e223d4d3758a80611e4e4d78812b88b6ffb20f4b26012dc794cc242a0307cf16597677a552987dbfec3d047cf836f039721bbebab468c76f2
 DIST PyICU-1.9.8.tar.gz 183432 BLAKE2B c2e28a123e56ea99ed90160c1bf91f6e779481929e968b5ed1e692fa1f66045225dfad09aa0b88980d4c9417e462bafa334e4957dce3d73e947ec4a6640e44ac SHA512 87a539168ef89c0b77219e9373fb304e95088a5410c64f7939c382d840bc021af0edfffce89d3212cc9642c31cff7e508b7f70ee83466bc84793287a8661f4e1
+DIST PyICU-2.0.2.tar.gz 194525 BLAKE2B 9ef0c5defdebfd65760c6de5782308eac5433fd8474b9802ed1a79db494a259c88f22286b0a98b25bdcec22cbf78a3a7e411d8a9a7a81b07a2112204d6b44141 SHA512 b3715a0f88227a41b56988ee98e795fe398867c2788b2929e0d4f83bfe9519ff01648eb23cfe8d1d9073930a4d7220c0ad5ebcf2652d8fa3ec43e4c4a4bcf091
 EBUILD pyicu-1.9.5.ebuild 1253 BLAKE2B 7775db4e2c13c1e794924b2dc3d428fda9fa6c61719ecf07c1759879f8e1d8d73ada60d4d230e8e56a9e2d87b11d20afbcc65c879dd71a0f59a5b87a73ca1775 SHA512 105b89e547c99052fd4caa9cdeba88edb451fa0de4e49f2fa1cf91b938396383b12a7ebed42d05ae01e1e34506afe13dc8e183189d5bbc3afcd72a8d5580869d
 EBUILD pyicu-1.9.7.ebuild 669 BLAKE2B 63694b24ad73b8ac5e1eeffc4a338d6d4cad4c1bcf7f46a1c034c536ef9c7ac14423418fdfd3b694fe5e165447da13abd9b1baba2d8ec0d53f23cd230fc5456f SHA512 6bf242216967d27bcb6fc4b54f1cf63b68dfeede3c398225a84db064159e7a6c0f769bacec4f6a87e1c61f57a9d842e262a06f374ec1b2beb9b2372169d8eee8
 EBUILD pyicu-1.9.8.ebuild 669 BLAKE2B 63694b24ad73b8ac5e1eeffc4a338d6d4cad4c1bcf7f46a1c034c536ef9c7ac14423418fdfd3b694fe5e165447da13abd9b1baba2d8ec0d53f23cd230fc5456f SHA512 6bf242216967d27bcb6fc4b54f1cf63b68dfeede3c398225a84db064159e7a6c0f769bacec4f6a87e1c61f57a9d842e262a06f374ec1b2beb9b2372169d8eee8
+EBUILD pyicu-2.0.2.ebuild 666 BLAKE2B ba6ab29b12a52cc35fad6e81b0fdd68f73cc055f4bf17231206c773adaa521685e36f7697e6e6f7f38af14530bbdf54ce57bde90367f451734e8edcc8fcc1ce2 SHA512 b22f9bccf54a0a2722df28cc19dcadb3f54db9e62dda2bfa561429510535ac82735d6d0e3f4dd8f095fa26e4da0e72e7f781d154b6c1e77f5dfcf5dfce3217a2
 MISC metadata.xml 358 BLAKE2B d35d487a8be34ecff1465171ee9fd9381c35da622401faebce3d55f160a36b6dc94f8ec109e74e01571fc91694bc932fce7cacfa60dfa33a0615daf00fb1f762 SHA512 b2e487bd32ab89cf1d5f0aa5ff10b394560b2415fe5b5c433c78a551324a17bb25603115020216706e775a9eedcabab431255032486d7b8c1a5f1296a2ff8835
diff --git a/dev-python/pyicu/pyicu-2.0.2.ebuild b/dev-python/pyicu/pyicu-2.0.2.ebuild
new file mode 100644
index 000000000000..1e6ff018f986
--- /dev/null
+++ b/dev-python/pyicu/pyicu-2.0.2.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+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() {
+	esetup.py test
+}
diff --git a/dev-python/pypy3-bin/Manifest b/dev-python/pypy3-bin/Manifest
index cc7313c57a62..b2a559798926 100644
--- a/dev-python/pypy3-bin/Manifest
+++ b/dev-python/pypy3-bin/Manifest
@@ -7,13 +7,20 @@ DIST pypy3-bin-5.10.0-amd64+bzip2+ncurses.tar.lz 6651701 BLAKE2B 2971b8c39eb7475
 DIST pypy3-bin-5.10.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8213224 BLAKE2B b168e80285afcc7fe6210d061d98337d4b8c5184d0d2a5eb2d2b30a7af391ba91c83aa543a9a9f82af71039a0bc86cbbf1db7017ed8a5d666b570df558d7ae05 SHA512 b5629c7a9a3097bd4a407293e01680ccbd8887a7c42530a08123112ed94291c63cac705491bff4e8b54eb33e4409b893a83adc2c385d04456825ff3d131fbf17
 DIST pypy3-bin-5.10.0-x86+bzip2+ncurses+sse2.tar.lz 5356294 BLAKE2B 01d282d28676cc7ebde528620aa4bbfea227b2130df4a2b9e14bb31d24a0063436a9961aa174b393bc9f7ab2615593e667cb773d155b634248da2a1e7ba3e5e7 SHA512 03d11482961a811b96ee75becdbdc97bf55dcf79fbc45b325fc43d86ca947e64b043edaa87fec3b2e5bb0fe777e035ad252a65e7b372cddc62efd2137f6148ff
 DIST pypy3-bin-5.10.0-x86+bzip2+ncurses.tar.lz 5334935 BLAKE2B 11be55a106f157fed0570d3fb684e8a7a7b42d061fa841511721adde0d5572d12cba989984b872efa76ed8ed15001a412abef115e65439d80a9497f911d3771e SHA512 b788008566bb409f55ebd1d7204784f322451fa6fd28db2a2adb3929c0dfa3e0490a71c697ca29cdf1251dd58090ad8dc6fa1c597c9cdac77d52fe84b77e3542
+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-5.9.0-amd64+bzip2+jit+ncurses.tar.lz 10510722 BLAKE2B d0f16b1c71686fa477484cb068c0e09f9a40bef83a0fed1721f5f60a5bd11eb39799e97b2da16fbea4f7255ea19d5e8c3f2a2da946eebe10a6d243f207ef2242 SHA512 659ed24c9f540168203098fc9b6086cc22a42767b55f3dbbf132b11cf8e1bc01a66baac78d7689dcc31d9f06e7f2ecfbda9969c9ba150d5af9c462e480aa288c
 DIST pypy3-bin-5.9.0-amd64+bzip2+ncurses.tar.lz 6589457 BLAKE2B 6b182a6bc25c7839a9465826f9c161c40d0e551ec74ce4d3ed6ba08ce8c7afcb4a2af73b7a525c76dbe30dbe2cb87ce331568679d0086450ee09bb0aabbe65f3 SHA512 7ad9e5934bc096b5087f8f1654e598dae1c2802b99b83f48b65c8d0b941a570d17c8f4e0f8b3f591600d7cdc471dc45cd903d166ea639e562453bf7ad93144eb
 DIST pypy3-bin-5.9.0-x86+bzip2+jit+ncurses+sse2.tar.lz 8595527 BLAKE2B 67e749a5153d5d75c09d27dfa5ed57bac8e886770e5264a2596c4f9e5cdcb7fcae63b709951a8ad862f1bf658deb3cbdf25ac3d0a3af12aef2dfe40942016329 SHA512 6d118cf2e9a657dcf719ca5e508b5b4bb2ab7f85ec3597840706b748ea2f6d582ed884fc34697a3ec36e343de4a40b113d7c8749683a53f2dda299a9e106a2f8
 DIST pypy3-bin-5.9.0-x86+bzip2+ncurses+sse2.tar.lz 5654668 BLAKE2B 964c06920e2d5d69ee9d1f2133d2453e096bc871e63ecdd815370187510f9391738432578b5be49771ad8d24fc735882df266655d88924b2776849a61a943694 SHA512 a378159ca39654fbf117e3bd5a0cdcdb23100a21caf837bba5d764b63bf039a791b27d397a6be918a2539d721fc8564f2b10a163df3bae89a4ddb3991ac33ec8
 DIST pypy3-bin-5.9.0-x86+bzip2+ncurses.tar.lz 5640443 BLAKE2B 4aa4a8cdfa536aea52cf6b94813e6c70f071ed62bc1bceac0584b2ab1a0b9d5a60e6d219ffe67f09f418246847ccd1f32f280b38c9bd973eca2c30c002a42856 SHA512 663fae9004eb7f002b849d4697ef67fb72df33faddfba7272a6d795432ecca4c110dc1fab43617909f962584c7519582f085854f55829ccc63dc988654b6add5
 DIST pypy3-v5.10.0-src.tar.bz2 29075971 BLAKE2B 02fb64d514ab292e09ced57e1c206b04d0fb38353ad6ec0e836448344a6d126d0fccfb61cbd278ea3acaa227032640e82f9ffd7efe3b33ade1ca34a18831b3e4 SHA512 69a373c18dbad9dd617f994ad885c8d8975f0c484ba9dd547e6e892c9a3030a43e9e3ee668aee5f4969403883de1311cef97a0a5e5701921172ee6c2119b771b
+DIST pypy3-v5.10.1-src.tar.bz2 29071765 BLAKE2B d5c163697d8dd36a9a61e9a355719628902de0c9a4c038d31cd134d9bb26b8058abfdf85b09715208146295c37e343fae5e1e4a3c8d1999306eeea93791e326c SHA512 91b0ed25130bdbb46d5e577136b5fe63d5162917dcc2d0b69f5cac2a283ece9d0bfd3c7c8dc61ff391e0550fa1603326f6edeb2df3159d71617fefe6c07439f5
 DIST pypy3-v5.9.0-src.tar.bz2 29055111 BLAKE2B 181d87ebe4a83a3f03b28d891f248f718ad120ed54621f8054f19a65aebbe90b65c69e40ca656612356b2019aa9ac22d5e242e688a80190b046511a8ceb9c040 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd
 EBUILD pypy3-bin-5.10.0.ebuild 5543 BLAKE2B d790bc82ec0c0f4e48bbfabc557241fb6eaed1e02678764ac887f498b08e277205d308126a4095a553d0d568499d6062cd76c47af1d887b0dd318a9a66fdb9f8 SHA512 ff0391da50cce922e424f2e5d47bbcd6584327be54eb03fe5570a6df45ddfab3dae510053e820961678dbc5c4c24d85bf59bdf6ce2f7cbe13ea1696a57712dff
+EBUILD pypy3-bin-5.10.1.ebuild 5543 BLAKE2B d790bc82ec0c0f4e48bbfabc557241fb6eaed1e02678764ac887f498b08e277205d308126a4095a553d0d568499d6062cd76c47af1d887b0dd318a9a66fdb9f8 SHA512 ff0391da50cce922e424f2e5d47bbcd6584327be54eb03fe5570a6df45ddfab3dae510053e820961678dbc5c4c24d85bf59bdf6ce2f7cbe13ea1696a57712dff
 EBUILD pypy3-bin-5.9.0-r3.ebuild 5730 BLAKE2B b254df486fc370e41ef7ae7f53294299ddaed93d3a8e7d1900b9cd3c846b48835a589cbdbb4357ba065c84b08d7f3f13df9e33cb14e1acb4604054683fdb3d8e SHA512 1b79b1603a148046e6c333960d0e35fc05c5e92bc6ed9fb10e62e519ff158a5ed331c31774152c28c07ec8aee45504fef403e9fcbaa6698dc68d0642d996fab2
 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
new file mode 100644
index 000000000000..2457cda763f7
--- /dev/null
+++ b/dev-python/pypy3-bin/pypy3-bin-5.10.1.ebuild
@@ -0,0 +1,183 @@
+# 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/Manifest b/dev-python/pypy3/Manifest
index e270ce4f821f..26bf0fe3e43a 100644
--- a/dev-python/pypy3/Manifest
+++ b/dev-python/pypy3/Manifest
@@ -4,8 +4,10 @@ AUX 5.8.0_all_distutils_cxx.patch 15896 BLAKE2B d6e39b1d1d0fa8c3497aeab8c3c7909b
 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.0-src.tar.bz2 29075971 BLAKE2B 02fb64d514ab292e09ced57e1c206b04d0fb38353ad6ec0e836448344a6d126d0fccfb61cbd278ea3acaa227032640e82f9ffd7efe3b33ade1ca34a18831b3e4 SHA512 69a373c18dbad9dd617f994ad885c8d8975f0c484ba9dd547e6e892c9a3030a43e9e3ee668aee5f4969403883de1311cef97a0a5e5701921172ee6c2119b771b
+DIST pypy3-v5.10.1-src.tar.bz2 29071765 BLAKE2B d5c163697d8dd36a9a61e9a355719628902de0c9a4c038d31cd134d9bb26b8058abfdf85b09715208146295c37e343fae5e1e4a3c8d1999306eeea93791e326c SHA512 91b0ed25130bdbb46d5e577136b5fe63d5162917dcc2d0b69f5cac2a283ece9d0bfd3c7c8dc61ff391e0550fa1603326f6edeb2df3159d71617fefe6c07439f5
 DIST pypy3-v5.9.0-src.tar.bz2 29055111 BLAKE2B 181d87ebe4a83a3f03b28d891f248f718ad120ed54621f8054f19a65aebbe90b65c69e40ca656612356b2019aa9ac22d5e242e688a80190b046511a8ceb9c040 SHA512 3d5384d644fdd1bc8b95f5747dbd1771ae06eb2cfc7b57be359b8bf40177676afd097620d0cb9d9000c40d8cce075cfa6bfd92de987d3dd927c04d7d595dc5bd
 EBUILD pypy3-5.10.0.ebuild 6917 BLAKE2B 18198e6dd1b66a2631dc32192af024a16b5bff8c6aceac84c2d36ad92eef7e20be35a53223cdf57e3bfc37fbdf4381b7e274dced1fe245e30999e3685dbc6e85 SHA512 4babcc4db87573e392298486c5aa10193812f1a95655bdcb17e9f652a8c576ccf33fabdffa191f20e8296c21f1634a409abffbe189bb5947cc1b1d152344488f
+EBUILD pypy3-5.10.1.ebuild 6917 BLAKE2B 18198e6dd1b66a2631dc32192af024a16b5bff8c6aceac84c2d36ad92eef7e20be35a53223cdf57e3bfc37fbdf4381b7e274dced1fe245e30999e3685dbc6e85 SHA512 4babcc4db87573e392298486c5aa10193812f1a95655bdcb17e9f652a8c576ccf33fabdffa191f20e8296c21f1634a409abffbe189bb5947cc1b1d152344488f
 EBUILD pypy3-5.9.0-r1.ebuild 7043 BLAKE2B fb91156cf416003da95dc67787018676f4f3bd75f4d218e9b0213cecb400db5c3882aacb73cfe87d8482bebdb7fb51f1621cd4868388830b0fe34aef9deac3ab SHA512 79f2187c150dc0c28e4b4062d38485a2e2aafed46e4375b28a023d1a43df20fbc31fec933c2f221d73f306e92e5bb6011568229885ba0b70f67d332e3e2757da
 EBUILD pypy3-9999.ebuild 7505 BLAKE2B 70b6cfff8eef4cd61619b4dee821dd490f7e4981aca009098980e185cc3580a6a07084b2c0ef73b9d2a4d3a1b8b7c4660091b754cd2daf77836f98e27347e653 SHA512 ac2fd55431e394326ec3baad4d66bba6e9ee8ff9c86642fd738d1a0a42a5cbe9532bdca5e34ab6fce4c252f6caf296f3d1aa37d7971513bb35ef324245741680
 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
new file mode 100644
index 000000000000..dcef9d5439d2
--- /dev/null
+++ b/dev-python/pypy3/pypy3-5.10.1.ebuild
@@ -0,0 +1,245 @@
+# 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/pysaml2/Manifest b/dev-python/pysaml2/Manifest
index 7390c218f109..4c83e2c7e689 100644
--- a/dev-python/pysaml2/Manifest
+++ b/dev-python/pysaml2/Manifest
@@ -2,7 +2,6 @@ AUX pysaml-4.0.2_CVE-2017-1000433.patch 1245 BLAKE2B ef0d8c68cadb6c53810e9b3d083
 AUX xxe-4.0.2.patch 10657 BLAKE2B 6ecb7b265c55ee9cffda2a9acc0358dc092eec1d8040415665d22104bc8ca1d54473c471c542ae74cda68fe1a62ec3d1ecab0c29f4a017e24d895da1f66bbb4c SHA512 5c18a3c850526e6fd0410d0526bbf385d3383978b944de80da781301114f6a9081d2a3c662f45990fbd7ed88f971382b1ce30d974e4e76e19c11d6aa74d010d1
 DIST pysaml2-4.0.2.tar.gz 13657558 BLAKE2B 35cb9dff897caf9f7fc39a70466dabce88098b6bbe0337a2ae47c733e4fd5de3bd80ddf73f27b6ff67e6f571b1f647d9856bbed58c8b19fe6547a35254dc2019 SHA512 debe23c2b193ca9f937bdb4fc9e8f308fa012c18e50e40183f7e531434af52b6e4d36608be3e9b0321190930cdfd9eb24555ed1805083e32db8de0f57e5afb14
 DIST pysaml2-4.5.0.tar.gz 20030696 BLAKE2B 547465c2c4191a26de6bf1bab55bd9c36ed7e477c620a4155b7a463c98dbf314a8067d45263055a05ec8ed696177fcbd1443dd856113871f2941b572b9df0628 SHA512 163dfc2acfa0f242bc97d3ec334aec98e993ef9265b2240223205e496f86df5518ca613620b371eabcca0c4070a0bf7bb72a2216f517e19e3b2ff0f20e30a0c7
-EBUILD pysaml2-4.0.2-r1.ebuild 1030 BLAKE2B 520548c8898e7c508ece1ae7c343b80eeabee5d2713fc5fbd367fa8fcfaa929463ccc9930e75c6375c86e92042a141b17f8c99866249341e0ef14fc9785889fd SHA512 7f0405c7dcad153ad041e1ced22c8d490e566fd090fd6baf61e9de3977de6d2d90c7b3e34899ce072b4bc0be58055e656546f62eef6ed57561a6ad85b2be3a4a
-EBUILD pysaml2-4.0.2-r3.ebuild 1083 BLAKE2B 4722c18270f2139a4238d3dd1d4430ecf9ced1edfaec70ab08c203520c4b3e0b3941fc8c531759a7708207aaa41d52226a264fe6e5c75a28d411121b648bf6b4 SHA512 132a6dfe3f0c81d6881277fc02c17fe284fb169baeb8cc461555c04da5574f8d282a01e7e4e337602770983eeaf2634c8f4ccbd4b8d3b9d5de4ba4885f49eb4a
+EBUILD pysaml2-4.0.2-r3.ebuild 1082 BLAKE2B 9b305f4cf78f9e1dfe65151d425434b97c17d6ea4382fb7ee8508b5006a6b6b7f418ab4eb7ffe20a9848a9fb5afd38a1ef30862e749de303b90e6369f56fe78b SHA512 4744b4617dcd64c172babc9dd706896b32a27d0ed920b0ff14c2d39606674083ffa14765b17f845f752f7358124d70f3a8a50ef18886dc4bc9045dfad3372504
 EBUILD pysaml2-4.5.0.ebuild 837 BLAKE2B ef546e17850b3d3088cda21c3cc31a18c7d80267ef51f89c091823c2e7b3ce5d64448a89d1f1b9bbb77780552b82058794d0b992ed3d0117522dd5ee924480b5 SHA512 6b313ff7137cb3b99ffa49148a2a76e10b5d1f4fe9256ac567e12b5be3698b8e95f0a7ab1d92b9b2c1136c3a0b512714730b6923468af5aeec3cfb469f813d76
 MISC metadata.xml 606 BLAKE2B 5262e7d7a6f2ff32547ab8570f3aace4dfc3af9d667fdaac6ba2eba77ffd562524a136154eb7b96d4f1f7dfb316b72ee7a0311efa46153afff150c3956151b32 SHA512 7b4facbe3e25898488fffb7b39f9ff7eedd12492f668fa294952711efb3ca9549f2653ab6bc2a948286deff5f45116b0b8bd9a5fc796e99413acc9334eade348
diff --git a/dev-python/pysaml2/pysaml2-4.0.2-r1.ebuild b/dev-python/pysaml2/pysaml2-4.0.2-r1.ebuild
deleted file mode 100644
index f6c60886769a..000000000000
--- a/dev-python/pysaml2/pysaml2-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_4 python3_5 )
-
-inherit distutils-r1
-
-DESCRIPTION="Python implementation of SAML Version 2 to be used in a WSGI environment"
-HOMEPAGE="https://github.com/rohe/pysaml2"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE=""
-
-PATCHES=( "${FILESDIR}/xxe-4.0.2.patch" )
-
-DEPEND="
-	dev-python/setuptools[${PYTHON_USEDEP}]
-"
-RDEPEND="
-	dev-python/decorator[${PYTHON_USEDEP}]
-	>=dev-python/requests-1.0.0[${PYTHON_USEDEP}]
-	dev-python/future[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	dev-python/zope-interface[${PYTHON_USEDEP}]
-	dev-python/repoze-who[${PYTHON_USEDEP}]
-	>=dev-python/pycrypto-2.5[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/pyopenssl[${PYTHON_USEDEP}]
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	dev-python/defusedxml[${PYTHON_USEDEP}]
-"
diff --git a/dev-python/pysaml2/pysaml2-4.0.2-r3.ebuild b/dev-python/pysaml2/pysaml2-4.0.2-r3.ebuild
index 8b3dded83c0c..34f2bf41ef13 100644
--- a/dev-python/pysaml2/pysaml2-4.0.2-r3.ebuild
+++ b/dev-python/pysaml2/pysaml2-4.0.2-r3.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE=""
 
 PATCHES=(
diff --git a/dev-python/pytest-cov/Manifest b/dev-python/pytest-cov/Manifest
index 66c475e9c0ff..573d607ebae2 100644
--- a/dev-python/pytest-cov/Manifest
+++ b/dev-python/pytest-cov/Manifest
@@ -2,6 +2,6 @@ AUX fix-for-deprecation-warnings.patch 678 BLAKE2B cbf75e452f1cb5225d23d29c8105f
 DIST pytest-cov-2.3.1.tar.gz 35378 BLAKE2B 758846db0b06ef9534823d3458ad6211b0cfc14b551a6e1737573a5c1c5bb59c23b26d3448ff8a67d65a4293ce75dd8c79d4916d3d9a7db5021db6b907152230 SHA512 79770beb53fbb43b5d68311c2efd0accbfd890ab6dad299da8c1c0b3d26b54d984807313b1507900cda7004bfb50fedc0bd4341cfcfce47849a4f24fc8184f11
 DIST pytest-cov-2.5.1.tar.gz 36201 BLAKE2B ba07d751c7635ee01262a6f2eeffb27393d58afadb625b220237ff9d014ecdda0f18c0b5fd7bdec66fa4a948f2bb70a715af6dc76664e9c573ad56520c8dee1e SHA512 868131d6ea6dd28deec6d653dec23ceb7d3adccfa2c6bcc0a3126bbb11e924e71f200676461b2202f274ce6e14d1799feb0917e3081817d9e8583271c18a43de
 EBUILD pytest-cov-2.3.1.ebuild 1539 BLAKE2B 2ef33a3cb6cb07cde3e5a756a7b25c1e81847675a409b35a3d81a4b77a7c5baa5b50dc98b83e3590434a2fa690de006fb4fb3a1e3de9eb21b339bc0c2a5e4a6d SHA512 4b2d0235e1affbd327df01544c6db6b807752aaece33f38bcbcbf66121e05967d8355784e91015b9183b51932008cd6ec984b90be2871b0fc6e3f70e17de2065
-EBUILD pytest-cov-2.5.1-r1.ebuild 1480 BLAKE2B 37358fb6d64c50ae7e0ecf52bd9f10e20eae6af1887df8e540b70cdcab4419934c136c6cd1f589c3666acf993163fdd62484da8281fba3995c09daf9f2fb6aa0 SHA512 3a191af6975fceb208e482bb9988df69a9303e00a36d1f44fb8425d943f65a043cd636785f0f660a6100c08e9e22d29a8fbe0f26f48fa39c571e6e94309acf0d
+EBUILD pytest-cov-2.5.1-r1.ebuild 1492 BLAKE2B 065f6e33f8d6e18f0a2555797e1743e85b2daf06124b6b0236a0872ddd1cd241ca37c93f4527e54366c9a856cd7dccd8cea653978a1c510d62290e6320cbbd8d SHA512 93b3047688f7084ab81d3e93320122bf8df7a5385b5542b50f66a56bb0c0b57e64563faeed959eca6fb521e8ba084b444c8826602c1f222462a1b904fcd79cf7
 EBUILD pytest-cov-2.5.1.ebuild 1509 BLAKE2B 04b63690469fe1d6af9ac85add37fd75f2f90c4bf95b092efee26e2f85bf47ecb8693628f025621928b26887312a85202c4447708e0f6b116aa886373a01ccd9 SHA512 741f39ad5f2d63ca64cfdad5a2049783d79b1402184a6bb3ced95c894ef332f5b97b23b9c4224ab168f7965af13ce8ea0bfb766fefea7e7d7c153e2b9924230e
 MISC metadata.xml 460 BLAKE2B acedcc7748c95511d1ebe201052b50e43569250e41f8d08d8eceb3f8c8b10924d64e74f6ff6453896f9fceff2a939f42d21d3013b9a486b007bb922dfd285ac9 SHA512 5600a6e66b683a30d6252699a28fecf727bdbbad6ef40cec0fabb89f5afd3a0cf1e2b8e2b80ffa6cc144ac03f5e7066117d72fc968492bd3b1d6c89a8b035228
diff --git a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
index 7f744e3bb5d9..4d2b6d45fa0e 100644
--- a/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
+++ b/dev-python/pytest-cov/pytest-cov-2.5.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~sparc ~x86"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/pytest-qt/Manifest b/dev-python/pytest-qt/Manifest
index bd8abb3823f7..cc70d6ce3143 100644
--- a/dev-python/pytest-qt/Manifest
+++ b/dev-python/pytest-qt/Manifest
@@ -1,3 +1,4 @@
 DIST pytest-qt-2.3.0.tar.gz 106707 BLAKE2B cf02aed42481cbcadfaaa15c883f3055337f6f32e33b7dfbce986ecd9936218ee5bfe9f21e1a910aa970e7adf88dd24415d63f40655e8417863e96a4285fd466 SHA512 2bda4b5f60ba68b151ce62972661cd704e40f4cadaef2583882099e96100b5c5b9398de796e851579e026e9736e07539c4db8c10eef16929ce729c4dd7a22940
-EBUILD pytest-qt-2.3.0.ebuild 899 BLAKE2B 4eee95fb161bdccba4d69121a600e8377c8c7ea4f32e1f4cddd70cbe7d862291c21c1e9b61b7b31d6953fcd7d68c188b9c6fd021a68b7b55e20aa4b3d248c2ac SHA512 908cbec8a3c9ae8ca9e7408d2484f6c23b6d9fc7aa3fc679ccfbbe0e909cb649215d730a66c9678ab822cd80ac8eb6f158185009956147ada7c5eaff631494be
+EBUILD pytest-qt-2.3.0-r1.ebuild 876 BLAKE2B 2f0a1c2fc54bd71a8601168f2aaeb75d138b15f5b1fe0ab730e3d1e241d62afb57b36e4e441f9f8ac98e07946213f6637accffc848a03f51f0c62d33733e3233 SHA512 570152e67299a36213593bd213fa9370a147ea641af8e1a30439ea00e0180b1707610b6ffcda185b7e8ad0698c4b0ab2bb388f38b8de9cd5285d4583acca2804
+EBUILD pytest-qt-2.3.0.ebuild 898 BLAKE2B 252414587ec176bfe22b329754eb953ede7b841943b9a5285a2092665fa5e8641e2f0649df02ef364b84211f576d6963ad0897868161a6153f596fe4bc5da7a7 SHA512 20fe62ec12efe92b57aba24cd80925da2657ebe65c1cdf3722602b5dcb3f415b3a9f88362f581270b4630c1a12d3fa19ef6478d5314c6238a3a9bd305cc423bc
 MISC metadata.xml 396 BLAKE2B f4d5cdd1823e62b7b0443623b9f34ffbd2f5f7944ddca44dacbeba2b4a3daa438203483b96f113ab821d4e5dccdc6e9cde8faa3a6a4a53d190b567af07cb9b61 SHA512 c5c3149a783a4d72eb7f0582d416b0f6c408d86878892a0ccde2aa5ec672a55c0c2658af31cffdd8f66500420fa3ee43dbda98397a1efb3cc06697e9e1af84ac
diff --git a/dev-python/pytest-qt/pytest-qt-2.3.0-r1.ebuild b/dev-python/pytest-qt/pytest-qt-2.3.0-r1.ebuild
new file mode 100644
index 000000000000..cbbfd24fc3d7
--- /dev/null
+++ b/dev-python/pytest-qt/pytest-qt-2.3.0-r1.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_5 )
+inherit distutils-r1
+
+DESCRIPTION="pytest plugin for PyQt4 or PyQt5 applications"
+HOMEPAGE="https://pypi.python.org/pypi/pytest-qt"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/pytest-2.7.0[${PYTHON_USEDEP}]
+	dev-python/PyQt5[gui]
+	doc? (
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/sphinx-py3doc-enhanced-theme[${PYTHON_USEDEP}]
+	)
+"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+"
+
+# Test make assumptions about Qt environment
+RESTRICT="test"
+
+python_compile_all() {
+	use doc && sphinx-build -b html docs _build/html
+}
+
+python_install_all() {
+	use doc && HTML_DOCS=( _build/html/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild b/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild
index 6c47cfd380b1..9032b7bee755 100644
--- a/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild
+++ b/dev-python/pytest-qt/pytest-qt-2.3.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="doc"
 
 RDEPEND="
diff --git a/dev-python/python3-openid/Manifest b/dev-python/python3-openid/Manifest
index ef85dab3f0d3..0cdc5d144c5c 100644
--- a/dev-python/python3-openid/Manifest
+++ b/dev-python/python3-openid/Manifest
@@ -1,4 +1,3 @@
-AUX django-tests.patch 970 BLAKE2B 288fde804671d98cb904d77c9dc2486c006827929c907b8ead82f6bb71a2334e1968ad95833f04ea0d1766d4ff121d03cfbbb23812153bbf79a34ea2175bc000 SHA512 7fda9e32b094712b35ce5a8b6a5238b90ff232eaf4ec12a8b3d34c87b133dd1b3e79b44d9e59a11c484a077d15e951300a7c15f60a511f7e77a377196094f8f5
 DIST python3-openid-3.1.0.tar.gz 299326 BLAKE2B 809e38cb20be9dcbb520a17a99758554f33f6f94b98b3deee4507eac0d8724c370a48c7b267f473e3b31e90593b1ef7702eb5d8adfc908c532ba624139da0b23 SHA512 9c96efd16191ddb6ddb12c4885a2cce523244d04e70f9418144d0124ef142fd7b6578cd2a01e949995d7dedf0b96cbb3b17d1d3a29db5da8934f7fa875ad8e9c
 EBUILD python3-openid-3.1.0.ebuild 697 BLAKE2B eb5c68a7ff93d3bd94e295129b233255f229c22e8c8f705f60a2fa76a1c3891d383a71c99e341dc592792dbed91bbed6ecba7fa9fdf59652b94cc0d9918115e9 SHA512 1bcf11fb571361c31d6be4b6e9aa96b490a17eebbe5deba48bdb712cc41a9c4320ec546f919c98b70161ece502699a394bdc5c8026825af306a5550e30208301
 MISC metadata.xml 337 BLAKE2B fd9b6c6e99251249623c019892e1962b2212f8781efb18935a9e9f6da8ac836e114b84758d43529a51e3260981621f8d5c5c17f8ffec7e8b1c34d2c2e335e531 SHA512 099dc2e5cd089e1638ad20bc476cd8d9e6d173b22611f48b34b9945f92886550f53d86ca672882bd570cd6515c33a2d8b4acb87fbd35abfbc55bd592b570459c
diff --git a/dev-python/python3-openid/files/django-tests.patch b/dev-python/python3-openid/files/django-tests.patch
deleted file mode 100644
index e5fcda877f31..000000000000
--- a/dev-python/python3-openid/files/django-tests.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/examples/djopenid/consumer/urls.py b/examples/djopenid/consumer/urls.py
-index d55e056..3926e27 100644
---- a/examples/djopenid/consumer/urls.py
-+++ b/examples/djopenid/consumer/urls.py
-@@ -1,5 +1,5 @@
- 
--from django.conf.urls.defaults import *
-+from django.conf.urls import *
- 
- urlpatterns = patterns(
-     'djopenid.consumer.views',
-diff --git a/examples/djopenid/server/urls.py b/examples/djopenid/server/urls.py
-index d6931a4..e61de52 100644
---- a/examples/djopenid/server/urls.py
-+++ b/examples/djopenid/server/urls.py
-@@ -1,5 +1,5 @@
- 
--from django.conf.urls.defaults import *
-+from django.conf.urls import *
- 
- urlpatterns = patterns(
-     'djopenid.server.views',
-diff --git a/examples/djopenid/urls.py b/examples/djopenid/urls.py
-index d91ee1f..16af9a1 100644
---- a/examples/djopenid/urls.py
-+++ b/examples/djopenid/urls.py
-@@ -1,4 +1,4 @@
--from django.conf.urls.defaults import *
-+from django.conf.urls import *
- 
- urlpatterns = patterns(
-     '',
diff --git a/dev-python/rosdistro/Manifest b/dev-python/rosdistro/Manifest
index 02af4c58b514..d992b59a8ef4 100644
--- a/dev-python/rosdistro/Manifest
+++ b/dev-python/rosdistro/Manifest
@@ -1,8 +1,6 @@
-DIST rosdistro-0.6.1.tar.gz 48699 BLAKE2B 87bc8d7d90d3731c5994be94bde9932e16cac8e4c257a97c80c1cc70b2af68bbeaa6c36c1eeba9dc32a75b33cf69196f1520c3475f1dfd56d4ab17804ca6802a SHA512 9f7c9eea737da443b1daaacde6bcea163ac2ffc707efb23016fe77c68423ee192e0610b9aa1c8a4b07735d1784e30a509dc78cf256061fcc4de75ed4c4244f75
-DIST rosdistro-0.6.2.tar.gz 42658 BLAKE2B 5f4c574438ff6e791adf1ee8076ab898b656c00bfa8b48b6cd2d871c71c48f3c5b609108ed8005ae47e2554ac92a9512382c1dcdd5bc74614aaf4573b13322b1 SHA512 df7da98a2b46d45d978bbb371ea98cf24aafa0704c1cd991db0f1b785eb3330227d42a505b765653bf11d267f676844e1043e5fcff52b7295afa1b21ffc99301
 DIST rosdistro-0.6.3.tar.gz 48789 BLAKE2B f26da2b2624501321033390d554559a0b807b224c35e96ff1643d6060e0225b9de6e2f9df354c5f6f13d277ba5b46453fe5db10d31cd5b05f50a78360d2b03dd SHA512 9fe50a9ed67d5772912ad7d15c60179894f3d775b593e4f42fff6c5221a77ea89176c9239ac0e962d2997eb6b1b365ad47da1080f69e62a4c75e1ea3f26294f0
-EBUILD rosdistro-0.6.1.ebuild 999 BLAKE2B e5e705c96b78cdf2672c3560597aa580bb420f4617211e6685736bae962487c503356ff7e901492174629e89ff03eeacb32c40105adc14dfb859471995239a75 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448
-EBUILD rosdistro-0.6.2.ebuild 999 BLAKE2B e5e705c96b78cdf2672c3560597aa580bb420f4617211e6685736bae962487c503356ff7e901492174629e89ff03eeacb32c40105adc14dfb859471995239a75 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448
+DIST rosdistro-0.6.4.tar.gz 58603 BLAKE2B 9eed482987826b69eba51f1776df0d2285c496130d500f082f82fe7fbbb8e8d5767dcaec93582328a33c164a862ac2a46ac6d0ed0f770ebb16b25e680dc1e9af SHA512 92365b556cc6615245bd69cce35efb2fe879fe42fb4aafef08b2472c67b43e14e3088c1186e8b1d4f5f3781bfebbe826b3c361a9435ce27745a3506d20d40f85
 EBUILD rosdistro-0.6.3.ebuild 999 BLAKE2B e5e705c96b78cdf2672c3560597aa580bb420f4617211e6685736bae962487c503356ff7e901492174629e89ff03eeacb32c40105adc14dfb859471995239a75 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448
-EBUILD rosdistro-9999.ebuild 999 BLAKE2B e5e705c96b78cdf2672c3560597aa580bb420f4617211e6685736bae962487c503356ff7e901492174629e89ff03eeacb32c40105adc14dfb859471995239a75 SHA512 c48867ae999fb3d5ba998d7136de9044cf370e9de08b0f69ebe8f5224db276bc9182f9fc4fe19a2207e92bbc5bf0889c4e4f790b072aa0fb50f9da856ec5c448
+EBUILD rosdistro-0.6.4.ebuild 979 BLAKE2B fa07155748189f0377c4ee69288f0d876d77bd8b8ed4f942abd309fcce01db3e890da5012c5c85110fc3e00724bfafc1bf32f53d5581557887102bd1407990c6 SHA512 ead56ec46c5e25727911212be51bffd567e5b84507984ab74221b5fb4107b95e17c2f1a8f51110fc70c361cd41f3e2d881dc7d9c9f42b4f911011e4443ba5bac
+EBUILD rosdistro-9999.ebuild 979 BLAKE2B fa07155748189f0377c4ee69288f0d876d77bd8b8ed4f942abd309fcce01db3e890da5012c5c85110fc3e00724bfafc1bf32f53d5581557887102bd1407990c6 SHA512 ead56ec46c5e25727911212be51bffd567e5b84507984ab74221b5fb4107b95e17c2f1a8f51110fc70c361cd41f3e2d881dc7d9c9f42b4f911011e4443ba5bac
 MISC metadata.xml 342 BLAKE2B 1975e171b6e686c5fa1cf51909101b1785f2610f619de6465329c935023adcbe5d0373512bf7e7fb5a2451e31664faeb2aed67eb9af58d40005f10ee1582e4f9 SHA512 5f55e6edbfd3be1214791b1897ce625f6cc52989ac007d7de9c9eb0bff57c1ca805ee18b911fcc2c29a86a5fb9f68e1b9647f69a38dc6b1d1d74334b35ac106d
diff --git a/dev-python/rosdistro/rosdistro-0.6.1.ebuild b/dev-python/rosdistro/rosdistro-0.6.1.ebuild
deleted file mode 100644
index e9ccf8b2beb3..000000000000
--- a/dev-python/rosdistro/rosdistro-0.6.1.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-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="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		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}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rosdistro/rosdistro-0.6.2.ebuild b/dev-python/rosdistro/rosdistro-0.6.2.ebuild
deleted file mode 100644
index e9ccf8b2beb3..000000000000
--- a/dev-python/rosdistro/rosdistro-0.6.2.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/ros-infrastructure/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="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		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}]"
-DEPEND="${RDEPEND}
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-	)
-"
-
-python_test() {
-	nosetests --with-xunit test || die
-}
diff --git a/dev-python/rosdistro/rosdistro-0.6.4.ebuild b/dev-python/rosdistro/rosdistro-0.6.4.ebuild
new file mode 100644
index 000000000000..8780e241c60c
--- /dev/null
+++ b/dev-python/rosdistro/rosdistro-0.6.4.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/ros-infrastructure/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}]"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+	)
+"
+
+python_test() {
+	nosetests --with-xunit test || die
+}
diff --git a/dev-python/rosdistro/rosdistro-9999.ebuild b/dev-python/rosdistro/rosdistro-9999.ebuild
index e9ccf8b2beb3..8780e241c60c 100644
--- a/dev-python/rosdistro/rosdistro-9999.ebuild
+++ b/dev-python/rosdistro/rosdistro-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,9 +18,7 @@ if [ "${PV#9999}" != "${PV}" ] ; then
 	SRC_URI=""
 	KEYWORDS=""
 else
-	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
-		https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz
-	"
+	SRC_URI="https://github.com/ros-infrastructure/rosdistro/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm"
 fi
 
@@ -36,6 +34,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? (
 		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
 	)
 "
 
diff --git a/dev-python/simplekv/Manifest b/dev-python/simplekv/Manifest
index 3f55b581a11c..d9c4bf424426 100644
--- a/dev-python/simplekv/Manifest
+++ b/dev-python/simplekv/Manifest
@@ -1,5 +1,7 @@
 DIST simplekv-0.11.5.tar.gz 19225 BLAKE2B feb9ce889576aa45e3915442c23a1c488ef4218c2eaa1ac39cb6ed97c909ca97e1e1e8cd6ba4ae7971c88e2a1feb892987ce3b2995e2e5532a866f6318bb45f0 SHA512 68aa5340fbce187776e0228d5fc9ff6414d2f3049cd9fcef4b92c8d9a7107145d28fb8a30a37d075aadc74975bd355dcab9d8ff87880965ea4c42b41f909eef7
+DIST simplekv-0.11.7.tar.gz 19333 BLAKE2B e9ad1aa038354b2d61f067096a1c165b7e200adfb1e75a17eaf69cff2336afc2caca464534ab26e32a2f919106dd2da94e79b9314bb4967bd98313000cc1f8f8 SHA512 8589f4437a11c200cecc2574e238d3686d81fdb27de451ed5c90f150ff8c1e3d56d729679b0cfac63ded2651e9657e1c90d99ceb9abe156a21eb043edd7520fd
 DIST simplekv-0.9.2.tar.gz 13750 BLAKE2B b3e64064ee8326a3e168cbb0ff7196e2b82ffd38c0388ca42d63c5f5ddf3078c071bf9ae2cb5b94bf7ef05a338800d567c9e61a4d560eb11f0e95b7eed8b1f9d SHA512 cfa17cc0920d4a0513c56443c30ed07a77130f689d71130a058e2a46a5b9dbfc22b1fd21d6fee973fc00242c6b9391143a4db91f9c1937ea7f64daa898a8f045
 EBUILD simplekv-0.11.5.ebuild 462 BLAKE2B 117ee7363c64853a6138da1d28198b4bbc1f1a662badd5556fa0869f33a4e76135295ee0fd5721f4f521dedfed3fc4e6004cced08033628bbcdc201f6eafa792 SHA512 dc865254aaef5f98054479ae2558a52c9de00e17f96caf03d3033023e5408cfaf7f4d9657f40e8eaca39c7e5a08edf0adf40677447e4b929418cca11015dd16d
+EBUILD simplekv-0.11.7.ebuild 462 BLAKE2B 2d5367c8e89c30aa95013d40bb94b0bfcb0f877d3c6c2b33763013a0ab13e3255aa45ccd72313cc5c3be04d2ad2802e1ece0eedd30edf6d708470cee2558e1cd SHA512 656f377ff4fbc51f80ac1a4a5dce3647e66e2ac00a02372df4c186f0381a4279f8029d78597699e2a4c08d8c5e29d46e047c941e9fb2bb417057db82f0c6956f
 EBUILD simplekv-0.9.2.ebuild 447 BLAKE2B fb7ed58150439e73ddf1155a75252a78c41566048edb19d707de4fa15337711622a99703370995839fa0ca56a541b3c04b88bb05026edbe28d71246f38cf6743 SHA512 348c87cc0280d4877f7d08c21a0db437996668a7392cc5c91ff9f2a9c9c0ad0bca2afbb5b9cb2734349cc29f49361f9039796e44fb32023ab97a536cffffea8c
 MISC metadata.xml 569 BLAKE2B 5d890f0ff8aedca1963530773432220abf8c88fbbd14283dc112b5060c7aabb4d00f8b74d53eea766e84cc01875425142c775326047536a0715b69bf7d344f16 SHA512 15775631b85b66248deed75545717ef7ccc4c2426851d651ddf29fc8fa9a225bd139415a43ce068510c323c143c1fac64e8ee143a0fa3a4e53827f7c6b82f7c6
diff --git a/dev-python/simplekv/simplekv-0.11.7.ebuild b/dev-python/simplekv/simplekv-0.11.7.ebuild
new file mode 100644
index 000000000000..b19a293adbc2
--- /dev/null
+++ b/dev-python/simplekv/simplekv-0.11.7.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit distutils-r1
+
+DESCRIPTION="A key-value storage for binary data, support many backends."
+HOMEPAGE="https://pypi.python.org/pypi/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/tempora/Manifest b/dev-python/tempora/Manifest
index 239d2f056fd7..e1e085d9c1e0 100644
--- a/dev-python/tempora/Manifest
+++ b/dev-python/tempora/Manifest
@@ -3,5 +3,5 @@ DIST tempora-1.7.tar.gz 11645 BLAKE2B d354fb863a8d30bd9e603ad942d7c7f61a70c24e7f
 DIST tempora-1.9.tar.gz 12469 BLAKE2B da18fc066cb9cf7ee0fa7eefb39ea2ac941760144c7efdea66a05780ced43d574757665dfad6088f98c135e7b14874aef0c8243ab338fcbaa5a515ec27507f52 SHA512 cb049675d7196738debca3dc0ddd8c5e72d0468bd1a853f77378cc5564b100cd94d23c63d7b06c6bed2827365d904a1582cf9d497618493b795600b6d476b91f
 EBUILD tempora-1.6.1.ebuild 1192 BLAKE2B 775920937225e50b4335b4d4bb14bead8bdd8858d9f7bde262bd609e8c9b81d102c6b3035906133dee7ee6a07db8ccf53c8e90e9838eef6b31bc2e5505f4092f SHA512 80d5b81ae922cb59b9db54fbb42ec1ee939584da1b1280c269b530e5c83052a71480b311d7591e4012f22e28721d9dab2071f478c95a713a043e5a7343107785
 EBUILD tempora-1.7.ebuild 1274 BLAKE2B 7cf4856b2eabd47a99c6150512e678c9c436fcc3511f2e23ab848d0e96ecdd5e49c235c86a5a942b620d6893fbbde546665d9347c9296465ce19a2caf83960cb SHA512 0e4a5b8e6296894c411accbc107a8dc677bd68ac0d6b190c699200636ab853e3980de9691a316dae2f928008ca87a7137e98c7fe6c0db89a0cba04efebb9ea8d
-EBUILD tempora-1.9.ebuild 1276 BLAKE2B aa7af9eb0bd768421ff4a1e884d47f151169f45932eeb563013c54d3d39ff96a21fd453abc6de77c4e270e7e4862c9414ae1f665136f39f682917c4215bd4a08 SHA512 7726efb1d0a06bf2c9d1e8053b57b9ac7b27e3e2bdb5d19cd052a5fb1d19dc65448bccdc41b6c6734d510f4764a0659a6afd6216e375111bb1a4e7f4ce534b73
+EBUILD tempora-1.9.ebuild 1281 BLAKE2B dce9d5716c5760c16b44f593f10527b09ffe90147087780b80142b7db4162ce5d8da6a03ae0325da234a58b302096c4e7bfacf8c7bc83c0373e99393378a29a7 SHA512 a9266c5e3581c13b072f986bff2923c102481f983648ed26311670d0ce5a6dddd7f4f651ed19c2588ae6abada87e1f3f75886d6652d5d12f56f564284f894d87
 MISC metadata.xml 638 BLAKE2B c86883f938a4779097001ac26dc998a900d39599a930fd5682fca2002f93bc6f3f8b8edb0da06476751ef32fda0ded0641ba12d120919b32bebe2843abca8f4d SHA512 06c699b11df110494a9714a8784042d45834ce647286e57c58831ce036a604f415c7de511901bbff1e9d10a114a2fc6f4ce5fd71dc72ec9cdbe856a93ebd9507
diff --git a/dev-python/tempora/tempora-1.9.ebuild b/dev-python/tempora/tempora-1.9.ebuild
index ac0b0ba352ad..a619b0f986ba 100644
--- a/dev-python/tempora/tempora-1.9.ebuild
+++ b/dev-python/tempora/tempora-1.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc test"
 
 RDEPEND="
diff --git a/dev-python/vcstools/Manifest b/dev-python/vcstools/Manifest
index bbb305f02e84..23f3eb8fc01d 100644
--- a/dev-python/vcstools/Manifest
+++ b/dev-python/vcstools/Manifest
@@ -1,6 +1,8 @@
 DIST vcstools-0.1.38.tar.gz 54671 BLAKE2B b19730749878de8fb55706751b8a276e351d944803aecb45d8f07497ed9d4283939594d751e818c7fcc09a7cefc4238df978470e8f9da10f27bed5abfe76ce5c SHA512 a3693d34777235e562a5db006af8f33590df99ffce96f5d3cfd2d816ebdc23ee5fb3536bf289b64a36588e60ce20ce8396a448394f300a12672fd8bf5800973e
 DIST vcstools-0.1.39.tar.gz 51610 BLAKE2B 24997cf3981a70f9647c16a230ff776b32aaf7096d760976b6af7b1fa1fe78b4993299680d8aad53d82465e66c4fcd80389e26b8da1476df64ccaf9b40c705af SHA512 163ced29baa158d915169a4f8f432bd9ad60ddcd5abae0d3801b5d970049d717c11bd8aa95f7af9dfe48cdcbcce49d14331a82a9c41b9ded1ce4caa2e27cd901
+DIST vcstools-0.1.40.tar.gz 62109 BLAKE2B a5347ba62031e602421f26b081e26e55549e92fc4a0648b58a3c4c3b0134b91dba096604f83edcc51a99c989e60fa51e8af2f9ecbf992500a6e942c19da9c82c SHA512 7cd062f3c72b27f78361d3000ed8951b1723ea7dd99bf05ea711e8a8b93c42c2acebdfd6c7cf7384730c708da11bd0d2712a54e538dd833eafbcef46f23857cd
 EBUILD vcstools-0.1.38.ebuild 1399 BLAKE2B 64d2a8e2ecd0bf51feb77f6e7ad4ca93c1813f8fe9a5aad796c1050d543116b00b99f80acb912957f61fda2aaeb6cb313af170c101f625f7b5695e8ac1638666 SHA512 f46354bae88a383be02b4992ff0e6139681a9c0884ff89bd9ab4f6fb3e485050a64f543915bc9ee063bcdaebcf52b07aa4fbbf4f80fddde841cf5e4f2c545fcd
 EBUILD vcstools-0.1.39.ebuild 1399 BLAKE2B 461dd2805e890216f0b5c1638fb6bfdd6bfa0cc32105228ba66c4345960f23f4030cf7429f696b34424a53eb2b8363a4c6e51baeec96563302f1e3470725b191 SHA512 bdaab338af6023d1621f4495ee47704a9396b11ea97fefd273e4a44f74bf810797582f02f91d6b15e7a5f923bd565e5d02141d1c47f7f39834719a234e876a6c
+EBUILD vcstools-0.1.40.ebuild 1399 BLAKE2B ec7a9bb3af948dd01651f9f3ef26611917e0573a5179521f36907c3b3dcc608fc0d88d7ef8ef4e0e2f1750d736b8f5ec5995e89d0457e51da2298a305a98dd62 SHA512 26f63b27ce8c41703f097630d9873e1bf04ba157b133aa42d96022a40654c592f25fa0df42d60891a25753f3efe61adb995b89ca3897142044af58aee5f7d209
 EBUILD vcstools-9999.ebuild 1399 BLAKE2B 64d2a8e2ecd0bf51feb77f6e7ad4ca93c1813f8fe9a5aad796c1050d543116b00b99f80acb912957f61fda2aaeb6cb313af170c101f625f7b5695e8ac1638666 SHA512 f46354bae88a383be02b4992ff0e6139681a9c0884ff89bd9ab4f6fb3e485050a64f543915bc9ee063bcdaebcf52b07aa4fbbf4f80fddde841cf5e4f2c545fcd
 MISC metadata.xml 331 BLAKE2B 11f0b79892ca57b4abcbd3e0538168569338972295dc250516dabf12f650416d013be219d17401ae24129ba40bea056e4831940982ae6b0368046e1efbb76974 SHA512 dbc3f8205ab4e4788a33377fd00d438a9bcc4558ff02989f20befb19de690428d377ca8e0450a47bfdc8654f74123e0e4b02a9a26ffe4f27e1a737266f5cf918
diff --git a/dev-python/vcstools/vcstools-0.1.40.ebuild b/dev-python/vcstools/vcstools-0.1.40.ebuild
new file mode 100644
index 000000000000..8283778fcf05
--- /dev/null
+++ b/dev-python/vcstools/vcstools-0.1.40.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vcstools/vcstools"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Python library for interacting with various VCS systems"
+HOMEPAGE="http://wiki.ros.org/vcstools"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/vcstools/vcstools/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/bzr
+		dev-vcs/mercurial
+		dev-vcs/subversion
+	)
+"
+
+python_test() {
+	# From travis.yml
+	# Set git config to silence some stuff in the tests
+	git config --global user.email "foo@example.com"
+	git config --global user.name "Foo Bar"
+	# Set the hg user
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	# Set the bzr user
+	bzr whoami "Your Name <name@example.com>"
+	#git config --global user.email "you@example.com"
+	#git config --global user.name "Your Name"
+
+	nosetests --with-coverage --cover-package vcstools || die
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index 4902132512b0..d65cafc3631b 100644
--- a/dev-qt/Manifest.gz
+++ b/dev-qt/Manifest.gz
diff --git a/dev-qt/qtwebengine/Manifest b/dev-qt/qtwebengine/Manifest
index 269374c022c7..882c05ac1d6d 100644
--- a/dev-qt/qtwebengine/Manifest
+++ b/dev-qt/qtwebengine/Manifest
@@ -9,5 +9,5 @@ AUX qtwebengine-paxmark-mksnapshot.patch 1478 BLAKE2B 99f99e8264c0bd534e5efe0dce
 DIST qtwebengine-opensource-src-5.7.1.tar.xz 163782564 BLAKE2B 624df9c61b887ed393d8021db4e7bd058544abab3a13341fd0bb76fa3c00cf2692c4e08c2058e1576dfe5c62f9e9bc9ac8a1b5a4a640a204e74ba88516fb4ffd SHA512 4f53e51141d8e3479d22062a80af0359d3d7ab6bc0d2d6530c6af2d3e5b625f7192cda2a9eb85c657864ec3b30bdc797d3bff57db4c71211e71bb4ee5ac9c71a
 DIST qtwebengine-opensource-src-5.9.3.tar.xz 217344496 BLAKE2B 51701dfa8a804ad7723d296fb8ba11df821041c60e4c96459b7851b3ba1ca683e83207c3020a5a54e401779186daf46049a1167649b930cc04151b6d0474aaeb SHA512 0db532b4d54540da1ca63de1cc4d561d72f052211535f75f60b99c1858ec0819ab0f831a3326d58da6350066748634000fe7ad0719ca545e12f3ed249a6eb90a
 EBUILD qtwebengine-5.7.1-r2.ebuild 3106 BLAKE2B e3ce8d5155c0a82d413a9d61bbf29e66f44bff39e3287446045eb9af78860ca478687330e4dbe069bc38aa70a7712dc49d559c04ba06877c4251c1d9ffe53d24 SHA512 40e425233d99bf82a0595d4248597177516f4fccc7dcba1a607e4940c828b5e35de7c3b1a5ebc700d1d05e436ff885f445b1428dd6bc9f7d9395b088ada04b20
-EBUILD qtwebengine-5.9.3.ebuild 3098 BLAKE2B 24805219b424287ceac9a354376757ed27e6fbd80a7bdbac00e2b4f1ab847cdbc7f87fa9e1c2bc075692ea6468852ea0c8db812532c88a74b62620e47bf96ff3 SHA512 db0f1685c5d879deed441a6e25d78f4005c412fe77be12c776061a762d4958b25d07e29892aed175ac8feb75b1f3ecd1afce4e149308968edeb8eba4a91e896f
+EBUILD qtwebengine-5.9.3.ebuild 3103 BLAKE2B 3d4c326b27f54799faa38ea36bc5147e1299483be0bed1214758cfbb0f7952b46cfc83b10b780edc834cc2d82ff5568bf1b7265f69e875b2b9be09b168897630 SHA512 ef109193825017c7c2e762c1e046b3667397aa56f3a87490b19f261b04651a68191f79e43c277eb0ee91fb837532167ee7bdc2a1580ac90af7889ae7a4999545
 MISC metadata.xml 948 BLAKE2B c3f99b9a59aeb8ad3754b0caafdd7132ee60142f41d992b0fecdb3ed0f396ec7903fb68bc2e734e127f4f722c4f0c6c8398f94685925296037684912ace05764 SHA512 999c61f79a077d37981fbac6420c6255ec6fea2397372182700d6c709fbd5029289173aaa910916ab9096109070afc47ad11f411cfd8d5bcaafb6c9bd6309a85
diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
index e6d72ee568db..e8a3d5f814e8 100644
--- a/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
+++ b/dev-qt/qtwebengine/qtwebengine-5.9.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -26,7 +26,7 @@ RDEPEND="
 	~dev-qt/qtwebchannel-${PV}[qml]
 	dev-libs/expat
 	dev-libs/libevent:=
-	dev-libs/libxml2
+	dev-libs/libxml2[icu]
 	dev-libs/libxslt
 	dev-libs/protobuf:=
 	dev-libs/re2:=
diff --git a/dev-ros/Manifest.gz b/dev-ros/Manifest.gz
index cc8f38f56039..cd17d1a28828 100644
--- a/dev-ros/Manifest.gz
+++ b/dev-ros/Manifest.gz
diff --git a/dev-ros/gazebo_dev/Manifest b/dev-ros/gazebo_dev/Manifest
new file mode 100644
index 000000000000..6ad70af80742
--- /dev/null
+++ b/dev-ros/gazebo_dev/Manifest
@@ -0,0 +1,4 @@
+DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
+EBUILD gazebo_dev-2.7.3.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
+EBUILD gazebo_dev-9999.ebuild 429 BLAKE2B 0cfb994b78a221e41ad5c82a7cb051f88bd26a31527f2cdc47279d5d941358233ec6321ba1e05cb4bab9305b53f506192ab96b0f512240d2fe28561caf124101 SHA512 a724a7ab312b8dda2dea5dcc0d40ed2e9024629b392aa0495dd3b1910f8bb499d2d04086a89764496252338b3594edb42db775950161e904e0d0632de68c2b58
+MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_dev/gazebo_dev-2.7.3.ebuild b/dev-ros/gazebo_dev/gazebo_dev-2.7.3.ebuild
new file mode 100644
index 000000000000..b7ed4eb9139f
--- /dev/null
+++ b/dev-ros/gazebo_dev/gazebo_dev-2.7.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Provides a cmake config for the default version of Gazebo for the ROS distribution."
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-electronics/gazebo
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_dev/gazebo_dev-9999.ebuild b/dev-ros/gazebo_dev/gazebo_dev-9999.ebuild
new file mode 100644
index 000000000000..b7ed4eb9139f
--- /dev/null
+++ b/dev-ros/gazebo_dev/gazebo_dev-9999.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Provides a cmake config for the default version of Gazebo for the ROS distribution."
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	sci-electronics/gazebo
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_dev/metadata.xml b/dev-ros/gazebo_dev/metadata.xml
new file mode 100644
index 000000000000..ca1574a351fc
--- /dev/null
+++ b/dev-ros/gazebo_dev/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>ros@gentoo.org</email>
+		<name>Gentoo ROS Project</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">ros-simulation/gazebo_ros_pkgs</remote-id>
+	</upstream>
+</pkgmetadata>
diff --git a/dev-ros/gazebo_msgs/Manifest b/dev-ros/gazebo_msgs/Manifest
index b37cc79ab099..bde2ee337c92 100644
--- a/dev-ros/gazebo_msgs/Manifest
+++ b/dev-ros/gazebo_msgs/Manifest
@@ -1,4 +1,6 @@
 DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
+DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 EBUILD gazebo_msgs-2.6.2.ebuild 582 BLAKE2B 15670ee1e99156f5a74f0527124cae39702cd712592abc6af1116ab479f833f70e828771a9718b745e917291e3fbe6534d6a76e753c7747bdd3cb870a1a179db SHA512 fe7a4b20c7e040eae416625326e4f4879a6ae3661981153d11e14711e48cffbdc92d65b503f835f4d4c40722f631c2ea4c6eb04b59993b9ed5466a6ea151f506
+EBUILD gazebo_msgs-2.7.3.ebuild 582 BLAKE2B 4f67fad9c1b3e04580803322540d16ada55edaa3c212bec423293ea9e2a5d03b8496beea4a4d19d71d806abe588a435fdd954803e52673ab10a5f53118604f44 SHA512 2a5a1a3764c4ab1a9798fcd5783be449393b73d2937766ec80ff68e68d68a3def76f1b26138e05417706603891528b8e11324400c248d12b75a8a788ce5efcea
 EBUILD gazebo_msgs-9999.ebuild 582 BLAKE2B 15670ee1e99156f5a74f0527124cae39702cd712592abc6af1116ab479f833f70e828771a9718b745e917291e3fbe6534d6a76e753c7747bdd3cb870a1a179db SHA512 fe7a4b20c7e040eae416625326e4f4879a6ae3661981153d11e14711e48cffbdc92d65b503f835f4d4c40722f631c2ea4c6eb04b59993b9ed5466a6ea151f506
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_msgs/gazebo_msgs-2.7.3.ebuild b/dev-ros/gazebo_msgs/gazebo_msgs-2.7.3.ebuild
new file mode 100644
index 000000000000..5972a463ebe4
--- /dev/null
+++ b/dev-ros/gazebo_msgs/gazebo_msgs-2.7.3.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/geometry_msgs dev-ros/sensor_msgs dev-ros/trajectory_msgs dev-ros/std_msgs dev-ros/std_srvs"
+
+inherit ros-catkin
+
+DESCRIPTION="Message and service data structures for interacting with Gazebo from ROS"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND=""
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_plugins/Manifest b/dev-ros/gazebo_plugins/Manifest
index 83078ffde2e1..ae314840eba1 100644
--- a/dev-ros/gazebo_plugins/Manifest
+++ b/dev-ros/gazebo_plugins/Manifest
@@ -1,4 +1,6 @@
 DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
-EBUILD gazebo_plugins-2.6.2.ebuild 1465 BLAKE2B 5d545d05698d83fa26aee625e8e6836f4c34a3bdac63417f761c3bdcd6319938d58ad5422093d6365c8c865aa2325a850ce9a27befe479c17a07fb08ca092627 SHA512 0ce8dbaf0500c4bc1fd0f5830c7208adb3d5303a2f6b3e8134b1f36fc31b5db18ef996225c63f705498c9643679280c0cbc8bf80407db51c5e7ad6407f5277b7
-EBUILD gazebo_plugins-9999.ebuild 1465 BLAKE2B 5d545d05698d83fa26aee625e8e6836f4c34a3bdac63417f761c3bdcd6319938d58ad5422093d6365c8c865aa2325a850ce9a27befe479c17a07fb08ca092627 SHA512 0ce8dbaf0500c4bc1fd0f5830c7208adb3d5303a2f6b3e8134b1f36fc31b5db18ef996225c63f705498c9643679280c0cbc8bf80407db51c5e7ad6407f5277b7
+DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
+EBUILD gazebo_plugins-2.6.2.ebuild 1432 BLAKE2B 1a4091f23832ba40054adee8ca2e7c61a5e0f09310b4707fd0f825d5519bd3dc40caf8e10aedec4313ca007352ad8757f28dfae0658b7ca7c0f64cee48d7028b SHA512 edddcd676dd1c2fa36291ea384ad03a52d88497f12dd32eb783300628d752405259c74cf95c45daa57ed41d713c7d633d54a99cc471b2aa094e8335837fb4cb5
+EBUILD gazebo_plugins-2.7.3.ebuild 1452 BLAKE2B ac320e7f139fddac2e60f4431e64140fddaadd708a52432ce4681a78b95afacbdd31f532f7fd931cd23f8cdde684dced54e9bbe625e2d6fb676df4bf27b95aa2 SHA512 bf9f2756140d3e5788fac30deec7fda0c970a2cb1d0cddf66eee977b6717c851e8d1cbf670a7ad8dfe0d9f19987ee8f00fd9b37fc68994089e9ecb5dfcd36827
+EBUILD gazebo_plugins-9999.ebuild 1452 BLAKE2B ac320e7f139fddac2e60f4431e64140fddaadd708a52432ce4681a78b95afacbdd31f532f7fd931cd23f8cdde684dced54e9bbe625e2d6fb676df4bf27b95aa2 SHA512 bf9f2756140d3e5788fac30deec7fda0c970a2cb1d0cddf66eee977b6717c851e8d1cbf670a7ad8dfe0d9f19987ee8f00fd9b37fc68994089e9ecb5dfcd36827
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.6.2.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.6.2.ebuild
index 546f272c37a2..c15813880a8a 100644
--- a/dev-ros/gazebo_plugins/gazebo_plugins-2.6.2.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -47,8 +47,6 @@ RDEPEND="
 	dev-games/ogre
 	sci-libs/pcl
 	dev-libs/boost:=
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
 	dev-ros/roslib[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-2.7.3.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-2.7.3.ebuild
new file mode 100644
index 000000000000..ef6837eae89c
--- /dev/null
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-2.7.3.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components"
+LICENSE="BSD Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/rospy
+	dev-ros/nodelet
+	dev-ros/angles
+	dev-ros/std_srvs
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/urdf
+	dev-ros/tf
+	dev-ros/tf2_ros
+	dev-ros/dynamic_reconfigure[${PYTHON_USEDEP}]
+	dev-ros/driver_base[${PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/trajectory_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/pcl_conversions
+	dev-ros/image_transport
+	dev-ros/rosconsole
+	dev-ros/cv_bridge
+	media-libs/opencv:=
+	dev-ros/polled_camera
+	dev-ros/diagnostic_updater
+	dev-ros/camera_info_manager
+	dev-ros/moveit_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-libs/libxml2
+	>=sci-electronics/gazebo-7:=
+	dev-libs/protobuf:=
+	dev-games/ogre
+	sci-libs/pcl
+	dev-libs/boost:=
+	dev-ros/roslib[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild b/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
index 546f272c37a2..ef6837eae89c 100644
--- a/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
+++ b/dev-ros/gazebo_plugins/gazebo_plugins-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+	dev-ros/gazebo_dev
 	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
 	dev-ros/roscpp
 	dev-ros/rospy
@@ -47,8 +48,6 @@ RDEPEND="
 	dev-games/ogre
 	sci-libs/pcl
 	dev-libs/boost:=
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
 	dev-ros/roslib[${PYTHON_USEDEP}]
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/Manifest b/dev-ros/gazebo_ros/Manifest
index 069d5e057734..bf9d282fb91f 100644
--- a/dev-ros/gazebo_ros/Manifest
+++ b/dev-ros/gazebo_ros/Manifest
@@ -1,4 +1,6 @@
 DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
+DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 EBUILD gazebo_ros-2.6.2.ebuild 1009 BLAKE2B 356b118f6b7e0e2638a9b513ded0b9a9ef94a413b17ecaad22d73984ae88980be5e77390774e2ef43fd470c8af1e5e997399a8011f1bbca04b4186e0bc1105bb SHA512 61c285486cf13f06346311cd83bb04c4c9dc87963ec2927d658a8782a5a4b43fe7f54bf07127652f20ae9dde473f1234e3fd2fc84b691f665b9f6d95f978c132
-EBUILD gazebo_ros-9999.ebuild 1009 BLAKE2B 356b118f6b7e0e2638a9b513ded0b9a9ef94a413b17ecaad22d73984ae88980be5e77390774e2ef43fd470c8af1e5e997399a8011f1bbca04b4186e0bc1105bb SHA512 61c285486cf13f06346311cd83bb04c4c9dc87963ec2927d658a8782a5a4b43fe7f54bf07127652f20ae9dde473f1234e3fd2fc84b691f665b9f6d95f978c132
+EBUILD gazebo_ros-2.7.3.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
+EBUILD gazebo_ros-9999.ebuild 1029 BLAKE2B 6cf605bc53c1088714faff8352aff0d7a47655e17cec74bcb2dfd8122d87bdbc9073e10de7a5f271af7339c3143f03a4138a50614a12053bb4beea99be179483 SHA512 db98b128349f555b484af6e2507da1f0603daded2c31fda700ad3339cb3d654e5c945da53e69e06b7c4962fa5e41ca2f1b11a9436b5e9ef440c1e70c7588f872
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros/gazebo_ros-2.7.3.ebuild b/dev-ros/gazebo_ros/gazebo_ros-2.7.3.ebuild
new file mode 100644
index 000000000000..ca217b085352
--- /dev/null
+++ b/dev-ros/gazebo_ros/gazebo_ros-2.7.3.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+PYTHON_COMPAT=( python2_7 )
+CATKIN_HAS_MESSAGES=yes
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS plugins that offer message and service publishers for interfacing with gazebo"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/gazebo_dev
+	dev-libs/tinyxml
+	sci-electronics/gazebo:=
+	dev-libs/protobuf:=
+	dev-ros/gazebo_plugins[${PYTHON_USEDEP}]
+	dev-ros/roslib[${PYTHON_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/dynamic_reconfigure
+	dev-libs/libxml2
+	dev-libs/boost:=[threads]
+	dev-ros/gazebo_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/rosgraph_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP},${CATKIN_MESSAGES_PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild b/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
index 168e26eb91b1..ca217b085352 100644
--- a/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
+++ b/dev-ros/gazebo_ros/gazebo_ros-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -16,6 +16,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+	dev-ros/gazebo_dev
 	dev-libs/tinyxml
 	sci-electronics/gazebo:=
 	dev-libs/protobuf:=
diff --git a/dev-ros/gazebo_ros_control/Manifest b/dev-ros/gazebo_ros_control/Manifest
index e60ce8ce66c9..bba985e29480 100644
--- a/dev-ros/gazebo_ros_control/Manifest
+++ b/dev-ros/gazebo_ros_control/Manifest
@@ -1,5 +1,7 @@
 AUX urdfdom1.patch 590 BLAKE2B bd90ab431b09a009e19d664e1161cfe07d5f4783827dbb364c9ef9816fe7ba208ef3ca0dc7b3fd4a6c9c7127ec964e5de6c66045865c4a6742cd93d1e8cb7677 SHA512 8476e9ba0a1f1977de88f299c5222f72361be8c334a37d1f4c7834c311f6a4cad2a49553d5fcee67ef5e9f2d164855dc89671958c2d069a7f6a301c3a43891dc
 DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
+DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 EBUILD gazebo_ros_control-2.6.2-r1.ebuild 743 BLAKE2B 7398cf457863ad2296e87275ad1a5dca21c5742d48bc9713a11a0a16d3b24906913460380349161f809abf61843616b12a18eea9472169db97f258b6d490fa60 SHA512 f7cee8fa23e02e997dea2462c6d87bfdf12fe68c6e5cc812c81fa119389517b4ee0743f93201bc4f2845ac154ac802ee0118da00a96c075a9296cad87b10dda0
-EBUILD gazebo_ros_control-9999.ebuild 743 BLAKE2B 7398cf457863ad2296e87275ad1a5dca21c5742d48bc9713a11a0a16d3b24906913460380349161f809abf61843616b12a18eea9472169db97f258b6d490fa60 SHA512 f7cee8fa23e02e997dea2462c6d87bfdf12fe68c6e5cc812c81fa119389517b4ee0743f93201bc4f2845ac154ac802ee0118da00a96c075a9296cad87b10dda0
+EBUILD gazebo_ros_control-2.7.3.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
+EBUILD gazebo_ros_control-9999.ebuild 722 BLAKE2B edd1cd3d2d5bfdc2e5c3e73264f49c3447831dc44a2363a0bcd2c8afaa3daaa0878032f43186c4a911d35f5d78e43377fd9aff973d1c0b9a5b2bcceb692b609a SHA512 5528e932fad26207b866e59b6d577892ee1a95493727434450ce5e7a07f9432e5d5fc426e89f2a7598f0ac8a4f1ba39b5354355dc7cba13fff90fe2632cb9715
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.3.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.3.ebuild
new file mode 100644
index 000000000000..e824028e5285
--- /dev/null
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-2.7.3.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="ROS control plugins for gazebo"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/roscpp
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_ros
+	dev-ros/control_toolbox
+	dev-ros/controller_manager
+	dev-ros/hardware_interface
+	dev-ros/transmission_interface
+	dev-ros/pluginlib
+		dev-libs/tinyxml2:=
+	>=dev-ros/joint_limits_interface-0.11.0
+	>=dev-ros/urdf-1.12.3-r1
+	dev-libs/urdfdom:=
+	sci-electronics/gazebo:=
+	dev-libs/boost:=[threads]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
diff --git a/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild b/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
index 778913a057cc..e824028e5285 100644
--- a/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
+++ b/dev-ros/gazebo_ros_control/gazebo_ros_control-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,6 +15,7 @@ IUSE=""
 
 RDEPEND="
 	dev-ros/roscpp
+	dev-ros/gazebo_dev
 	dev-ros/gazebo_ros
 	dev-ros/control_toolbox
 	dev-ros/controller_manager
@@ -30,4 +31,3 @@ RDEPEND="
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
-PATCHES=( "${FILESDIR}/urdfdom1.patch" )
diff --git a/dev-ros/robot_localization/Manifest b/dev-ros/robot_localization/Manifest
index 883f274de2f1..b2d8292df8de 100644
--- a/dev-ros/robot_localization/Manifest
+++ b/dev-ros/robot_localization/Manifest
@@ -1,4 +1,4 @@
-DIST robot_localization-2.5.0.tar.gz 6466866 BLAKE2B 6d56a68eeb15c9774b6b6f93eefb0ae8bf9d7f5bbe0832cb8578b2fda4c7e04840eec5614b8e310a4148fa7be56a232265d5d2ccb00a0e49b42851bb8e5bcadd SHA512 f3b614aaf8cedd28cfc1eeb3406a7910a3d4a89bf83780586fd84cb4bd8aee51d9dbd10a5c894b6548dd6d50f41874413770e45481d38db7a4ef1e37bd81b527
-EBUILD robot_localization-2.5.0-r1.ebuild 1222 BLAKE2B 85b5a68123b8e3edf746192d8e25af0b22c717a70f2558bd65071fab6d7849faa5fdfd930946217265f72f9580a5ed4d26f67f871c7a1079142dc69485c0caa5 SHA512 70e3fd12472a4251db8edff62c2f8e66b2a55c6f3fa509552440ec101378e38586a23f3a7a2284c7950c5a390e1efe4267a88ca27d152e65e8659336bb65314d
+DIST robot_localization-2.5.1.tar.gz 6466840 BLAKE2B bb6f6dc935837d4891230bb26c649646586fb26032f5985ccaa736aaf1f2641eafe0d97e397900cef44a415a499bdd7acdf5c460fea8712d49e4c22aaba8e45b SHA512 0eb0ba81ae0cf85b7117a39b67a3b5ec0ebe09f55a85ac370695b7c281ab076bb7ede8495876c5917c34b6c912ce92fb05ddd7bcfe231b519c45fe9215b63dc2
+EBUILD robot_localization-2.5.1.ebuild 1222 BLAKE2B 994b89879922db1b33e1604398ab64277b83a841004b41369ece2593cf3ad8f7746c3bd2cf229e587c8ca4ccbb993503f0ed0611c2c41ff458d10e0ff96b03d4 SHA512 70305c75e28c266ff5ca55d102a5b340dd7d3e1d683ffd830eabcfefba864853065909cd872a5ff96071e49c6ffbcfefcd362c9535a3af2a879ce887a93ade57
 EBUILD robot_localization-9999.ebuild 1222 BLAKE2B 85b5a68123b8e3edf746192d8e25af0b22c717a70f2558bd65071fab6d7849faa5fdfd930946217265f72f9580a5ed4d26f67f871c7a1079142dc69485c0caa5 SHA512 70e3fd12472a4251db8edff62c2f8e66b2a55c6f3fa509552440ec101378e38586a23f3a7a2284c7950c5a390e1efe4267a88ca27d152e65e8659336bb65314d
 MISC metadata.xml 344 BLAKE2B 96e3dfb26e972a619ecd9e986e67272c46186bf0fe88721d42fcce8f94329417a30ddfb0b3b7a5f6b4dee8094bdeb842ba74da67a46db1270c4932dd3548d8d3 SHA512 682ee23502ff9b98b82cc8edb5dffafb1bde520ffa42ce8ab417e9c5dabab929286bb572e0988108201e29363315d12c8a5f55f841324fa339effe82ac1595c1
diff --git a/dev-ros/robot_localization/robot_localization-2.5.0-r1.ebuild b/dev-ros/robot_localization/robot_localization-2.5.0-r1.ebuild
deleted file mode 100644
index 1c508af6daf1..000000000000
--- a/dev-ros/robot_localization/robot_localization-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-ROS_REPO_URI="https://github.com/cra-ros-pkg/robot_localization"
-KEYWORDS="~amd64"
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geographic_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Package of nonlinear state estimation nodes"
-LICENSE="BSD"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-ros/diagnostic_updater
-	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/eigen_conversions
-	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/message_filters
-	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/roscpp
-	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
-	dev-ros/tf2
-	dev-ros/tf2_geometry_msgs
-	dev-ros/tf2_ros
-	dev-ros/xmlrpcpp
-	dev-libs/boost:=
-	dev-cpp/yaml-cpp
-	dev-ros/nodelet
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}
-	dev-ros/roslint
-	dev-cpp/eigen:3
-	test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit )
-"
diff --git a/dev-ros/robot_localization/robot_localization-2.5.1.ebuild b/dev-ros/robot_localization/robot_localization-2.5.1.ebuild
new file mode 100644
index 000000000000..474ef66b9734
--- /dev/null
+++ b/dev-ros/robot_localization/robot_localization-2.5.1.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/cra-ros-pkg/robot_localization"
+KEYWORDS="~amd64"
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} pypy{,3} )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geographic_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Package of nonlinear state estimation nodes"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/diagnostic_updater
+	dev-ros/diagnostic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/eigen_conversions
+	dev-ros/geographic_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/message_filters
+	dev-ros/nav_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/roscpp
+	dev-ros/sensor_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_msgs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/std_srvs[${CATKIN_MESSAGES_CXX_USEDEP}]
+	dev-ros/tf2
+	dev-ros/tf2_geometry_msgs
+	dev-ros/tf2_ros
+	dev-ros/xmlrpcpp
+	dev-libs/boost:=
+	dev-cpp/yaml-cpp
+	dev-ros/nodelet
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}
+	dev-ros/roslint
+	dev-cpp/eigen:3
+	test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit )
+"
diff --git a/dev-ros/visp_tracker/Manifest b/dev-ros/visp_tracker/Manifest
index c83f870dd0ee..8bbc978aa7f5 100644
--- a/dev-ros/visp_tracker/Manifest
+++ b/dev-ros/visp_tracker/Manifest
@@ -1,5 +1,5 @@
 AUX gcc6.patch 350 BLAKE2B 5e0f54319cc37bf0a4cf46e3b96f37bdb059af0f0e4a2b7219363504c96a2ed43121f4028c4d264959f1cf78e10d329ac67ee85d6a2868212b0cbcf924e2f93d SHA512 b1647cca84792212a1fe20685e83ee28fc225fb7272ed892fdbc4faae809059ce955cf5df1d8b3543c1248a741ad9a0bcb263a547aa21be2cebd8608dfba457e
 DIST vision_visp-0.10.0.tar.gz 1015180 BLAKE2B bf0474d0633a6b704077e232d4676e6ebb9ec666b9b03792dbb929c6c6d1c52a941f7a4517f7bc6a7150882c16ba719eb3cf17c3fbdd13df109eab3a34afa259 SHA512 8e2652d6ca9c9535f1bebb628ec908f64c9fc89358bc92ed42ef12430b0b28c8ed3ed7935d2d3fe03c9761f9ac08e200eb59839ee2243df62d5934e8162cca9c
-EBUILD visp_tracker-0.10.0-r1.ebuild 1080 BLAKE2B f15adf89f015d0ed306eab5be87da2c23fd1507e4251a54b3d69fe3bb988c8d21a23870115a9a0c8ec902e025485b27b0b71a808f05bc75d2b55dba2f9117486 SHA512 a6c35a5c7aa5ff9dc262b72c7f19bac9b8fad59685e99afd760f565d994284c1adda42d9654396b82ce24931f41e817c2af07aa9a77e41e82f05dae7d0acec88
-EBUILD visp_tracker-9999.ebuild 1080 BLAKE2B f15adf89f015d0ed306eab5be87da2c23fd1507e4251a54b3d69fe3bb988c8d21a23870115a9a0c8ec902e025485b27b0b71a808f05bc75d2b55dba2f9117486 SHA512 a6c35a5c7aa5ff9dc262b72c7f19bac9b8fad59685e99afd760f565d994284c1adda42d9654396b82ce24931f41e817c2af07aa9a77e41e82f05dae7d0acec88
+EBUILD visp_tracker-0.10.0-r2.ebuild 1082 BLAKE2B 8a3c5df1b1082f6146b1e651b9a3b56135fa8f9f7ef225d1f9a18da8065d3afabf3b2ffa373bc0046e6364d7c90718ed4d4221cc955be9f102cc322bc09af8fd SHA512 867d3842ca354574e0434538fc02bb2163cd658c95c354ca318453a94acd42b98741efb04177510e56249aa4407bd63a08cb4d5a852d46edc203a134182cb491
+EBUILD visp_tracker-9999.ebuild 1082 BLAKE2B 8a3c5df1b1082f6146b1e651b9a3b56135fa8f9f7ef225d1f9a18da8065d3afabf3b2ffa373bc0046e6364d7c90718ed4d4221cc955be9f102cc322bc09af8fd SHA512 867d3842ca354574e0434538fc02bb2163cd658c95c354ca318453a94acd42b98741efb04177510e56249aa4407bd63a08cb4d5a852d46edc203a134182cb491
 MISC metadata.xml 333 BLAKE2B 107f301bea0dd9adee5e472d36be074cc6a57d8a49fa14cb28b5aca166e99c73f3aaf19ce77acd1040bddcd86c3961f1411e994cd1ce9c0a636cff7d11e4ea66 SHA512 ddf6afe9a48cd4b3a1387aa6e7f0a46260ee2aaeb99d93e96aecac0ba5c36d59b578cc40c0337d40c5ecb9e485a3506138932897c0d9b5a8972d6ad479fa64a3
diff --git a/dev-ros/visp_tracker/visp_tracker-0.10.0-r1.ebuild b/dev-ros/visp_tracker/visp_tracker-0.10.0-r1.ebuild
deleted file mode 100644
index baaa58596ce2..000000000000
--- a/dev-ros/visp_tracker/visp_tracker-0.10.0-r1.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
-ROS_REPO_URI="https://github.com/lagadic/vision_visp"
-KEYWORDS="~amd64 ~arm"
-VER_PREFIX="kinetic-"
-ROS_SUBDIR=${PN}
-CATKIN_HAS_MESSAGES=yes
-PYTHON_COMPAT=( python2_7 )
-CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
-
-inherit ros-catkin
-
-DESCRIPTION="Wraps the ViSP moving edge tracker provided by the ViSP visual servoing library into a ROS package"
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-RDEPEND="
-	dev-libs/boost:=[threads]
-	dev-ros/dynamic_reconfigure
-	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
-	dev-ros/image_proc
-	dev-ros/image_transport
-	dev-ros/nodelet
-	dev-ros/resource_retriever
-	dev-ros/roscpp
-	dev-ros/sensor_msgs
-	dev-ros/tf[${PYTHON_USEDEP}]
-	dev-ros/rospy[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/ViSP[opencv,X]
-	dev-libs/console_bridge:=
-"
-DEPEND="${RDEPEND}"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
-fi
-PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_tracker/visp_tracker-0.10.0-r2.ebuild b/dev-ros/visp_tracker/visp_tracker-0.10.0-r2.ebuild
new file mode 100644
index 000000000000..d4999b7b5199
--- /dev/null
+++ b/dev-ros/visp_tracker/visp_tracker-0.10.0-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/lagadic/vision_visp"
+KEYWORDS="~amd64 ~arm"
+VER_PREFIX="kinetic-"
+ROS_SUBDIR=${PN}
+CATKIN_HAS_MESSAGES=yes
+PYTHON_COMPAT=( python2_7 )
+CATKIN_MESSAGES_TRANSITIVE_DEPS="dev-ros/std_msgs dev-ros/geometry_msgs"
+
+inherit ros-catkin
+
+DESCRIPTION="Wraps the ViSP moving edge tracker provided by the ViSP visual servoing library into a ROS package"
+LICENSE="GPL-2"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-libs/boost:=[threads]
+	dev-ros/dynamic_reconfigure
+	dev-ros/geometry_msgs[${CATKIN_MESSAGES_PYTHON_USEDEP}]
+	dev-ros/image_proc
+	dev-ros/image_transport
+	dev-ros/nodelet
+	dev-ros/resource_retriever
+	dev-ros/roscpp
+	dev-ros/sensor_msgs
+	dev-ros/tf[${PYTHON_USEDEP}]
+	dev-ros/rospy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	sci-libs/ViSP:=[opencv,X]
+	dev-libs/console_bridge:=
+"
+DEPEND="${RDEPEND}"
+if [ "${PV#9999}" = "${PV}" ] ; then
+	S="${WORKDIR}/vision_visp-kinetic-${PV}/${ROS_SUBDIR}"
+fi
+PATCHES=( "${FILESDIR}/gcc6.patch" )
diff --git a/dev-ros/visp_tracker/visp_tracker-9999.ebuild b/dev-ros/visp_tracker/visp_tracker-9999.ebuild
index baaa58596ce2..d4999b7b5199 100644
--- a/dev-ros/visp_tracker/visp_tracker-9999.ebuild
+++ b/dev-ros/visp_tracker/visp_tracker-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -30,7 +30,7 @@ RDEPEND="
 	dev-ros/tf[${PYTHON_USEDEP}]
 	dev-ros/rospy[${PYTHON_USEDEP}]
 	dev-python/numpy[${PYTHON_USEDEP}]
-	sci-libs/ViSP[opencv,X]
+	sci-libs/ViSP:=[opencv,X]
 	dev-libs/console_bridge:=
 "
 DEPEND="${RDEPEND}"
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index b104cede4546..c3e222981054 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/activesupport/Manifest b/dev-ruby/activesupport/Manifest
index d19ed4f666b6..03e124d1ddf0 100644
--- a/dev-ruby/activesupport/Manifest
+++ b/dev-ruby/activesupport/Manifest
@@ -11,9 +11,9 @@ EBUILD activesupport-4.2.10.ebuild 2168 BLAKE2B 4bfe8e4d4d585733bbe6a0ab9618e5e7
 EBUILD activesupport-5.0.3.ebuild 2423 BLAKE2B e89122f6c7c0062aec972d82ad88e8f550ad7e9d32e94e4ad672ab697a0cd28978fe6f2d588b2f5358e93c63e293507c37d19d57f72fc66eddcdb5cecabbaa67 SHA512 c74a9fd341a2a7de552176faee4b6b10e8ac5242b55502f1cbbed98f34a79358b6c9ec8b93a2e22e9fe1bf251f2186282557fcead77af8b9fb662985b25b61a4
 EBUILD activesupport-5.0.4.ebuild 2551 BLAKE2B f43e336330f5078cb31dd225e667bdde07b8c3932dfdce18810b3712a530fa1b30d517f97083bae9616d6e0dd29e97814ccc6892e684b9b55e7b9ab39bda5ad1 SHA512 d0fba8bdc6c62476e22f73208b72c84a85f2347db77616c37f9d430d9570963f63b348e39571e241baff8c48688064b34585c6d4f8749fa6683839ead8d80455
 EBUILD activesupport-5.0.5.ebuild 2551 BLAKE2B f43e336330f5078cb31dd225e667bdde07b8c3932dfdce18810b3712a530fa1b30d517f97083bae9616d6e0dd29e97814ccc6892e684b9b55e7b9ab39bda5ad1 SHA512 d0fba8bdc6c62476e22f73208b72c84a85f2347db77616c37f9d430d9570963f63b348e39571e241baff8c48688064b34585c6d4f8749fa6683839ead8d80455
-EBUILD activesupport-5.0.6.ebuild 2551 BLAKE2B f43e336330f5078cb31dd225e667bdde07b8c3932dfdce18810b3712a530fa1b30d517f97083bae9616d6e0dd29e97814ccc6892e684b9b55e7b9ab39bda5ad1 SHA512 d0fba8bdc6c62476e22f73208b72c84a85f2347db77616c37f9d430d9570963f63b348e39571e241baff8c48688064b34585c6d4f8749fa6683839ead8d80455
+EBUILD activesupport-5.0.6.ebuild 2550 BLAKE2B 81122edaa795a0125c0cca02afc8317f7c9ea1d44d449bd2a2d5bd0513259ad0cb0beda092b1fe0efba19e1e9b901766a4105fc9d63390649823c90ec7ff5458 SHA512 3880e2718c015c1ba4fc7ee62b7abfdc110fabb409ba1f0d41acbaa7a83e5ca6881507f5a6886fce74f7c22fb1c504da9acf5fa329f522083d28b27807cac2c9
 EBUILD activesupport-5.1.1.ebuild 2202 BLAKE2B 77ef796d8afc9ca3d94f10a55dbaa74a55b20976b566396a4b5f91cdb09b898569b36bd9f8520c625254e5c9a12c27f53e2d3a586ec5bf0adc134dc4d40c0a35 SHA512 cf29ff2bc2ca3328e0c94c5ab6569b6effc4a17ce3e7f82e6455bdd1b605a8915a66f9e0c737cc00a1e0f86ac0676d300f580a5b6ddc73c492c21d8d22604c5e
 EBUILD activesupport-5.1.2.ebuild 2186 BLAKE2B 98da4f626e72bf0b51a003e4e6a476b81ba8f4d4e04f66fca4566a494458b0e0ba3cf41f26ec54f868f73a1ea5d2d351a512f22d21061176e04e182c03bd7f5f SHA512 ad46821afdd448ff150613d343c26f1432b49aed82ee333816ee2720856cbed067fa37ce4c98a8183cf67f0f50cc2779644a5bbea9e00fd69b458a5b0f15507b
 EBUILD activesupport-5.1.3.ebuild 2186 BLAKE2B 98da4f626e72bf0b51a003e4e6a476b81ba8f4d4e04f66fca4566a494458b0e0ba3cf41f26ec54f868f73a1ea5d2d351a512f22d21061176e04e182c03bd7f5f SHA512 ad46821afdd448ff150613d343c26f1432b49aed82ee333816ee2720856cbed067fa37ce4c98a8183cf67f0f50cc2779644a5bbea9e00fd69b458a5b0f15507b
-EBUILD activesupport-5.1.4.ebuild 2193 BLAKE2B 0b8dc5df58649a028e45412c55542c7de13cd0b203f5e78a9774019b18de14d71427092b99995c0a872a3488fc51c9cb3ed7030b77d4fbb94c89b1b2d914afdd SHA512 91224a9d91f9c6554801b5e7b6876d775cdef20eb364e1bd23a6f9ee8ce7083c85c38392b23e88fea805733e6c048ae308a6f0ae894a099b40b36b50af66b248
+EBUILD activesupport-5.1.4.ebuild 2192 BLAKE2B 43b6e566fc5ee062fc12f49da0932148fef9ede436dc188cf396933aca15fd5d0911df8a4f7e3f48186f00c5906ba702c08131f376e1bbf869c70c2f660d850f SHA512 7fd642efbd73c30449ae6493b73f47e2e1b6f8858b10f8d020dc9a0efa06281a39a450d07e1d0edacba8519d0c704878b1c28e074bd1f44fc0daaa26f6b9542d
 MISC metadata.xml 337 BLAKE2B f2b57aeb9ea63b3cba576df9bed58bc86577ddfb1707d3a183a8536c71c797aca25ca61b22eb50ea54368fac052518f889db0503b816767e05978c803e204351 SHA512 ad52f0a3bf101472aa80ce4b516349ac090620aba4afecde872585bf1ff11f55cffaf762df123910a16d70aaf67ef59dcbdec728816f611a2d5bde90d2b6d09f
diff --git a/dev-ruby/activesupport/activesupport-5.0.6.ebuild b/dev-ruby/activesupport/activesupport-5.0.6.ebuild
index 32482f660ae7..30d09d48b91f 100644
--- a/dev-ruby/activesupport/activesupport-5.0.6.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.0.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -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 ~arm ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/activesupport/activesupport-5.1.4.ebuild b/dev-ruby/activesupport/activesupport-5.1.4.ebuild
index 2bbd048191cf..533b0d02a483 100644
--- a/dev-ruby/activesupport/activesupport-5.1.4.ebuild
+++ b/dev-ruby/activesupport/activesupport-5.1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=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 ~arm ~arm64 ~ppc64 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 RUBY_S="rails-${PV}/${PN}"
diff --git a/dev-ruby/amq-protocol/Manifest b/dev-ruby/amq-protocol/Manifest
index 1d22598de634..ecaca70f70dc 100644
--- a/dev-ruby/amq-protocol/Manifest
+++ b/dev-ruby/amq-protocol/Manifest
@@ -1,7 +1,9 @@
 DIST amq-protocol-1.9.2.gem 43520 BLAKE2B 5085326ac5865876ce17c4acfc2fe89f8946fa5fb6851bb5bfb3eea387e505083ceaf9033243b47b5b9cf484217f6bbffaac567ef44b5069d505d4ae6cb394e3 SHA512 ea4553b337589589cc89b70e351722ec8af402bd560d73fd35ad41665424a6212e03e26ac86aace5d90f599c7fc2236686fbd83bd75c7023647d95163a2d8573
 DIST amq-protocol-2.1.0.gem 43520 BLAKE2B bcb389c1ce1e250e78d96f2451c5d01b22d151fec3a7e5666d284edb0c46609a239cd9426dabc92e8cb1b3d28b677b57b89c2510b2cb7ac13368287bac5d2d30 SHA512 3111c3233a3fdf830cb95d9161132b96035c3835bcf4acd74ec9a915a44096295f5e0cb6b444db7fc4eba84b218800f9c9d33d1cfa5b2d3dcd80dfc65c92c133
 DIST amq-protocol-2.2.0.gem 43520 BLAKE2B 7cc9d8550ec2bfb40f4ad64f1baaeb782bda52562ccb6f7bb7692a1db400e1320e52c6ee10d0c1d3a96557fe4aa8f428e4f524e36b2a4c8685ca60b505fb3d9a SHA512 8637e7c1b2540edd57d9d06f5cf51430ff2ed4cd603e3b8a9f9c48dce2468452a4d365782ba949b7e007d773febe83c1a22bca2dafb21c24b3c8f655eb53e5b4
+DIST amq-protocol-2.3.0.gem 45568 BLAKE2B f5af9184a37bb7484e18765cf6bd807048339f44ece70a1c5dc8d6580eb1449bd1deda9bd467970c0d03088f4f666ef0ba59141fe90b335508a854440cc5dae4 SHA512 cb9ca136908f09dd7f38f763b87516379efafb2cc3dfe34268064c08ee9fdda8e9299de4d94b70aa0569362fe18a541287a6b9649383ee0720f199fdc0b75263
 EBUILD amq-protocol-1.9.2.ebuild 573 BLAKE2B f6b873cad7ddaf37c80b70442d30eeae7f283e405c37ecf765462cfec5d6cf605fee626a6d31879a2483bad662f324a382442ecd443543ce3c6710410ffe7523 SHA512 7cf29cbf88226eba36f3e7b644b7ee61a899c561af47ac0b1153e1641cd13778f5f49b40fc66f58304e037813c093cfb767bf007fbfb2ec42bb284f29d18d60c
 EBUILD amq-protocol-2.1.0.ebuild 623 BLAKE2B 48f3a9792bf8f6523923ba9303158ff5b4facdca76ee5ba35b369e0496e489d69f9cdd95da579edc4ac9d79af59a436596b282e724b2cbc91423df2ab937ea48 SHA512 d2385b2ffda00df75c5d53d4b90445002f154b040ed2766e8d808418f79d0924fce45c4320c145354c1b538eb45c6d85fb2f9b70949e7bff25f0c4a2515c007d
 EBUILD amq-protocol-2.2.0.ebuild 630 BLAKE2B 2a2ee4777165f13f95274f063110b5e4d977d1b045b29bab2e49d7a38e23f4fe59e5a71ad385f7a12f22df9575d21679714b4f0bb3c05976f55cda254d8e317f SHA512 cdc140bfb73cb0d9ab312e2ce12d32244db637c28cb0209348b6d90b7b02d1f62b7853562bba005b1eb212956b395ecabdfb25125209d77e96357d6e9eaf29cd
+EBUILD amq-protocol-2.3.0.ebuild 670 BLAKE2B 4f78f212afae79bd4bce94792bfe75d732a52274eb3390610d7c8e6a74da28ff5da1bf370f940ccb9f88c226b4f8d02d27fde1e5aaed38a919f38b60a389b09c SHA512 cc911a2884dac9192ca570768dc5edec4cf8b79468e0a9af20c7b173f40f25a9b0d51266f1392feb493205459f0f7d3eb9a5a5e1f90312b1bfd87f52a253bc3a
 MISC metadata.xml 348 BLAKE2B ad178aa788b27c4acf67ab9e2e02b521e5b4def2669edc7a09b230b05e0876b2624b8039a9d715b92b6304338ab7cbbd0e73cf68b894199112c060f3b27ab55e SHA512 40807ab72ba61b47ebfe9e79363ec67c1237c8aae654f217fecfc8f78f7c77a6f099a535992213f128ce526e355405092d826612000511177ed784698b338a6e
diff --git a/dev-ruby/amq-protocol/amq-protocol-2.3.0.ebuild b/dev-ruby/amq-protocol/amq-protocol-2.3.0.ebuild
new file mode 100644
index 000000000000..65ddb930a2ff
--- /dev/null
+++ b/dev-ruby/amq-protocol/amq-protocol-2.3.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An AMQP 0.9.1 serialization library for Ruby"
+HOMEPAGE="https://github.com/ruby-amqp/amq-protocol"
+
+LICENSE="MIT"
+SLOT="2"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_bdepend "test? ( dev-ruby/bundler dev-ruby/rspec-its )"
+
+all_ruby_prepare() {
+	sed -i -e '/\(simplecov\|effin_utf8\|byebug\)/ s:^:#:' Gemfile || die
+	sed -i -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/bunny/Manifest b/dev-ruby/bunny/Manifest
index 0135e5b008f4..d1ce23fe3853 100644
--- a/dev-ruby/bunny/Manifest
+++ b/dev-ruby/bunny/Manifest
@@ -2,8 +2,10 @@ DIST bunny-2.6.5.gem 198144 BLAKE2B f2f13823833fcb84e25c3d40671be241ca168637d71f
 DIST bunny-2.7.2.gem 199168 BLAKE2B 30293eda9a336a78383f52981109c5c231c6d850376042f63ce8108e677d553b9a867d696be2fdfb33fa3d26c27e0d8da96287fcd113b574bc47d3caa3ce897b SHA512 acba94a6611be0c72d10016366c00f8a2c84c36e897d1e9b179f49ae717edd1d6ade5b90fa963d1f830a315927be01267d0f848bd8f3016978ab2b2ec38c6bde
 DIST bunny-2.8.0.gem 200704 BLAKE2B d2a76c7e5d16b5a86c8cd6562e67e705cdd223778c84c995000fd1d128bb85a06f96765629d8b555f96f18e480bd840b13db0f9a01501b7cffac76effa0ebb1a SHA512 638cdf63a4a46bfa74af12c994cb4fd2798b57718be1386b7d0dc592bae4f35902d4bb72e0e58ee289bcffd2d6eb7ea8e82ccb0ed98d743b7d09f149dd042916
 DIST bunny-2.8.1.gem 200704 BLAKE2B 6692bf5e16975193ef2c56992b542258f2dea5f013f0e744f8a7c1537fd3f1496ac1e566d314c65e198aafb096bd20378afd773a2074d1c14526153302ec6459 SHA512 024aa4d8e13dfb6cda0cdb2f3f12d3d2c7bb62b8bb28e7c580214db34aea4a6c88d07ff2fb01f0bf2b679bf2208c6e71b358bf67d55a52b3c8a38ffd61e2e8e9
+DIST bunny-2.9.1.gem 201216 BLAKE2B 008c308484fccd42761f237a57d244a0843b3eaffa04d826a04fae73712aa8b1fce407359905040164a10ff7ca06141951206f5975b3f23a394e2e44ed2949e8 SHA512 56a44c4ca6269c3a120a8e77cb370e008b81d2e072c7637d812b501f7e8793573a7f1fcbccd62a95b677348e8996b156477e9519ed8f6c73104996fe805a4600
 EBUILD bunny-2.6.5.ebuild 636 BLAKE2B e62d140160d5b7b8fb1bbc6fc1e25a01dd954b5ced9fe3f762038798b4ea090b33d675cf0dcca4a434205dced30a22af79e38d26dd664f5e62d29c02d092a3bd SHA512 ab215f0081a6a458dd713851c5104ce9e5c1b4dd248c32c1ced924dd503e9813856a7e5374d2cccab7ad328618784704543b76407990bf05d8f3c619492ba620
 EBUILD bunny-2.7.2.ebuild 636 BLAKE2B 37d636fce7d1760e43749352102f27bcfea18674de5636b24a06bbe9686d87835def9dbf8f5678961ed45d5eef86af34c8baa7e345405948328540c9c0b69b14 SHA512 233dbec10d60927bbecc3f9c5f5b76a781a6baa1b286a07c7b5b1fceb0c1b6beecb34b9dacd6896aa821e339e04367134cb96ff8c1e6d31489fa6bea8293b578
 EBUILD bunny-2.8.0.ebuild 642 BLAKE2B c3f81beb9f9aa72d8a5f893cbf57403b8293f72fa33810dac2c0d389c267652d1eee4f79cc01e7ce69529a4b65998c8ea33a28d6decce91b0d61143ec2ccdc23 SHA512 3525de343a0f75df5603e968ef881566c9de879bfca61ab423935330dbff0113495489866b10c3b41a0d63fc99fe2373716fec346ebea091413e4006af11fc55
 EBUILD bunny-2.8.1.ebuild 642 BLAKE2B 4d46348f3446064dbaabb4a60ba7b11a2fe4599bb10cea3f0f8559852e48502b2aee98646f9f05bfc21a4db02912868edcd87df3dee0ba08fc4217b5a089805c SHA512 955f9ec3b25dde15d2a162ade7fd922ad4ecd4876ba4afa6d6854035af95cf69ceada5eefa68c942f0f00d51392ec66fd4cef6b48a2c33cc646aa07b1c9e0d42
+EBUILD bunny-2.9.1.ebuild 642 BLAKE2B 3c8a5d70f6fe4b60386022c74bb3ee70b2044adf29be2db2659d66dc3c7d4fc67da8199cc3349e006300a165bd91f41244bc76b2cd21730dee970b0037b5f7a9 SHA512 11a8e08b2e9d01f600e0cba9d1eb9ffacaf3980231dac006523fa8306a1186690d0ce98a828d33ffc57103b51488d164e25e899a7ac0878bf0c94a93bb370b58
 MISC metadata.xml 339 BLAKE2B 4a125163d9a518d1b7da4bacf6af27231a0015ac40cec6278b0d144dc43734bf5b4957d0ecce757f4029634768da9460c44e6be884b8f1649cec204f5ec79e7f SHA512 2d782782ba704b3ea7db62f8b7fbdb71e09bbe7429de43461be76c6319d4e81d502a75008b12a580a9ad8a0d34ceba6bbc749ec061a7fb288043e7d9e2c2670f
diff --git a/dev-ruby/bunny/bunny-2.9.1.ebuild b/dev-ruby/bunny/bunny-2.9.1.ebuild
new file mode 100644
index 000000000000..18136f36d42f
--- /dev/null
+++ b/dev-ruby/bunny/bunny-2.9.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+
+# Tests require a live AMQP server.
+RUBY_FAKEGEM_TASK_TEST=""
+
+RUBY_FAKEGEM_EXTRADOC="ChangeLog.md README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="Another synchronous Ruby AMQP client"
+HOMEPAGE="https://github.com/celldee/bunny"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+ruby_add_rdepend ">=dev-ruby/amq-protocol-2.3.0:2"
+
+all_ruby_install() {
+	all_fakegem_install
+
+	insinto /usr/share/doc/${PF}
+	doins -r examples || die
+}
diff --git a/dev-ruby/capybara/Manifest b/dev-ruby/capybara/Manifest
index 65415d8ce24d..58cf7e882ffe 100644
--- a/dev-ruby/capybara/Manifest
+++ b/dev-ruby/capybara/Manifest
@@ -1,8 +1,6 @@
 DIST capybara-2.14.4.gem 265728 BLAKE2B 7b61fc7424b5e5aeec50e0695ef7719d23b594d3fe233c04443c37a5f06b0f1e7c440135c50225813d9da954c2efa0563488668202e09a4e3877f28708f9624e SHA512 d3ebbd8d96e4d2026327b1c70ff723225ce052fff510a909111b8cc7e02b12fec9e00acddc0bc2565371cc5eb0b590abef43d42a99c3938a929ea25930fdefd1
-DIST capybara-2.15.4.gem 271360 BLAKE2B 67a3abe0b0f07ad1af0e894723e1ad2a0d0e2dce9903472e6369ddee8edcb54b0fde833e4c31c18625fc329d85ff39df029636e62821feac138c19e8cdb97788 SHA512 405f5d9aeafe98e8aafe26d1f563c42ebe737b88efb9a52fbd38aec6b2418e1d7701368c75b6ea4946bf4eee0c1471e9af7be63dda3238ac5c4129fec8e3f999
 DIST capybara-2.16.1.gem 273408 BLAKE2B 1d1a68427fcfed9a8153e409e17fc043dd8d926c3ebbab3560ae12454f3010c8b4569348c231e807d993263940b703dc5380a235da438eb5ac2f9d0bd3a66309 SHA512 921e05111278b7bff93fe805a29e7b2e0e78b36510db5dff1189e34c3cdeada52504a8e06534238e578c32e8e0efa8d99a0ffc8516d94e60c06e7fd2c4ecb174
 EBUILD capybara-2.14.4-r1.ebuild 1506 BLAKE2B f2bac2b3122085a3190e5bfe14af9fc2a57629488ae418e1115b26975b5aa4d80bfffaa492c91457ee3ee5663b0197b2dd792a0755617151c26a445b4b1ce835 SHA512 98a6096c892facbbd9f665fa9cfefdebce53fb7ce328b0a4b97716c58a090089e2dfd9b2454763fc4eebd384871bb964780b8fc9e2a883b31ee169781a1fde20
 EBUILD capybara-2.14.4.ebuild 1352 BLAKE2B 868ff6d1d8e9619b0c750679692e5687bb7d940f498bd7659cc673d07ad4174af58d0a5437fdd75427f6a77816915c1fd49b2430a0e6e9aa810d6b8e7e584bc7 SHA512 e979fef0dc97221dc2d47a85afa6fa817f7f42acf6f6ec168a1cc9f48b58e057bdb208f2c366b2958f26bc9e8a7f55b5b1aac8fa484c42f515d1476958fe2447
-EBUILD capybara-2.15.4.ebuild 1487 BLAKE2B ffe5c49381b6e4a76cb097991e8203c2cf2c3c5d32240aefba321849f72d7fa9ce569250923c67626218cd500b8233d47d890456d53d125e50bf14373bfdfb96 SHA512 7c061aee86de394cd6f1e5e236c7d15b8d89dc907d2c386a2ea1bc570bd8c6f5de08592414dd225bea42aa8bfc7adb5974ad58f05eb2ca441eb611809b5c3286
 EBUILD capybara-2.16.1.ebuild 1494 BLAKE2B b6bdd372e8544a4fe3d57a956695ab39e294246f398684d0b424b53f8d176d181085937ed48195c5930251d00bd9e101db6b9b65a742b205a7e84d162545ef33 SHA512 ed1beb2f507c53ca474d36e6f8e8d6aabb46b62325225b039a192f9f0929a76431f2c6e30f36ef569316a4c630ba452ce888bd6e8a232d68b23762113d8ff409
 MISC metadata.xml 343 BLAKE2B 93caed6f938d8f2c10a7106e7377812064351018521cbb63477340af9531c5c67940097580c5f7610cea03b0dde6853c9fcbe9ab8cf5daa2a49018b8888e20fc SHA512 1e526463690f3ff61390ed77cb528352bdd1c089b368c3f6ab587766d81167afe99f752b861233f755e10bf2aa6f09dde98a9dc359d51392f15b55462ba66e77
diff --git a/dev-ruby/capybara/capybara-2.15.4.ebuild b/dev-ruby/capybara/capybara-2.15.4.ebuild
deleted file mode 100644
index e978384153dc..000000000000
--- a/dev-ruby/capybara/capybara-2.15.4.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="History.md README.md"
-
-# Rake tasks are not distributed in the gem.
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_TASK_TEST=""
-
-inherit virtualx ruby-fakegem
-
-DESCRIPTION="Capybara aims to simplify the process of integration testing Rack applications"
-HOMEPAGE="https://github.com/jnicklas/capybara"
-LICENSE="MIT"
-
-KEYWORDS="~amd64"
-SLOT="2"
-IUSE="test"
-
-DEPEND="${DEPEND} test? ( www-client/firefox )"
-
-ruby_add_bdepend "test? ( dev-ruby/rspec:3 dev-ruby/launchy >=dev-ruby/selenium-webdriver-2.0 dev-ruby/sinatra )"
-
-ruby_add_rdepend "
-	dev-ruby/addressable
-	>=dev-ruby/mini_mime-0.1.3
-	>=dev-ruby/nokogiri-1.3.3
-	>=dev-ruby/rack-1.0.0:*
-	>=dev-ruby/rack-test-0.5.4:*
-	>=dev-ruby/xpath-2.0.0:2"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/d' -e '/pry/d' -e '1igem "sinatra"' spec/spec_helper.rb || die
-
-	# Avoid window-manager specific tests (sizes are specific for fluxbox)
-	sed -i -e '/#maximize/,/^  end/ s:^:#:' lib/capybara/spec/session/window/window_spec.rb || die
-
-	# Avoid spec that requires unpackaged geckodriver
-	sed -i -e '/register_server/,/^  end/ s:^:#:' spec/capybara_spec.rb || die
-
-	# Avoid test dependency on puma server for now
-	sed -i -e '/should have :puma registered/,/^    end/ s:^:#:' spec/capybara_spec.rb || die
-}
-
-each_ruby_test() {
-	virtx ${RUBY} -Ilib -S rspec-3 spec || die "Tests failed."
-}
diff --git a/dev-ruby/crass/Manifest b/dev-ruby/crass/Manifest
index eb7253d2d259..7679d70224cc 100644
--- a/dev-ruby/crass/Manifest
+++ b/dev-ruby/crass/Manifest
@@ -1,5 +1,5 @@
 DIST crass-1.0.2.gem 92160 BLAKE2B f24572c0140abe24e00b3b345fe2afcbc13e7ccb4b5e49f11ae7ab41d99bcc25c21b72c98cbbcf2991f7fecfb70011164513d85b963efc0fac12ecceb08e0ae4 SHA512 28ea16dea1ba8e46589489a60780195711304902b805bff0b362f99e8af9c9d2ecd0c11dcdf3e67e18e0997f37594012a4ceb312df352faf56eeb47d0441d289
 DIST crass-1.0.3.gem 92160 BLAKE2B 25512ebe4c1b3f2104896a0d6978a3cb58c344dbf058d308ca105866ed89bf059f2b53d98e2481f7a6a72a92f35e5625ee4588a7e886984324788bd0fee32ba9 SHA512 063dc3e95f83d713a47f88a06efc05607e75313f6f5982350ee783cb16dab159afdbf779e043ef9f5c56282e12c962c9ca2bec92cf87d1042a719ca58cd180ac
 EBUILD crass-1.0.2.ebuild 671 BLAKE2B 67f20d101d5d9682f17602ed2bf2aea5dc9143dd9bfdbc3b3dc2e72bd52d991707ba937354206fd69f9bc94dd73920c255b66fa0b5b91853c1d094099189c8e9 SHA512 6deca0987832b49f8e2bebd05e494f28ddaf53f8ac8be40b5cbd0330afa8ca49401957fa7c9becf0959d1385b5d962b574846e52d1f0f6d74ac098ab406ef3d5
-EBUILD crass-1.0.3.ebuild 664 BLAKE2B 57c60eff7141aa1356de49d521631b8f210d25683402db278266d21a1e8b407ff1b03286160e99fbbac34985101f23092953b2a166b8755fa40aeaa22e33b87d SHA512 b3c90cffc7155e82436395ec81bd04b18963c43023c4324e6f6bd33c690cdbf9b36d01acf1126466d59dce32f9b020c09ae6c464f2521a6c456809be41ec57f8
+EBUILD crass-1.0.3.ebuild 663 BLAKE2B 98fb8ddf474445355be3ce6dd27dee05f9856a0598a0eb36ccb52cc5e588c40005d204cd86f4b15222f51daf15da83e954b96b7afcf9c8b36208e4f4cba781c5 SHA512 fb5118aa3719a6d43de6cb85812542a9404a5bc3da23a470c635c56c4eb30e4f32bf0de44c08423633bd3e8d9d7d14b3bf0c3557c57c9bd4b32186322efd6439
 MISC metadata.xml 338 BLAKE2B 7c67c73b8424d0f83d98cbc7b2c8608ae80829f5f59029a143132b0669a44eefda849bc941a34b143e0dcb3625be05eebe02a4176c219525ee3fa151676766fa SHA512 fd48781e866b789fb7b938ccc47d70a6d84af2afd104aad532d12b81c9235c3fe00c44546d8724d2c98a3e7808b62adbcd50b065e795cc634ae4fcd0eb711247
diff --git a/dev-ruby/crass/crass-1.0.3.ebuild b/dev-ruby/crass/crass-1.0.3.ebuild
index 5f06c0bed56a..7a7956742567 100644
--- a/dev-ruby/crass/crass-1.0.3.ebuild
+++ b/dev-ruby/crass/crass-1.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ HOMEPAGE="https://github.com/rgrove/crass/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_bdepend ">=dev-ruby/minitest-5.0.8:5"
diff --git a/dev-ruby/dalli/Manifest b/dev-ruby/dalli/Manifest
index 510e8c21b1f0..417828561820 100644
--- a/dev-ruby/dalli/Manifest
+++ b/dev-ruby/dalli/Manifest
@@ -1,3 +1,3 @@
 DIST dalli-2.7.6.tar.gz 48481 BLAKE2B 9f83523b75d1c6fa109aba7e288e13924d8c7677c6fa38ffe5ce21dfb22f858f8a3ab8593afceed97e980e5f0172c1f8c58cc96b42f4bde31013f5ffcbb26f8b SHA512 ee2270e719f6ff108654d20dfc560cdc6067808c211ae75304f5ca3f7772561b25a699fddb051e42db744bb202228bdbb904171faf5e1804f1f2bed4341bc258
-EBUILD dalli-2.7.6.ebuild 1408 BLAKE2B 218285312b7d910e91e2d5eb5cc42fc8178a293e92193a798ed80c8d36c13b9cf978c273e696758ec8c06ab910e83408846f8f630dd3df1e08790dfc096a6381 SHA512 9c599a342bd75a0a5d7b969ac9735322dc054eb992f77d45594ba58f229b6f6738117a332149819a895debd7678feba711ae42849925297a68c28b9ceb833149
+EBUILD dalli-2.7.6.ebuild 1407 BLAKE2B c1a47e18c933355b7cb917582e8342218da00e1755e92691abae96254d09a43e06c0b27ddaf64df66e9831a8eac04c0297d57007ea4509546b9f529a4fa601b5 SHA512 de044b223df4c284be5b981aeccc401365c47143c7f1b33768278e24f51eda5270ffc482f72eadf9af31b8b5b527becfbcafd810c1b9d1e2d2683560156fdadf
 MISC metadata.xml 346 BLAKE2B e34b47009de19ff810f3c3893517533730fa09cc4713b5fb8ebc05011004e17466ca0a6e6df307e5748003a7b4c83691d28ca0d80b423f6f870c4f7fc9be88eb SHA512 22b3ca0c5024974556840a2cf47ffa0dac63b6a4573d2ca6244c3ec9231b1c8321c7f544bc979882a6bb6ca37545b8ccf4612ce9ffd1ab34521b24e896f57e41
diff --git a/dev-ruby/dalli/dalli-2.7.6.ebuild b/dev-ruby/dalli/dalli-2.7.6.ebuild
index 58c5b204bc1f..995b081f9ea8 100644
--- a/dev-ruby/dalli/dalli-2.7.6.ebuild
+++ b/dev-ruby/dalli/dalli-2.7.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/petergoldstein/dalli"
 SRC_URI="https://github.com/petergoldstein/dalli/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
 IUSE=""
 
 DEPEND+="${DEPEND} test? ( >=net-misc/memcached-1.4.0 )"
diff --git a/dev-ruby/docile/Manifest b/dev-ruby/docile/Manifest
index d1cea8d0d95a..ec702e0f3bb4 100644
--- a/dev-ruby/docile/Manifest
+++ b/dev-ruby/docile/Manifest
@@ -1,3 +1,5 @@
 DIST docile-1.1.5.gem 14848 BLAKE2B a8689b3d1a23cac3f62c9fa5d6dd6425bd780a01ffaf96869a57d1bb0a7756b2d8242d77726ed7286e3405c0abc86644e6ac6b51722d120d4c541e4406d7de4d SHA512 3bdb2e42d83fd0050bf541d4dad0120180b63f80ab5ace1504ab7a12bd38397a89c74855437698267b4a87d72dd02dd4ab4ec365a2a4610828d2b100c2a9e3d4
+DIST docile-1.2.0.gem 16896 BLAKE2B eadbf625fe1f26bb63cafdf2c30e53d0f7362e19baeac2ffaa8bb8ecc01453bdd7a5d1b5005bf60a892b6f48188f0d7d3e2a1d75b53cefddc206e11c0384982b SHA512 328ef09e4d9981aeaec8e3d97ed54a1806ca1de8e5a00b6f2b311e377fcb986eef1b7fbfa8a27992d235f93629a636fa20a5c347ae7310f325af7e4af88ebccc
 EBUILD docile-1.1.5.ebuild 513 BLAKE2B 3e77257ee9bf68757011077a39cd31c05b3e15d1161bffbbf23ce73b7a17ba0ad8db0ad9ff14ad2a9ffaee9bd35b5d9c1c4a6c338d82dd34416cd98f349f70ac SHA512 8ca56622d9d5d496161b7fbe11790ad8ade778e565c090b6c399b37677b2a9dde04710f62d3eb60b8c9cae3d685188e143ac3c52bbfe737450c4b13d5c055ad6
+EBUILD docile-1.2.0.ebuild 574 BLAKE2B 9e0423a18009f60c536f01524551566cbafb65ba0988a516ba79457d2e8e6cb78c5f1a81f7a7ea2114c27581e76ab6c39c877e31c6afb986742f1c1a33b11524 SHA512 53dfca3c0c52a69e3d973513d411e364a5c1ff3e011e5f8c4e2ce7c2ed3056c53241a22726ce5c839a0381935b5d12ab99505af39d70b531ba4d70b78aae9848
 MISC metadata.xml 247 BLAKE2B 7717702c51c35b2a20983332abc6218047b2b5036e6b4c09d3d58b4339e8f9e776879cd116cfda60d3bcf4188859993fb9f3f779aaf595f155d53e85288f3dcc SHA512 ea4c044637b751a2c28c6ac226121e74ef18196af4b594e60413fec907bbab29c6b0c7735c3f503485df16dcfb36ddb86038394d92e2cd18c8f04626628e9f09
diff --git a/dev-ruby/docile/docile-1.2.0.ebuild b/dev-ruby/docile/docile-1.2.0.ebuild
new file mode 100644
index 000000000000..e38d1a5e24d2
--- /dev/null
+++ b/dev-ruby/docile/docile-1.2.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="README.md HISTORY.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Turns any Ruby object into a DSL"
+HOMEPAGE="https://ms-ati.github.io/docile/"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/require \"github\/markup\"/d' Rakefile || die
+	sed -i -e '/^unless on/,/^end/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/erubi/Manifest b/dev-ruby/erubi/Manifest
index 1022aec0a3e8..e5ad55cb1432 100644
--- a/dev-ruby/erubi/Manifest
+++ b/dev-ruby/erubi/Manifest
@@ -1,7 +1,3 @@
-DIST erubi-1.6.0.gem 12288 BLAKE2B 366099e8717f2811d675a5e5ab7fdad838bb0df2004848c3b959f291c79c11ac0f62da3f7997248af365308964b0d63d87d70ebc1907e6d32352ee6240280f6c SHA512 33da5ab621f505aaa2203e156f7071400a516cff845c405eb30f2fdd2d1ffad2109ff369a878bfb701e884de54d9b4b5ee13d4fb65d822ad35d4c0d192709f8c
-DIST erubi-1.6.1.gem 12288 BLAKE2B 9f2c25cd6a19e25e2c9234b0dae613c73055d90063a3aa886c4de1ba2573f2c720454af89cb3d0de3aa832c9472058eb66b23807df6d3777ce8c5e66287d2567 SHA512 a7aec32c676a13b93f7e186844bfecb5217dc8051fad3702b0b7f7e3df0b7c04a0f11d98047ae9bc211443ef92c040de5e8a262662a4a311efd9b5ba3dda0077
 DIST erubi-1.7.0.gem 12800 BLAKE2B af4584e640f0ae177c6e4d98850d94b148bb1b2df406c16fe582bdecf54895e47942ab94df472f628d185c71f89895250a5a9765fb41ce9365eb2ffa273f1d78 SHA512 1494c28aebab08a82dffac7b340ff6e16edc8a3731f69ec568bec6cb0bda4a334f94033f43416812cd00b0c99dc98458867d963bef34796ebbdb11ea65dd8c1b
-EBUILD erubi-1.6.0.ebuild 522 BLAKE2B 3602e06b0488ac3f88f05927c5bdb9cb438c66b3b4a613690c4f708afc044e37ac1c4cf9cfc18bec42a12bf726393e8dfb2e52ca3b07bf85f4bba135f3bdbb89 SHA512 b52866f029c28402d5465860c9e81ed419032911d9126eed9c1e4020c508dc40a2a6dbb303b7057413e902670f54f23ebed978e36cffa832b75e8e4ba1eeb665
-EBUILD erubi-1.6.1.ebuild 536 BLAKE2B 5ec81cca06105477c8ec1f89408ede2c27d64825033e6dd2a603937bc42d591404cf2f00298af2aadbbfc9e9245ffe8f829f61a8ba643c8ab7e421bd1185434e SHA512 a2e185489b6dba1b385f114531c1bb12d3352cacb0a18b6c2a373ef0ce0e5515dd368e71b4c1c3ae9219a0fd30cc6a0d6732cdbc810a55846f813e6157b568eb
-EBUILD erubi-1.7.0.ebuild 529 BLAKE2B 4434fc92d0f53db78a0844d80d2a8cc4ba284a8cd646bb941a0e138ae86960d44134603b1d76ee2fd759587f2743ba278b7e19c562fea2648c7fd01fafd71e6d SHA512 7c12cc8a07ad3717846419379542bc49f669bc9257d73b665b8b01a91919048cac8a2ed21f6a2299f8d0fc5aa3dde18df50971cb94e9473afd0d16c6e9cea09d
+EBUILD erubi-1.7.0.ebuild 535 BLAKE2B 27ade03cc82852d07ddabb60d83a598b6061c470f8ec4b5db8dd4301419fde16107bd48d436d1123f3ba1423d7290fa1c072d7a70f90d0f52cbaf6a54941d703 SHA512 8b8d139ff66223c2e0d1d6e6597c81602627debfe948555c847ea9494be8fb92d71025627e5c7d776166731dfd6f50b4a0ae5bd484facc0b68a6152cebdfa9fd
 MISC metadata.xml 392 BLAKE2B 69b13996a3f20cfea19c9633ae778b8fe408fb0ce3655ff27b10dd5b128ac1c0f63128f77076586584a95389b6f6d2890153b653a5ddc71e053cd50224a8f15a SHA512 011c951701fd525c150ba9ca737c502cb78937c173e5286b06f3ed3f007860eee68265f419975ea131eb18682789435a328f5d8345078781c733e7148eb381b0
diff --git a/dev-ruby/erubi/erubi-1.6.0.ebuild b/dev-ruby/erubi/erubi-1.6.0.ebuild
deleted file mode 100644
index 19f35743eacb..000000000000
--- a/dev-ruby/erubi/erubi-1.6.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a ERB template engine for ruby; a simplified fork of Erubis"
-HOMEPAGE="https://github.com/jeremyevans/erubi"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/erubi/erubi-1.6.1.ebuild b/dev-ruby/erubi/erubi-1.6.1.ebuild
deleted file mode 100644
index fe78ab299eca..000000000000
--- a/dev-ruby/erubi/erubi-1.6.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-RUBY_FAKEGEM_TASK_TEST="spec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="a ERB template engine for ruby; a simplified fork of Erubis"
-HOMEPAGE="https://github.com/jeremyevans/erubi"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/erubi/erubi-1.7.0.ebuild b/dev-ruby/erubi/erubi-1.7.0.ebuild
index 8c26ac854d53..80a72c3bf58e 100644
--- a/dev-ruby/erubi/erubi-1.7.0.ebuild
+++ b/dev-ruby/erubi/erubi-1.7.0.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.rdoc"
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
@@ -17,7 +17,7 @@ HOMEPAGE="https://github.com/jeremyevans/erubi"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "test? ( dev-ruby/minitest )"
diff --git a/dev-ruby/fakefs/Manifest b/dev-ruby/fakefs/Manifest
index 1202dfe490f7..26aa1596eb15 100644
--- a/dev-ruby/fakefs/Manifest
+++ b/dev-ruby/fakefs/Manifest
@@ -1,7 +1,9 @@
 DIST fakefs-0.11.3.tar.gz 44888 BLAKE2B 498dbcbe12389f27b6c6776425910f91ccc45ff85db1fa59e4fef8635dc9923294dbc979df2d10846d1435e81ee6d622190d3195399a4778d00bd4446edd2571 SHA512 9c9e18337d3c461fe4b5a4e6ede17cd840959147e66a57eb61fa203d8ba95d5655885d3e5b776ecb3a1cee93488dc711d1b2bd28df23bc131195e311229c329d
 DIST fakefs-0.12.0.tar.gz 45573 BLAKE2B 8fabed4ae113da67a3e7b61c6b4c400d1e20509a5e9cdd4f865b5c0539a0840fa4d94899c58841d8158a431cb8f370973c89488d3929b43f1080d53283f7266b SHA512 623a8b150d2b1a324eb5f349c89eb4dbd0dd84a4efc3305ab6e53d45b8513d6272368ea0d8db9c57eeda0a2c68617bad57f27ff2e6bad3fb3342aace591bfa77
+DIST fakefs-0.13.0.tar.gz 45866 BLAKE2B 0c31b6672aed70d00b5372a6b43045ebc1037126b81fe8cae8b139c1298fe833b42b09255f3c64148a6073d0205759786e401c6c34cdb5054295a2f654ba2584 SHA512 9df14a3d7ec2cdd92126eedf7663460caf21ad017f5db8a941fe8489ca3e3d16b8dd5fcb41d92b45a2895d18e18c9dd705d70e9b2d7895edb2f4430be7e6a0fa
 DIST fakefs-0.9.2.tar.gz 42792 BLAKE2B dc2037960f9aa05f62e09f8fb98f7b115c6f63af56436573ce88bc66fee2cb42f1e362ceb2de7f17b21701b884ad8bc7c6ef5170a7441fcc16fb16977cbb1b4f SHA512 ba68f9d240d54379ba8b16dcb3e375b586c50f78a081a916151d21af2d6d8b61471fdc842ad91d1390e8dcf54b0744e95ba4794a5ebc915858886ec47f9dbb8a
 EBUILD fakefs-0.11.3.ebuild 1104 BLAKE2B 948485c1436e46487bc462e4201e4059bc82ce1456dd7f1d00ec57e42f96cf6c3fd377bf82a0e0d6e207c621052527c211fd4c86b20dc90650f804cb0e6c3162 SHA512 51c7922076ef3954fd669994124ba08465a94c5ad668ab0cc2d69d4af03d3687404c1c22f790039d38635e7243648cb877e1e03d256e94396684452c45a03bbe
 EBUILD fakefs-0.12.0.ebuild 1104 BLAKE2B d0a7970702ab9fef9e3666d69709e06c7241e0c9d81f4fde6533a44fe1e001bd97846646641c72f5b3e21f3e87d5b3abcf0d3ea8bcca6ca85c93ed3ce0a541b8 SHA512 9819ba0565b28adfc23239f4199a6643814fbef45f28f080e3d48e7cdd21f395dc84556265513f0e81dfe421ac0ff2852a422292f65d5b45bee814ae1f0cb69e
+EBUILD fakefs-0.13.0.ebuild 1104 BLAKE2B d0a7970702ab9fef9e3666d69709e06c7241e0c9d81f4fde6533a44fe1e001bd97846646641c72f5b3e21f3e87d5b3abcf0d3ea8bcca6ca85c93ed3ce0a541b8 SHA512 9819ba0565b28adfc23239f4199a6643814fbef45f28f080e3d48e7cdd21f395dc84556265513f0e81dfe421ac0ff2852a422292f65d5b45bee814ae1f0cb69e
 EBUILD fakefs-0.9.2.ebuild 1098 BLAKE2B bac77ad94c7ab488f0f3dc7cb12a8f866b1df2054a0f8bb55491da01b98d2cac68a882d2652a46e7fa64ab993d41627180dfad9c1270d2ddac8c2dee45e36b00 SHA512 ce41610a34f6328f6ddca9777952059f791db5f1d3b52c094d36bb6e6671be64f8ab0cbc3290c7e3127786ec481810ecc238a656aff383dca291ca6945564fb3
 MISC metadata.xml 340 BLAKE2B a31a62212f53154af4d3dce332d30eab8433785cdcb07531f743a5d48f3e7d9dc55580651cdcc765d4dcea5d27e78902624d475f8ae052efc6d9c2eea8b57d0e SHA512 1369c8941ac7aad5dd54222a870a5d173194c4f241093864b25abc1ca97e9f55d8fe928157c11ed63d2281352bbdbf6779cbc00abaac206fd024385ed5eb8478
diff --git a/dev-ruby/fakefs/fakefs-0.13.0.ebuild b/dev-ruby/fakefs/fakefs-0.13.0.ebuild
new file mode 100644
index 000000000000..738412468a2b
--- /dev/null
+++ b/dev-ruby/fakefs/fakefs-0.13.0.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby22 ruby23 ruby24"
+
+RUBY_FAKEGEM_RECIPE_TEST="none"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CONTRIBUTORS README.md"
+
+inherit ruby-fakegem eutils
+
+DESCRIPTION="A fake filesystem. Use it in your tests"
+HOMEPAGE="https://github.com/defunkt/fakefs"
+SRC_URI="https://github.com/defunkt/fakefs/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE=""
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/rspec-3.1:3
+		>=dev-ruby/minitest-5.5
+	)"
+
+all_ruby_prepare() {
+	# Remove bundler
+	rm Gemfile || die
+
+	# Avoid unneeded minitest-rg dependency.
+	sed -i -e '1igem "minitest", "~>5.5"' \
+		-e '/bundler/ s:^:#:' \
+		-e '/minitest\/rg/ s:^:#:' test/test_helper.rb || die
+}
+
+each_ruby_test() {
+	RSPEC_VERSION=3 ruby-ng_rspec
+	${RUBY} -Ilib:.:test -e 'Dir["test/**/*_test.rb"].each{|f| require f}' || die
+}
diff --git a/dev-ruby/i18n/Manifest b/dev-ruby/i18n/Manifest
index 6b8cc4ab29d3..728faf0c84c0 100644
--- a/dev-ruby/i18n/Manifest
+++ b/dev-ruby/i18n/Manifest
@@ -2,11 +2,9 @@ AUX i18n-0.7.0-frozen-classes.patch 1126 BLAKE2B 4cfaca964ed676d4b35b7e2aadeec36
 DIST i18n-0.6.11.gem 61440 BLAKE2B 3cfee519dd006578a328ec80d216ddae56433e1cb633e773826a2425df5ba6c518290438180af7c11c8eee4a69d1f38cd6666819d5d4b401efd026038492d853 SHA512 f3c26c13b333daed69dc044985816d79a27a489c860caaa03cd64b3ff31e3ea65aa850dd581162a264d0b0bb6bc383b12cb96c1a97d5d1d04bee45517a48b721
 DIST i18n-0.7.0.tar.gz 57647 BLAKE2B 50ea36ec616b90a261151cce47c98250e85b25ae75f90eb52ea01e8bb7e0c6288abb9055a4f80a199deb93c9ca66efd1ad568950d3f505206e0ba9ee9cdb8bc6 SHA512 8824feb3fb99bba759963d2ae34555f27b85dbac3d3001168471a27e47fc805e5ffe5c3b4e10d6ca4b2e2524ec16c98260b981ef504f274aab93f912a57d2e14
 DIST i18n-0.8.6.tar.gz 59657 BLAKE2B f0ddbee202daa4ac75f00113aa8bcac44797e782072a9626125497c9eca0545dccb2228c2d634bf0b9daab0339196c9d0cdd2df07285bd3792c9300353a60e53 SHA512 fe55729b5d9d2af7112d030c020257a98e7504aa554f691a759f5abe48058949442296ec154060d4a3243cefe0d6d420417f3aa8c857e3616de9bc996decc8cb
-DIST i18n-0.9.0.tar.gz 60524 BLAKE2B 2dbe952bc0781cc6ab5d0aeb6a0b2f4b7fe385cede3bdc84ad9a664e36e30109bc44efbb53ffefab31dcad5d39931dbcb510a0f6d98cc7d4a9740ca9d9610ca3 SHA512 9be199e3cf78879bafa11f80425e5ede710b5df180a81b89aafa56fe74dc9adc209ef021d5e8d4cae8d03478dc19388279316fbcfac366c0d682d41c5727e978
 DIST i18n-0.9.1.tar.gz 60359 BLAKE2B 98201124b557dd7e77ea56c491a99274f90853eabbdfd8217cd3a27888ddaf976f76c14fc2236609283546117b0c9837e272fc44aae0ff498ab7c557d6f036f3 SHA512 9726dea0b5aff12e6ddf499ddd5dea0853d345241b1ff19d6f97106a3f5f592b3336d2afddcd0717d15ed04c8098a8f9ea2870f1388353e073f78add2f0a77a5
 EBUILD i18n-0.6.11-r1.ebuild 1325 BLAKE2B 6f0fdfe1af9f5c11e36f6f4d5090854f9b61752059053b143f58f63dde4eb160d79b36c71900b83cde941ae69bb2d777af999fedbe1d48b39846c11681aca5ce SHA512 0497dbca374d5afd9e7064335457fca6fdc8daf2d20bc550bc04603748f3818e9d44799ac510004afc304ecfc1774053d8928d9352da62e5d4197081791010fc
 EBUILD i18n-0.7.0-r2.ebuild 1514 BLAKE2B a027548d166ca6bd176d3cf2c7728fb0b6a22445ac22cf9e6e628a1d77f65d6c5f7262149cfdf6f22b83aa2c7a0fdfbc30d948466adc5885a2eeb58c1cce7360 SHA512 fe0eaaeda79550bd120e08fc6adf0a17d6e437e2682578dbd7dad08145e4188b37ea7f0a590d27a3548fc6b2e2989210957e39b94fe2f570234f5d7c06bfeff8
 EBUILD i18n-0.8.6.ebuild 1350 BLAKE2B ccc38b18a766f850c3dbc7bc092b805ac15d9b7505e8443d5e39269d4f6e800d75dc09921ecd8123644b43f377573431e87aa58f5ba3624a177efddbefd6a2ba SHA512 6466ad5af282db56c980b065378ce87ad3a6495079d2f0436cdfaf1e77bfb3fc8ed120bc0eefec55d27dbeced6ac1ccb687b53fd02aebe107cb131e8a9f1ae37
-EBUILD i18n-0.9.0.ebuild 1394 BLAKE2B 76d91f7423925d0b6711cbfe2321758c3afd627ffd5715761aad14174fbce284a335813b27e5cc83b052e024d7b3562d19077e08fafaea46bd28b003274ce12d SHA512 22ff3a7d472c7a5c2f6917ae61d556c354fad4086163acdb73a765cb48eda312efb49b2627891f86b1a9cb6e3f049a295ab32f1a0566f8bcf0b46775a5fb837d
-EBUILD i18n-0.9.1.ebuild 1394 BLAKE2B 76d91f7423925d0b6711cbfe2321758c3afd627ffd5715761aad14174fbce284a335813b27e5cc83b052e024d7b3562d19077e08fafaea46bd28b003274ce12d SHA512 22ff3a7d472c7a5c2f6917ae61d556c354fad4086163acdb73a765cb48eda312efb49b2627891f86b1a9cb6e3f049a295ab32f1a0566f8bcf0b46775a5fb837d
+EBUILD i18n-0.9.1.ebuild 1393 BLAKE2B bfd42402e4c243c86285c6ee40019454595a17b38a338b1f7bf5794e23aa275c3b6ce7a5109f878490b6ac9690852a58977644f9b2f14b81f368df3d381495d5 SHA512 ed277f52680d78f7f790c2008bdd1a65c7c326c2d3ca265348c492f89275c1e90880605af61c641aef02e12cb50d971bd8bf3694bedd395929405115675a559b
 MISC metadata.xml 340 BLAKE2B fd50e1569f22c70ba423cfd181cdfbad5348aed4ffc751ff04d38db0e3c64ec0e3d7501fd134401337337549509f7501a23e36b8a9bdd99a18a374885f8c8596 SHA512 09bf74eefe2371ac635fe302efe1b928e37cf0e1da0979f629085f357bc3e93ea87407781ad172139166f21cb979dbbc7e1bec013f8fe0a760cbbe94ab23ac64
diff --git a/dev-ruby/i18n/i18n-0.9.0.ebuild b/dev-ruby/i18n/i18n-0.9.0.ebuild
deleted file mode 100644
index fd42d43ee0c1..000000000000
--- a/dev-ruby/i18n/i18n-0.9.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_TEST="test"
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem versionator
-
-DESCRIPTION="Add Internationalization support to your Ruby application"
-HOMEPAGE="http://rails-i18n.org/"
-SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~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"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
-
-ruby_add_bdepend "test? (
-	>=dev-ruby/activesupport-4.2
-	dev-ruby/bundler
-	>=dev-ruby/mocha-0.13
-	dev-ruby/test_declarative )"
-
-all_ruby_prepare() {
-	rm -f gemfiles/*.lock || die
-}
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby22|*ruby23|*ruby24)
-			versions="4.2 5.0 5.1"
-			;;
-		*)
-			versions="4.2"
-			;;
-	esac
-
-	for version in ${versions} ; do
-		if has_version "dev-ruby/activesupport:${version}" ; then
-			einfo "Running tests with activesupport ${version}"
-			BUNDLE_GEMFILE="${S}/gemfiles/Gemfile.rails-${version}.x" ${RUBY} -S bundle exec ${RUBY} -S rake test || die
-		fi
-	done
-}
diff --git a/dev-ruby/i18n/i18n-0.9.1.ebuild b/dev-ruby/i18n/i18n-0.9.1.ebuild
index fd42d43ee0c1..97946c9477ba 100644
--- a/dev-ruby/i18n/i18n-0.9.1.ebuild
+++ b/dev-ruby/i18n/i18n-0.9.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/svenfuchs/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~alpha ~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"
+KEYWORDS="~alpha 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"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/concurrent-ruby:1"
diff --git a/dev-ruby/listen/Manifest b/dev-ruby/listen/Manifest
index dc01b21d093e..8929bca2116f 100644
--- a/dev-ruby/listen/Manifest
+++ b/dev-ruby/listen/Manifest
@@ -3,6 +3,6 @@ DIST listen-1.3.1-git.tgz 35521 BLAKE2B 6b93daff2b3ba221d0c0f196c67353963e983610
 DIST listen-3.1.5.tar.gz 51250 BLAKE2B 8ed941ed72293fad3327f2fb939920f82b02a9c0f25e8b1273961d9bff64830d619e9e97c184e353b69a78fe38be01a2fd2f0453cf94d3ca9fff66e40d18f59d SHA512 132266485d70002da5bd1e680530331db6b74e8ea12011d60a6ba7df0ec045459b5b3a6305bb2ea6a80ff6a4a1244ef935a4143f6c8709df7a176d6db69da08a
 EBUILD listen-0.7.3-r2.ebuild 894 BLAKE2B 7c3223adae2b7852ea9d9bff70e018e37f1f26948842105e4f59763b0069e51f5b3f2fe7800c3ed16f55d7f8762fe0de612cad50084c0a99bb3f2eee6dc9f8ef SHA512 267964667edf9c79b1a0652d32a8827f46a4307cb59245ecf9fd246a212ef0c7046f8c7319e352929c7836f71749b4344fcd74e90c63491c55abaac762a53a5d
 EBUILD listen-1.3.1-r4.ebuild 977 BLAKE2B 45c6d8c6d577e83d5f5d5af5172617875c83a51a670b9947e89c9c250eb05f1c6283a821bd56840f7586545ba14a3e295d04cf789df9f407e6aa7f61daea70a0 SHA512 9051c534210cd5e7a9eac6a38e7d0c3f2a01cad620866fa5e6177d58c69a1610221b131d174ce073d198dac2a797404127a61602ed2a3549042acb0401775631
-EBUILD listen-3.1.5-r1.ebuild 1224 BLAKE2B 5911a6ea57ccc430d14368d9a465df760e2f6ad8bc2a1ed76b847ba8e3f5dcdf84c08d025d141adad21d17ad1d41102169276c3f7f07af6fe0dfdb94de329537 SHA512 ce667d1911a8320f71b008e9e0379a4226bba2c2498fab1aae210953c6a551a8492fa12e682395862226d270efc76ac5a96b217d215a422dbdd79cc56ff08d93
+EBUILD listen-3.1.5-r1.ebuild 1223 BLAKE2B ddb54fe403d3349091c204288b841c874c7925488e33c049743cbf7abde9be26fcc94e37c014cee148fe0bdd1bc19a270a1488af296ad0b49cde2c50612e05f3 SHA512 469d7c81f1d8d925f4c9150be675dd51cddda01a5e115e12dec9df249b231c2f0c4cbcb5dae3b9a33bce8037b4eca737336695d938a046842375896fa52ed740
 EBUILD listen-3.1.5.ebuild 1240 BLAKE2B 05dff2609fffff83d14cac7e29d0db5d766ccd2ee0d1d83d5b1164c8a743c120718167c921136fade76940dab1756acba6c310489c6ca632b0b158b1b74750ce SHA512 aa7a3d783f4a9b3df163a80c7ee957bcdf5d3e6c36b52d1091d1eb94f33729a5448777d7d7fd4f7eea48066bb2d4facc5e4de33236cf0ce01e453d01a8ef1d62
 MISC metadata.xml 338 BLAKE2B aa66734c1150c6a7b21e1c018d4303311955fb6e1eadcdfe16c3ca514b3aad663e4c16399a75b091e614ed87a86b6958577771e040700e01590447d33bd77dab SHA512 f4035107afc1bcbab797e116a0f39e49c9a4034f838878ad448efea9eba8d2fbc4db074db73871550a42c175c9e36a220877d2ed50580828c3180fcc50913288
diff --git a/dev-ruby/listen/listen-3.1.5-r1.ebuild b/dev-ruby/listen/listen-3.1.5-r1.ebuild
index 3c21cb6f8782..165e64e20464 100644
--- a/dev-ruby/listen/listen-3.1.5-r1.ebuild
+++ b/dev-ruby/listen/listen-3.1.5-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/guard/listen"
 
 LICENSE="MIT"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64"
 IUSE="test"
 
 # Block on other packages trying to install a /usr/bin/listen
diff --git a/dev-ruby/loofah/Manifest b/dev-ruby/loofah/Manifest
index e0d831ed2a56..f1ab205c0a8e 100644
--- a/dev-ruby/loofah/Manifest
+++ b/dev-ruby/loofah/Manifest
@@ -1,5 +1,5 @@
 DIST loofah-2.0.3.gem 60416 BLAKE2B 04e37464ac9e2b61fcc838763b6360fe80a8aeec26cc365803e6121bb4a628f17e79bc2426d0b351935dffc18829ab9d37239786fb3192c328f5a8026365cc41 SHA512 1f08bcfa09bf075b4d84707099cce6bdaa986cd6c79f63fc60c8bee4812c5a31cee1021cd314fc2033842d7b01ffe63f5f6acbf271a0db2ee631cd326520d700
 DIST loofah-2.1.1.gem 61440 BLAKE2B adefeb040e0ad6302de3cfdd169cf33c22eb409be519f2acd610d210254295a935a8fc1223200003c27275756c8a3c604fb3c5589e3abc7c5207b457dcc6c349 SHA512 16499113ba3b435ba2cd3a583ed958db7f02604a56d87125341d5c143602ed9755272598faef9995be57f2b408c4696675f69cf5fb15d472c958e16f46c35d58
 EBUILD loofah-2.0.3.ebuild 984 BLAKE2B 77905717b5c8a8072ea9cad4c6dca80d027c7a3de519744626136e842c08fe13c0b587cd474e0690294227b62600eb36dd7d8de79c5199380e27f02b03342b92 SHA512 87531b7b36097d779e08d1fafbadf1c27d37690ff52a967a83ba1ab65c96f991ad669c2d16a9e8bfa0c6ea4b508474b80586e21e9984e40862c730f7d0055f81
-EBUILD loofah-2.1.1.ebuild 1108 BLAKE2B e6d96ff04215bba4be52347c948d39baf4ea60b3ae78de034d30feffef714096b65ae89cd2127c9808c3342b47925093cf9c671093731b276c8bcb1dd43fe59d SHA512 f7cf0d5745e0fcc59bc7625bfbbcd875353e51bbd46a0df49b75aef2748018f053b741004047057671e6e3fb8abc45a3e641d74400d1adc82b653cf169fafa18
+EBUILD loofah-2.1.1.ebuild 1107 BLAKE2B 58009706d88d3ac569f501bf8191a6bd94caa9d2b05ebb4b8779979483ff523d0a2878358cfd3b56499d567d29bd10b11a7eb5fd98354c52dd84189148f5c10d SHA512 f55ddc98fc45569c0c3020f11ff43187f898f6ea9498a750f71e26a1093f074ea0af8ae34266c5b1893a48711ad4b763e70f1644a44ff8c195333988905dd584
 MISC metadata.xml 344 BLAKE2B a3f2ff5b2aab094581e9f6a3874fbc35fde908d210ea6fbe3643bf8ffcae21de206d0d6afa5055ef3f9dc520778aebfe182dc6018bebc19b075e717278b7babc SHA512 dbcf17023520a30b8d578f04db73d0a67851199b31589473c9bddf1d82f6096d78369ce1b943f05cca904f1bdb2a09adc605a3dc5d8d4e64db5df152b89dd843
diff --git a/dev-ruby/loofah/loofah-2.1.1.ebuild b/dev-ruby/loofah/loofah-2.1.1.ebuild
index 361f9f350b9d..01a3d0176180 100644
--- a/dev-ruby/loofah/loofah-2.1.1.ebuild
+++ b/dev-ruby/loofah/loofah-2.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/flavorjones/loofah"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend "=dev-ruby/crass-1.0* >=dev-ruby/crass-1.0.2 >=dev-ruby/nokogiri-1.5.9"
diff --git a/dev-ruby/maxitest/Manifest b/dev-ruby/maxitest/Manifest
index 41f4c5dd23b6..ab0f97116d7b 100644
--- a/dev-ruby/maxitest/Manifest
+++ b/dev-ruby/maxitest/Manifest
@@ -1,5 +1,5 @@
 DIST maxitest-2.4.0.tar.gz 15370 BLAKE2B 1645e818c06c42590e919f73c581407aa38dc4f1ff58fe06c7a5a734c3570a4342c7952cbf5130ca9db66f081a3e4c5d32ca2166d6ed5937474a3bbc093ab13c SHA512 41fc6e8eaaebad76278e19574c48e5192363ef466327e83cfd5a3490b98d157bb736556cde57c01180a353ac383e583fed6433443e24a5a5fb6159ed9821a323
 DIST maxitest-2.4.1.tar.gz 59653 BLAKE2B 8bdaea5ad48d30cef9c07947634b05f6e5cc8f8e74f985321b1878e26cc36680cf6f6c2d069e947342a5f0e2f2346347952e6121198b0b74af31b0d58bef4070 SHA512 b1c1faeda4c670083d3564a0763ccb4005954e018aed4a574fb4ddcba16c943b1da8ae471d8df5aca9c1010a19605d55609186b4ab56c13b033ad67ed6c9eb27
-EBUILD maxitest-2.4.0.ebuild 1310 BLAKE2B 9ea05a562376c513077987377aab2e52b2b0af0104cec093d767e4fab27c0c6bd10d9aa88244e5159db2b1f128b101de64a6e695427833fef571e0cb2296c303 SHA512 e257a1c32ab50b9bd435417c90a15825e7635c8783fa8a4e1a78e803aa684157790abeae1e8b7b81b2f730dab1949dd38a551b99ddbf68aa96b64d8f6b13e1b3
+EBUILD maxitest-2.4.0.ebuild 1309 BLAKE2B 9cbf011c54cb4c8d5fb9d167cc95ca509a60a534ffe399229a15b719ebd28264c123fb0c6fb4c57be4c45a3326207f7adad88a75e485961f782e4071e1663ea6 SHA512 4f6602f895c2b8b6674afdd48ab80457efe781e31c19ebc6a6645e3ec282fe9051d6a64e42cd4aaa3147056c0ed2b496000dd52965be880a4ea288b155653dc9
 EBUILD maxitest-2.4.1.ebuild 1303 BLAKE2B 425fa63a294a2294a5b16e35f7723804d2db864cfcbff3ead296d0f76ffeb72e3784d944bab085ab2d3a34b6eefeec0de420629d86d7fc08e04f280f1b81dd5e SHA512 99f4dabba47c74759643688119b9c538e25861a6549643edcbba2eedae4b543717edc4b0ed2554fba3eb027c3321af9e85bfaffea6c000fc6401df9993820a7f
 MISC metadata.xml 332 BLAKE2B cdef4488ce14b1d8addc2b3f23fa74aa64022d4ed2dfea7a84c85122e357806dd3a466ec2f4fb0fd486373055a78ae579c0f68c90a22b8940499e1ae29c29ded SHA512 ad86da72b8bc8895b0e09bc9e435eefec9ca1738e8b34aceaa959b2431b35c2732c704bd68a02d02c3c88912c20395f8601e2d42ec26f5d15c064893c0ceff0e
diff --git a/dev-ruby/maxitest/maxitest-2.4.0.ebuild b/dev-ruby/maxitest/maxitest-2.4.0.ebuild
index 214f312afe44..97cce974ad46 100644
--- a/dev-ruby/maxitest/maxitest-2.4.0.ebuild
+++ b/dev-ruby/maxitest/maxitest-2.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/grosser/maxitest/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "<dev-ruby/minitest-5.11:5"
diff --git a/dev-ruby/method_source/Manifest b/dev-ruby/method_source/Manifest
index 04fbe594eb63..d9cc05b8db15 100644
--- a/dev-ruby/method_source/Manifest
+++ b/dev-ruby/method_source/Manifest
@@ -1,5 +1,5 @@
 DIST method_source-0.8.2.gem 13312 BLAKE2B a75b2072d85752eb36715e04c490cecc97f02cee9690748775820dbef5f7577e861b2d22839a8dc834c5fffc04653a0dde92ae01d9cf2d0bbbba78cbf813dc7f SHA512 44cf12bf0e47101f4e91b91b62c54e5403c827be5999b739a930e74c4449861a254631935f6a60430912316767fcc74e3f947075b0b0d994dc864bfdb935af1e
 DIST method_source-0.9.0.gem 13312 BLAKE2B c3d3cd541b782a3e4e2aa2b1576d9206338988330a17e9770e82ff9fc3156f6feff9be970f5f5f0cef90ee160a3dfbbd20c1bac34593906a47daa7404895b08c SHA512 4ef6cdf3f4427a7910f9da8e569d9cc2711de449498fe88ea8782379330a5725a4800168b06fcc593c18faa52294836881852768306303ebc658f97c1bec8830
 EBUILD method_source-0.8.2-r3.ebuild 599 BLAKE2B 8eca73b3ea5922378e3a74341295de03335cb8c4723aba7f1eaef937426f7643dffdb89e1984e200d35754125e2f613dc4bd5290399ad2d980e7194bd7fb738d SHA512 0b580020bac3cb83f599eb086c9eecd18dd79ba89d598911021bcdedecbbf49e1f42cdbb5ec322142526c4fbcd851eba7723f25e5bb54b2b4829436018e945eb
-EBUILD method_source-0.9.0.ebuild 466 BLAKE2B 1a0be21a535c7f5bf4b3cd10c4e0eb4d47a77fbf78fff9b19fbb7fba591fc3367803046f7335eaee002ed20904eb42b0167409a2da60a35f0a9f6a372c5e0b56 SHA512 137ee1105e09773fc2b95b26d956cd3146dd9b398a63471e865e8bb9a6498b3806863223810e2f94a38da77a2379a0a4358f6afcb27589f3560a4c3d28dce1f9
+EBUILD method_source-0.9.0.ebuild 465 BLAKE2B 0599bb883477f51c15e1db03bbdd8dae2195cb6b6f369c9f9f7dc62adce4b4e0c2f7efedd7984670ded213d278e0494fefa2637708d488f4a1d2396a813014d3 SHA512 600a33f01a5ec9123fc6868de582d7a0352a96f39234c690f71f94ca958dc844da09e5cbb7d25e8011cdc217ebb26aeac51674b0142ad43c0cdd2e80d122d5a7
 MISC metadata.xml 348 BLAKE2B 055674d709a654248c63bf20a1867646170cd6b9e2d74cf54b6640ed14b5b0255b2e23986ed068a96412b0c288262fd207d0e267b70f356ee048635732f8a965 SHA512 425721c75e37753f9df91fdc628d1cdad2ab61fb9c49af31405df4070bcf429a703b8696ba5f0a596416f7d7f14ccb4285e39afd15302da6ec753a630d098e88
diff --git a/dev-ruby/method_source/method_source-0.9.0.ebuild b/dev-ruby/method_source/method_source-0.9.0.ebuild
index 3bd2f030131e..d92be735886d 100644
--- a/dev-ruby/method_source/method_source-0.9.0.ebuild
+++ b/dev-ruby/method_source/method_source-0.9.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -16,4 +16,4 @@ IUSE=""
 SLOT="0"
 
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
diff --git a/dev-ruby/mini_mime/Manifest b/dev-ruby/mini_mime/Manifest
index b407d9c2668b..ddae0ed2f405 100644
--- a/dev-ruby/mini_mime/Manifest
+++ b/dev-ruby/mini_mime/Manifest
@@ -1,5 +1,3 @@
-DIST mini_mime-0.1.4.tar.gz 31171 BLAKE2B c876d2a2d9d3307aaa5b71c8e453e4579d9d6b7078dc349aeb354b090230c295311b40c9b867b7353295ca348e57a86bc7fa8433c1705183586fb5f31b663316 SHA512 7895ac02fd0cb376241cf6e769428c1587bd4b9a777a6f44cfa6496ddded34c78a253fd9146de883b108a67c02e8cdfba3af1997ba11f6775469c2ac55999157
 DIST mini_mime-1.0.0.tar.gz 31205 BLAKE2B c82b806dec4b726d997ebd916e41d8873919a2c53ef1a6b8b02a94ef174837079552058084999e870944885118ee37127c29aa46c602bdd58fdc85bf473fd0cf SHA512 dbb976fa23679a42a2e28b06eb33f61ec991e7115e9bbadca7d09cb4b247a2345b14a2cb4fd4897aab5ffb40c710e931302d07ea3dff4ee64e935a70c9e88fff
-EBUILD mini_mime-0.1.4.ebuild 690 BLAKE2B 1e3e56659108ad6f762e7626fe7ac49a8be5edc16df68bd93ee60f1de4aa7b0aa74ae986ab3ee105c1b58e354a1d323d1726bc8b74387b73a322609b0fe2a6a1 SHA512 002b6640f04334cdcd80121490613e63b948595dfd9f3fd133dfb8ade0ce3d8c324fd2e1fb4e6a2c38d53dc87fb163ac9ba32a39d2cce36f40734f59fae1251b
-EBUILD mini_mime-1.0.0.ebuild 793 BLAKE2B 0fc63af500667d9d7a6fe07ad8e7b98978bcef01805dfd61235c7037a0ef4ebac0155a1dd4513ed53b60fb87ac149f74074828282dc99e4fa7f89945be51303c SHA512 703add56f73b0a2cd06abf23d42ab92cb7be12a8852a5cb2e2a6002d8e6fb562995ce2cc2f3aa7e029251fe696be500926b09f4e2fa9ed2402b2e72b9646c145
+EBUILD mini_mime-1.0.0.ebuild 804 BLAKE2B daf213b9ede121ee84b06840ae1671eb094fb5a697ac488cb5adc0fa4643b3577768fb3ef8158b60188194d1f88a70876c395f5182db4e27d6bdd44ad5b34e7e SHA512 f6719df0f136718a013a4aa284dc522096ca1cdbc79e783924841d69ebf3475617a5b218c3f3118cbfa3caa831484afa2c7bdde3957120535d3183d7af7a8dc0
 MISC metadata.xml 345 BLAKE2B fc6de1be1e40f5e450d784f3e2e2be6f0339687cf728fd6b63bf6f4fd1927200f3a5262a2fca9bfa5a33310cfffdab9fbb817ea40072dfcecffc963b5193107e SHA512 bbffbfd689e60f39f73d5117f6327b250a917446edc6d0dc14cb43a5fbb00dbeaf6ebd92c090f3e7b2168dfc0c409c58be287acad9243a420bd5bbde64f80c43
diff --git a/dev-ruby/mini_mime/mini_mime-0.1.4.ebuild b/dev-ruby/mini_mime/mini_mime-0.1.4.ebuild
deleted file mode 100644
index 9b24443b1cb1..000000000000
--- a/dev-ruby/mini_mime/mini_mime-0.1.4.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="mini_mime.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A lightweight mime type lookup toy"
-HOMEPAGE="https://github.com/discourse/mini_mime"
-SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="test"
-
-all_ruby_prepare() {
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-}
diff --git a/dev-ruby/mini_mime/mini_mime-1.0.0.ebuild b/dev-ruby/mini_mime/mini_mime-1.0.0.ebuild
index 2437211ae6cc..3eb2f0e7ca07 100644
--- a/dev-ruby/mini_mime/mini_mime-1.0.0.ebuild
+++ b/dev-ruby/mini_mime/mini_mime-1.0.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/discourse/mini_mime/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 
 all_ruby_prepare() {
diff --git a/dev-ruby/pkg-config/Manifest b/dev-ruby/pkg-config/Manifest
index 70e90bc42b41..732510b5723e 100644
--- a/dev-ruby/pkg-config/Manifest
+++ b/dev-ruby/pkg-config/Manifest
@@ -1,5 +1,7 @@
 DIST pkg-config-1.1.7.gem 19456 BLAKE2B ae6f3641181a60aa46a2da63a5343f23c4a41a9499ff5e00b1115ddfb328a4db33db2890d234f5cbc9a45af28aa537e886c776f0a8f24e54e307f637e5a2c8ae SHA512 9f515874d3edabdfff5f4c8d624bbc91e9c5032e79c241412cd073f0a049e35a2e2a660d5503eaae9640286d74cb98510bbbb34f757c702e220f728fba1c2337
 DIST pkg-config-1.2.8.gem 20480 BLAKE2B cc11b5eff30f0f5e1a91e64902931ed540da108fd326fe731b71527c9c4310f55e9002617e1baae4f71a4b705b20cf10f6fa112f8ef56971e82868145d372a47 SHA512 d83a599a48c7d404946054c6846b6cfd9fce2a264c288519a6eccd9787f05d45397dd46300bf97c80700921456318154ea6d44ba32cd159803471073c2a2b065
+DIST pkg-config-1.2.9.gem 20480 BLAKE2B 8a77d1b00082635ff622940cf313e18e9639e22d7cc0cc170ef62b65c69a3f2d98409339de3d8de2c765699734c6177dfa77ca8357090c4f8d805b9cff453f40 SHA512 6b16b741f8efce51623a98a1979b3bc8af18ce6d74bd35f46baafa9eb19bdab50372921f8548a958bc4428f5e9ff0015ca9ec1700065d70bb9fb9d2a98c311c7
 EBUILD pkg-config-1.1.7.ebuild 814 BLAKE2B b6739a0cc7285df5a6db56eca3473742fac6b816e7bae226e1673b473743a9b6cbf655016bc9b5c90aaa9605b73b35f5479604f4bb6b60cae2944345fb25e324 SHA512 5e6e06a783a032ea54412a27780c7837133e295cf3d0becfeb22d0ef7d2fac4b5188d3fe415abb092c827c81efa5ce382c42eced83833b79bef7464d5324e232
 EBUILD pkg-config-1.2.8.ebuild 818 BLAKE2B 0a0000ac94bdf98d9f3708f472acba5f639bf7f4310e6ebb8174ad15f1bb140dea604b56c0be48ee06425aadac496da562ce835d76561e28bc58918375125921 SHA512 6c12988ae40771b731d70027cdb4b77e7d062af60ea9eaf91326c58fd71c247a8e288bbdbf7f651a609cbed6dcf1dd92c185462ae44d3f864b245197739ed30a
+EBUILD pkg-config-1.2.9.ebuild 824 BLAKE2B 9c03eaa53bfaabea7177f1f02b2e2673f99be970f2c896c695bc8de38eadd84e5f47c1c9d7fbba2f2cb8feb7601451e416bfa0dd7c2148755fe75bf6e4b0077c SHA512 a4997b9fef72f9a616e68ec66b05366cac3cc8ca2aaed521f3f64ecf00d28c675a1bc2cf5750a9aadb42dded8f92489414de9ec646661a0e8ae7dc61de28b5ea
 MISC metadata.xml 424 BLAKE2B f3283c73952daca20d85a5421afb67150aae553faa03d653686718ca5216c1a65ab5983fb669cc34003902b0a969275bd22e4d1765f3896c7e25bee301323f42 SHA512 40e700a309e3678157d9da4ef18e8f0178e23aa192949ac06acd6f8026d0d53d4f79c199aaf59e0e27dba17925f44a97ad901e0774c6b70583b24b09254eb8d5
diff --git a/dev-ruby/pkg-config/pkg-config-1.2.9.ebuild b/dev-ruby/pkg-config/pkg-config-1.2.9.ebuild
new file mode 100644
index 000000000000..961b61c5e574
--- /dev/null
+++ b/dev-ruby/pkg-config/pkg-config-1.2.9.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+USE_RUBY="ruby22 ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
+
+RUBY_FAKEGEM_TASK_DOC=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A pkg-config implementation by Ruby"
+HOMEPAGE="https://github.com/rcairo/pkg-config"
+LICENSE="|| ( LGPL-2 LGPL-2.1 LGPL-3 )"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+SLOT="0"
+IUSE="test"
+
+ruby_add_bdepend "test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
+# this is used for testing
+DEPEND+=" test? ( x11-libs/cairo )"
+
+all_ruby_prepare() {
+	# drop failing tests
+	sed -i -e "/test_cflags/,/end/d"\
+		-e "/test_cflags_only_I/,/end/d" test/test_pkg_config.rb || die
+}
+
+each_ruby_test() {
+	ruby-ng_testrb-2 -Ilib test/test_${PN/-/_}.rb || die
+}
diff --git a/dev-ruby/rack-cache/Manifest b/dev-ruby/rack-cache/Manifest
index 14d0446e73bc..542d4a4272ce 100644
--- a/dev-ruby/rack-cache/Manifest
+++ b/dev-ruby/rack-cache/Manifest
@@ -1,7 +1,3 @@
-DIST rack-cache-1.6.1.tar.gz 259823 BLAKE2B 290ab81186c7742649dcbf9dd5c1cac8215e5ff370599b6f6f7d0175d79695524aa873a91db679a156e0b9a83c2a2d0102557d36946a75e047b1b31e959c4689 SHA512 326643c9b438b94e556b38530401d2ef2cda8b86ccc5b2e8bdbd79bcba93cec6124ca425f12b993b9090a11210586f8772b552b4a526eb07c7d91ed71275f2ff
-DIST rack-cache-1.7.0.tar.gz 260355 BLAKE2B e3f4243046f04ef62a8b480c7e162165f55e3e8feb29b36ab7c26633dee479fe5f89866ebf229c3b8667b00e0a2aa6e47ed595b5dc9b9623fd886e8be659eed7 SHA512 efb4a7736747fd088862373205295655c9dad63e5d1c357a5e19fbe8196f4310fd50cd8cb0c81133f6339b57aa8e152733341373756567166df9d59def8d0914
 DIST rack-cache-1.7.1.tar.gz 260613 BLAKE2B fac2f4a476531a3c89e2917e039b3bd27d6b4486b396cfe1de12894bfc1cb2fa7e1739d45b92152e05be243ff1010636260f66b06cc2055ea09c2140ee857d40 SHA512 a4045483b0e10054f8e2dafddb45f72f3d06acde1df9f14ab51f72bbbf16b8e587b3fdb1f0d18a358fd5a46fb7babaa3d4f2b49d26ea1efbaca32cc62d2b19ff
-EBUILD rack-cache-1.6.1.ebuild 1128 BLAKE2B a7e1180d27df9250ffafeb8adfda01f3677554c10f5f4135a17d0bf2a0f2add0f3558e1b031be31e3bbdf88477cee8be3ff766f4dd1817ed4c670d3291b7185f SHA512 b71bf8d99204aff0ab9db0a00e2422050dba348d2f3830f75eebb364f08ff18525b6f81279cde4e5916453ef481b35079bdcc638f863376f1a59be6e76c698f0
-EBUILD rack-cache-1.7.0.ebuild 1135 BLAKE2B ec927c964097b713ebc95305d6c6f35779abac67f9f0063ae0e04d601ad87b1f917a0d4b3a9ddce6a1fb68b53a650b582000fa3aa87e6664b1036a470bcf4d13 SHA512 75b5e44dd868c01a6ca9e59afc0c4cad8a4bda3b037db1f0abfaae3c14eb59129e04c74b414d523fe0f5c11d34c0446867decdf79e1ef874916cba43ffc01623
-EBUILD rack-cache-1.7.1.ebuild 1128 BLAKE2B 356b572873e6db526589e81e3fa3f0d4867004353381a1cefc77207b4eb14951744ee4d2d65632a13019672d5f2de7517235b24932155b5cc3888edaf4421f50 SHA512 82370436901236b8506e65bb0259a7fb713cdff9842cd7787d5cb8710b961409ddcda162496ff5efc3aa2c204f2239b2aa3d0c6b04455fdf1f0ea4fa42f4ff0c
+EBUILD rack-cache-1.7.1.ebuild 1127 BLAKE2B 3ecf72a82c9ea3b9a572d0e2dcc44450f0a6b8f0d499090e56f25dfc0efd85b8b616f6d9bff97c3c7c40f60720d1a8faa94beb5d5c110aa5f77d39a0a4c34060 SHA512 7c6516f274c0b93048ac3d69ac54bed7670bd8aba733da901c684c4bfa0daade8f390d1e431f2be109674c019bdb69916299ea4ce659804202bb80170ec476e8
 MISC metadata.xml 335 BLAKE2B d6f5130ac567d01cf6c3d831149be70ffc68d04d1b115473e6e8a550f392dd82341d72d9ba813dfd33cfa4bb5453ead5506ae75ae6f80cb9f47623e631e7c997 SHA512 3763e8653d06f4f62a253bd075ff31273fdc39edafdd74838c8fe65bee42a9bdfede99c01f236218baf496b910f5aef722ee3d5ff39d26c901e30df1406ecfa0
diff --git a/dev-ruby/rack-cache/rack-cache-1.6.1.ebuild b/dev-ruby/rack-cache/rack-cache-1.6.1.ebuild
deleted file mode 100644
index ee8569fcc8f5..000000000000
--- a/dev-ruby/rack-cache/rack-cache-1.6.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-# no documentation is generable, it needs hanna, which is broken
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
-
-inherit versionator ruby-fakegem
-
-DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
-HOMEPAGE="https://github.com/rtomayko/rack-cache"
-SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.2"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rack:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/maxitest
-	>=dev-ruby/minitest-5.7.0:5
-	>=dev-ruby/mocha-0.13.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' \
-		-e "2i require 'timeout'" \
-		test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rack-cache/rack-cache-1.7.0.ebuild b/dev-ruby/rack-cache/rack-cache-1.7.0.ebuild
deleted file mode 100644
index 20c03920d9ca..000000000000
--- a/dev-ruby/rack-cache/rack-cache-1.7.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-# no documentation is generable, it needs hanna, which is broken
-RUBY_FAKEGEM_RECIPE_DOC="none"
-
-RUBY_FAKEGEM_TASK_TEST="none"
-
-RUBY_FAKEGEM_EXTRADOC="CHANGES README.md doc/*"
-
-inherit versionator ruby-fakegem
-
-DESCRIPTION="Enable HTTP caching for Rack-based applications that produce freshness info"
-HOMEPAGE="https://github.com/rtomayko/rack-cache"
-SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="1.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_rdepend "dev-ruby/rack:*"
-
-ruby_add_bdepend "test? (
-	dev-ruby/maxitest
-	>=dev-ruby/minitest-5.7.0:5
-	>=dev-ruby/mocha-0.13.0 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' \
-		-e "2i require 'timeout'" \
-		test/test_helper.rb || die
-}
-
-each_ruby_test() {
-	${RUBY} -I.:lib:test -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rack-cache/rack-cache-1.7.1.ebuild b/dev-ruby/rack-cache/rack-cache-1.7.1.ebuild
index 191d24cf05f5..12bc9efe3eff 100644
--- a/dev-ruby/rack-cache/rack-cache-1.7.1.ebuild
+++ b/dev-ruby/rack-cache/rack-cache-1.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,7 +19,7 @@ SRC_URI="https://github.com/rtomayko/rack-cache/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="MIT"
 SLOT="1.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/rack:*"
diff --git a/dev-ruby/rack/Manifest b/dev-ruby/rack/Manifest
index 079f9c830400..d00b244668ca 100644
--- a/dev-ruby/rack/Manifest
+++ b/dev-ruby/rack/Manifest
@@ -8,5 +8,5 @@ DIST rack-2.0.3.gem 254464 BLAKE2B c7052ae0210d2c8d9aeaa6e3b5b10b272ea48d6c2601a
 EBUILD rack-1.4.7.ebuild 1557 BLAKE2B cbc32e320f170ee5347549eac30dc2dfd47ff5d7de2277ed2ad2d0f09fef14f41b98194369afacf21179ffc00fe1d28a09c5ce2710918cee500720f6ee96a68f SHA512 b239eb29871e63a8833c59f38d32703ca11463040f2606dadacf43b382b52cb706b0e1e9e223ed1c956d28470c51b8b038492304c657214e7fb8c7b45b61bf74
 EBUILD rack-1.5.5.ebuild 1390 BLAKE2B d02e9894ac29f189ef11dc64c3388dc9e1bc1f160c27f0c0800f6a2fbfc6fe97f91d4d34aff5cd5e61fb237a15dd91fb0bf06377de81609707a32a8d1c8db2ab SHA512 e71a13d85c2bd8513a14fc805ed3ae4795be5de773e9cf9982e7ba3309695f97b221de9a84856ee9e2465c28de88509a1a48e0af5d33b209a0341ad5fcc62ca1
 EBUILD rack-1.6.7.ebuild 1650 BLAKE2B 33d989d656b6b63de13a30e8ba021596107bb19457e3a04142d478a11bc1d45414e5adfcb7b1ce6164049cd3bac6736e59ee9d6d515be92cf4f119b44bc04f09 SHA512 19bf31a91818bb58322c68978825af255fc32a75aa81906de61f436f477b6ab75a96949079de2c68753fed5743b937d2190330fe19f1eaf16fa9d157709a0053
-EBUILD rack-2.0.3.ebuild 1509 BLAKE2B 8274c24575c14793b5f1f30de1ebc66a06020cf8d00c0fc964365ec7ab6ef3a87c2cb189a6ac022007ecfb8d80c5bb78ae5e1806ed50b36e684d2abe5803b6fa SHA512 28f4f90c15376a6a21c9e76b59a4f5040cab78e1b37606d23ff3ebeab0e29f18b27ea8cfd8e9062fc562788f8da96ece43d43bbbbaee45a552f4d8b1a10c43c4
+EBUILD rack-2.0.3.ebuild 1508 BLAKE2B f5f9bafb1ca637b1303cbf44a32b77b1969e8b773408141de007781524f40643fa59e9b37bb8feb92e950fecb7fa4b96f0d1fe4e8db2c9ab9e7cbf15f9dfd1b3 SHA512 e62cc26861382a150c813a39a5aef7d9e41858ba415f03f789333e4e9f64187b506df4bee860abfca3a2c120b2251b416c3058179be47ca58a4138437145895a
 MISC metadata.xml 391 BLAKE2B 5ed2f863a5fd68cf57f25afc2c2efa63df1eb25c4e01087130f70edbbd1b79c655ff7455b73ecdd31e083cd35381331fceef52856f946d24fc3d313705fbaef3 SHA512 7ffff4c4cc64855b0c95e2364fa9cfd1e3b06946155cc8244444f5f4e450abda8d8387aabddc224b94a55ff3d5e42391970e5541923e5aae24f408113a65a5c7
diff --git a/dev-ruby/rack/rack-2.0.3.ebuild b/dev-ruby/rack/rack-2.0.3.ebuild
index 14f281db3471..c701430d525f 100644
--- a/dev-ruby/rack/rack-2.0.3.ebuild
+++ b/dev-ruby/rack/rack-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://rack.github.com/"
 
 LICENSE="MIT"
 SLOT="$(get_version_component_range 1-2)"
-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"
+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=""
 
 RUBY_PATCHES=( ${PN}-1.2.1-gentoo.patch )
diff --git a/dev-ruby/rails-dom-testing/Manifest b/dev-ruby/rails-dom-testing/Manifest
index 2eb9c65c9309..167b929f8a10 100644
--- a/dev-ruby/rails-dom-testing/Manifest
+++ b/dev-ruby/rails-dom-testing/Manifest
@@ -1,8 +1,6 @@
 DIST rails-dom-testing-1.0.8.gem 17408 BLAKE2B 50d786712c8d85426e773d66c6f7ae0f687b6be02579ae52e2a3b61637fd27be08519bee0fd00ca687e7ea2c21ec5633b26e9ef1fefddbe48ea38127349fc1f3 SHA512 313ee52e68878264122aeeb264f2a25eed3b7b1122e1e7ebe0223407e67b6c17e1ce98e6822b5a28fc8b0f3457bbdbe7e3f60cc9d03447a0a1034c151392dab4
-DIST rails-dom-testing-2.0.2.gem 14336 BLAKE2B d7d5087795f69543e8761b02df862c0acbeeccf961a674c0254cec74bd5e02046eeefa4ea7c9328a7c00f9451a214ce23e0eaaf94bbda4f293a7c565ff45486b SHA512 8a4648de9c1384de66e5fbbdc4558688868b0403f7a2b7fe1ba00d920520c488288b144e470a91e7b29234fe0d8501d81f1e58a711a65feaaa955c5cd6220a93
 DIST rails-dom-testing-2.0.3.gem 14336 BLAKE2B 8740433474e88a7cb5be14b4357dd0b69d45a39972136cfe9a4d695d2478b5b535e2b407eb0acc9ec3abd633cb1f8591a634abe6eacd8ec38bba865ad32ed92e SHA512 910549bd42e6651b7160af0a4aaffbbdeaee829aa7c3f3552a73ba985ef1230d5586f5bf723018f2cd8c6d5c6238d045a8f3e686704b6989e5a56664061f6c72
 EBUILD rails-dom-testing-1.0.8-r1.ebuild 706 BLAKE2B f644f6d75cada9eeacd7aac778ca8f40e87a82017f3057abb308a53559aaaefa1521c85363a8174d39070ebf7016eb0b8a1bc60e148486bc26ff2012fd97f827 SHA512 0cac76fddac477998b764c17f8d0dce671d88007a68f50cbc45199163ade47e34ab4cd9ef6cb5a04b21eff2e2e04b2f2e3489578b1eb1026f27d3980d28e0439
 EBUILD rails-dom-testing-1.0.8.ebuild 709 BLAKE2B 267b9341b1f9868e105115866cf4aa0414077e37ae035bdc2b12be320e58cdf93392ad89cd20ce84f2d25506c9fa11417bf10f1d3baeb712a13c38ff5fbd0abb SHA512 e31fc40522a09685b7fb03563a6aa690d94c8ceb55f8f6fd82cfa71308e04c8b8e8fccb2deb6c3eae715b459acc627518c8a34a4440bce93c98a904da31e9f17
-EBUILD rails-dom-testing-2.0.2.ebuild 678 BLAKE2B b09030324c6feb148b5d83953f610c40278288b1ab848c6b51bc30971c477c056646cb6d9812b2ba751ac01e0a6aa5e7b7d8b158334880a152790285929f2805 SHA512 03907c3007a6daec82b939780873f419cf53a555ad1a7915a933a7d595326d62954f12d361d677945f7cbee6bc6d299cb91689ad9ad58387625e760fd199caa0
-EBUILD rails-dom-testing-2.0.3.ebuild 653 BLAKE2B 0c3c17733a14355f80a1fcd4acdc75cbabc6da51d08bcc0163cfad1cea672e0ede50aa66e05dc9d4f6814d89907525c66ef42cf7c5dabaedb3de2717dddcaea9 SHA512 fa151d56e859008bf5619887e68969825769d29e3ada097fd82d78c1eb961a85b5f14a9cf2b8585df7ef66dab6640b1a9ad9debb73f77a20ce969bfe269b999b
+EBUILD rails-dom-testing-2.0.3.ebuild 652 BLAKE2B 317653cf827ce6bb3d29355aa12c73a0c0f3695336dbe4ce614efb327e9e40f384e7bd6a610210bd4e3a618d8a6fb944fd782005566625f3ac6eae59c833b2ab SHA512 dfc5cf8fe92d4a70e994f2abcfa227770765d84f4c598af724dc89cdf46c43ba5cdbdce72a0249c86593b5e7c4e18978010cc79bc69c6da6198862138be3772e
 MISC metadata.xml 350 BLAKE2B 1c2caa318832438e9f00f976edbb95493e9313ecbc0b481cb1ebcbdcac1bd9068eddf8ef6e7becde15efef1e33c6a83a5dcb9b5e20863a6081f10faac65d55a3 SHA512 a0ed76fb694f21c179472ddc7081b3114f9762c65b98cccb47c419dd7626701cbc111205dce3976d54f0fe5811a256da4edd2862bbf075aa62dcc8cd4fbcf21b
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.2.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.2.ebuild
deleted file mode 100644
index c9e061bd2f6d..000000000000
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.2.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-USE_RUBY="ruby20 ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_EXTRADOC="README.md"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Compare doms and assert certain elements exists in doms using Nokogiri"
-HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
-
-LICENSE="MIT"
-SLOT="2"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE=""
-
-ruby_add_rdepend "
-	>=dev-ruby/activesupport-4.2:* <dev-ruby/activesupport-6.0:*
-	>=dev-ruby/nokogiri-1.6.0:0"
-
-each_ruby_test() {
-	${RUBY} -Ilib:test:. -e 'Dir["test/*_test.rb"].each{|f| require f}' || die
-}
diff --git a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3.ebuild b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3.ebuild
index 9fcd8a48d5f4..f79bd5f4c24b 100644
--- a/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3.ebuild
+++ b/dev-ruby/rails-dom-testing/rails-dom-testing-2.0.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/kaspth/rails-dom-testing"
 
 LICENSE="MIT"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend "
diff --git a/dev-ruby/rails-html-sanitizer/Manifest b/dev-ruby/rails-html-sanitizer/Manifest
index f5bfcfc3f4ff..5d6d7ecfb07a 100644
--- a/dev-ruby/rails-html-sanitizer/Manifest
+++ b/dev-ruby/rails-html-sanitizer/Manifest
@@ -1,3 +1,3 @@
 DIST rails-html-sanitizer-1.0.3.gem 15360 BLAKE2B 375cce24dd83b56baa0fc11bc0bed9e843ac694548d103eab2daccb30fd38be19d91782c87530d47dec7ad4683a6e2433152644580a804f8ca42e0b5887f7469 SHA512 84d91014384773389492d7cde0afcdc7e3324320970788d88861f89395d847d2599d1e645177f5301109194805ffb684f591e287f3e4280117738416655d934a
-EBUILD rails-html-sanitizer-1.0.3-r1.ebuild 1019 BLAKE2B 95588b1b6cff4553e6bbada6fc71a865446df1583619c27a64903ec106101e095e2ab5720d8a9574ab2d0bbaadc9463f69c30cb1eaa2a4a077cc6f0c333f4ea5 SHA512 c4875264aa3ae8c582116dbaa1f9e9de9b1bb4abb03d0c97fc367c5dc09f4ef2a96fc227410118616d6e7e0b947f6850f3e4750abfc98bc74fa56d2c47ef6433
+EBUILD rails-html-sanitizer-1.0.3-r1.ebuild 1011 BLAKE2B 47a285dce008bcffccbdc6751b6990f880350402ae9533b73a7b3acbe463727fd230c149838a7b98f925ffebf14b88ff9dd02fa49f7220613ba76eae9c21ad70 SHA512 6117a1ada5e713aef1e04f4281174d861e81bd5862e5fa1b0f3e1cdc29f8c1ce360b2c10fcc5d762886f928cd49c11b9073edb5511bb84a1168c5ac45c4cd9e0
 MISC metadata.xml 359 BLAKE2B f227b45aa66e29d5ad9fe902cbd05ff8d41b6ad06ea0acbf812595b936897db899436a788fb0af5143303f0ebe6f18de1f2d265c337e57d616bdbfc7b1fdfcd5 SHA512 a7b934bec0d958559083b417dac76c3ffee71d9efa912b6bab2c2c01e6aa9acf39a46d71fff54a9b750afe6f59a8eb4b12c10b5cbee62fc5f32dab29911f4bd5
diff --git a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.3-r1.ebuild b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.3-r1.ebuild
index 2528ffd9528c..14ffa3593343 100644
--- a/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.3-r1.ebuild
+++ b/dev-ruby/rails-html-sanitizer/rails-html-sanitizer-1.0.3-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
@@ -14,7 +14,7 @@ HOMEPAGE="https://github.com/rafaelfranca/rails-html-sanitizer"
 
 LICENSE="MIT"
 SLOT="1"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
 IUSE=""
 
 ruby_add_rdepend "dev-ruby/loofah:0"
diff --git a/dev-ruby/thor/Manifest b/dev-ruby/thor/Manifest
index 4ee3b27e9072..adf7e46848f5 100644
--- a/dev-ruby/thor/Manifest
+++ b/dev-ruby/thor/Manifest
@@ -2,6 +2,6 @@ DIST thor-git-0.19.1.tgz 86389 BLAKE2B e5fdadf13639c93cf36d8ce3c0124eed5bdfc7385
 DIST thor-git-0.19.4.tgz 88733 BLAKE2B 8be54310cc4bf4a0308e6b103832831b89285003bb22a679986cd02636aaee57a25aa606f3e99bf532961a4e1d3625c46bfdb874a09f66cab85a21e5f7ed22d6 SHA512 a5cc52b23806e6104b12f924324960f2567bcd6c73b72ad47c33da222201b0377e7677b996698774de8adf3eff551926393785323ecf46cb59d72eb0e5b05aa0
 DIST thor-git-0.20.0.tgz 91758 BLAKE2B 86e4079a86a9c65852e710e40e49e915afe5522512f061ecc62aed48acc08a5397cc82d45cff7c4b1dd549ec57d8699b9afe7c391ac9ab838d1ba9100f1f058a SHA512 aa5344c94cad7c33dd0582409dbcf9bd109bf97b37131357a4cc8a66317acf8781460e8fe5532b301a74521010be59bb34ac1c68bc01ad3140bfe73fedc2a451
 EBUILD thor-0.19.1.ebuild 1667 BLAKE2B 0fc80a8a6951191c3c109f0bce1c9c1ac9ebc920f02d0749aa03e245100ce061c8aa4ec2e5cde3497ac8e351d092787b49a814624677ad943203e23689822441 SHA512 5c18689a805e35e6629bf4e1c8d02ce934502856f0a9d9ec4da166f14818880b28a83cb344805c25cea29c930cb22c6eda0224ce16fd50624dc727de7cc402eb
-EBUILD thor-0.19.4.ebuild 1423 BLAKE2B 05f02f9d6dce9e3b1142c8532e3a1314efa70fe11af441ce0666414d59d11afbf8c8b795dce462495394e36ccc9d860c3e992c940ccd0e5503760b4abff3fec8 SHA512 25c1e0f3ad31eff8f3159c81a662499758a18393bd9c22186e34ed1960c31040695226e51b74a5b309aec3fa892096f7195f1ac960253edeef5587d1d77741bf
+EBUILD thor-0.19.4.ebuild 1132 BLAKE2B e5db9166c0d7f22271a37ad2eef636b07328b224c291265ad8979ca7602ac9edd2d891de9e1a709a7d63d2f416ade68f5509b1de0c7440d785b6b67d7d9e8221 SHA512 f181e97df6219ef2b641a5132d8b9213805b6ecbd8885ae33fb52d60deebacea16e47019c21961f2e4880ac6f7c57c4e674ea8afb68c4077596b30e6df98b13b
 EBUILD thor-0.20.0.ebuild 1421 BLAKE2B a1bac2cf3a6d71d85611a89fee74870b3c5de62f714f73b2c85ee1c85e8df3b561ef7e3d892a3bf0f8a3e87fd25e7147d57afc43079d5685aa7a5ab28ec0c3e7 SHA512 929003394eadd70193d835c1e40980f25f4abd3788df95e3814fcf448dc717cd64a8494a02bcd59cf0953e4513d3d46ba8615ea2b51009b8801d74429afcdc9d
 MISC metadata.xml 680 BLAKE2B d4b03ac058de229b055e01ee99da7745a8fc67200979f626b55d6156d573269bb260c42ef44d6dd3b391a3e06d46844ef3fcd7cdd1f0d4053957c00bcfb1fd27 SHA512 d4938ad6ec003fe17d09274f39a2526c84d69d447b1e8063e9301000b776496fb3f8fd6d7e596791d9f8d05714e856d6a6d8df2c5c4747420e3221edf48ab264
diff --git a/dev-ruby/thor/thor-0.19.4.ebuild b/dev-ruby/thor/thor-0.19.4.ebuild
index 21005803cb06..58028ada9729 100644
--- a/dev-ruby/thor/thor-0.19.4.ebuild
+++ b/dev-ruby/thor/thor-0.19.4.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
+USE_RUBY="ruby22 ruby23 ruby24"
 
 RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_RECIPE_TEST="none"
 RUBY_FAKEGEM_DOCDIR="rdoc"
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 RUBY_FAKEGEM_BINWRAP="thor"
@@ -19,15 +19,9 @@ SRC_URI="https://github.com/erikhuda/${PN}/archive/v${PV}.tar.gz -> ${PN}-git-${
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~amd64-linux"
 IUSE="doc"
 
-USE_RUBY="ruby21 ruby22 ruby23" ruby_add_bdepend "
-	test? (
-		dev-ruby/childlabor
-		dev-ruby/webmock:0
-	)"
-
 all_ruby_prepare() {
 	# Remove rspec default options (as we might not have the last
 	# rspec).
@@ -45,14 +39,3 @@ all_ruby_prepare() {
 	# bug 430402
 	sed -i -e '/uses maximum terminal width/,/end/ s:^:#:' spec/shell/basic_spec.rb || die
 }
-
-each_ruby_test() {
-	case ${RUBY} in
-		*ruby24)
-			einfo "Skipping tests due to circular dependencies"
-			;;
-		*)
-			RSPEC_VERSION=3 ruby-ng_rspec spec || die
-			;;
-	esac
-}
diff --git a/dev-ruby/xpath/Manifest b/dev-ruby/xpath/Manifest
index b72f2f4233ae..44f2d933ca31 100644
--- a/dev-ruby/xpath/Manifest
+++ b/dev-ruby/xpath/Manifest
@@ -1,5 +1,5 @@
 DIST xpath-2.1.0.gem 16896 BLAKE2B b8dc2b0e207c666446ba5948f6e37c71f410d8a5a027dddd17d5ccb2fa8b0c32f274a34cc144a2380b22266248acad288828114a755d4f04c2a1caeec6ee55e3 SHA512 50d80cac3fd65cbd211d3a87b8844a6607b14c841a1a5609e2370c3624daf719b937a61e526bf31aedee13346802d6bbb721d58bda2bef9c564c187b28bb90e2
 DIST xpath-3.0.0.gem 13824 BLAKE2B 19b41febf466a8bd72cab071fd8e68844c3bf1b2c06ce4aefe6c5a08e4f57ec8f1fd8478c60076a7e6967a85faf49680950f66ab9ebf1d2c47326da40e1f1847 SHA512 fd1e8cfff11e8c14efb1ad2cabb9a0a3bc3d79d40b61264c524ff4524c5e7b9ff86de0746f4530fe7501f5e5e1683cb87c4a479f5e67deb7d8f93ed552ec78d6
-EBUILD xpath-2.1.0.ebuild 578 BLAKE2B b2a736cc4c5e149377bec3a37e517d92ba5ece3d43008285da1ca297ca12d76d3687b577a97f78ff5f775f1d6bd3c84bf740578d5a4073a1ce7095cfffb4c121 SHA512 91c2fc2ee8c004e565e86daaa0f89a1af443017a95c21bc01a43a4bf96b1580ff99513a5fefb7668098ab6fa3fa672e91d00b5ec1916929ab27ee7e78fed059d
+EBUILD xpath-2.1.0.ebuild 577 BLAKE2B 60ac9f6bfb258349526a5132b8e105e0a12313aab9dd008d9be6fbb3bd7cd1e0f0068d142370796390ce9098e9cb223d6c7fddfb36bd2a8b95f9d7f0688f799f SHA512 44c05776c34a3fd6a8c1a2aed721d23dfe28af048c863317af6810726ca785d870ef2604933db5bd1eb72f680d0961022f1fab0fb8c885366d88206f5c2f83f1
 EBUILD xpath-3.0.0.ebuild 570 BLAKE2B f0e78afd3042970da40b93ade4d3a0813ba1005f3a326041aab09258d1413e107242300784e8c9e5c3f52a4104d7c4de48366d70140f972aea4fe33fb0c51341 SHA512 fee70e8701d9dac4d04ace434064caa0bc3bd987bd2ee58962db7c72a761dbc394f4de34206d62f3ce78bfd170c1943a04bd721b4ef72d516b928a7fe2a24bdd
 MISC metadata.xml 340 BLAKE2B 6426c5c5b6a61a7df860473b9636c072c43fde9a6bb986f4504a438abe4b86766934ea99eb001d42b308a2af778dabaa24b3edd5d12dde519029758e1609f766 SHA512 6b3fd82cb8cdcb55a98ede899602193acceabde52e93125adb02f0212b646273dc345867cd2c561de43afee480a19fcd4ee9e8a96287d43278877d4dca543e6a
diff --git a/dev-ruby/xpath/xpath-2.1.0.ebuild b/dev-ruby/xpath/xpath-2.1.0.ebuild
index 61590472fc31..42d459e61757 100644
--- a/dev-ruby/xpath/xpath-2.1.0.ebuild
+++ b/dev-ruby/xpath/xpath-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -15,7 +15,7 @@ DESCRIPTION="XPath is a Ruby DSL around a subset of XPath 1.0"
 HOMEPAGE="https://github.com/jnicklas/xpath"
 LICENSE="MIT"
 
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 SLOT="2"
 IUSE=""
 
diff --git a/dev-scheme/Manifest.gz b/dev-scheme/Manifest.gz
index 7d2e21e297f3..bd2e1bcdb0e4 100644
--- a/dev-scheme/Manifest.gz
+++ b/dev-scheme/Manifest.gz
diff --git a/dev-scheme/guile/Manifest b/dev-scheme/guile/Manifest
index 53f74779335b..a46c9a8e852b 100644
--- a/dev-scheme/guile/Manifest
+++ b/dev-scheme/guile/Manifest
@@ -17,7 +17,7 @@ DIST guile-2.0.13.tar.gz 7808173 BLAKE2B e1d59356173b54595512c0322ac596ccf46f566
 DIST guile-2.0.14.tar.gz 7823099 BLAKE2B e7fa5a4ca19dc4adfcc151350b0ed4e211b8470b0d12f65451697a818c3139a4a5992a019bd213114748230cb15ec755d1af70d42b901230854915c0ee7b05de SHA512 d69c9bdf589fedcc227f3203012f6ed11c327cef3a0147d8e016fe276abecdb4272625efe1d0c7aa68219fe8f29bbced44089a4b479e4eafe01976c6b2b83633
 DIST guile-2.2.3.tar.gz 17266587 BLAKE2B 68751b881bca53e7ab04038483aa8c5a689978d1017e4c944a8142e301e2e13d5ffd2aba73f7b0aa27efd84d068558b96a88452d1e0b79dc04db1921e22a621d SHA512 31df17d28177badf63e1eb0d0d64e6a4d2abe64d4d5e69d8ff33a24dfb10abd25109ea9abfa86f5ff303b43665eb5b8127927f683f3b16139c5b3dc99f06f6fd
 EBUILD guile-1.8.8-r3.ebuild 3106 BLAKE2B 1f080be08e9d7f69292edfc990466c5c89bd8d312889f798c23c9f29e4d3a689c62288aa669cf09111ae639680bcfb38e509a79cfc44b5151be33b6e433d35d1 SHA512 e83ecd2c5939e940a0b7203bb9e1cdb0e38dac1533d3652155fcfbaaa5009cc243859c800214e4aa0512efba87ccaa08f451fda236dfa3cf7f26897b1f9cfcb8
-EBUILD guile-2.0.13-r2.ebuild 2105 BLAKE2B 0ef4bf19c2206c0cea8205f71df84899341a5f72d229873246f4f57d019980db2fcb1437396338d11eb110840ac39b4ae597a0167d5f513e36c61639225d0e75 SHA512 0224ae401033f3bd36aa935984d84021ceddb8aea3bba2da79de6320efc7c6b14035b8e26bebffa1413d42e7b0f6512ba7235007917f181c62329abfee697bb0
-EBUILD guile-2.0.14-r3.ebuild 2252 BLAKE2B 686a2d5def9f6a4ceae1fec61a4d1d52de203f6f50043a51a6ec92aa6d8f854af9c41e70d03cc718feaa65e755c7559148422ec43bd2afe4102c246102e899ef SHA512 01839b756c237dfc3472ac121499717b6f7ff8f7d9f5ffc405aeeb9f4f214fc72f7b5ae97004a52b71d201484de4a93168a137adf4ad27ff54638b6db94c52f4
-EBUILD guile-2.2.3.ebuild 2052 BLAKE2B 4f78bc1dc476afaa7b8bd19118660d9b9d2a62e64bdf51a5f3b26c5a03e66056ee31052f4e3ade962e77dce70a29574740efe3ae44efd376824f5733c320bf68 SHA512 5db83796dcc46be46a6f55456ba2f37b335e648320df54ecad5c5f81b27ed6a536ef436b3c2c4834953dd93e63d7b32bdf75c97a8ca885f5c24816ec66c66b87
+EBUILD guile-2.0.13-r2.ebuild 2107 BLAKE2B 1bb3fbed942d57a410549298d16e933c1daaa0c06d167e53ed8ccd6c1b584ffd72bfba09ba066053497b561977514585612d83d3f46784521dbe04140e6f73f2 SHA512 ba403bede09718d687930d77d8bec64cd16c93531de0234fc4b4fcd2711b97cde63af1b5d1c7a65dbd7619cca94b4923388ac85528ee6fba0615a10f1addd8e8
+EBUILD guile-2.0.14-r3.ebuild 2254 BLAKE2B ad37077c83a48ca5e88203fc4b66ad7aa75b0d5ac1dd19446e67cad018428782ce31cd317d27a7169fc021906170df4e46204a57f12a7c23d86c96e02082e017 SHA512 72e5667cd56c57e6679af0544a8e3f533bc6d393d55dda1058496fc3309eb8e3c9fc0ffa416485cd7187363ab39ff5cf6c4dc75382112f7576b2371a51a4546a
+EBUILD guile-2.2.3.ebuild 2054 BLAKE2B cd3af6f083dbd96eb50db8e65e1c6041bc18643207ef35fdbbd05f3ae9541672138f55c0c4001d9c4bf6567035c9c55dcaf8d2915adcb498c8c7d4aaf98dc30f SHA512 d3f1f1e2165e7c2faddd35e1b1e6e8bae693714c1f47cee9db0fc1bc726d56baab4612401e2f20784c7fea9043b252b0289463e3f754d920cc08266e797ab9f5
 MISC metadata.xml 1040 BLAKE2B ea7db45fc50b1b17b90948224837643278741aa84fe75e7d3fa3716711060f8aef189124d4491238aa0a72c4e0364d940fcf5d38fb4a178ff0ac7c7039138751 SHA512 6c44b82f0c361f23d377e34fd88249c4e601b215c1bb183afb8cac27bf105b314d5138877b05bf3144a3c60f5b240e4e76ca3fabf151e1182cc913825a093cf3
diff --git a/dev-scheme/guile/guile-2.0.13-r2.ebuild b/dev-scheme/guile/guile-2.0.13-r2.ebuild
index c5974166eba0..037cc1595b2b 100644
--- a/dev-scheme/guile/guile-2.0.13-r2.ebuild
+++ b/dev-scheme/guile/guile-2.0.13-r2.ebuild
@@ -16,7 +16,7 @@ IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstrea
 REQUIRED_USE="regex"
 
 RDEPEND="
-	>=dev-libs/boehm-gc-7.0[threads?]
+	>=dev-libs/boehm-gc-7.0:=[threads?]
 	dev-libs/gmp:=
 	virtual/libffi
 	dev-libs/libltdl:=
diff --git a/dev-scheme/guile/guile-2.0.14-r3.ebuild b/dev-scheme/guile/guile-2.0.14-r3.ebuild
index 56165f81bcb4..5450876e2eb2 100644
--- a/dev-scheme/guile/guile-2.0.14-r3.ebuild
+++ b/dev-scheme/guile/guile-2.0.14-r3.ebuild
@@ -16,7 +16,7 @@ IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstrea
 REQUIRED_USE="regex"
 
 RDEPEND="
-	>=dev-libs/boehm-gc-7.0[threads?]
+	>=dev-libs/boehm-gc-7.0:=[threads?]
 	dev-libs/gmp:=
 	virtual/libffi
 	dev-libs/libltdl:=
diff --git a/dev-scheme/guile/guile-2.2.3.ebuild b/dev-scheme/guile/guile-2.2.3.ebuild
index dfac7f89ae86..e2fad703dca4 100644
--- a/dev-scheme/guile/guile-2.2.3.ebuild
+++ b/dev-scheme/guile/guile-2.2.3.ebuild
@@ -16,7 +16,7 @@ IUSE="debug debug-malloc +deprecated +networking +nls +regex +threads" # upstrea
 REQUIRED_USE="regex"
 
 RDEPEND="
-	>=dev-libs/boehm-gc-7.0[threads?]
+	>=dev-libs/boehm-gc-7.0:=[threads?]
 	dev-libs/gmp:=
 	virtual/libffi
 	dev-libs/libltdl:=
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 50778a16a909..86f5fa626e37 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index a035f5e85e20..203da61e001e 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -6,7 +6,7 @@ DIST catalyst-2.0.18.tar.bz2 861398 BLAKE2B 70986d312410fb7abb5c8d7eacefa0f0150a
 DIST catalyst-3.0.0.tar.bz2 879203 BLAKE2B 15c410a38aa5db4b558f18fe84f7ed4c12db26c8af39062728d4217f7d034c694531e4693dd0925848a983345dcd519955226bb9825041556bd0b62bcaba181b SHA512 0f5d5f0898dc070271aab5347d4fb1ad4d44e777a2242f8b80a2f1a5a11e3ba6005754e6af2a6848246ad05f10124e4ce172637c7e2d23eb4f055610456d903f
 DIST catalyst-3.0.1.tar.bz2 877731 BLAKE2B 0c0b67b4be26737fa6d81011a8a63cfd7f2f41e49a81ecd45f3c901ef70d04e0a72295b12609df036dd9be09241c33dda8fa7a204ad074683b18685d027efe2a SHA512 be7c4d6fcf1f41087995a1a3621fb0250dce6d0a96101255c70832d5cf727a94e924d86092b33464fc5e284173704d33d5aa0d0d49dfcce7369befa5fc8de4e8
 EBUILD catalyst-2.0.18-r1.ebuild 3119 BLAKE2B 2c5c658caeea4d1f6fa8436273b9da86fdf9fe3cdfb1b94633c320c1a415c39ad52b98809ed5020ad0cc240e1f3ecb383a30ff9b139a6090f6fe8a15a1991bf7 SHA512 b7c088b0d52a1ff3805727379ece6ee9077e2e7359454d81f4d0dff0013322b50b9049d5d19ca0fd655e5bac2f5f1b74047d26d7a6fbec681a977557022c8b1d
-EBUILD catalyst-2.0.18-r4.ebuild 3287 BLAKE2B 36a68bce5a1bd41473ee67804d6d99223eb774b7ce89e88f6588cf2f57d70652f52727c512e4724bb2eeb958bf6e94c6f49121ff13204f9ee20c7a35fe63cb1b SHA512 6f091b4d783281c48daacd65dcdc88f791f76250760a9bffa33f8086a25ba5866c4e6b3ba14a8c610accb924019435c4b851aeb6383335d9ce58acf6000094f6
+EBUILD catalyst-2.0.18-r4.ebuild 3280 BLAKE2B 4c639f7b4029d603330e9dff0d1b236f3776f634d664124c2411ef5e75eb9136535fe9287fda6ccc912c62a6798410334c987a67f42421c3ae9e6a86b1b7e66e SHA512 14f5b4cac65d683b5395720d722ac8ee870776ff3f1e2a5dac31720bb499f4da20ff084989122341609b7fecf9a508a5c11d2712da71759cba75512753c528ac
 EBUILD catalyst-2.0.9999.ebuild 2920 BLAKE2B 3d64ad52708a6107176d17824c0e0672aeeec1eee8a6070d1a75162861ca91b89db93fd920a07f3d1e5e11a176051653f2fc1108a54ac1f7093481f22723547c SHA512 8b034a56f52a4c10edc696689c480ed5737f59bd23f5f84ac7535a78d82bc488dacedc62b406a2895ef0b450c02027522dcac8dedcd4677cd6123ecd795172e5
 EBUILD catalyst-3.0.0.ebuild 1680 BLAKE2B ac456283dc3d7f16811b7edeb9a4e674da723ab3183dfdc6f79e7231598c3b326f737c8f5ef61064e13bd3586e9fcf33fca586207e8bed273f57c7c0930512ce SHA512 e71fb731b7d007bc26cf65eb85a23902378da0d7c931dabdeb4f5201f399a1555151cfbcfe19c4620467b0f3ad910e79456dd7f3bbf875e1b2705cb3ec1e246b
 EBUILD catalyst-3.0.1.ebuild 1756 BLAKE2B c603a8fe69ae249700eb62e3ff45e338cf61758692cd6746d51833a24eaba10cc0b9d32deedbbf336efc1cbfc5571a7c40cde33be63191697f0cce9d3d4f74df SHA512 5f3c60d668c6aeb27987f32c71cfeee29d4a56bf3d48e2ea906527ef221638010512ac3bd00065591ae7aba71359cf2730078a33db883895d116fa95321519ef
diff --git a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
index d82b44c26066..3cf2b1bb66e7 100644
--- a/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
+++ b/dev-util/catalyst/catalyst-2.0.18-r4.ebuild
@@ -14,7 +14,7 @@ else
 		https://dev.gentoo.org/~mattst88/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~zerochaos/distfiles/${P}.tar.bz2
 		https://dev.gentoo.org/~dolsen/releases/catalyst/${P}.tar.bz2"
-	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"
 fi
 
 PYTHON_COMPAT=( python2_7 )
diff --git a/dev-util/debhelper/Manifest b/dev-util/debhelper/Manifest
index b9d68f782094..7ec92cb21ddf 100644
--- a/dev-util/debhelper/Manifest
+++ b/dev-util/debhelper/Manifest
@@ -1,7 +1,7 @@
-DIST debhelper_10.10.9.tar.xz 431480 BLAKE2B 579a88a45aa74dd8097984bcfba16efb523f8ef5fb7cef8d43433cecddafafabbcb717439aedb847940c382da4f86d7448dbddecd66cbe9a567a9e389476c512 SHA512 45c1357c0e34083f6bad070973d58bdc5388cf7dc71152fce684e38158674baeb436e2d7577d3b5e43918e0788d80968ca6e6e1ee303ea4d3b79be3d55f32e9b
+DIST debhelper_11.1.2.tar.xz 448676 BLAKE2B 52e79349449c387f48cacedfae334c241b8e0187071aec1ec571a7fc04a4bfd2a9ea9c54f7cfa75ec96a01ef5d2f859caeac317f53b72479664d4f2670d44a22 SHA512 26cd04eef4cb634b1424b7d08bcc61fdae9b18a96753680658ed412e51c9124b33295e79f3aabbb40579a9d4bb059b526428b97c151d9f34ae93b615b64291bb
 DIST debhelper_11.tar.xz 439268 BLAKE2B 45c1eeb046a6fbc59b814f696c7320b344ba3cf1ba47b02e9aafd38f88e72943eaba0c0625115fc35cdce9cec0f01232278956644f02b632beda2e2d052ca1aa SHA512 12eabb2f02df24a2c1d8db8e1d88ecec2fce1547c21e99f99bf89f5a44ebd71d09ebbb7e19e0e30ca7e2f17b252769c79968d81989ab7330f870b7ee42e13521
 DIST debhelper_9.20160814.tar.xz 344328 BLAKE2B 38791ab3dfb74d12e44226b79a377889911a08505cdb45cc0a6e653906edbafcac1038d1d9ff9f5fd9f714ed36681562ce7fb1c9c1109a8528523100128fced6 SHA512 63072ba35ec8c62ee4c4d44833712925264c808a91f1522ef6a73377f2da3d11b285a21ad39158fd44693c801916189261186c8c7b28096719328a81a0a65f62
-EBUILD debhelper-10.10.9.ebuild 1517 BLAKE2B 22ec088254e5d2c13ef506b03422444c3a8b3089d9a857730455fb447a247d22528267528685350cedfbd23af6d9fb807072727202818a50c748e6d0c67c5794 SHA512 f9534629a2c227b4475838be880ec3bad65f6d8a7c0701a7942c2b6bfc1f61572a4c169b89db181ca144fb577b242a4b355e9bbd6a61e21b0739efda61a9d22c
+EBUILD debhelper-11.1.2.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
 EBUILD debhelper-11.ebuild 1510 BLAKE2B 97488758d8f45e3bf1917e238f3b88d472d07852129874273810e90ea7358bb80510c5f0c746cf7ca6db9b17cbf4b6831487bef6f1d32252c8f3840518e4fa2b SHA512 568cf0359d63e344030a31de04ba4ebb1feb60721c66f6e0346544734055c6ab4a152b575fcd67b61b3b6cc9e0c267ec48ba8e4bd1980fd6530a5643225468d4
 EBUILD debhelper-9.20160814.ebuild 1508 BLAKE2B e690fd6e7e568ef0245db0bcc8fbd47131b0bba0bb6c0d0363c2c52b1ab9fbc39b9ff4523c8f48a7a15a0685730fb6af38c82029b35bf3a82ef5fbd7e74d8b5b SHA512 edf4a1242cd0ece4dd3afea0641299fe89be0398a313111ffaaf11f72ce97194e53bcd5cb223d8b271b0e5612704a8f008c06ffc6001198d5e9d39e9a379d411
 MISC metadata.xml 260 BLAKE2B f88f6dac92c60982c9aa64365826d2bc8b5d1933190d4cdb44323f59c2a431add04feceb4e66470e9dd20ae0fab1ac1b5641c8bed429a2d6205b3c7acd6c7738 SHA512 b7f7421081083b48e0aa1d7cff7a776b18d670a32a2af64341332c39d0f531735f86857555e70327e257d51f6e0c97b3e293075bf59b9048ce0c0ec097c36735
diff --git a/dev-util/debhelper/debhelper-10.10.9.ebuild b/dev-util/debhelper/debhelper-10.10.9.ebuild
deleted file mode 100644
index f485cb5d4c27..000000000000
--- a/dev-util/debhelper/debhelper-10.10.9.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
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
-HOMEPAGE="https://packages.qa.debian.org/d/debhelper.html"
-SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
-IUSE="test"
-DH_LANGS=( de es fr )
-IUSE+=" ${DH_LANGS[@]/#/l10n_}"
-
-NLS_DEPEND=$(
-	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
-)
-
-RDEPEND="
-	>=dev-lang/perl-5.10:=
-	>=app-arch/dpkg-1.17
-	dev-perl/TimeDate
-	virtual/perl-Getopt-Long
-"
-DEPEND="
-	${RDEPEND}
-	${NLS_DEPEND}
-	test? (
-		dev-perl/Test-Pod
-		sys-apps/fakeroot
-	)
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	tc-export CC
-
-	local LANGS="" USE_NLS=no lang
-	for lang in ${DH_LANGS[@]}; do
-		if use l10n_${lang}; then
-			LANGS+=" ${lang}"
-			USE_NLS=yes
-		fi
-	done
-
-	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
-	dodoc doc/* debian/changelog
-	docinto examples
-	dodoc examples/*
-	local lang
-	for manfile in *.1 *.7 ; do
-		for lang in ${DH_LANGS[@]}; do
-			case ${manfile} in
-				*.${lang}.?)
-					use l10n_${lang} \
-						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
-						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
-					;;
-				*)
-					doman ${manfile}
-					;;
-			esac
-		done
-	done
-}
diff --git a/dev-util/debhelper/debhelper-11.1.2.ebuild b/dev-util/debhelper/debhelper-11.1.2.ebuild
new file mode 100644
index 000000000000..eb7e5fa626c2
--- /dev/null
+++ b/dev-util/debhelper/debhelper-11.1.2.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Collection of programs that can be used to automate common tasks in debian/rules"
+HOMEPAGE="https://tracker.debian.org/pkg/debhelper"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${P/-/_}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux"
+IUSE="test"
+DH_LANGS=( de es fr )
+IUSE+=" ${DH_LANGS[@]/#/l10n_}"
+
+NLS_DEPEND=$(
+	printf "l10n_%s? ( >=app-text/po4a-0.24 )\n" ${DH_LANGS[@]}
+)
+
+RDEPEND="
+	>=dev-lang/perl-5.10:=
+	>=app-arch/dpkg-1.17
+	dev-perl/TimeDate
+	virtual/perl-Getopt-Long
+"
+DEPEND="
+	${RDEPEND}
+	${NLS_DEPEND}
+	test? (
+		dev-perl/Test-Pod
+		sys-apps/fakeroot
+	)
+"
+
+S=${WORKDIR}/${PN}
+
+src_compile() {
+	tc-export CC
+
+	local LANGS="" USE_NLS=no lang
+	for lang in ${DH_LANGS[@]}; do
+		if use l10n_${lang}; then
+			LANGS+=" ${lang}"
+			USE_NLS=yes
+		fi
+	done
+
+	emake USE_NLS="${USE_NLS}" LANGS="${LANGS}" build
+}
+
+src_install() {
+	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" install
+	dodoc doc/* debian/changelog
+	docinto examples
+	dodoc examples/*
+	local lang
+	for manfile in *.1 *.7 ; do
+		for lang in ${DH_LANGS[@]}; do
+			case ${manfile} in
+				*.${lang}.?)
+					use l10n_${lang} \
+						&& cp ${manfile} "${T}"/${manfile/.${lang}/} \
+						&& doman -i18n=${lang} "${T}"/${manfile/.${lang}/}
+					;;
+				*)
+					doman ${manfile}
+					;;
+			esac
+		done
+	done
+}
diff --git a/dev-util/gdbus-codegen/Manifest b/dev-util/gdbus-codegen/Manifest
index 870434b3a151..ad94108ce279 100644
--- a/dev-util/gdbus-codegen/Manifest
+++ b/dev-util/gdbus-codegen/Manifest
@@ -3,5 +3,5 @@ AUX setup.py-2.32.4 192 BLAKE2B 574320d89095d1452a3eee4404b5ebb19fbed32febf2a154
 DIST glib-2.50.3.tar.xz 7589284 BLAKE2B 8648e5d9e8f4c943ca3ec5a5ec01f380f55f76555bf4ec731e211b33d0e23c29ea2a9323e2e839f35f89f292863df76d4e8c622fc44c0e5905eb904576618dbd SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af
 DIST glib-2.52.3.tar.xz 7679972 BLAKE2B 8d9f6b714571bd04ab9717fbf9ded8556664e43dcdb7dd59436b8b7f1a8a5cdf98e9ce60ca1ead941af1d57688044fefb6c749fa735084622a3482b058864ff6 SHA512 a068f2519cfb82de8d4b7f004e7c1f15e841cad4046430a83b02b359d011e0c4077cdff447a1687ed7c68f1a11b4cf66b9ed9fc23ab5f0c7c6be84eb0ddc3017
 EBUILD gdbus-codegen-2.50.3.ebuild 1317 BLAKE2B 97698b5d0b339ec65e2eb11f6e641b75df60569659cac119417a427043603d0331b7f84df47c68c422d4b1182952b5fc877be41d8ccbae56517e17aca5a6802d SHA512 360162724e4d55bb05c4d048fc42c761b42fee345973f1f11e5d4df86c2f48c6e7028e7f0b83e8128e426b95e2a5c652843bc02ea5fbb6a06a22a940612b5982
-EBUILD gdbus-codegen-2.52.3.ebuild 1334 BLAKE2B 676c03fd97e098d6014c2c4f58178a6f810a205a5fa9610e73a9ad3e86ad986e41eca881f72ebdd7adc20f2b97aa0087444c28608f8cdf7f82f1112adb641128 SHA512 0bea85dee8a9d9c968acfe379f0ba504e3970869b35a74c831e983d96be2f69d7b9c82e3ceb1e4b0fcae523258b2b5f296de2aa235acc7590121a8ab8ed1f70e
+EBUILD gdbus-codegen-2.52.3.ebuild 1333 BLAKE2B c7acedd4eba007272ae7ca0d4b64c36d00adf8ed089983c14aa1c1ae25586561daa15944f9527946f48ea1c422beaa35c4bc1161e7702935fef9e0f382cb9cd1 SHA512 413ab486d6654017ac3898ddeea9481b93c8e0bedefcaddf5e87f24acb9a6883b883ad33d3fc49c6e65d2bd0e2569f8481b0cf4ee606dd6017fce25b4e35d97f
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
index 4735e85999b8..d84ebc1d1712 100644
--- a/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
+++ b/dev-util/gdbus-codegen/gdbus-codegen-2.52.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -13,7 +13,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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos"
 IUSE=""
 
 RDEPEND="${PYTHON_DEPS}"
diff --git a/dev-util/glade/Manifest b/dev-util/glade/Manifest
index 4d90b85607a5..49b2b1116db3 100644
--- a/dev-util/glade/Manifest
+++ b/dev-util/glade/Manifest
@@ -2,5 +2,5 @@ AUX glade-3.14.1-doc-version.patch 853 BLAKE2B b7cad3cc9d49cfe24189ba21bffaec2c5
 DIST glade-3.20.0.tar.xz 3492928 BLAKE2B bab8682ec83a98f7f405a667e9fc9ad4b0fa334e0f1f3b1ba5bd8e17af1c61c65031ebe2fe56b8321df142f5a4d8dec348793bba0fc3c195c6722d635d52a291 SHA512 58c8da3522c75470f5b42492bddd83f61d828fa2a3fb8a78d15813f6d1f1df22bd808f25ae7228bf2e821bacdcc5665b889bac3ea8364c4dac288f95e817e98a
 DIST glade-3.20.2.tar.xz 3535064 BLAKE2B 33e5e9477556ac5f645cf13658ff1eebdaf046c1bbbcf5ac528c00f9b5f76943ede8140cc6a3b73dc27ed96c363208700031306f19478ba0e9e2fbae8319f500 SHA512 45f850ed4d409aaf11153da45398e7974d7b85235bf5d5043bc11755c3e4d1201f59ed854786162a7414f0521c818982560d4e226f93625b9253dc598793118a
 EBUILD glade-3.20.0.ebuild 2390 BLAKE2B 22cd5f2417192d963cbb2ff1376d9fa4b5eb44aba78f53c233dc5fd159fb93fa2c03096d71a35cd89321dd2d1f28092a503a4fd0f5cc8883da76854d9a470292 SHA512 98673ca19010e2a63c5c7c9c79dbfdb65939324004c7be6d8b846684411af444ef1fc499234296bfff24d5f8e03842781378d6099356af8b6dc236e757bdf047
-EBUILD glade-3.20.2.ebuild 2398 BLAKE2B e647eac6105adaaf6f8831b200e1f5095cedb7ec7129a8c1fefd7992c42747bc0f9f939d72f907838b5cf33ff7d3ce53a02bd305d2f67d62b380363794882045 SHA512 0743e8e2f3216d4f2c79d520ae58d8d521f59b60fa5093568c8714a8eb39e54e1533a2f106cd1e34baf5bc87eb53b1bec9dc7c5c0a18cb4d80e5b1e6bd4f0105
+EBUILD glade-3.20.2.ebuild 2397 BLAKE2B 46ea62a8620bdfbef63ffe8621a1ef46a183aff3ccd3d5c49a8b2d50cd069f463e0b17c79b7fb3673a57f2acb409840680d54fa7980f2441e30c4ca0c4d1ea44 SHA512 beaa99674cc7063d278e69309fb1956fa278234e61efb7a0f8df83b4e2d2ab5ba7a0685630fbaf0a8d97722f47bf1fb7b471659aa9fb1f001746c8c288242828
 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
index 2f8c73bbc2ca..2f11faca6166 100644
--- a/dev-util/glade/glade-3.20.2.ebuild
+++ b/dev-util/glade/glade-3.20.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ 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"
+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} )"
diff --git a/dev-util/goland/Manifest b/dev-util/goland/Manifest
index 5ddc7a976443..ace2cf421347 100644
--- a/dev-util/goland/Manifest
+++ b/dev-util/goland/Manifest
@@ -1,5 +1,5 @@
-DIST goland-173.3531.21.tar.gz 213040527 BLAKE2B 57fbc0820fb09aa23ebad45c9f6477469f71f84d3abb9e77eba45a90c89695754a7800ff768b63b815b48a1aa35631af0332a0a9af10b3e6dc6d22c587aef30c SHA512 db2deb4e52fb4135e3fb27c63a181c34acddf61dd2bedf81e50144a85b3e9bcb1a7490532b6841815e2b888c660aa26bc8c3176f83bb30bcf20ec568cdfeb65b
+DIST goland-2017.3.1.tar.gz 213951052 BLAKE2B 019ebf772443dd9f5e81cfb3717f5e4cb19ec3c8a67eb20037b6b72c97bf3e382e073660021aac22c3e6dbef9b71c4642acd026e10f27e09a5c60002cc2fc84e SHA512 b4d0251ede2a80b1cabf6b29e362a1679929d4f24530a88f6bc80482bb8fbd36d0d619d94b0cce45ca2c92142335a84141aa6e54fb42154ac09097e8b7318a16
 DIST goland-2017.3.tar.gz 213261483 BLAKE2B 4c84d073265fc701dc0f34571850c2fab05e2e07479d9dc886af660a097a361a5532cf9078569e9dc8cee0322f92544683e9c05689d025bb39de925a10e05c2d SHA512 5fa8d61850e31c1db82e32d9ccccaad71fc00db85a31bc423384b443819d9dc6f3ba11399c580d8eb9c3fe698b437c13072fc49126359bd405b7d57e12c92328
-EBUILD goland-173.3531.21.ebuild 1040 BLAKE2B a3b68b84a6b726c53ee09aabe65e4d1aa6759cdaf853033219c4a3e773ab3e0765a0d00f2c817e2ed9fa791b350f005352be5f287d3b5b95ba2ecb091ef2e5de SHA512 ba6903ab409c8e4d9023708cb5f16b6304e59cae302270e1055a906bcab52e778c9923265d53aa97c0118ea00d667f39baaaa2ed7840fdda8f26f785313d9e97
+EBUILD goland-2017.3.1.ebuild 1043 BLAKE2B da6f4c5156e10afe541dce7dd6f3221488cc5cc893a5ce198c0a77ec4de7b40e9ace46a3675221dc52ede0c5243ae884fe5f682d4fbed018f29719a7991d025f SHA512 0b15d7f4eef60f271ba5df45d9dadb704b8bb5eee596b3826d871f533c6efe6b1fb4ea90148346caf3d684ec485684cd0c995388487506cbc0cca0f3cbdecf0e
 EBUILD goland-2017.3.ebuild 1040 BLAKE2B a3b68b84a6b726c53ee09aabe65e4d1aa6759cdaf853033219c4a3e773ab3e0765a0d00f2c817e2ed9fa791b350f005352be5f287d3b5b95ba2ecb091ef2e5de SHA512 ba6903ab409c8e4d9023708cb5f16b6304e59cae302270e1055a906bcab52e778c9923265d53aa97c0118ea00d667f39baaaa2ed7840fdda8f26f785313d9e97
 MISC metadata.xml 245 BLAKE2B e1699af4b81d0a5829bac6fec911eb9fe66f9e1030346889cd4bdb27a6327fbe6c75dbf59cac764ecd2940a486cbca3de234861684ff1f29b45f95ddf85bce00 SHA512 ce14e948c06d19eefb8504b77746e191099fd4d66083ad01ac62d874029b397af4edc5940312dac09c9ed18ccbcd98909b93fc0bc463c15db97bf68d13c9fec4
diff --git a/dev-util/goland/goland-173.3531.21.ebuild b/dev-util/goland/goland-173.3531.21.ebuild
deleted file mode 100644
index 3698daaba68c..000000000000
--- a/dev-util/goland/goland-173.3531.21.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils
-
-SLOT=0
-
-SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
-DESCRIPTION="Golang IDE by JetBrains"
-HOMEPAGE="http://www.jetbrains.com/go"
-
-KEYWORDS="~amd64"
-LICENSE="IDEA
-	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
-
-QA_PREBUILT="opt/${P}/*"
-
-S=${WORKDIR}/GoLand-${PV}
-
-RDEPEND="dev-lang/go"
-
-src_prepare() {
-	default
-	if ! use arm; then
-		rm -rf bin/fsnotifier-arm || die
-	fi
-}
-
-src_install() {
-	local dir="/opt/${P}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
-
-	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
-	newicon "bin/${PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
-
-	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
-	mkdir -p "${D}/etc/sysctl.d/" || die
-	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
-}
diff --git a/dev-util/goland/goland-2017.3.1.ebuild b/dev-util/goland/goland-2017.3.1.ebuild
new file mode 100644
index 000000000000..94765715499f
--- /dev/null
+++ b/dev-util/goland/goland-2017.3.1.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils
+
+SLOT=0
+
+SRC_URI="http://download.jetbrains.com/go/${P}.tar.gz"
+DESCRIPTION="Golang IDE by JetBrains"
+HOMEPAGE="http://www.jetbrains.com/go"
+
+KEYWORDS="~amd64"
+LICENSE="IDEA
+	|| ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )"
+
+QA_PREBUILT="opt/${P}/*"
+
+S=${WORKDIR}/GoLand-${PV%.*}
+
+RDEPEND="dev-lang/go"
+
+src_prepare() {
+	default
+	if ! use arm; then
+		rm -rf bin/fsnotifier-arm || die
+	fi
+}
+
+src_install() {
+	local dir="/opt/${P}"
+
+	insinto "${dir}"
+	doins -r *
+	fperms 755 "${dir}"/bin/{${PN}.sh,fsnotifier{,64}}
+
+	make_wrapper "${PN}" "${dir}/bin/${PN}.sh"
+	newicon "bin/${PN}.png" "${PN}.png"
+	make_desktop_entry "${PN}" "gogland" "${PN}" "Development;IDE;"
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-idea-inotify-watches.conf" || die
+}
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index f0b93e4e3094..8c21833d3562 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -7,6 +7,6 @@ EBUILD meson-0.41.2.ebuild 797 BLAKE2B 8d070beaa894b2a3c4c96fa1dd538ec6e32bf6291
 EBUILD meson-0.42.0.ebuild 805 BLAKE2B 7e3a4ca5a0da7e3898575fbbc5d8c6b452b73b7ecd2d3aa8ae59f442d09b64e9eecdef07bb5fffc3fdc372b44a9bd816bcec3c7c0b4e005939943e40e8191122 SHA512 ccfb7dacbb5cb935f51709917060a9c7849d861d8396f3dcb3d39e4f2fd4706232dbff88055d2d61845f21a4f0c5b0726baf943e3b1b12507a1f4d7fbb292c88
 EBUILD meson-0.42.1.ebuild 805 BLAKE2B 7e3a4ca5a0da7e3898575fbbc5d8c6b452b73b7ecd2d3aa8ae59f442d09b64e9eecdef07bb5fffc3fdc372b44a9bd816bcec3c7c0b4e005939943e40e8191122 SHA512 ccfb7dacbb5cb935f51709917060a9c7849d861d8396f3dcb3d39e4f2fd4706232dbff88055d2d61845f21a4f0c5b0726baf943e3b1b12507a1f4d7fbb292c88
 EBUILD meson-0.43.0.ebuild 798 BLAKE2B 2696dae59c445e29d0538d6a8cb9656647f3931f8047fe95e6af1c06ea8797ebbe22748fe2ffffc31dbdeb7e152dde1c87bdd4ebd6f49bcbc3c7b02953ae8562 SHA512 89385f25f16ac8d9b289618eb313c9a4d6e44c11ed71ce5e9da2d2f0b160accd02991ce33d412367c3597c153950ee206a5420362b295971ee2e685cf417bc05
-EBUILD meson-0.44.0.ebuild 883 BLAKE2B 6ff58ab085b6fb618685bcd7a9baee45a9d42b66a3353bb6905fb1a64e1ef8fa2fe746e1963005b2fe5be4d8f24edbc5a0517466a8111dba56fa08831ed9d0da SHA512 28dd2ac2ed97fec08b0463c32c489cb6467599715aa91b8aaa5316aa5d3b7047c5055b140c59f4a20e6d00d55b4112f73dfd614299e0d634899e952cedc2fc19
-EBUILD meson-9999.ebuild 792 BLAKE2B 05d42a8f579b200ad6f230c6b02fa3c4ce0d216bc6e676f7873d179e69057e5d09f52f54402df6d8a8fa65de194259a0f1669cefda2d2b0e3df66dea1cce169c SHA512 1f7ab26089b79546881d031a44b57a98715163bb973e7aae9c25ee10caab24a75fbf4bc8ec1bf0ea561e41ca547090dc22e1026ac027730df6d0a8bab8b7d180
+EBUILD meson-0.44.0.ebuild 899 BLAKE2B 2065872eed39e54e84cb74dbf28f2e8f9e7230f8ce34bd23a6da35a863859510757416bc0dd422de8d69b34a90e72bfa7a18da7d65ae411519242f115a8740d5 SHA512 024e8b698cb4198edea6d18e93e764f74e7f83a4cf908ac23fc2fe688998325d64c08188e493602beeb31bfa04043f3ea04d837b10e23c2e347cfe9d0f24b7c6
+EBUILD meson-9999.ebuild 814 BLAKE2B 1e7439398a08e8059c0fcd046b136b44ee5f2a1c074914592b052737583ea1d9eea130df41ca9c917c0732a6c451fddcf24a86919e1c8bb78356553450141317 SHA512 e987956ed667d35465300d0db312ce05b2c398dc10a731e9ea416d9645c0f1b9dbcfa74196490f2aa8e595488c16702439992ac49871a1fea397a4e6d0d686d8
 MISC metadata.xml 443 BLAKE2B df3275dde920dd96d5a078c34d08793d7e377a64910b30b6620a4365a61005d63ba2dfd630191765c47b52e9b309d95dad18d86a10276308f4253c5faca078cf SHA512 acc217d18494f1f968d25b52e58fa268d6a1931c5ecd03350e84ed8094ce5d0a708ba536688dfdd267ca6bfad103a2bffcfece5bb5bd9a34f4853b5f1f655826
diff --git a/dev-util/meson/meson-0.44.0.ebuild b/dev-util/meson/meson-0.44.0.ebuild
index c9d0ed682e2b..4932f997995e 100644
--- a/dev-util/meson/meson-0.44.0.ebuild
+++ b/dev-util/meson/meson-0.44.0.ebuild
@@ -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 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/meson/meson-9999.ebuild b/dev-util/meson/meson-9999.ebuild
index bd996e33f689..5cacad33d492 100644
--- a/dev-util/meson/meson-9999.ebuild
+++ b/dev-util/meson/meson-9999.ebuild
@@ -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 ~ia64 ~mips ~ppc ~ppc64 ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
 fi
 
 inherit distutils-r1
diff --git a/dev-util/ninja/Manifest b/dev-util/ninja/Manifest
index 3a7cb83ffc37..509d70653edf 100644
--- a/dev-util/ninja/Manifest
+++ b/dev-util/ninja/Manifest
@@ -2,6 +2,6 @@ AUX ninja-uclibc.patch 526 BLAKE2B 732fb8dc79b326a1a4d453ef7d7210dedaca436f19ed2
 DIST ninja-1.7.2.tar.gz 180611 BLAKE2B 9e0b5faaed9dd0c01b3cb22e5927668e985f897c4a448871b3147d4383d562b91f4e4fe304cb61a31d5ee096b58f0c4e4a7c1907ed9637658faa1eafb31cdd72 SHA512 29900d07364d87ad8b9614b82bc1b0afda5ca6522563ab73fb228f206ed6b29b70cf034a3caf5a9b2c0b105d1e076c6b425d93b5d14aa3ca3730d75611212a64
 DIST ninja-1.8.2.tar.gz 185226 BLAKE2B c464c50829a0e9f0f6fd4b860946b14bf07f752adb8e7857d4072a1c1f06977eda283f633041929065c9164377ca769b3293b04fc9ceab583371708a9c4e8f2a SHA512 1650bf9e3eddeb0b0fbb415c2b8e0a7c094421e991fa8139fd77fae0f6ee7ee980b7cf5e98d883c3a884f99abcb06fa26e3980af3a3a5bb6dd655124755782c2
 EBUILD ninja-1.7.2.ebuild 2654 BLAKE2B 6d06ebc1142aa72cc51f6ef11c42b9798adf36c98c778ea660ec88595c6b558458f3b2d4b988cea5c27b9daa717c78334da132eb40fd18ef50b6a70d0050e123 SHA512 715d1473f7515354f0c3f3d8c7017abbf45509c477b1d66f6c4e7cd3d2dac0d85fe68a35feed89c77be4d1d10540039a9966abe35c453d3bb6965709686e0cd3
-EBUILD ninja-1.8.2.ebuild 2614 BLAKE2B c8c1a78c7e6144b59fdfa8b55217205c97400ff3d8d9d8d05c26c9372411602dd4140d78c6f516b2561c25b2cb5ea8a030831ef4956b7912103f6ca830977592 SHA512 d62ed1c6428be682b5afdec9d154255474be55ddfa4bf224133e4978ca80bf2128f447013f623df176a165a53e68c5aabe261ad2f24094024bb805d1b1b0b242
+EBUILD ninja-1.8.2.ebuild 2610 BLAKE2B 96dcba452cd3f358a75a73d1ef3422055833aef0f08497cf48bcf20a4e2e8b9d2e871b272202f9d0814d56e0be009962c428e0561600469d91818e8bc6a49bdd SHA512 b82f91e3faf70dd5b345725b1a5e9de68f1929ed3aaccaf4cbce909cbf00bbe068862604fca732f81a6e94ac46e8cd3420470ade28c24196928c664e8f578742
 EBUILD ninja-9999.ebuild 2617 BLAKE2B b39d201c06de2faed1e66931a03a5e3aa7a09e12a12cd2d618b7cb3537054205cc9e137fdc811f6fae3f0cbae1ec75a4a0c69dd880ba1cd9dcf15d27bec790f2 SHA512 510034c91bc8be87f2e267e3d38ef86f0fe27dc8d2ca634e302b47a1752cd7caa379055f91c493d248693ae5c472ca4987870f0f126b41be0507dd0872ebcce8
 MISC metadata.xml 340 BLAKE2B 7cf71b1a09f74328ea74362db4250bf038c0455dcd5f65676ceb5d80a61b5c2923696ecfeccf9d6cd264633e7dc00daa80bf960cc67e5b889d18d487d8e89b97 SHA512 4b78365b98eb9b8a1ef27115261dbf426942cccb7be03c8264e2728e60dedfec8fa51ee3f43488043be5af21b28a74c1c81f4767bcc58574873c2223172447b2
diff --git a/dev-util/ninja/ninja-1.8.2.ebuild b/dev-util/ninja/ninja-1.8.2.ebuild
index a98527082e3a..f956707544f1 100644
--- a/dev-util/ninja/ninja-1.8.2.ebuild
+++ b/dev-util/ninja/ninja-1.8.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/ninja-build/ninja.git"
 else
 	SRC_URI="https://github.com/ninja-build/${PN}/archive/v${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 ~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"
 fi
 
 DESCRIPTION="A small build system similar to make"
diff --git a/dev-util/vbindiff/Manifest b/dev-util/vbindiff/Manifest
index 88b73f81ccac..410580dd35ca 100644
--- a/dev-util/vbindiff/Manifest
+++ b/dev-util/vbindiff/Manifest
@@ -1,5 +1,5 @@
 DIST vbindiff-3.0_beta4.tar.gz 121538 BLAKE2B 2d9d548461497d27eeb26a96135ff0c9e60e069b8bea8f640ae526267bb53d0da3550b8b251cd922b131d1bf499d6c2c0c6353a9e75a94af61256340944afb5a SHA512 6437f107fe58e8343ccd8cb65b3c562d5cb25445fcce284c7ce73fe4a2ed7191100595b9cd0c88d5a630a176f4c4bd374625c97c109a6ee14f1f56ca136d23da
 DIST vbindiff-3.0_beta5.tar.gz 134192 BLAKE2B 9a7437833fef8db4316fd2c67a781868f6aead5ae47c7abc05683545bb3990950a465b1665ff5bc2e7d298465b3b1a427d6d67b43f59bd7dfb112143c9b52d2f SHA512 e6abd5cb93beffa3bc55455dbfbc98f0effc2a6667c8b9c721792c4a274dfe6f35ef121d27506fc9c951a1decb0e69886775fcf092a5f47fda82ed75ef760a74
 EBUILD vbindiff-3.0_beta4-r1.ebuild 512 BLAKE2B 0b23603fd9d90585ab62bea8e128b206fb877b221fdef67aa2a266098755ebb9aa3ebd870d0c3f53fb5c48853153823240a79a9f5cd046893a7ab372a7204fbd SHA512 cccc8ba05665680717ee48ff6f38eeaa12ac8e7eaab1c88f969b0667a027aa10f5c55fa37cd8cf2a0dfe3e8fb6b0e4c300ee022e1ea5d322239d31988ee385db
-EBUILD vbindiff-3.0_beta5.ebuild 414 BLAKE2B 6879b68121afa05dc92827923a0debf7f2234d68a884582002f68394f057f15bafed549877defca598a3504aee2585b853cf9d6e21646a3ecbaf14c073efa275 SHA512 c8e55b4e303fd62a1e286088844978aca56ac3c264cce45bc75742766046df43d172b7d5ad677837057bfa87e1a68ca206b9ad85da652f1ee5a1c05c56a40cfb
+EBUILD vbindiff-3.0_beta5.ebuild 413 BLAKE2B 85e0cb9171cc9594fedfe932ab14ffd3f80a60f33c23ae66a43794a056fa02ab7fc4a3ff0b3d04659614d97ff6d29dbe8e734879ead4987c38752af13166c167 SHA512 a8e14ce4315ab9ebff4df273c347eb3bceb9c20212395b29423dca42f8d7313cc6f38d7fd73f650e39ae5d6c2ece986051686548da83b35adbd5c552f9ec848e
 MISC metadata.xml 331 BLAKE2B e1827fc3619bfde5ed89a9eebb60943e22419a20e89d6ff3441f30195bb05fdafff6549cf09985e43a58712cf5846f9eec82a792dd66505cded6525c1c5235a2 SHA512 32b9763a0137fc5fb36751a38c9476a6f813ff118f4cc0a491dcae75439fb7ce40f934d6d0cffb0397ad11b85373859791622884c194ddddd3bd5bb03427001f
diff --git a/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild b/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
index 791b2b611b80..755647dd488a 100644
--- a/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
+++ b/dev-util/vbindiff/vbindiff-3.0_beta5.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/mrdudz/${PN}/releases/download/${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses:0="
diff --git a/dev-util/wstool/Manifest b/dev-util/wstool/Manifest
index dcde5918d169..adaa9e2cf272 100644
--- a/dev-util/wstool/Manifest
+++ b/dev-util/wstool/Manifest
@@ -1,5 +1,7 @@
 AUX prefix2.patch 1031 BLAKE2B 489bc334d6119f1175bf4ea671644ae1878a680b237c424f73ae99ebc20e398d070716bce1df2fa554da382882385693ead202b19af1aaf979b4eff3639dc5b5 SHA512 747b973ec84a31213de84fc15f40d4d9dce854a32602b3dffaac088992578a07f48047358bf7c38b6ca597c251232f48432404836cb2304f5423db4ddf2f9345
 DIST wstool-0.1.13.tar.gz 75188 BLAKE2B 6a34aa04e4a076a75dacf24faf789d5295f6ad9afbbdddae480d8cdd11db63940faeca2c5936a2432aeccae5274e2e9e4e824f303460fe96f95c0d17abeeb9c1 SHA512 4d54f78ca044d31d927de1c3387536d0447ece77672c555845adf54e47f07adb67e6e9c866bc2719aae468aeeb26c900b3784e0ec7cf014c8118e841a92dca14
+DIST wstool-0.1.17.tar.gz 76168 BLAKE2B 4862df0ff16a5102e42d3ed683dbd9e8eb432aaf44f6e641fba6bb6f5d962645685b0fc9ca11f3c8adbe15dbef33086b93e3f9136073f7f181b5da37522e28fa SHA512 13533354a40723137baadc125425a2ec3d6a441da4870f04a9e17c53509ee4d3dc27df1a59edc2c3985a05fbd66a045539e9814f73509ee527fb763f8a804626
 EBUILD wstool-0.1.13.ebuild 1455 BLAKE2B 4e6426b563f90641ec27db893bb7980a8cb90bf3527f05a88bd65bb1ba6407abef549831b08ee54339a95810f065ed0456cbfb0decab86be3479b322cf1249fa SHA512 b92eaabaf6197e82d72ec20faf6af57a36912192a13576e5bcd52c88c99cb08c75f6cf5958b64d3c931c28201c1f15371c93c83529093d6d49c9883af878c5cf
+EBUILD wstool-0.1.17.ebuild 1455 BLAKE2B 074eb1dcbe01cab0a3ae86279207642ba5051603c19077ed0ea52ae0cfa9003623dcd8562458bba60ce1a16be996eaf0433840856a2011c7c66602a790e444e0 SHA512 f59f23d2669288f3234f5e69421c4d496258d5e8264a9731741698791c3fadfd6e3f44280fcbb4d1bf1f48d3b4ba209f2b679cf2fabe82cafc5115bbd5ad7815
 EBUILD wstool-9999.ebuild 1455 BLAKE2B 4e6426b563f90641ec27db893bb7980a8cb90bf3527f05a88bd65bb1ba6407abef549831b08ee54339a95810f065ed0456cbfb0decab86be3479b322cf1249fa SHA512 b92eaabaf6197e82d72ec20faf6af57a36912192a13576e5bcd52c88c99cb08c75f6cf5958b64d3c931c28201c1f15371c93c83529093d6d49c9883af878c5cf
 MISC metadata.xml 329 BLAKE2B ffdb449cef2fa449771425241f9a03b49d915bed8abc73329586e9a2873e41ac669e4a347ed6f2cabc92b7132a741d5fcc79f13a9d900f7fced17fba322c460c SHA512 7bedf1430c3a2e5a8c98701ef48ce3a97ac59bebe3d42e19da193480c97ef0b2020916c7582f4083ebbf361b5c66b17ad1bfa7889e8aa62d3c945ba8dcf5b62f
diff --git a/dev-util/wstool/wstool-0.1.17.ebuild b/dev-util/wstool/wstool-0.1.17.ebuild
new file mode 100644
index 000000000000..5615dbd2b241
--- /dev/null
+++ b/dev-util/wstool/wstool-0.1.17.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+SCM=""
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SCM="git-r3"
+	EGIT_REPO_URI="https://github.com/vcstools/wstool"
+fi
+
+inherit ${SCM} distutils-r1
+
+DESCRIPTION="Commands to manage several local SCM repositories for ROS"
+HOMEPAGE="http://wiki.ros.org/wstool"
+if [ "${PV#9999}" != "${PV}" ] ; then
+	SRC_URI=""
+	KEYWORDS=""
+else
+	SRC_URI="http://download.ros.org/downloads/${PN}/${P}.tar.gz
+		https://github.com/vcstools/wstool/archive/${PV}.tar.gz -> ${P}.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="test"
+
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	>=dev-python/vcstools-0.1.38[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+	dev-python/sphinx
+	test? (
+		dev-python/nose[${PYTHON_USEDEP}]
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-vcs/git
+		dev-vcs/bzr
+		dev-vcs/mercurial
+		dev-vcs/subversion
+	)
+"
+
+PATCHES=( "${FILESDIR}/prefix2.patch" )
+DISTUTILS_IN_SOURCE_BUILD="yes"
+
+python_test() {
+	# From travis.yml
+	# Set git config to silence some stuff in the tests
+	git config --global user.email "foo@example.com"
+	git config --global user.name "Foo Bar"
+	# Set the hg user
+	echo -e "[ui]\nusername = Your Name <your@mail.com>" >> ~/.hgrc
+	# Set the bzr user
+	bzr whoami "Your Name <name@example.com>"
+	# command to run tests
+	nosetests --with-coverage --cover-package=wstool || die
+}
diff --git a/dev-vcs/Manifest.gz b/dev-vcs/Manifest.gz
index 9a1073c574fd..bce854651fe2 100644
--- a/dev-vcs/Manifest.gz
+++ b/dev-vcs/Manifest.gz
diff --git a/dev-vcs/git/Manifest b/dev-vcs/git/Manifest
index 7199cb0f9ebd..8c4631ece714 100644
--- a/dev-vcs/git/Manifest
+++ b/dev-vcs/git/Manifest
@@ -14,21 +14,21 @@ AUX git-daemon_at-r1.service 340 BLAKE2B 879db8b274d8e1d2995a2ea1e4b1d66cac3d697
 DIST git-2.13.6.tar.xz 4756820 BLAKE2B 5fdb7aae5ceb1e1d0bd9be2541e8d39f28503ebeda5ef30eee306348afb290171cba7f8d6e0002775288bfba699ca12e388a4007008509d91a9ac92e90fb5d5c SHA512 ed39784205e1077f886eebdfb34a205fb0433071de29f673a79ea32bca31a2ba9bdabba208c9679ea2f6f295bafad52a7e7852b5bd2ccb1e6c99a1d2e76e8ada
 DIST git-2.14.3.tar.xz 4802252 BLAKE2B 9b5a13e337ba1f4609875897a3ee92dd5a433fa5e7f8bbac1436dcd8275514378fe99dd8cfcf6212e27825e43f000100850ad6f3a0b3fd53bbf9ee820a3973d8 SHA512 e32e9ff904cbc2a77d78ca08953e3b69ac527c333a898dd053806e3d7e684ad4ae153ae7663b7ff9c16e2414c3189878a2e6c95fe9320b4af6cb1e7fa5102643
 DIST git-2.15.1.tar.xz 4894768 BLAKE2B 89258e58ff06b50759364c79bebc9a70a267eca7bd25c1feb73ca49cb2b9cf5f6b890729aee4c9bda9025cbacfd8ed29d1a251ee0add9cd84c277e2bb29dbad5 SHA512 dcf300b28e41f7757d866e768d641137718b43eb6d12a2cfff99fb429775e0cab87bbff48147b8588bc0f69e92eb5ca2ad1f75c8cf5205e41853d8e8652f900b
-DIST git-2.16.0.rc1.tar.xz 4944496 BLAKE2B b14c207b0cce3ff3ab90f39546ef4d6352c7a76a1b1bb268c4bc0c6cfcb9894a7e0153fc3106ab73806c6f5199df07ebd3a884cd43d5e8413ef7a73015ca59c7 SHA512 7e63457e2bbca5d77eed84f48039ba577b715dec23c2cf6c85ce433e534791896f8a8bc7618b7df1493ff4b994d351efc9a3df4afb8954c7dbbec7df670fb72b
+DIST git-2.16.0.rc2.tar.xz 4946128 BLAKE2B a0cf9ca4ce4fee2721a8f5c0333b3395b103377da619119316e0c6175fee19d1f89abeb502c79293c573c32628edb460d1e39d3c77b87075ac782cdc619610d8 SHA512 6078cec99aa03cdb3915c91759d01ce741740fcda0659d030024aa0b4195cd77af1089695ad2138f38e63b7b8a46a336abea9f19e125db13f85e1ca8be844787
 DIST git-htmldocs-2.13.6.tar.xz 1110668 BLAKE2B 7cfbd453c72c3e300244f9a8c4d13efd60d22219dee48f6a06e6f23fb3a0bd5bc66e624829d685b3ae8b47b81bba39e605f0dd6fd3459364c83b2d922be94a64 SHA512 9eb26f04836620bf4486d3bb2a170ab2b0af319f7f53e2677f4c1445767f5c3521cfdbb274dcc4df2bfd2fc5bf0ca18c6a4a9ca0b9f957c53f66e530684af6cc
 DIST git-htmldocs-2.14.3.tar.xz 1116824 BLAKE2B ca7068a4983e2f7c3694222f6a932d8db132b0a20a50a10415f58a77100a95d8e0fd2e8cf980ece8ef55be0f0ca652cc1a75af62a22b9d60ff19ad4801383416 SHA512 a73160724f944832f915ff29c557e2a968d6c5ae5c4e9759d96444af8841e52a1193d50a74f01deb1ec5ef03b3301897bd85c5ebb82ac22d8188d528629d74d4
 DIST git-htmldocs-2.15.1.tar.xz 1134848 BLAKE2B 1efb6d4ca16779c39be69fed57fccb023ddac6bb9c9727ebd7050eb40035c1d56dbce0191224e8d3370d433d8e1cf210df9bc9bde2effb6fbb2d62bfd5e9e440 SHA512 50e53b506c17b046c42a8d9f888741b1f408fb7bb566d981ad6dcda3383f1d310008732a849b4755e7233dc83477f354e9c6d5d4e1fcf0e81af54d49153e8c34
-DIST git-htmldocs-2.16.0.rc1.tar.xz 1159900 BLAKE2B 609a851c4024ae9ff859072ef6abb07e590d1fd81f10f142c67899f2ed0f8ebc0524370eb0fd5c75300cde73157b6846b8401ee84a03ab35e2f53a8d54d90c9d SHA512 67a6ba5c64bb044bae8e931dedde14679c7d637241871d992e9d991c5e13cd4b83267f3fcb9450a2086473ac28e968d52843ad0361d93354aae69e8057d58a7e
+DIST git-htmldocs-2.16.0.rc2.tar.xz 1159672 BLAKE2B e0769344224ea591a25e80f798a5b55bde8cd959be750cc96f9a5a2da82c39db9c4e1a5f1b895b92f38bd01431b4d57db8c3407a8aea26fbd16384504b7b7564 SHA512 44ce34629180c579cd3efde964aa218e03e9bfb821842bd312429201c7404b0d4a89b332c1c4b62265e3dd9db88c2ac0e143db1d332aece955dd819aa8caeee7
 DIST git-manpages-2.13.6.tar.xz 407660 BLAKE2B 76bae6c11cf21f39adf121b4580fe10021e354374e37de6ca5eee6e60e1c7ef3b2dafb086c6b8d88f35216204269945cf45fcd6868f9940d2f00b72a87bad8e2 SHA512 b24a96053e348e1d2ebf5c66d968074bc73471f07ac3a680d8b16fd211b69b5fdfad6a087473edf9941ad08493e4d7ff0a916b85ce40ebe19b3e3dad6a4baf5f
 DIST git-manpages-2.14.3.tar.xz 411324 BLAKE2B c896a54305276ff0bb1d860f02833f5902bf869e746333c0598f8c494efb56c65c4a9d5d9eeb54a9a38a6b07776abddc4267b73c2ff020cedf65248ac89afca6 SHA512 3e1215bdc28df84fd26ba40f6aedfa9f2140c170af48148b1b89d28e8b411686376715920f86d9db9aa18f4a3f4e8f68082da7632febbcbc7fc956f32807da50
 DIST git-manpages-2.15.1.tar.xz 413124 BLAKE2B 61407bc2c87fddff7a992c25f71768e39bee56941a7291f8c03ee59d10f7db36259e80c6f85ca0303c5e79edb3e1ff02b4abc6c8577bb1f3072b8a469ca55f23 SHA512 de02606554c14fdb780f2885b8b88e6b15e82e4debe9f59da75d57832a41f688be9882e74eacd0dc36db7a42bfbd88c5168b378ca0c8658317fe68e207ec2d18
-DIST git-manpages-2.16.0.rc1.tar.xz 417108 BLAKE2B 8fe8c4fe68039c565af22b6f95ec3bd92e918857f7d18c504c74891bccd8e46c964f4d0acb794b47426f163f4151af7f50b5c979ca3b1d019257107ef26f7d47 SHA512 f14ad4b06f5125335e5300e65f96e854edaab95a3f79d5942aca15eb72820643650a6ebf9524925df7def2c1f6b359c14c3e8cc7ea94710ebf2c33de66f62deb
-EBUILD git-2.13.6.ebuild 19013 BLAKE2B 33cda14b40308cbafc3ad5895eea7126c27ef20dc8d8a4dd3c0740b52046096bac6d6ad4a9d9894513d1eadb379c323c0ecbe1bcbb470ab6e11d6950f4d2f504 SHA512 ba6f3f6a4bc384d8c7cd1061fec38d5037e0007d050061dbb854a705ae1d93ce93d9572feea6d97800169db178811ad2266499949c15ba37389f749a25552274
-EBUILD git-2.14.3.ebuild 19492 BLAKE2B 02a8110d2f5b3c44c4a5f8b0b463c762967d644da20a7b6599ee58217cd04d840514d5c770f593dc42da7183d3ce2c90673f14672e38dbb4f5c9ad643bf5a1dd SHA512 f0dfd54aad567141b2806c0e2bc8a24699b66456f6fe964071a5da78b201b4f27dd7942e75ae320f6b5b4c0c18a948971ad75a339125cbd5f5709ec0780726a8
-EBUILD git-2.15.1.ebuild 19495 BLAKE2B 3805120b40df21a440ae5d47075aa2d1929bf00825e8e1b5827e9bd5772aecd65b08b424a4336594ba0e971a3f8e28e3beea4d39e08b9b6669d0d127b9c4ab6d SHA512 18b14460fbefe35f246409af0c9bb4bd93ad169d7c1014a9f5826bd3fb6f73c11d4d8bbbb7726d719c2c98fd6e9a1129ae0e1553229573026e9010d6f490c5f1
-EBUILD git-2.16.0_rc1.ebuild 19495 BLAKE2B 3805120b40df21a440ae5d47075aa2d1929bf00825e8e1b5827e9bd5772aecd65b08b424a4336594ba0e971a3f8e28e3beea4d39e08b9b6669d0d127b9c4ab6d SHA512 18b14460fbefe35f246409af0c9bb4bd93ad169d7c1014a9f5826bd3fb6f73c11d4d8bbbb7726d719c2c98fd6e9a1129ae0e1553229573026e9010d6f490c5f1
-EBUILD git-9999-r1.ebuild 19495 BLAKE2B 3805120b40df21a440ae5d47075aa2d1929bf00825e8e1b5827e9bd5772aecd65b08b424a4336594ba0e971a3f8e28e3beea4d39e08b9b6669d0d127b9c4ab6d SHA512 18b14460fbefe35f246409af0c9bb4bd93ad169d7c1014a9f5826bd3fb6f73c11d4d8bbbb7726d719c2c98fd6e9a1129ae0e1553229573026e9010d6f490c5f1
-EBUILD git-9999-r2.ebuild 19495 BLAKE2B 3805120b40df21a440ae5d47075aa2d1929bf00825e8e1b5827e9bd5772aecd65b08b424a4336594ba0e971a3f8e28e3beea4d39e08b9b6669d0d127b9c4ab6d SHA512 18b14460fbefe35f246409af0c9bb4bd93ad169d7c1014a9f5826bd3fb6f73c11d4d8bbbb7726d719c2c98fd6e9a1129ae0e1553229573026e9010d6f490c5f1
-EBUILD git-9999-r3.ebuild 19495 BLAKE2B 3805120b40df21a440ae5d47075aa2d1929bf00825e8e1b5827e9bd5772aecd65b08b424a4336594ba0e971a3f8e28e3beea4d39e08b9b6669d0d127b9c4ab6d SHA512 18b14460fbefe35f246409af0c9bb4bd93ad169d7c1014a9f5826bd3fb6f73c11d4d8bbbb7726d719c2c98fd6e9a1129ae0e1553229573026e9010d6f490c5f1
-EBUILD git-9999.ebuild 19495 BLAKE2B 3805120b40df21a440ae5d47075aa2d1929bf00825e8e1b5827e9bd5772aecd65b08b424a4336594ba0e971a3f8e28e3beea4d39e08b9b6669d0d127b9c4ab6d SHA512 18b14460fbefe35f246409af0c9bb4bd93ad169d7c1014a9f5826bd3fb6f73c11d4d8bbbb7726d719c2c98fd6e9a1129ae0e1553229573026e9010d6f490c5f1
+DIST git-manpages-2.16.0.rc2.tar.xz 417216 BLAKE2B 39d434afb66201acd440bdd7dfe6bf099a0d5e0d35926debbc51d149039dc654fb0e76689efd29f918a07b01acf14491cc2e0c48f497dc4e8517fcd3f21ffd95 SHA512 5921e26f05578d10e88686de65340f4c71e602aac4f373bcc2bb86036f0ed40ac93af2463f5557895fac2cc99468dbf6095186a6198b9d4e9e97bc9882616bbe
+EBUILD git-2.13.6.ebuild 18885 BLAKE2B 097dc3192b7f71372eb3c001bf8aaa9f86b5d3f0479087c7daeaa13fcb77acb987463a565bc394e0aaa3014c72726e6364fc138ede07abf77062561711db80a0 SHA512 931fe26d4f73ac6ffb7794f913581041768dd0db0ec142640c8b2470b92adfd6198919e148e9675151cc1d67b1753c4259089afb6ebda8ea26a8733d8c2631dd
+EBUILD git-2.14.3.ebuild 19363 BLAKE2B 7b06642fe92fa81859c400ba03c2c3ff97ea99d57451510e7597bfc9d94e0259aa465bd6165a0940534eb175cee49217d76b7869feb9065a4a900edc6244b67c SHA512 a315292faf871312cfcd89b702a1c1449461fbb02c63746c24344bfba1ce94b4bb078f133d09655b6298b0b41c9f9007675508d7db194b2b6f55fa90e789de84
+EBUILD git-2.15.1.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
+EBUILD git-2.16.0_rc2.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
+EBUILD git-9999-r1.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
+EBUILD git-9999-r2.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
+EBUILD git-9999-r3.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
+EBUILD git-9999.ebuild 19366 BLAKE2B 1e6803a7a0b4e43eec7430410fcee4956b42ad888ee088d404b0c60fe1a6e95036f37708da23040833026ce121c05a12fb8052d8fd6af951ed3e516f9f8df561 SHA512 f511e5d8051ec4547fad1587c8f0ac6ea75d471ff98835d45242aad9ab735f1927d3c1e815d6cc51b3584032ad91638f9d636c7523cba5c81208bb8436d27db3
 MISC metadata.xml 2066 BLAKE2B c5a716346a69a971cb78e5b0435f921e218ae8b07a714a4718e2238924a947f9143f10829031237ad74d051106ead5296673d58b99035ef9f77a1c5cd430242a SHA512 a0018307f19e6695002fa52a7cf898071ea8b7798ed7454f544a3bd15a3448cdab322fac5fcbae7b72e9a9ecf823c56b6ced8de560e68012be0ea6d09b0640bd
diff --git a/dev-vcs/git/git-2.13.6.ebuild b/dev-vcs/git/git-2.13.6.ebuild
index 81e7734629c8..3f4dab26bde8 100644
--- a/dev-vcs/git/git-2.13.6.ebuild
+++ b/dev-vcs/git/git-2.13.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -280,7 +280,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -294,13 +293,12 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
+
 }
 
 src_configure() {
diff --git a/dev-vcs/git/git-2.14.3.ebuild b/dev-vcs/git/git-2.14.3.ebuild
index d079a65a75eb..fde79e887f8a 100644
--- a/dev-vcs/git/git-2.14.3.ebuild
+++ b/dev-vcs/git/git-2.14.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {
diff --git a/dev-vcs/git/git-2.15.1.ebuild b/dev-vcs/git/git-2.15.1.ebuild
index 3f45eb3ef445..d3e89d0092f7 100644
--- a/dev-vcs/git/git-2.15.1.ebuild
+++ b/dev-vcs/git/git-2.15.1.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {
diff --git a/dev-vcs/git/git-2.16.0_rc1.ebuild b/dev-vcs/git/git-2.16.0_rc1.ebuild
deleted file mode 100644
index 3f45eb3ef445..000000000000
--- a/dev-vcs/git/git-2.16.0_rc1.ebuild
+++ /dev/null
@@ -1,699 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-GENTOO_DEPEND_ON_PERL=no
-
-# bug #329479: git-remote-testgit is not multiple-version aware
-PYTHON_COMPAT=( python2_7 )
-PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
-if [[ ${PV} == *9999 ]]; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
-	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
-	# See https://git-scm.com/docs/gitworkflows#_graduation
-	# In order of stability:
-	# 9999-r0: maint
-	# 9999-r1: master
-	# 9999-r2: next
-	# 9999-r3: pu
-	case "${PVR}" in
-		9999) EGIT_BRANCH=maint ;;
-		9999-r1) EGIT_BRANCH=master ;;
-		9999-r2) EGIT_BRANCH=next;;
-		9999-r3) EGIT_BRANCH=pu ;;
-	esac
-fi
-
-inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
-
-MY_PV="${PV/_rc/.rc}"
-MY_P="${PN}-${MY_PV}"
-
-DOC_VER=${MY_PV}
-
-DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
-HOMEPAGE="http://www.git-scm.com/"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI_SUFFIX="xz"
-	SRC_URI_KORG="mirror://kernel/software/scm/git"
-	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
-	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
-			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			doc? (
-			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-			)"
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
-
-# Common to both DEPEND and RDEPEND
-CDEPEND="
-	gnome-keyring? ( app-crypt/libsecret )
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
-	sys-libs/zlib
-	pcre? (
-		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
-		!pcre-jit? ( dev-libs/libpcre )
-	)
-	perl? ( dev-lang/perl:=[-build(-)] )
-	tk? ( dev-lang/tk:0= )
-	curl? (
-		net-misc/curl
-		webdav? ( dev-libs/expat )
-	)
-	emacs? ( virtual/emacs )
-"
-
-RDEPEND="${CDEPEND}
-	gpg? ( app-crypt/gnupg )
-	mediawiki? (
-		dev-perl/DateTime-Format-ISO8601
-		dev-perl/HTML-Tree
-		dev-perl/MediaWiki-API
-	)
-	perl? ( dev-perl/Error
-			dev-perl/Net-SMTP-SSL
-			dev-perl/Authen-SASL
-			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
-			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
-			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
-			)
-	python? ( ${PYTHON_DEPS} )
-"
-
-# This is how info docs are created with Git:
-#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
-#   .xml/docbook  --(docbook2texi.pl)--> .texi
-#   .texi         --(makeinfo)---------> .info
-DEPEND="${CDEPEND}
-	doc? (
-		app-text/asciidoc
-		app-text/docbook2X
-		sys-apps/texinfo
-		app-text/xmlto
-	)
-	nls? ( sys-devel/gettext )
-	test? (	app-crypt/gnupg	)"
-
-# Live ebuild builds man pages and HTML docs, additionally
-if [[ ${PV} == *9999 ]]; then
-	DEPEND="${DEPEND}
-		app-text/asciidoc"
-fi
-
-SITEFILE=50${PN}-gentoo.el
-S="${WORKDIR}/${MY_P}"
-
-REQUIRED_USE="
-	cgi? ( perl )
-	cvs? ( perl )
-	mediawiki? ( perl )
-	mediawiki-experimental? ( mediawiki )
-	subversion? ( perl )
-	webdav? ( curl )
-	pcre-jit? ( pcre )
-	python? ( ${PYTHON_REQUIRED_USE} )
-"
-
-PATCHES=(
-	# bug #350330 - automagic CVS when we don't want it is bad.
-	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
-
-	# install mediawiki perl modules also in vendor_dir
-	# hack, needs better upstream solution
-	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
-
-	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
-
-	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
-	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
-)
-
-pkg_setup() {
-	if use subversion && has_version "dev-vcs/subversion[dso]"; then
-		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
-		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
-		ewarn "have been warned."
-	fi
-	if use python ; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-# This is needed because for some obscure reasons future calls to make don't
-# pick up these exports if we export them in src_unpack()
-exportmakeopts() {
-	local myopts
-
-	if use blksha1 ; then
-		myopts+=" BLK_SHA1=YesPlease"
-	elif use ppcsha1 ; then
-		myopts+=" PPC_SHA1=YesPlease"
-	fi
-
-	if use curl ; then
-		use webdav || myopts+=" NO_EXPAT=YesPlease"
-	else
-		myopts+=" NO_CURL=YesPlease"
-	fi
-
-	# broken assumptions, because of static build system ...
-	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
-	myopts+=" INSTALL=install TAR=tar"
-	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
-	myopts+=" SANE_TOOL_PATH="
-	myopts+=" OLD_ICONV="
-	myopts+=" NO_EXTERNAL_GREP="
-
-	# For svn-fe
-	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
-
-	# can't define this to null, since the entire makefile depends on it
-	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
-
-	use iconv \
-		|| myopts+=" NO_ICONV=YesPlease"
-	use nls \
-		|| myopts+=" NO_GETTEXT=YesPlease"
-	use tk \
-		|| myopts+=" NO_TCLTK=YesPlease"
-	if use pcre; then
-		if use pcre-jit; then
-			myopts+=" USE_LIBPCRE2=YesPlease"
-			extlibs+=" -lpcre2-8"
-		else
-			myopts+=" USE_LIBPCRE1=YesPlease"
-			myopts+=" NO_LIBPCRE1_JIT=YesPlease"
-			extlibs+=" -lpcre"
-		fi
-	fi
-	use perl \
-		&& myopts+=" INSTALLDIRS=vendor" \
-		|| myopts+=" NO_PERL=YesPlease"
-	use python \
-		|| myopts+=" NO_PYTHON=YesPlease"
-	use subversion \
-		|| myopts+=" NO_SVN_TESTS=YesPlease"
-	use threads \
-		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
-		|| myopts+=" NO_PTHREADS=YesPlease"
-	use cvs \
-		|| myopts+=" NO_CVS=YesPlease"
-	use elibc_musl \
-		&& myopts+=" NO_REGEX=YesPlease"
-# Disabled until ~m68k-mint can be keyworded again
-#	if [[ ${CHOST} == *-mint* ]] ; then
-#		myopts+=" NO_MMAP=YesPlease"
-#		myopts+=" NO_IPV6=YesPlease"
-#		myopts+=" NO_STRLCPY=YesPlease"
-#		myopts+=" NO_MEMMEM=YesPlease"
-#		myopts+=" NO_MKDTEMP=YesPlease"
-#		myopts+=" NO_MKSTEMPS=YesPlease"
-#	fi
-	if [[ ${CHOST} == ia64-*-hpux* ]]; then
-		myopts+=" NO_NSEC=YesPlease"
-	fi
-	if [[ ${CHOST} == *-*-aix* ]]; then
-		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
-	fi
-	if [[ ${CHOST} == *-solaris* ]]; then
-		myopts+=" NEEDS_LIBICONV=YesPlease"
-		myopts+=" HAVE_CLOCK_MONOTONIC=1"
-		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
-			myopts+=" HAVE_GETDELIM=1"
-	fi
-
-	has_version '>=app-text/asciidoc-8.0' \
-		&& myopts+=" ASCIIDOC8=YesPlease"
-	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
-
-	# Bug 290465:
-	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
-	[[ "${CHOST}" == *-uclibc* ]] && \
-		myopts+=" NO_NSEC=YesPlease"
-
-	export MY_MAKEOPTS="${myopts}"
-	export EXTLIBS="${extlibs}"
-}
-
-src_unpack() {
-	if [[ ${PV} != *9999 ]]; then
-		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		use doc && \
-			cd "${S}"/Documentation && \
-			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
-		cd "${S}"
-	else
-		git-r3_src_unpack
-		cd "${S}"
-		#cp "${FILESDIR}"/GIT-VERSION-GEN .
-	fi
-
-}
-
-src_prepare() {
-	# add experimental patches to improve mediawiki support
-	# see patches for origin
-	if use mediawiki-experimental ; then
-		PATCHES+=(
-			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
-			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
-		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
-		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
-		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
-		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
-		Makefile contrib/svn-fe/Makefile || die "sed failed"
-
-	# Never install the private copy of Error.pm (bug #296310)
-	sed -i \
-		-e '/private-Error.pm/s,^,#,' \
-		perl/Makefile.PL
-
-	# Fix docbook2texi command
-	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
-		Documentation/Makefile || die "sed failed"
-
-	# Fix git-subtree missing DESTDIR
-	sed -i \
-		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
-		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
-		contrib/subtree/Makefile
-}
-
-git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
-	# bug #320647: PYTHON_PATH
-	PYTHON_PATH=""
-	use python && PYTHON_PATH="${PYTHON}"
-	emake ${MY_MAKEOPTS} \
-		DESTDIR="${D}" \
-		OPTCFLAGS="${CFLAGS}" \
-		OPTLDFLAGS="${LDFLAGS}" \
-		OPTCC="$(tc-getCC)" \
-		OPTAR="$(tc-getAR)" \
-		prefix="${EPREFIX}"/usr \
-		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
-		sysconfdir="${EPREFIX}"/etc \
-		PYTHON_PATH="${PYTHON_PATH}" \
-		PERL_MM_OPT="" \
-		GIT_TEST_OPTS="--no-color" \
-		V=1 \
-		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
-}
-
-src_configure() {
-	exportmakeopts
-}
-
-src_compile() {
-	if use perl ; then
-	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
-	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
-	fi
-	git_emake || die "emake failed"
-
-	if use emacs ; then
-		elisp-compile contrib/emacs/git{,-blame}.el
-	fi
-
-	if use perl && use cgi ; then
-		git_emake \
-			gitweb \
-			|| die "emake gitweb (cgi) failed"
-	fi
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		cd "${S}"/contrib/credential/osxkeychain || die
-		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
-			|| die "emake credential-osxkeychain"
-	fi
-
-	cd "${S}"/Documentation
-	if [[ ${PV} == *9999 ]] ; then
-		git_emake man \
-			|| die "emake man failed"
-		if use doc ; then
-			git_emake info html \
-				|| die "emake info html failed"
-		fi
-	else
-		if use doc ; then
-			git_emake info \
-				|| die "emake info html failed"
-		fi
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		# by defining EXTLIBS we override the detection for libintl and
-		# libiconv, bug #516168
-		local nlsiconv=
-		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
-		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
-		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
-		if use doc ; then
-			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
-		fi
-		cd "${S}"
-	fi
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		git_emake || die "emake git-credential-libsecret failed"
-	fi
-
-	cd "${S}"/contrib/subtree || die
-	git_emake
-	use doc && git_emake doc
-
-	cd "${S}"/contrib/diff-highlight || die
-	git_emake
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake
-	fi
-}
-
-src_install() {
-	git_emake \
-		install || \
-		die "make install failed"
-
-	if [[ ${CHOST} == *-darwin* ]]; then
-		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
-	fi
-
-	# Depending on the tarball and manual rebuild of the documentation, the
-	# manpages may exist in either OR both of these directories.
-	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
-	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
-	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
-	use doc && dodir /usr/share/doc/${PF}/html
-	for d in / /howto/ /technical/ ; do
-		docinto ${d}
-		dodoc Documentation${d}*.txt
-		if use doc ; then
-			docinto ${d}/html
-			dodoc Documentation${d}*.html
-		fi
-	done
-	docinto /
-	# Upstream does not ship this pre-built :-(
-	use doc && doinfo Documentation/{git,gitman}.info
-
-	newbashcomp contrib/completion/git-completion.bash ${PN}
-	bashcomp_alias git gitk
-	# Not really a bash-completion file (bug #477920)
-	# but still needed uncompressed (bug #507480)
-	insinto /usr/share/${PN}
-	doins contrib/completion/git-prompt.sh
-
-	if use emacs ; then
-		elisp-install ${PN} contrib/emacs/git.{el,elc}
-		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
-		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
-		# don't add automatically to the load-path, so the sitefile
-		# can do a conditional loading
-		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
-		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
-	fi
-
-	#dobin contrib/fast-import/git-p4 # Moved upstream
-	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
-	newbin contrib/fast-import/import-tars.perl import-tars
-	exeinto /usr/libexec/git-core/
-	newexe contrib/git-resurrect.sh git-resurrect
-
-	# git-subtree
-	cd "${S}"/contrib/subtree
-	git_emake install || die "Failed to emake install git-subtree"
-	if use doc ; then
-		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
-	fi
-	newdoc README README.git-subtree
-	dodoc git-subtree.txt
-	cd "${S}"
-
-	if use mediawiki ; then
-		cd "${S}"/contrib/mw-to-git
-		git_emake install
-		cd "${S}"
-	fi
-
-	# diff-highlight
-	dobin contrib/diff-highlight/diff-highlight
-	newdoc contrib/diff-highlight/README README.diff-highlight
-
-	# git-jump
-	exeinto /usr/libexec/git-core/
-	doexe contrib/git-jump/git-jump
-	newdoc contrib/git-jump/README git-jump.txt
-
-	# git-contacts
-	exeinto /usr/libexec/git-core/
-	doexe contrib/contacts/git-contacts
-	dodoc contrib/contacts/git-contacts.txt
-
-	if use gnome-keyring ; then
-		cd "${S}"/contrib/credential/libsecret
-		dobin git-credential-libsecret
-	fi
-
-	if use subversion ; then
-		cd "${S}"/contrib/svn-fe
-		dobin svn-fe
-		dodoc svn-fe.txt
-		if use doc ; then
-			doman svn-fe.1
-			docinto html
-			dodoc svn-fe.html
-		fi
-		cd "${S}"
-	fi
-
-	dodir /usr/share/${PN}/contrib
-	# The following are excluded:
-	# completion - installed above
-	# diff-highlight - done above
-	# emacs - installed above
-	# examples - these are stuff that is not used in Git anymore actually
-	# git-jump - done above
-	# gitview - installed above
-	# p4import - excluded because fast-import has a better one
-	# patches - stuff the Git guys made to go upstream to other places
-	# persistent-https - TODO
-	# mw-to-git - TODO
-	# subtree - build  seperately
-	# svnimport - use git-svn
-	# thunderbird-patch-inline - fixes thunderbird
-	local contrib_objects=(
-		buildsystems
-		fast-import
-		hg-to-git
-		hooks
-		remotes2config.sh
-		rerere-train.sh
-		stats
-		workdir
-	)
-	for i in "${contrib_objects[@]}" ; do
-		cp -rf \
-			"${S}"/contrib/${i} \
-			"${ED}"/usr/share/${PN}/contrib \
-			|| die "Failed contrib ${i}"
-	done
-
-	if use perl && use cgi ; then
-		# We used to install in /usr/share/${PN}/gitweb
-		# but upstream installs in /usr/share/gitweb
-		# so we will install a symlink and use their location for compat with other
-		# distros
-		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
-
-		# INSTALL discusses configuration issues, not just installation
-		docinto /
-		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
-		newdoc  "${S}"/gitweb/README README.gitweb
-
-		find "${ED}"/usr/lib64/perl5/ \
-			-name .packlist \
-			-exec rm \{\} \;
-	else
-		rm -rf "${ED}"/usr/share/gitweb
-	fi
-
-	if ! use subversion ; then
-		rm -f "${ED}"/usr/libexec/git-core/git-svn \
-			"${ED}"/usr/share/man/man1/git-svn.1*
-	fi
-
-	if use xinetd ; then
-		insinto /etc/xinetd.d
-		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
-	fi
-
-	if use !prefix ; then
-		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
-		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
-		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
-		systemd_dounit "${FILESDIR}/git-daemon.socket"
-	fi
-
-	perl_delete_localpod
-
-	# Remove disabled linguas
-	# we could remove sources in src_prepare, but install does not
-	# handle missing locale dir well
-	rm_loc() {
-		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
-			rm -r "${ED}/usr/share/locale/${1}" || die
-		fi
-	}
-	l10n_for_each_disabled_locale_do rm_loc
-}
-
-src_test() {
-	local disabled="t9128-git-svn-cmd-branch.sh"
-	local tests_cvs="t9200-git-cvsexportcommit.sh \
-					t9400-git-cvsserver-server.sh \
-					t9401-git-cvsserver-crlf.sh \
-					t9402-git-cvsserver-refs.sh \
-					t9600-cvsimport.sh \
-					t9601-cvsimport-vendor-branch.sh \
-					t9602-cvsimport-branches-tags.sh \
-					t9603-cvsimport-patchsets.sh \
-					t9604-cvsimport-timestamps.sh"
-	local tests_perl="t3701-add-interactive.sh \
-					t5502-quickfetch.sh \
-					t5512-ls-remote.sh \
-					t5520-pull.sh \
-					t7106-reset-unborn-branch.sh \
-					t7501-commit.sh"
-	# Bug #225601 - t0004 is not suitable for root perm
-	# Bug #219839 - t1004 is not suitable for root perm
-	# t0001-init.sh - check for init notices EPERM*  fails
-	local tests_nonroot="t0001-init.sh \
-		t0004-unwritable.sh \
-		t0070-fundamental.sh \
-		t1004-read-tree-m-u-wf.sh \
-		t3700-add.sh \
-		t7300-clean.sh"
-	# t9100 still fails with symlinks in SVN 1.7
-	local test_svn="t9100-git-svn-basic.sh"
-
-	# Unzip is used only for the testcase code, not by any normal parts of Git.
-	if ! has_version app-arch/unzip ; then
-		einfo "Disabling tar-tree tests"
-		disabled="${disabled} t5000-tar-tree.sh"
-	fi
-
-	cvs=0
-	use cvs && let cvs=$cvs+1
-	if [[ ${EUID} -eq 0 ]]; then
-		if [[ $cvs -eq 1 ]]; then
-			ewarn "Skipping CVS tests because CVS does not work as root!"
-			ewarn "You should retest with FEATURES=userpriv!"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-		einfo "Skipping other tests that require being non-root"
-		disabled="${disabled} ${tests_nonroot}"
-	else
-		[[ $cvs -gt 0 ]] && \
-			has_version dev-vcs/cvs && \
-			let cvs=$cvs+1
-		[[ $cvs -gt 1 ]] && \
-			has_version "dev-vcs/cvs[server]" && \
-			let cvs=$cvs+1
-		if [[ $cvs -lt 3 ]]; then
-			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
-			disabled="${disabled} ${tests_cvs}"
-		fi
-	fi
-
-	if ! use perl ; then
-		einfo "Disabling tests that need Perl"
-		disabled="${disabled} ${tests_perl}"
-	fi
-
-	einfo "Disabling tests that fail with SVN 1.7"
-	disabled="${disabled} ${test_svn}"
-
-	# Reset all previously disabled tests
-	cd "${S}/t"
-	for i in *.sh.DISABLED ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
-	done
-	einfo "Disabled tests:"
-	for i in ${disabled} ; do
-		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
-	done
-
-	# Avoid the test system removing the results because we want them ourselves
-	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
-		-i "${S}"/t/Makefile
-
-	# Clean old results first, must always run
-	cd "${S}/t"
-	nonfatal git_emake clean
-
-	# Now run the tests, keep going if we hit an error, and don't terminate on
-	# failure
-	cd "${S}"
-	einfo "Start test run"
-	#MAKEOPTS=-j1
-	nonfatal git_emake --keep-going test
-	rc=$?
-
-	# Display nice results, now print the results
-	cd "${S}/t"
-	nonfatal git_emake aggregate-results
-
-	# And bail if there was a problem
-	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
-}
-
-showpkgdeps() {
-	local pkg=$1
-	shift
-	elog "  $(printf "%-17s:" ${pkg}) ${@}"
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
-	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
-	einfo "Note that the prompt bash code is now in that separate script"
-	elog "These additional scripts need some dependencies:"
-	echo
-	showpkgdeps git-quiltimport "dev-util/quilt"
-	showpkgdeps git-instaweb \
-		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
-	echo
-	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/dev-vcs/git/git-2.16.0_rc2.ebuild b/dev-vcs/git/git-2.16.0_rc2.ebuild
new file mode 100644
index 000000000000..d3e89d0092f7
--- /dev/null
+++ b/dev-vcs/git/git-2.16.0_rc2.ebuild
@@ -0,0 +1,696 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+# bug #329479: git-remote-testgit is not multiple-version aware
+PYTHON_COMPAT=( python2_7 )
+PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN"
+if [[ ${PV} == *9999 ]]; then
+	SCM="git-r3"
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/git/git.git"
+	# Please ensure that all _four_ 9999 ebuilds get updated; they track the 4 upstream branches.
+	# See https://git-scm.com/docs/gitworkflows#_graduation
+	# In order of stability:
+	# 9999-r0: maint
+	# 9999-r1: master
+	# 9999-r2: next
+	# 9999-r3: pu
+	case "${PVR}" in
+		9999) EGIT_BRANCH=maint ;;
+		9999-r1) EGIT_BRANCH=master ;;
+		9999-r2) EGIT_BRANCH=next;;
+		9999-r3) EGIT_BRANCH=pu ;;
+	esac
+fi
+
+inherit toolchain-funcs eutils elisp-common l10n perl-module bash-completion-r1 python-single-r1 systemd ${SCM}
+
+MY_PV="${PV/_rc/.rc}"
+MY_P="${PN}-${MY_PV}"
+
+DOC_VER=${MY_PV}
+
+DESCRIPTION="stupid content tracker: distributed VCS designed for speed and efficiency"
+HOMEPAGE="http://www.git-scm.com/"
+if [[ ${PV} != *9999 ]]; then
+	SRC_URI_SUFFIX="xz"
+	SRC_URI_KORG="mirror://kernel/software/scm/git"
+	[[ "${PV/rc}" != "${PV}" ]] && SRC_URI_KORG+='/testing'
+	SRC_URI="${SRC_URI_KORG}/${MY_P}.tar.${SRC_URI_SUFFIX}
+			${SRC_URI_KORG}/${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			doc? (
+			${SRC_URI_KORG}/${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+			)"
+	[[ "${PV}" = *_rc* ]] || \
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test"
+
+# Common to both DEPEND and RDEPEND
+CDEPEND="
+	gnome-keyring? ( app-crypt/libsecret )
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:= )
+	sys-libs/zlib
+	pcre? (
+		pcre-jit? ( dev-libs/libpcre2[jit(+)] )
+		!pcre-jit? ( dev-libs/libpcre )
+	)
+	perl? ( dev-lang/perl:=[-build(-)] )
+	tk? ( dev-lang/tk:0= )
+	curl? (
+		net-misc/curl
+		webdav? ( dev-libs/expat )
+	)
+	emacs? ( virtual/emacs )
+"
+
+RDEPEND="${CDEPEND}
+	gpg? ( app-crypt/gnupg )
+	mediawiki? (
+		dev-perl/DateTime-Format-ISO8601
+		dev-perl/HTML-Tree
+		dev-perl/MediaWiki-API
+	)
+	perl? ( dev-perl/Error
+			dev-perl/Net-SMTP-SSL
+			dev-perl/Authen-SASL
+			cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) )
+			cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite )
+			subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey )
+			)
+	python? ( ${PYTHON_DEPS} )
+"
+
+# This is how info docs are created with Git:
+#   .txt/asciidoc --(asciidoc)---------> .xml/docbook
+#   .xml/docbook  --(docbook2texi.pl)--> .texi
+#   .texi         --(makeinfo)---------> .info
+DEPEND="${CDEPEND}
+	doc? (
+		app-text/asciidoc
+		app-text/docbook2X
+		sys-apps/texinfo
+		app-text/xmlto
+	)
+	nls? ( sys-devel/gettext )
+	test? (	app-crypt/gnupg	)"
+
+# Live ebuild builds man pages and HTML docs, additionally
+if [[ ${PV} == *9999 ]]; then
+	DEPEND="${DEPEND}
+		app-text/asciidoc"
+fi
+
+SITEFILE=50${PN}-gentoo.el
+S="${WORKDIR}/${MY_P}"
+
+REQUIRED_USE="
+	cgi? ( perl )
+	cvs? ( perl )
+	mediawiki? ( perl )
+	mediawiki-experimental? ( mediawiki )
+	subversion? ( perl )
+	webdav? ( curl )
+	pcre-jit? ( pcre )
+	python? ( ${PYTHON_REQUIRED_USE} )
+"
+
+PATCHES=(
+	# bug #350330 - automagic CVS when we don't want it is bad.
+	"${FILESDIR}"/git-2.12.0-optional-cvs.patch
+
+	# install mediawiki perl modules also in vendor_dir
+	# hack, needs better upstream solution
+	"${FILESDIR}"/git-1.8.5-mw-vendor.patch
+
+	"${FILESDIR}"/git-2.2.0-svn-fe-linking.patch
+
+	# Bug #493306, where FreeBSD 10.x merged libiconv into its libc.
+	"${FILESDIR}"/git-2.5.1-freebsd-10.x-no-iconv.patch
+)
+
+pkg_setup() {
+	if use subversion && has_version "dev-vcs/subversion[dso]"; then
+		ewarn "Per Gentoo bugs #223747, #238586, when subversion is built"
+		ewarn "with USE=dso, there may be weird crashes in git-svn. You"
+		ewarn "have been warned."
+	fi
+	if use python ; then
+		python-single-r1_pkg_setup
+	fi
+}
+
+# This is needed because for some obscure reasons future calls to make don't
+# pick up these exports if we export them in src_unpack()
+exportmakeopts() {
+	local myopts
+
+	if use blksha1 ; then
+		myopts+=" BLK_SHA1=YesPlease"
+	elif use ppcsha1 ; then
+		myopts+=" PPC_SHA1=YesPlease"
+	fi
+
+	if use curl ; then
+		use webdav || myopts+=" NO_EXPAT=YesPlease"
+	else
+		myopts+=" NO_CURL=YesPlease"
+	fi
+
+	# broken assumptions, because of static build system ...
+	myopts+=" NO_FINK=YesPlease NO_DARWIN_PORTS=YesPlease"
+	myopts+=" INSTALL=install TAR=tar"
+	myopts+=" SHELL_PATH=${EPREFIX}/bin/sh"
+	myopts+=" SANE_TOOL_PATH="
+	myopts+=" OLD_ICONV="
+	myopts+=" NO_EXTERNAL_GREP="
+
+	# For svn-fe
+	extlibs="-lz -lssl ${S}/xdiff/lib.a $(usex threads -lpthread '')"
+
+	# can't define this to null, since the entire makefile depends on it
+	sed -i -e '/\/usr\/local/s/BASIC_/#BASIC_/' Makefile
+
+	use iconv \
+		|| myopts+=" NO_ICONV=YesPlease"
+	use nls \
+		|| myopts+=" NO_GETTEXT=YesPlease"
+	use tk \
+		|| myopts+=" NO_TCLTK=YesPlease"
+	if use pcre; then
+		if use pcre-jit; then
+			myopts+=" USE_LIBPCRE2=YesPlease"
+			extlibs+=" -lpcre2-8"
+		else
+			myopts+=" USE_LIBPCRE1=YesPlease"
+			myopts+=" NO_LIBPCRE1_JIT=YesPlease"
+			extlibs+=" -lpcre"
+		fi
+	fi
+	use perl \
+		&& myopts+=" INSTALLDIRS=vendor" \
+		|| myopts+=" NO_PERL=YesPlease"
+	use python \
+		|| myopts+=" NO_PYTHON=YesPlease"
+	use subversion \
+		|| myopts+=" NO_SVN_TESTS=YesPlease"
+	use threads \
+		&& myopts+=" THREADED_DELTA_SEARCH=YesPlease" \
+		|| myopts+=" NO_PTHREADS=YesPlease"
+	use cvs \
+		|| myopts+=" NO_CVS=YesPlease"
+	use elibc_musl \
+		&& myopts+=" NO_REGEX=YesPlease"
+# Disabled until ~m68k-mint can be keyworded again
+#	if [[ ${CHOST} == *-mint* ]] ; then
+#		myopts+=" NO_MMAP=YesPlease"
+#		myopts+=" NO_IPV6=YesPlease"
+#		myopts+=" NO_STRLCPY=YesPlease"
+#		myopts+=" NO_MEMMEM=YesPlease"
+#		myopts+=" NO_MKDTEMP=YesPlease"
+#		myopts+=" NO_MKSTEMPS=YesPlease"
+#	fi
+	if [[ ${CHOST} == ia64-*-hpux* ]]; then
+		myopts+=" NO_NSEC=YesPlease"
+	fi
+	if [[ ${CHOST} == *-*-aix* ]]; then
+		myopts+=" NO_FNMATCH_CASEFOLD=YesPlease"
+	fi
+	if [[ ${CHOST} == *-solaris* ]]; then
+		myopts+=" NEEDS_LIBICONV=YesPlease"
+		myopts+=" HAVE_CLOCK_MONOTONIC=1"
+		grep -q getdelim "${ROOT}"/usr/include/stdio.h && \
+			myopts+=" HAVE_GETDELIM=1"
+	fi
+
+	has_version '>=app-text/asciidoc-8.0' \
+		&& myopts+=" ASCIIDOC8=YesPlease"
+	myopts+=" ASCIIDOC_NO_ROFF=YesPlease"
+
+	# Bug 290465:
+	# builtin-fetch-pack.c:816: error: 'struct stat' has no member named 'st_mtim'
+	[[ "${CHOST}" == *-uclibc* ]] && \
+		myopts+=" NO_NSEC=YesPlease"
+
+	export MY_MAKEOPTS="${myopts}"
+	export EXTLIBS="${extlibs}"
+}
+
+src_unpack() {
+	if [[ ${PV} != *9999 ]]; then
+		unpack ${MY_P}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+		unpack ${PN}-manpages-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		use doc && \
+			cd "${S}"/Documentation && \
+			unpack ${PN}-htmldocs-${DOC_VER}.tar.${SRC_URI_SUFFIX}
+		cd "${S}"
+	else
+		git-r3_src_unpack
+		cd "${S}"
+		#cp "${FILESDIR}"/GIT-VERSION-GEN .
+	fi
+
+}
+
+src_prepare() {
+	# add experimental patches to improve mediawiki support
+	# see patches for origin
+	if use mediawiki-experimental ; then
+		PATCHES+=(
+			"${FILESDIR}"/git-2.7.0-mediawiki-namespaces.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-subpages.patch
+			"${FILESDIR}"/git-2.7.0-mediawiki-500pages.patch
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e 's:^\(CFLAGS[[:space:]]*=\).*$:\1 $(OPTCFLAGS) -Wall:' \
+		-e 's:^\(LDFLAGS[[:space:]]*=\).*$:\1 $(OPTLDFLAGS):' \
+		-e 's:^\(CC[[:space:]]* =\).*$:\1$(OPTCC):' \
+		-e 's:^\(AR[[:space:]]* =\).*$:\1$(OPTAR):' \
+		-e "s:\(PYTHON_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		-e "s:\(PERL_PATH[[:space:]]\+=[[:space:]]\+\)\(.*\)$:\1${EPREFIX}\2:" \
+		Makefile contrib/svn-fe/Makefile || die "sed failed"
+
+	# Never install the private copy of Error.pm (bug #296310)
+	sed -i \
+		-e '/private-Error.pm/s,^,#,' \
+		perl/Makefile.PL
+
+	# Fix docbook2texi command
+	sed -r -i 's/DOCBOOK2X_TEXI[[:space:]]*=[[:space:]]*docbook2x-texi/DOCBOOK2X_TEXI = docbook2texi.pl/' \
+		Documentation/Makefile || die "sed failed"
+
+	# Fix git-subtree missing DESTDIR
+	sed -i \
+		-e '/$(INSTALL)/s/ $(libexecdir)/ $(DESTDIR)$(libexecdir)/g' \
+		-e '/$(INSTALL)/s/ $(man1dir)/ $(DESTDIR)$(man1dir)/g'  \
+		contrib/subtree/Makefile
+}
+
+git_emake() {
+	# bug #320647: PYTHON_PATH
+	PYTHON_PATH=""
+	use python && PYTHON_PATH="${PYTHON}"
+	emake ${MY_MAKEOPTS} \
+		DESTDIR="${D}" \
+		OPTCFLAGS="${CFLAGS}" \
+		OPTLDFLAGS="${LDFLAGS}" \
+		OPTCC="$(tc-getCC)" \
+		OPTAR="$(tc-getAR)" \
+		prefix="${EPREFIX}"/usr \
+		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
+		sysconfdir="${EPREFIX}"/etc \
+		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
+		PERL_MM_OPT="" \
+		GIT_TEST_OPTS="--no-color" \
+		V=1 \
+		"$@"
+}
+
+src_configure() {
+	exportmakeopts
+}
+
+src_compile() {
+	if use perl ; then
+	git_emake perl/PM.stamp || die "emake perl/PM.stamp failed"
+	git_emake perl/perl.mak || die "emake perl/perl.mak failed"
+	fi
+	git_emake || die "emake failed"
+
+	if use emacs ; then
+		elisp-compile contrib/emacs/git{,-blame}.el
+	fi
+
+	if use perl && use cgi ; then
+		git_emake \
+			gitweb \
+			|| die "emake gitweb (cgi) failed"
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		cd "${S}"/contrib/credential/osxkeychain || die
+		git_emake CC=$(tc-getCC) CFLAGS="${CFLAGS}" \
+			|| die "emake credential-osxkeychain"
+	fi
+
+	cd "${S}"/Documentation
+	if [[ ${PV} == *9999 ]] ; then
+		git_emake man \
+			|| die "emake man failed"
+		if use doc ; then
+			git_emake info html \
+				|| die "emake info html failed"
+		fi
+	else
+		if use doc ; then
+			git_emake info \
+				|| die "emake info html failed"
+		fi
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		# by defining EXTLIBS we override the detection for libintl and
+		# libiconv, bug #516168
+		local nlsiconv=
+		use nls && use !elibc_glibc && nlsiconv+=" -lintl"
+		use iconv && use !elibc_glibc && nlsiconv+=" -liconv"
+		git_emake EXTLIBS="${EXTLIBS} ${nlsiconv}" || die "emake svn-fe failed"
+		if use doc ; then
+			git_emake svn-fe.{1,html} || die "emake svn-fe.1 svn-fe.html failed"
+		fi
+		cd "${S}"
+	fi
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/libsecret
+		git_emake || die "emake git-credential-libsecret failed"
+	fi
+
+	cd "${S}"/contrib/subtree || die
+	git_emake
+	use doc && git_emake doc
+
+	cd "${S}"/contrib/diff-highlight || die
+	git_emake
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake
+	fi
+}
+
+src_install() {
+	git_emake \
+		install || \
+		die "make install failed"
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		dobin contrib/credential/osxkeychain/git-credential-osxkeychain
+	fi
+
+	# Depending on the tarball and manual rebuild of the documentation, the
+	# manpages may exist in either OR both of these directories.
+	find man?/*.[157] >/dev/null 2>&1 && doman man?/*.[157]
+	find Documentation/*.[157] >/dev/null 2>&1 && doman Documentation/*.[157]
+	dodoc README* Documentation/{SubmittingPatches,CodingGuidelines}
+	use doc && dodir /usr/share/doc/${PF}/html
+	for d in / /howto/ /technical/ ; do
+		docinto ${d}
+		dodoc Documentation${d}*.txt
+		if use doc ; then
+			docinto ${d}/html
+			dodoc Documentation${d}*.html
+		fi
+	done
+	docinto /
+	# Upstream does not ship this pre-built :-(
+	use doc && doinfo Documentation/{git,gitman}.info
+
+	newbashcomp contrib/completion/git-completion.bash ${PN}
+	bashcomp_alias git gitk
+	# Not really a bash-completion file (bug #477920)
+	# but still needed uncompressed (bug #507480)
+	insinto /usr/share/${PN}
+	doins contrib/completion/git-prompt.sh
+
+	if use emacs ; then
+		elisp-install ${PN} contrib/emacs/git.{el,elc}
+		elisp-install ${PN} contrib/emacs/git-blame.{el,elc}
+		#elisp-install ${PN}/compat contrib/emacs/vc-git.{el,elc}
+		# don't add automatically to the load-path, so the sitefile
+		# can do a conditional loading
+		touch "${ED}${SITELISP}/${PN}/compat/.nosearch"
+		elisp-site-file-install "${FILESDIR}"/${SITEFILE}
+	fi
+
+	#dobin contrib/fast-import/git-p4 # Moved upstream
+	#dodoc contrib/fast-import/git-p4.txt # Moved upstream
+	newbin contrib/fast-import/import-tars.perl import-tars
+	exeinto /usr/libexec/git-core/
+	newexe contrib/git-resurrect.sh git-resurrect
+
+	# git-subtree
+	cd "${S}"/contrib/subtree
+	git_emake install || die "Failed to emake install git-subtree"
+	if use doc ; then
+		git_emake install-man install-doc || die "Failed to emake install-doc install-mangit-subtree"
+	fi
+	newdoc README README.git-subtree
+	dodoc git-subtree.txt
+	cd "${S}"
+
+	if use mediawiki ; then
+		cd "${S}"/contrib/mw-to-git
+		git_emake install
+		cd "${S}"
+	fi
+
+	# diff-highlight
+	dobin contrib/diff-highlight/diff-highlight
+	newdoc contrib/diff-highlight/README README.diff-highlight
+
+	# git-jump
+	exeinto /usr/libexec/git-core/
+	doexe contrib/git-jump/git-jump
+	newdoc contrib/git-jump/README git-jump.txt
+
+	# git-contacts
+	exeinto /usr/libexec/git-core/
+	doexe contrib/contacts/git-contacts
+	dodoc contrib/contacts/git-contacts.txt
+
+	if use gnome-keyring ; then
+		cd "${S}"/contrib/credential/libsecret
+		dobin git-credential-libsecret
+	fi
+
+	if use subversion ; then
+		cd "${S}"/contrib/svn-fe
+		dobin svn-fe
+		dodoc svn-fe.txt
+		if use doc ; then
+			doman svn-fe.1
+			docinto html
+			dodoc svn-fe.html
+		fi
+		cd "${S}"
+	fi
+
+	dodir /usr/share/${PN}/contrib
+	# The following are excluded:
+	# completion - installed above
+	# diff-highlight - done above
+	# emacs - installed above
+	# examples - these are stuff that is not used in Git anymore actually
+	# git-jump - done above
+	# gitview - installed above
+	# p4import - excluded because fast-import has a better one
+	# patches - stuff the Git guys made to go upstream to other places
+	# persistent-https - TODO
+	# mw-to-git - TODO
+	# subtree - build  seperately
+	# svnimport - use git-svn
+	# thunderbird-patch-inline - fixes thunderbird
+	local contrib_objects=(
+		buildsystems
+		fast-import
+		hg-to-git
+		hooks
+		remotes2config.sh
+		rerere-train.sh
+		stats
+		workdir
+	)
+	for i in "${contrib_objects[@]}" ; do
+		cp -rf \
+			"${S}"/contrib/${i} \
+			"${ED}"/usr/share/${PN}/contrib \
+			|| die "Failed contrib ${i}"
+	done
+
+	if use perl && use cgi ; then
+		# We used to install in /usr/share/${PN}/gitweb
+		# but upstream installs in /usr/share/gitweb
+		# so we will install a symlink and use their location for compat with other
+		# distros
+		dosym /usr/share/gitweb /usr/share/${PN}/gitweb
+
+		# INSTALL discusses configuration issues, not just installation
+		docinto /
+		newdoc  "${S}"/gitweb/INSTALL INSTALL.gitweb
+		newdoc  "${S}"/gitweb/README README.gitweb
+
+		find "${ED}"/usr/lib64/perl5/ \
+			-name .packlist \
+			-exec rm \{\} \;
+	else
+		rm -rf "${ED}"/usr/share/gitweb
+	fi
+
+	if ! use subversion ; then
+		rm -f "${ED}"/usr/libexec/git-core/git-svn \
+			"${ED}"/usr/share/man/man1/git-svn.1*
+	fi
+
+	if use xinetd ; then
+		insinto /etc/xinetd.d
+		newins "${FILESDIR}"/git-daemon.xinetd git-daemon
+	fi
+
+	if use !prefix ; then
+		newinitd "${FILESDIR}"/git-daemon-r1.initd git-daemon
+		newconfd "${FILESDIR}"/git-daemon.confd git-daemon
+		systemd_newunit "${FILESDIR}/git-daemon_at-r1.service" "git-daemon@.service"
+		systemd_dounit "${FILESDIR}/git-daemon.socket"
+	fi
+
+	perl_delete_localpod
+
+	# Remove disabled linguas
+	# we could remove sources in src_prepare, but install does not
+	# handle missing locale dir well
+	rm_loc() {
+		if [[ -e "${ED}/usr/share/locale/${1}" ]]; then
+			rm -r "${ED}/usr/share/locale/${1}" || die
+		fi
+	}
+	l10n_for_each_disabled_locale_do rm_loc
+}
+
+src_test() {
+	local disabled="t9128-git-svn-cmd-branch.sh"
+	local tests_cvs="t9200-git-cvsexportcommit.sh \
+					t9400-git-cvsserver-server.sh \
+					t9401-git-cvsserver-crlf.sh \
+					t9402-git-cvsserver-refs.sh \
+					t9600-cvsimport.sh \
+					t9601-cvsimport-vendor-branch.sh \
+					t9602-cvsimport-branches-tags.sh \
+					t9603-cvsimport-patchsets.sh \
+					t9604-cvsimport-timestamps.sh"
+	local tests_perl="t3701-add-interactive.sh \
+					t5502-quickfetch.sh \
+					t5512-ls-remote.sh \
+					t5520-pull.sh \
+					t7106-reset-unborn-branch.sh \
+					t7501-commit.sh"
+	# Bug #225601 - t0004 is not suitable for root perm
+	# Bug #219839 - t1004 is not suitable for root perm
+	# t0001-init.sh - check for init notices EPERM*  fails
+	local tests_nonroot="t0001-init.sh \
+		t0004-unwritable.sh \
+		t0070-fundamental.sh \
+		t1004-read-tree-m-u-wf.sh \
+		t3700-add.sh \
+		t7300-clean.sh"
+	# t9100 still fails with symlinks in SVN 1.7
+	local test_svn="t9100-git-svn-basic.sh"
+
+	# Unzip is used only for the testcase code, not by any normal parts of Git.
+	if ! has_version app-arch/unzip ; then
+		einfo "Disabling tar-tree tests"
+		disabled="${disabled} t5000-tar-tree.sh"
+	fi
+
+	cvs=0
+	use cvs && let cvs=$cvs+1
+	if [[ ${EUID} -eq 0 ]]; then
+		if [[ $cvs -eq 1 ]]; then
+			ewarn "Skipping CVS tests because CVS does not work as root!"
+			ewarn "You should retest with FEATURES=userpriv!"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+		einfo "Skipping other tests that require being non-root"
+		disabled="${disabled} ${tests_nonroot}"
+	else
+		[[ $cvs -gt 0 ]] && \
+			has_version dev-vcs/cvs && \
+			let cvs=$cvs+1
+		[[ $cvs -gt 1 ]] && \
+			has_version "dev-vcs/cvs[server]" && \
+			let cvs=$cvs+1
+		if [[ $cvs -lt 3 ]]; then
+			einfo "Disabling CVS tests (needs dev-vcs/cvs[USE=server])"
+			disabled="${disabled} ${tests_cvs}"
+		fi
+	fi
+
+	if ! use perl ; then
+		einfo "Disabling tests that need Perl"
+		disabled="${disabled} ${tests_perl}"
+	fi
+
+	einfo "Disabling tests that fail with SVN 1.7"
+	disabled="${disabled} ${test_svn}"
+
+	# Reset all previously disabled tests
+	cd "${S}/t"
+	for i in *.sh.DISABLED ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i%.DISABLED}"
+	done
+	einfo "Disabled tests:"
+	for i in ${disabled} ; do
+		[[ -f "${i}" ]] && mv -f "${i}" "${i}.DISABLED" && einfo "Disabled $i"
+	done
+
+	# Avoid the test system removing the results because we want them ourselves
+	sed -e '/^[[:space:]]*$(MAKE) clean/s,^,#,g' \
+		-i "${S}"/t/Makefile
+
+	# Clean old results first, must always run
+	cd "${S}/t"
+	nonfatal git_emake clean
+
+	# Now run the tests, keep going if we hit an error, and don't terminate on
+	# failure
+	cd "${S}"
+	einfo "Start test run"
+	#MAKEOPTS=-j1
+	nonfatal git_emake --keep-going test
+	rc=$?
+
+	# Display nice results, now print the results
+	cd "${S}/t"
+	nonfatal git_emake aggregate-results
+
+	# And bail if there was a problem
+	[ $rc -eq 0 ] || die "tests failed. Please file a bug."
+}
+
+showpkgdeps() {
+	local pkg=$1
+	shift
+	elog "  $(printf "%-17s:" ${pkg}) ${@}"
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+	einfo "Please read /usr/share/bash-completion/git for Git bash command completion"
+	einfo "Please read /usr/share/git/git-prompt.sh for Git bash prompt"
+	einfo "Note that the prompt bash code is now in that separate script"
+	elog "These additional scripts need some dependencies:"
+	echo
+	showpkgdeps git-quiltimport "dev-util/quilt"
+	showpkgdeps git-instaweb \
+		"|| ( www-servers/lighttpd www-servers/apache www-servers/nginx )"
+	echo
+	use mediawiki-experimental && ewarn "Using experimental git-mediawiki patches. The stability of cloned wiki filesystems is not guaranteed."
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-vcs/git/git-9999-r1.ebuild b/dev-vcs/git/git-9999-r1.ebuild
index 3f45eb3ef445..d3e89d0092f7 100644
--- a/dev-vcs/git/git-9999-r1.ebuild
+++ b/dev-vcs/git/git-9999-r1.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {
diff --git a/dev-vcs/git/git-9999-r2.ebuild b/dev-vcs/git/git-9999-r2.ebuild
index 3f45eb3ef445..d3e89d0092f7 100644
--- a/dev-vcs/git/git-9999-r2.ebuild
+++ b/dev-vcs/git/git-9999-r2.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {
diff --git a/dev-vcs/git/git-9999-r3.ebuild b/dev-vcs/git/git-9999-r3.ebuild
index 3f45eb3ef445..d3e89d0092f7 100644
--- a/dev-vcs/git/git-9999-r3.ebuild
+++ b/dev-vcs/git/git-9999-r3.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {
diff --git a/dev-vcs/git/git-9999.ebuild b/dev-vcs/git/git-9999.ebuild
index 3f45eb3ef445..d3e89d0092f7 100644
--- a/dev-vcs/git/git-9999.ebuild
+++ b/dev-vcs/git/git-9999.ebuild
@@ -299,7 +299,6 @@ src_prepare() {
 }
 
 git_emake() {
-	# bug #326625: PERL_PATH, PERL_MM_OPT
 	# bug #320647: PYTHON_PATH
 	PYTHON_PATH=""
 	use python && PYTHON_PATH="${PYTHON}"
@@ -313,13 +312,11 @@ git_emake() {
 		htmldir="${EPREFIX}"/usr/share/doc/${PF}/html \
 		sysconfdir="${EPREFIX}"/etc \
 		PYTHON_PATH="${PYTHON_PATH}" \
+		PERL_PATH="${EPREFIX}/usr/bin/perl" \
 		PERL_MM_OPT="" \
 		GIT_TEST_OPTS="--no-color" \
 		V=1 \
 		"$@"
-	# This is the fix for bug #326625, but it also causes breakage, see bug
-	# #352693.
-	# PERL_PATH="${EPREFIX}/usr/bin/env perl" \
 }
 
 src_configure() {
diff --git a/dev-vcs/svn2git/Manifest b/dev-vcs/svn2git/Manifest
index 5737c3611eef..e956f665ea4f 100644
--- a/dev-vcs/svn2git/Manifest
+++ b/dev-vcs/svn2git/Manifest
@@ -1,8 +1,6 @@
 AUX svn2git-1.0.10-version.patch 900 BLAKE2B 748f66cf3fcb3937365b5d2b01d2bd1bd7d91932b2057be81063b55ee93d94c62806e3e9abd3e2392358b0527c7e29f59caa849f3928ebd17352c92296ba31fb SHA512 51d69b34c5d2a481b04d3ef43368815a406fd709aeaa358e60e41c75b776895e79a11b402d87cb4d0c4b0b70776dd31f34809fbece9b069bc834510872af4b03
-AUX svn2git-1.0.2.1-include-path.patch 637 BLAKE2B d251c22b0139683dede572dbd69583fa4238b6c19bf8c78603c75eadcb4ccd37ecd376790eeac3a7b414dbbd3610f22df8c5b5f9bb0b07b3f5d6566e40192a53 SHA512 1711a6281622bfe781fdf05df3644073ff6d2240cba1744540bf28b9f8732482002cc4769e040db93f08b0f8378e4cd9b4288f8bf7db4ee759d5c5c1770b3fe3
-DIST svn2git-1.0.10.tar.gz 26667 BLAKE2B 50b8817cbdbee72622a1bf3d3f654d292366fbf8018346a4277b435769e71c94f990aae5d7bb1ec9860b3758d5daecf3b2bcd61c9d6a68a78de67d57d11f24d1 SHA512 7148721a5470be2537494349a63e02abf2a0a115c1cea51dae7c407c4480b4576ed3f572b4d1cfa2d5af6df37d3941dda3b174d298b6bf5530de68b5b504ed49
+AUX svn2git-1.0.2.1-include-path.patch 641 BLAKE2B 4df6dbbb8935377355cf9fa35c005e349f5ce5b7d7decb7fb5038db5b70bff25aa1ff91b345c1f3b3d9a3c4a7c566417a49b4385a7f7e6660dcd54f528990210 SHA512 2be52266425ba4b287eb5adde4f2a643759a65b5ece00a7ef1982256dc0f460c069afd4b7d4aee63f2e4a99ebcaabc6f24b5688dd939cb172f333c2d4755a36f
 DIST svn2git-1.0.11.tar.gz 30986 BLAKE2B 76300c05e070364b4bec8340534dd494fb93bc6b3965c938918821c3321eb59d2e691163b418e2ab7ece131776d9fd550a05345fb56d449d68c530c3f90d3f95 SHA512 8fa082d8da2dfc9687ebb4269b3861a053f83afb71a5c0666155bdb179d7799de3f37f3d58cabe02069bda8e8fd306bb729ba04709c0654ba8a5c24952142de9
-EBUILD svn2git-1.0.10.ebuild 1136 BLAKE2B 99f1090d3286c845ce486c716f4d22782c74339f412a8ca35612cc4c28ceace3dfd74c401d4fdf1e50c04a19f871c39b80ab538f245a4146bba1f24668e6e83b SHA512 41533788c0db01aabe51384f3b3744f96053b26fea2a1e2d163f21211684f3c24c2ecef5b407637e53689ddc649093184e03bd88f5edb67649046ea5106a832c
-EBUILD svn2git-1.0.11.ebuild 1169 BLAKE2B 67bf677eba6cafcb34b78fe6b7c9ed0f16c859560d0d07f60023af70fec37de3b63f36d0a57944c93744ceffb2cdd84055ee7f57b403d3eb00c0f8a996c609a7 SHA512 9e1a3300a721e032b7b6ec7fda1602ea7c5ad921acd7d7e74228796915b250172a8a0f001e544f9c1d2ebb928c0101540e98ed843dbcaa62ee05a1b04b9d4e6d
-EBUILD svn2git-9999.ebuild 1169 BLAKE2B 67bf677eba6cafcb34b78fe6b7c9ed0f16c859560d0d07f60023af70fec37de3b63f36d0a57944c93744ceffb2cdd84055ee7f57b403d3eb00c0f8a996c609a7 SHA512 9e1a3300a721e032b7b6ec7fda1602ea7c5ad921acd7d7e74228796915b250172a8a0f001e544f9c1d2ebb928c0101540e98ed843dbcaa62ee05a1b04b9d4e6d
+EBUILD svn2git-1.0.11-r1.ebuild 1230 BLAKE2B aef6f52f1eec8783b48d62ca67ab4801b524221244db5453a661344947262557920626b2ff640282c4bd146ae74c5b3266fa37b5f41f3d0e5b9a42f0b4e6a7b6 SHA512 b3cd213677fae1ccb9e8548a1140dbfedc157793d009f32ee7cbca262d122fcf5722c4e5743411820828a2f9b76a3e4cfb5d450671fac59506ae4bbe95a6c895
+EBUILD svn2git-9999.ebuild 1230 BLAKE2B aef6f52f1eec8783b48d62ca67ab4801b524221244db5453a661344947262557920626b2ff640282c4bd146ae74c5b3266fa37b5f41f3d0e5b9a42f0b4e6a7b6 SHA512 b3cd213677fae1ccb9e8548a1140dbfedc157793d009f32ee7cbca262d122fcf5722c4e5743411820828a2f9b76a3e4cfb5d450671fac59506ae4bbe95a6c895
 MISC metadata.xml 341 BLAKE2B a717046fb841b51b7e24fec4206379614a66d18aa60f8665e81f914beb100931418a37a2ed242ab7f48e9ed65affa0468f20192ab1d3661547d5db6d00dfbc23 SHA512 9026002122daf2c35d3c407ca605e353c8b6b39514572207bf3642ad98b8265965e2b56244ebfa1f864670426e98dbe21fec948e17cf97fdafce8bafb27bf590
diff --git a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch b/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
index 2349b3080835..e5c898ba9738 100644
--- a/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
+++ b/dev-vcs/svn2git/files/svn2git-1.0.2.1-include-path.patch
@@ -1,5 +1,5 @@
---- src/src.pro	2011-01-11 09:02:15.696463807 +0100
-+++ src/src.pro	2011-01-11 09:03:59.793959849 +0100
+--- a/src/src.pro	2011-01-11 09:02:15.696463807 +0100
++++ b/src/src.pro	2011-01-11 09:03:59.793959849 +0100
 @@ -3,8 +3,8 @@
  # Automatically generated by qmake (2.01a) dim. dc. 23 13:49:28 2007
  ######################################################################
diff --git a/dev-vcs/svn2git/svn2git-1.0.10.ebuild b/dev-vcs/svn2git/svn2git-1.0.10.ebuild
deleted file mode 100644
index d23b946dd204..000000000000
--- a/dev-vcs/svn2git/svn2git-1.0.10.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="2"
-
-inherit eutils qt4-r2
-[ "$PV" == "9999" ] && inherit git
-
-DESCRIPTION="Tool for one-time conversion from svn to git"
-HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
-if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://www.hartwork.org/public/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-# KEYWORDS way up
-
-DEPEND="dev-vcs/subversion
-	dev-qt/qtcore:4"
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-
-S=${WORKDIR}/${PN}-${PN}
-
-src_prepare() {
-	# Note: patching order matters
-	epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
-	if [[ "$PV" != "9999" ]]; then
-		epatch "${FILESDIR}"/${PN}-1.0.10-version.patch
-		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
-	fi
-
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	insinto /usr/share/${PN}/samples
-	doins samples/*.rules || die 'doins failed'
-	dobin svn-all-fast-export || die 'dobin failed'
-	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
-}
diff --git a/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
new file mode 100644
index 000000000000..0fd35c4b742f
--- /dev/null
+++ b/dev-vcs/svn2git/svn2git-1.0.11-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop qmake-utils
+[[ "${PV}" == "9999" ]] && inherit git-r3
+
+DESCRIPTION="Tool for one-time conversion from svn to git"
+HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
+else
+	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE=""
+# KEYWORDS way up
+
+DEPEND="
+	dev-qt/qtcore:5
+	dev-vcs/subversion"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch )
+
+src_prepare() {
+	# Note: patching order matters
+	default
+
+	if [[ "${PV}" != "9999" ]]; then
+		eapply "${FILESDIR}"/${PN}-1.0.10-version.patch
+		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
+	fi
+}
+
+src_configure() {
+	eqmake5 fast-export2.pro
+}
+
+src_install() {
+	einstalldocs
+	insinto /usr/share/${PN}/samples
+	doins samples/*.rules || die 'doins failed'
+	dobin svn-all-fast-export || die 'dobin failed'
+	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
+}
diff --git a/dev-vcs/svn2git/svn2git-1.0.11.ebuild b/dev-vcs/svn2git/svn2git-1.0.11.ebuild
deleted file mode 100644
index c9fa2d784940..000000000000
--- a/dev-vcs/svn2git/svn2git-1.0.11.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils qt4-r2
-[ "$PV" == "9999" ] && inherit git-r3
-
-DESCRIPTION="Tool for one-time conversion from svn to git"
-HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
-if [ "$PV" == "9999" ]; then
-	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE=""
-# KEYWORDS way up
-
-DEPEND="dev-vcs/subversion
-	dev-qt/qtcore:4"
-RDEPEND="${DEPEND}
-	dev-vcs/git"
-
-src_prepare() {
-	# Note: patching order matters
-	epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
-	if [[ "$PV" != "9999" ]]; then
-		epatch "${FILESDIR}"/${PN}-1.0.10-version.patch
-		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
-	fi
-
-	qt4-r2_src_prepare
-}
-
-src_install() {
-	dodoc README.md
-	insinto /usr/share/${PN}/samples
-	doins samples/*.rules || die 'doins failed'
-	dobin svn-all-fast-export || die 'dobin failed'
-	dosym svn-all-fast-export /usr/bin/svn2git || die 'dosym failed'
-}
diff --git a/dev-vcs/svn2git/svn2git-9999.ebuild b/dev-vcs/svn2git/svn2git-9999.ebuild
index c9fa2d784940..0fd35c4b742f 100644
--- a/dev-vcs/svn2git/svn2git-9999.ebuild
+++ b/dev-vcs/svn2git/svn2git-9999.ebuild
@@ -1,16 +1,15 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
+EAPI=6
 
-inherit eutils qt4-r2
-[ "$PV" == "9999" ] && inherit git-r3
+inherit desktop qmake-utils
+[[ "${PV}" == "9999" ]] && inherit git-r3
 
 DESCRIPTION="Tool for one-time conversion from svn to git"
 HOMEPAGE="https://github.com/svn-all-fast-export/svn2git"
-if [ "$PV" == "9999" ]; then
+if [[ "${PV}" == "9999" ]]; then
 	EGIT_REPO_URI="https://github.com/svn-all-fast-export/svn2git.git"
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/svn-all-fast-export/svn2git/archive/${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~x86"
@@ -21,24 +20,32 @@ SLOT="0"
 IUSE=""
 # KEYWORDS way up
 
-DEPEND="dev-vcs/subversion
-	dev-qt/qtcore:4"
+DEPEND="
+	dev-qt/qtcore:5
+	dev-vcs/subversion"
 RDEPEND="${DEPEND}
 	dev-vcs/git"
 
+DOCS=( README.md )
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch )
+
 src_prepare() {
 	# Note: patching order matters
-	epatch "${FILESDIR}"/${PN}-1.0.2.1-include-path.patch
-	if [[ "$PV" != "9999" ]]; then
-		epatch "${FILESDIR}"/${PN}-1.0.10-version.patch
+	default
+
+	if [[ "${PV}" != "9999" ]]; then
+		eapply "${FILESDIR}"/${PN}-1.0.10-version.patch
 		export SVN_ALL_FAST_EXPORT_VERSION=${PVR}  # for src_compile
 	fi
+}
 
-	qt4-r2_src_prepare
+src_configure() {
+	eqmake5 fast-export2.pro
 }
 
 src_install() {
-	dodoc README.md
+	einstalldocs
 	insinto /usr/share/${PN}/samples
 	doins samples/*.rules || die 'doins failed'
 	dobin svn-all-fast-export || die 'dobin failed'
diff --git a/eclass/Manifest.gz b/eclass/Manifest.gz
index e8ffc18752c2..8b1740739ddd 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/kde5-functions.eclass b/eclass/kde5-functions.eclass
index d60d9d55101e..3df54d517242 100644
--- a/eclass/kde5-functions.eclass
+++ b/eclass/kde5-functions.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: kde5-functions.eclass
@@ -276,7 +276,11 @@ add_qt_dep() {
 	local slot=${4}
 
 	if [[ -z ${version} ]]; then
-		version=${QT_MINIMAL}
+		if [[ ${1} = qtwebkit && ${QT_MINIMAL} = 5.9* ]]; then
+			version=5.9.1 # no more upstream release, need bug #624404
+		else
+			version=${QT_MINIMAL}
+		fi
 	fi
 	if [[ -z ${slot} ]]; then
 		slot="5"
diff --git a/eclass/kde5.eclass b/eclass/kde5.eclass
index 826e0abf10c9..346838570a46 100644
--- a/eclass/kde5.eclass
+++ b/eclass/kde5.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: kde5.eclass
@@ -95,6 +95,11 @@ EXPORT_FUNCTIONS pkg_setup pkg_nofetch src_unpack src_prepare src_configure src_
 # Specifies the location of the KDE handbook if not the default.
 : ${KDE_DOC_DIR:=doc}
 
+# @ECLASS-VARIABLE: KDE_PO_DIRS
+# @DESCRIPTION:
+# Specifies the possible locations of KDE l10n files if not the default.
+: ${KDE_PO_DIRS:="po poqm"}
+
 # @ECLASS-VARIABLE: KDE_QTHELP
 # @DESCRIPTION:
 # If set to "false", do nothing.
@@ -199,21 +204,14 @@ case ${KDE_AUTODEPS} in
 			RDEPEND+=" || ( $(add_frameworks_dep breeze-icons) kde-frameworks/oxygen-icons:* )"
 		fi
 
-		case ${CATEGORY} in
-			kde-frameworks | \
-			kde-plasma)
-				RDEPEND+=" !<kde-apps/kde4-l10n-15.12.3-r1"
-				;;
-			kde-apps)
-				[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
-				[[ $(get_version_component_range 1) -ge 17 ]] && \
-					RDEPEND+="
-						!kde-apps/kde-l10n
-						!<kde-apps/kde4-l10n-16.12.0:4
-						!kde-apps/kdepim-l10n:5
-					"
-				;;
-		esac
+		if [[ ${CATEGORY} = kde-apps ]]; then
+			[[ ${KDE_BLOCK_SLOT4} = true ]] && RDEPEND+=" !kde-apps/${PN}:4"
+			RDEPEND+="
+				!kde-apps/kde-l10n
+				!<kde-apps/kde4-l10n-16.12.0:4
+				!kde-apps/kdepim-l10n:5
+			"
+		fi
 		;;
 esac
 
@@ -523,18 +521,18 @@ kde5_src_prepare() {
 
 	# drop translations when nls is not wanted
 	if in_iuse nls && ! use nls ; then
-		if [[ -d po ]] ; then
-			rm -r po || die
-		fi
-		if [[ -d poqm ]] ; then
-			rm -r poqm || die
-		fi
+		local po
+		for po in ${KDE_PO_DIRS}; do
+			if [[ -d ${po} ]] ; then
+				rm -r ${po} || die
+			fi
+		done
 	fi
 
 	# enable only the requested translations when required
 	if [[ -v LINGUAS ]] ; then
 		local po
-		for po in po poqm; do
+		for po in ${KDE_PO_DIRS}; do
 		if [[ -d ${po} ]] ; then
 			pushd ${po} > /dev/null || die
 			local lang
diff --git a/eclass/qt5-build.eclass b/eclass/qt5-build.eclass
index fd29ed1e6c05..82855656e040 100644
--- a/eclass/qt5-build.eclass
+++ b/eclass/qt5-build.eclass
@@ -213,6 +213,11 @@ qt5-build_src_prepare() {
 		# Don't add -O3 to CXXFLAGS (bug 549140)
 		sed -i -e '/CONFIG\s*+=/ s/optimize_full//' \
 			src/{corelib/corelib,gui/gui}.pro || die "sed failed (optimize_full)"
+
+		# Respect build variables in configure tests (bug #639494)
+		if [[ ${QT5_MINOR_VERSION} -ge 9 ]]; then
+			sed -i -e "s|\"\$outpath/bin/qmake\" \"\$relpathMangled\" -- \"\$@\"|& $(qt5_qmake_args) |" configure || die
+		fi
 	fi
 
 	default
@@ -567,7 +572,7 @@ qt5_base_configure() {
 		-no-sql-psql -no-sql-sqlite -no-sql-sqlite2 -no-sql-tds
 
 		# ensure the QML debugging support (qmltooling) is built in qtdeclarative
-		-qml-debug
+		$([[ ${QT5_MINOR_VERSION} -lt 11 ]] && echo -qml-debug)
 
 		# MIPS DSP instruction set extensions
 		$(is-flagq -mno-dsp   && echo -no-mips_dsp)
@@ -689,6 +694,33 @@ qt5_base_configure() {
 
 }
 
+# @FUNCTION: qt5_qmake_args
+# @INTERNAL
+# @DESCRIPTION:
+# Helper function to get the various toolchain-related variables.
+qt5_qmake_args() {
+	echo \
+		QMAKE_AR=\"$(tc-getAR)\" \
+		QMAKE_CC=\"$(tc-getCC)\" \
+		QMAKE_LINK_C=\"$(tc-getCC)\" \
+		QMAKE_LINK_C_SHLIB=\"$(tc-getCC)\" \
+		QMAKE_CXX=\"$(tc-getCXX)\" \
+		QMAKE_LINK=\"$(tc-getCXX)\" \
+		QMAKE_LINK_SHLIB=\"$(tc-getCXX)\" \
+		QMAKE_OBJCOPY=\"$(tc-getOBJCOPY)\" \
+		QMAKE_RANLIB= \
+		QMAKE_STRIP=\"$(tc-getSTRIP)\" \
+		QMAKE_CFLAGS=\"${CFLAGS}\" \
+		QMAKE_CFLAGS_RELEASE= \
+		QMAKE_CFLAGS_DEBUG= \
+		QMAKE_CXXFLAGS=\"${CXXFLAGS}\" \
+		QMAKE_CXXFLAGS_RELEASE= \
+		QMAKE_CXXFLAGS_DEBUG= \
+		QMAKE_LFLAGS=\"${LDFLAGS}\" \
+		QMAKE_LFLAGS_RELEASE= \
+		QMAKE_LFLAGS_DEBUG=
+}
+
 # @FUNCTION: qt5_qmake
 # @INTERNAL
 # @DESCRIPTION:
diff --git a/eclass/toolchain-glibc.eclass b/eclass/toolchain-glibc.eclass
index bea0299d3de6..f58b44bcfff2 100644
--- a/eclass/toolchain-glibc.eclass
+++ b/eclass/toolchain-glibc.eclass
@@ -227,6 +227,7 @@ setup_flags() {
 	strip-flags
 	strip-unsupported-flags
 	filter-flags -m32 -m64 -mabi=*
+	filter-ldflags -Wl,-rpath=*
 
 	# Bug 492892.
 	filter-flags -frecord-gcc-switches
diff --git a/games-board/Manifest.gz b/games-board/Manifest.gz
index a959ed9b302a..c63e207a86d0 100644
--- a/games-board/Manifest.gz
+++ b/games-board/Manifest.gz
diff --git a/games-board/spider/Manifest b/games-board/spider/Manifest
index 830e58a8a827..715605250e6b 100644
--- a/games-board/spider/Manifest
+++ b/games-board/spider/Manifest
@@ -1,4 +1,4 @@
 DIST spider_1.2-4.diff.gz 2882 BLAKE2B 3016e4d6a7f4aa6e4f47e7abb78b12d70d5cee400a4e61b514e8fbbfdb7ad8484f84c1c1006447f3c6ab8a5897dfc4d4af5304eeaea716203c5c5440f9084b3b SHA512 e1e6eb4d5b14de7c32e1537877a3d26470c032bea567aa679c8a3744d62ab6b12d81bf05120679a273d98b6fd976c32d24ce9c54b720d006c51464f7ff6d5e75
 DIST spider_1.2.orig.tar.gz 168209 BLAKE2B 3a1163099ba9ce4faa9bc7c3424a2a2105c6fe001487822898dba7598dc5dc8d43cab2a3d7685fb71b1d19ff1b667397a41a3ba03fca4abf5d700308b19dc202 SHA512 a1d01f15ca37c8abdcc9f7c3dac925b1726f9b58ce51eb4096a9248abe0a55086ccdd5cc5ec358c2ee609ff089978676a3e3c669062a522ed7f1d4ea1ce33ab0
-EBUILD spider-1.2_p4-r1.ebuild 1700 BLAKE2B 84114810e57d7c88cd09c971c273be6f28b9277aa868eeefd99669105a8b16d19d7084c112f33b3fa09b3ed6fa680ee481c3ba2b9d806869127692c74103caad SHA512 73823198f0e271c179f552b7e7d775ae936b35602203d6f045609783bbb2c1fd4d4deef71022d1ab175506be4dff0f829ee7180bc683bb3b658d42ecc3dba013
+EBUILD spider-1.2_p4-r1.ebuild 1655 BLAKE2B 3bb36ea32ba136d70e9badba43a46546ae9baeb45f626495036a6613b112dbd68e3abab558b282de91daa102df01a58aee7334b238d3a55c5b8100e5a6d968e4 SHA512 0f0025fc52bf5c1090351280b7d86aaa9761c18810a90943a37b08f2cd2a87f85ba79ae4f88379f1d4862d78fca22e6acf109fc54958e5cad1db3e6d44e76c9b
 MISC metadata.xml 327 BLAKE2B 60eff6a4428512cda35daa5d6d02f55f946b5e7840a9ff866a1f76014a837c25fa5c4e142187270a5b25b1c38c96a61cf3e7a229f39caf70d830731565b9222e SHA512 e55a8b00c37c88331de81c2c28e9a187c1a28d4fd64c5fcafd9e01c8cdfbdbd455ded19f523d1806506a1652a5eecaf09b5f8097a42ac40bb36821b92bd3c4b9
diff --git a/games-board/spider/spider-1.2_p4-r1.ebuild b/games-board/spider/spider-1.2_p4-r1.ebuild
index c20901755c68..0d2b229121cc 100644
--- a/games-board/spider/spider-1.2_p4-r1.ebuild
+++ b/games-board/spider/spider-1.2_p4-r1.ebuild
@@ -38,12 +38,10 @@ src_prepare() {
 }
 
 src_configure() {
-	imake \
-		-DUseInstalled \
+	xmkmf \
 		-DSmallCards=NO \
 		-DRoundCards \
 		$(use athena && echo "-DCompileXAW=YES" || echo "-DCompileXlibOnly=YES") \
-		-I/usr/lib/X11/config \
 		|| die "imake failed"
 	sed -i \
 		-e '/CC = /d' \
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 38633d1e78db..9807b9dc1809 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 4e1842786fbd..ee77c733c28d 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,5 +1,5 @@
 AUX dolphin-5.0-CHAR_WIDTH-collision.patch 2043 BLAKE2B d29f1f9ff360d79105d7020174bfc5063ad18c544d17056dca055174d8d0c837671f5d04f95de98e140d8634651f869e1a0d9e79b834f0f039ce59900c0696b0 SHA512 47c25a3fd5e6c47e34fe23d5faa71ea316c708fa2bbcbc5136a415fc25a0b207c4d18bfedb2d7c4e2a71394581d1e41fd7d4cca3544d34e3f4a6a84fee360314
 DIST dolphin-5.0.zip 41802909 BLAKE2B 57fb7741e86b8b5194c9ccaf99e60be0202429209ce98d08aec4ed1d6f47fb347d9149509de7ac1e4bb28435cba35e357b87cf5d29efe2867706dbb3b903c886 SHA512 36c4f371e066537331a9a8ec4a17befa278465cdebe258e1cbf1157752ba69bff9c1b8a6e8698bbb650aa257bd48b6b42ee9f61357904b09fd01738af8223d3a
-EBUILD dolphin-5.0.ebuild 4448 BLAKE2B 4dcdfc0bb5c6ca3fbb60a18c16d8f35bc9833e677a9bfbb015ea7176e362b1be15d57d45b5cae478739872b4bac0743236789807b50d3d22c7b64f95aa659a74 SHA512 c233e2117543315b920fa79fa73c3dcf56b0f7fea102be1464c1830c4308c9de3e8751b747fbb4423e4adc5c18bef64df2845f725661941e42152c749edb7d9e
-EBUILD dolphin-9999.ebuild 4788 BLAKE2B 32c316edeeeb8a9c17f8dd610d12f00e4c7c26d7fa4eee5e63e78d22ca0a76a7666ea924de0c4ff7282446516d33032e4f183afc95887f3d206247285092301c SHA512 45bcc0bfbe7b1db17713f94a89be5df7146b720457ce4fe1f881ac981b4757c5e0125f9079b3fa10d4f313443919c469c790bfb095acbd107078fc2d6933f988
+EBUILD dolphin-5.0.ebuild 4532 BLAKE2B 1938ea8a2833c7ea7193ba01957d2ebf9f362ce0ea7b37d908f0b7d12cc7a269ee46abb1c1d45024c56caa48a123dc1a206b4fc4c15d40e5f3c5a394ca8091ed SHA512 fd654aad5ae739a9381b07b6d3bab7e38ddc34b381de57f9685241c156760eb9d8241c52519171cf7dd8060749b36e4b628117a347a33be0da44028dcc3eb222
+EBUILD dolphin-9999.ebuild 4585 BLAKE2B 863f9e2639e4536e65d40563fda50efbe20afc497d249a3ec456d1e6f690cb98b59165889400fecc4fc5a8d1b76055a835a23b2807e477d52900612b5d97eefa SHA512 18860e2bf29b291fd6e50e8d97ab0a78931d40f11782e9b6f43273277f014932d9cf21b9815afe2eeb0e85cc5276f909956af1e8b8340563ba7bc53e8b10c30b
 MISC metadata.xml 836 BLAKE2B 786a1a9f4e7d76c0111bd9755f784a0bba5607465e2693986c6e2f37e0a32f9ceea84c902464ea47b66f84c183660d5767f569ae933c6b8774d47a15de4c6f30 SHA512 7bdcb2ba2f3a1fa247080a08da495274bea1f61bec1a88e824ebd44fb7e21e74e7ef52855c1c6fba07f12b278df19c0014ba98a5b6ec50f62c08b0ee31e5fc6b
diff --git a/games-emulation/dolphin/dolphin-5.0.ebuild b/games-emulation/dolphin/dolphin-5.0.ebuild
index 190053251053..56737af95d72 100644
--- a/games-emulation/dolphin/dolphin-5.0.ebuild
+++ b/games-emulation/dolphin/dolphin-5.0.ebuild
@@ -7,7 +7,7 @@ PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt pt_B
 PLOCALE_BACKUP="en"
 WX_GTK_VER="3.0"
 
-inherit cmake-utils desktop l10n pax-utils toolchain-funcs versionator wxwidgets
+inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs versionator wxwidgets
 
 SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
 KEYWORDS="amd64"
@@ -170,4 +170,10 @@ pkg_postinst() {
 		ewarn "If you want microphone capabilities in dolphin-emu, rebuild with"
 		ewarn "USE=\"portaudio\""
 	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
diff --git a/games-emulation/dolphin/dolphin-9999.ebuild b/games-emulation/dolphin/dolphin-9999.ebuild
index b726d122197e..1df45aa19853 100644
--- a/games-emulation/dolphin/dolphin-9999.ebuild
+++ b/games-emulation/dolphin/dolphin-9999.ebuild
@@ -1,19 +1,18 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt_BR pt ro_RO ru sr sv tr zh_CN zh_TW"
+PLOCALES="ar ca cs da_DK de el en es fa fr hr hu it ja ko ms_MY nb nl pl pt pt_BR ro_RO ru sr sv tr zh_CN zh_TW"
 PLOCALE_BACKUP="en"
 WX_GTK_VER="3.0"
 
-inherit cmake-utils eutils l10n pax-utils toolchain-funcs versionator wxwidgets
+inherit cmake-utils desktop gnome2-utils l10n pax-utils toolchain-funcs versionator wxwidgets
 
-if [[ ${PV} == 9999* ]]
+if [[ ${PV} == *9999 ]]
 then
 	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
 	inherit git-r3
-	KEYWORDS=""
 else
 	SRC_URI="https://github.com/${PN}-emu/${PN}/archive/${PV}.zip -> ${P}.zip"
 	KEYWORDS="~amd64"
@@ -24,15 +23,15 @@ HOMEPAGE="https://www.dolphin-emu.org/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="alsa ao bluetooth doc egl +evdev ffmpeg llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
+IUSE="alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets"
 
-RDEPEND=">=media-libs/libsfml-2.1
+RDEPEND="
+	>=media-libs/libsfml-2.1
 	>net-libs/enet-1.3.7
 	>=net-libs/mbedtls-2.1.1
 	dev-libs/lzo
-	media-libs/libpng:=
-	sys-libs/glibc
-	sys-libs/readline:=
+	media-libs/libpng:0=
+	sys-libs/readline:0=
 	sys-libs/zlib
 	x11-libs/libXext
 	x11-libs/libXi
@@ -44,14 +43,17 @@ RDEPEND=">=media-libs/libsfml-2.1
 	bluetooth? ( net-wireless/bluez )
 	egl? ( media-libs/mesa[egl] )
 	evdev? (
-			dev-libs/libevdev
-			virtual/udev
+		dev-libs/libevdev
+		virtual/udev
+	)
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:= )
 	)
-	ffmpeg? ( virtual/ffmpeg )
 	llvm? ( sys-devel/llvm )
 	openal? (
-			media-libs/openal
-			media-libs/libsoundtouch
+		media-libs/openal
+		media-libs/libsoundtouch
 	)
 	portaudio? ( media-libs/portaudio )
 	profile? ( dev-util/oprofile )
@@ -64,35 +66,18 @@ RDEPEND=">=media-libs/libsfml-2.1
 	sdl? ( media-libs/libsdl2[haptic,joystick] )
 	upnp? ( >=net-libs/miniupnpc-1.7 )
 	wxwidgets? (
-				dev-libs/glib:2
-				x11-libs/gtk+:2
-				x11-libs/wxGTK:${WX_GTK_VER}[opengl,X]
-	)
-	"
+		dev-libs/glib:2
+		x11-libs/gtk+:2
+		x11-libs/wxGTK:${WX_GTK_VER}[opengl,X]
+	)"
 DEPEND="${RDEPEND}
-	>=dev-util/cmake-2.8.8
-	>=sys-devel/gcc-4.9.0
 	app-arch/zip
 	media-libs/freetype
 	sys-devel/gettext
-	virtual/pkgconfig
-	"
-
-pkg_pretend() {
-
-	local ver=4.9.0
-	local msg="${PN} needs at least GCC ${ver} set to compile."
-
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if ! version_is_at_least ${ver} $(gcc-fullversion); then
-			eerror ${msg}
-			die ${msg}
-		fi
-	fi
-
-}
+	virtual/pkgconfig"
 
 src_prepare() {
+	cmake-utils_src_prepare
 
 	# Remove automatic dependencies to prevent building without flags enabled.
 	if use !alsa; then
@@ -146,13 +131,12 @@ src_prepare() {
 }
 
 src_configure() {
-
 	if use wxwidgets; then
 		need-wxwidgets unicode
 	fi
 
 	local mycmakeargs=(
-		"-DUSE_SHARED_ENET=ON"
+		-DUSE_SHARED_ENET=ON
 		$( cmake-utils_use ffmpeg ENCODE_FRAMEDUMPS )
 		$( cmake-utils_use log FASTLOG )
 		$( cmake-utils_use profile OPROFILING )
@@ -169,12 +153,7 @@ src_configure() {
 	cmake-utils_src_configure
 }
 
-src_compile() {
-
-	cmake-utils_src_compile
-}
 src_install() {
-
 	cmake-utils_src_install
 
 	dodoc Readme.md
@@ -195,4 +174,10 @@ pkg_postinst() {
 		ewarn "If you want microphone capabilities in dolphin-emu, rebuild with"
 		ewarn "USE=\"portaudio\""
 	fi
+
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
 }
diff --git a/games-emulation/ppsspp/Manifest b/games-emulation/ppsspp/Manifest
index a704f3f7b86e..8435b21dd8db 100644
--- a/games-emulation/ppsspp/Manifest
+++ b/games-emulation/ppsspp/Manifest
@@ -18,7 +18,9 @@ DIST ppsspp-1.5.4-ext_glslang.tar.gz 1944927 BLAKE2B a9bfae046335f8cba72fc92208f
 DIST ppsspp-1.5.4-ffmpeg.tar.gz 311610961 BLAKE2B e01b203ff1f230a27b02dab0596dedbc26e049190fa1607903b70023865c50de4fb7361de33c1bd1c5de305124ea02f2ba9ac854bf2f40f3e79259663cdfa4ec SHA512 d4bdb3c5a13bc64d7b22e38b416355d302a4401a1d8f6bd57a4d8502823dc9a2987df92b8e781ddab6de8ded9b59b268ef1b33f8f43a0be7b1c57d4ffbee6871
 DIST ppsspp-1.5.4-pspautotests.tar.gz 36005395 BLAKE2B fa92d1acb0adfecb23f55132c4e85843c3c04c73e4bc8cfb054cfa8e0b67fe1c03c4a83032892bc534a78a64bf190da00db91fd49df4c3838e5b8d0396cce15b SHA512 1485eace5526f53f6c41200e63d6d5d0ff217f22ec4788d58b33a33c64e344609f95bf2b73a8f35fd395914b33910b38a0348b35b488dadbdd43e24ac0bfed9f
 DIST ppsspp-1.5.4.tar.gz 19008538 BLAKE2B 10ca63a3f05757bd091a66b6563e34b3ca3c9c4df12a0b7796e42776d54997bec581582ee16706d5fb3630ebb8c0bcd1a5c0040856d94330865932b3d1ada2db SHA512 dbf4d2e9cc94a64908d5006ad562da72860fd12dadac66b0bdc6903d4cad4c81436963e24017517aa261440fd15efff6e5cab6ed7801928e107d7982d1604714
+EBUILD ppsspp-1.4.2-r1.ebuild 3149 BLAKE2B 6e5793b47694b730e8c54abf6656d32f06230dc52a12de21570d9250494fafcf91fbf0a4926180dfb5d81344dab940e18c456d19c10282a41f4c28d5d303039a SHA512 bb496040f78fe330c714ffde35cf364c961b2fddc7b20a53f857050f33529eb8a2b3d1f3e837a010d3d8ecd002723ee45a6051a8aa4853c8255e4e358a2eab38
 EBUILD ppsspp-1.4.2.ebuild 3294 BLAKE2B 70e77c3a3560aef03626b1398c4b4b37d45d57eb546e4e85b87d8e7560b0a30a2a779b24725f1329a167d8e496346d2273fa98ff32bbed1a0c56ccaf45687888 SHA512 a886a1b98c06ded0c52d2052a7f75c5cc313ef87b64997508a95c45db86df20c069aa38961ce385a127debf0757d8f3baf6ecc75482fadd5005faab8d80f7feb
+EBUILD ppsspp-1.5.4-r1.ebuild 3156 BLAKE2B daa114667318aede5fbfc1b8a02a6b8920c81dd2fda241b57a4c6011974b97d4e48c5da511eb40d5c8c661045a9189170d16e3057f1cf229acc95486a2ad09cc SHA512 8697cb9a5ba55f6ef84ac9a2896cc16ac23ab106e619324e95ff0cf2b2711cb4f24d7042977d1b7881f8f3bb6abbdac0a53654b12b6d4eb743169c2369d89e28
 EBUILD ppsspp-1.5.4.ebuild 3301 BLAKE2B 900cfb98f21129adb7fee7eac4a2b1b5dcae11e6f5f5eb6a9af8373cf428771d0ee7fe44de2732afe9fcb250ddce65f5092503849c8105e1e507120cd4eef4a8 SHA512 37281cec1fff6577fd102e449eb070d15e035ae735cba4c0e91f4d4b963af02d6c057947211cf8402537403990abc9f15650654bd282073b8f23dbedfa7a8b68
-EBUILD ppsspp-9999.ebuild 2310 BLAKE2B df5efd7233f42543915af70989a185ec979d169adc5577b9ac7cb6c0fafb90c8675d7602ee64f2af1fa752dfa07a17b972ef6b7ac84549d1b02d0426ec3d57c8 SHA512 0fe86b8ab480b460c0c1629bfc0da20ad6afee7bc5d7fc496c0fc1f561096f39b9ded1ee3e00fd04e24d018cc8f7a9d8ca191c7bc37a1395c4e6783481198e69
+EBUILD ppsspp-9999.ebuild 2164 BLAKE2B fbdc48fdfb6a2c963f15b13b1c0eb39ce8dca8101105ac5ac260c56007f8af1dbd8821ffad1495d1bcb79e05e42f0917b6c7145a2976e0be54b8948ae7eaa63c SHA512 538bec64d920089826856c6c19c2db352d211d2c8dd6dd74ef00f7fa082a65d5f119c0beaaca8acd49e4da48c28b59340fd78640022d9d3bebb2e883980d0bb5
 MISC metadata.xml 782 BLAKE2B 384a8c9475f8ac4d43bd908721c80f48d71f9d08e83630cfc12bb47f2aefb5e30e7fd197dd415d1e54d680da89ef60c1c51920074766ab8dbec1a7ca0af83161 SHA512 7107fe18d17f3a69c6a5d1241ec28b607b93ac3d45a311eab23742a393c8fdb62cbf1986095591ff643b741c4c81410116ed7efe685dd82b3c76cbfd38a2a221
diff --git a/games-emulation/ppsspp/ppsspp-1.4.2-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.4.2-r1.ebuild
new file mode 100644
index 000000000000..b50b2c98db5c
--- /dev/null
+++ b/games-emulation/ppsspp/ppsspp-1.4.2-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop cmake-utils
+
+DESCRIPTION="A PSP emulator written in C++."
+HOMEPAGE="https://www.ppsspp.org/"
+SRC_URI="
+	https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	!system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ${P}-ffmpeg.tar.gz )
+	https://github.com/hrydgard/ppsspp-lang/archive/f32328a88cbf368af90eb79bc7ad5420795d6585.tar.gz -> ${P}-assets_lang.tar.gz
+	https://github.com/hrydgard/pspautotests/archive/e18cface3db64ccb96738dc128fe769b28fff65c.tar.gz -> ${P}-pspautotests.tar.gz
+	https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ${P}-dx9sdk.tar.gz
+	https://github.com/hrydgard/glslang/archive/b16f7e6819267e57c3c244808d1981f0ce34acbc.tar.gz -> ${P}-ext_glslang.tar.gz
+	https://github.com/Kingcom/armips/archive/770365d44df35d6e675c58bb2a774ca412278ef5.tar.gz -> ${P}-ext_armips.tar.gz
+	https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ${P}-ext_armips_ext_tinyformat.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Cross/archive/6381b2ff9c0d975af8fd2974c97aa12a69ab6cc6.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+qt5 sdl headless libav +system-ffmpeg"
+REQUIRED_USE="
+	!headless? ( || ( qt5 sdl ) )
+	?? ( qt5 sdl )
+"
+
+RDEPEND="sys-libs/zlib
+	system-ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	sdl? ( media-libs/libsdl2 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-assets-lookup.patch
+	"${FILESDIR}"/${PN}-1.4-O2.patch
+)
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}" || die
+	local i list=( assets_lang pspautotests dx9sdk ext_glslang ext_armips ext_SPIRV-Cross ext_armips_ext_tinyformat )
+	if ! use system-ffmpeg; then
+		list+=( ffmpeg )
+	fi
+	for i in "${list[@]}"; do
+		tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz"
+	done
+}
+
+src_prepare() {
+	if ! use system-ffmpeg; then
+		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSING_QT_UI=$(usex qt5)
+		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
+		-DHEADLESS=$(usex headless)
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
+	insinto /usr/share/"${PN}"
+	doins -r "${BUILD_DIR}/assets"
+	if use qt5 || use sdl ; then
+		dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
+		local i
+		for i in 16 24 32 48 64 96 128 256 512 ; do
+			doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png"
+		done
+		make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
+	fi
+}
+
+pkg_postinst() {
+	if use system-ffmpeg; then
+		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
+		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
+	fi
+}
diff --git a/games-emulation/ppsspp/ppsspp-1.5.4-r1.ebuild b/games-emulation/ppsspp/ppsspp-1.5.4-r1.ebuild
new file mode 100644
index 000000000000..023b9217fe85
--- /dev/null
+++ b/games-emulation/ppsspp/ppsspp-1.5.4-r1.ebuild
@@ -0,0 +1,98 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit desktop cmake-utils
+
+DESCRIPTION="A PSP emulator written in C++."
+HOMEPAGE="https://www.ppsspp.org/"
+SRC_URI="
+	https://github.com/hrydgard/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	!system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ${P}-ffmpeg.tar.gz )
+	https://github.com/hrydgard/ppsspp-lang/archive/1e3e4a0ba0ca8c0a092e027dfb7c1c4778366db5.tar.gz -> ${P}-assets_lang.tar.gz
+	https://github.com/hrydgard/pspautotests/archive/d02ba7407050f445edf9e908374ad4bf3b2f237b.tar.gz -> ${P}-pspautotests.tar.gz
+	https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ${P}-dx9sdk.tar.gz
+	https://github.com/hrydgard/glslang/archive/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz -> ${P}-ext_glslang.tar.gz
+	https://github.com/Kingcom/armips/archive/8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz -> ${P}-ext_armips.tar.gz
+	https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ${P}-ext_armips_ext_tinyformat.tar.gz
+	https://github.com/KhronosGroup/SPIRV-Cross/archive/90966d50f57608587bafd95b4e345b02b814754a.tar.gz -> ${P}-ext_SPIRV-Cross.tar.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+qt5 sdl headless libav +system-ffmpeg"
+REQUIRED_USE="
+	!headless? ( || ( qt5 sdl ) )
+	?? ( qt5 sdl )
+"
+
+RDEPEND="sys-libs/zlib
+	system-ffmpeg? (
+		!libav? ( media-video/ffmpeg:= )
+		libav? ( media-video/libav:= )
+	)
+	sdl? ( media-libs/libsdl2 )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		dev-qt/qtwidgets:5
+	)"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.4.2-assets-lookup.patch
+	"${FILESDIR}"/${PN}-1.4-O2.patch
+)
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	cd "${S}" || die
+	local i list=( assets_lang pspautotests dx9sdk ext_glslang ext_armips ext_SPIRV-Cross ext_armips_ext_tinyformat )
+	if ! use system-ffmpeg; then
+		list+=( ffmpeg )
+	fi
+	for i in "${list[@]}"; do
+		tar xf "${DISTDIR}/${P}-${i}.tar.gz" --strip-components 1 -C "${i//_//}" || die "Failed to unpack ${P}-${i}.tar.gz"
+	done
+}
+
+src_prepare() {
+	if ! use system-ffmpeg; then
+		sed -i -e "s#-O3#-O2#g;" "${S}"/ffmpeg/linux_*.sh || die
+	fi
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSING_QT_UI=$(usex qt5)
+		-DUSE_SYSTEM_FFMPEG=$(usex system-ffmpeg)
+		-DHEADLESS=$(usex headless)
+		)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	use headless && dobin "${BUILD_DIR}/PPSSPPHeadless"
+	insinto /usr/share/"${PN}"
+	doins -r "${BUILD_DIR}/assets"
+	if use qt5 || use sdl ; then
+		dobin "${BUILD_DIR}/PPSSPP$(usex qt5 Qt SDL)"
+		local i
+		for i in 16 24 32 48 64 96 128 256 512 ; do
+			doicon -s ${i} "icons/hicolor/${i}x${i}/apps/${PN}.png"
+		done
+		make_desktop_entry "PPSSPP$(usex qt5 Qt SDL)" "PPSSPP ($(usex qt5 Qt SDL))" "${PN}" "Game"
+	fi
+}
+
+pkg_postinst() {
+	if use system-ffmpeg; then
+		ewarn "system-ffmpeg USE flag is enabled, some bugs might arise due to it."
+		ewarn "See https://github.com/hrydgard/ppsspp/issues/9026 for more informations."
+	fi
+}
diff --git a/games-emulation/ppsspp/ppsspp-9999.ebuild b/games-emulation/ppsspp/ppsspp-9999.ebuild
index acd37286ab88..5ece82adfcce 100644
--- a/games-emulation/ppsspp/ppsspp-9999.ebuild
+++ b/games-emulation/ppsspp/ppsspp-9999.ebuild
@@ -23,20 +23,11 @@ RDEPEND="sys-libs/zlib
 		!libav? ( media-video/ffmpeg:= )
 		libav? ( media-video/libav:= )
 	)
-	sdl? (
-		media-libs/libsdl
-		media-libs/libsdl2
-	)
+	sdl? ( media-libs/libsdl2 )
 	qt5? (
-		dev-db/sqlite
-		dev-qt/assistant:5
 		dev-qt/qtcore:5
-		dev-qt/qtdeclarative:5
 		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
 		dev-qt/qtopengl:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwebkit:5
 		dev-qt/qtwidgets:5
 	)"
 
diff --git a/games-emulation/vbam/Manifest b/games-emulation/vbam/Manifest
index 10ff55ad63e1..3c730fd5c90d 100644
--- a/games-emulation/vbam/Manifest
+++ b/games-emulation/vbam/Manifest
@@ -1,7 +1,11 @@
 AUX vbam-2.0.0_beta2-fix-install-path-bin.patch 475 BLAKE2B a08a94cf0db76d7e70e89c5c1b19b226a167db2925c92d6df7f1f6b0c8f115f1f2c4a1a1d1e413c678bde458742e601ae7b5aa65e0e041575e8beaff10a877a8 SHA512 70a4dd2473a7156d1fdf5322f96827835423c615d83abe5ca7b7538f303f9f0d8daa2e8da153460939ed98883c77d26f288a00eaca8e94c73410247059879d8e
 AUX vbam-2.0.0_beta2-fix-zlib-macros.patch 238 BLAKE2B 777accae17b4ad82b62c23ce1683bafb7b8a7ed72914a1cc539e55a3092791b309e02bf79b8ab0d9e9172c7288162e902ec3e73d025d9f5995eca40395375eaf SHA512 ea591ea9d3a5a766a4f5345b54af2e8d8406e2854d2769449568d1355af333d11d95fbc8351202d7673adad89e31b4427a10a39f2361d679d8fbf3e88ffbb29c
 AUX vbam-2.0.0_beta2-remove-hardcoded-flags.patch 6368 BLAKE2B 491238ca2c2e45c73a4a2fef951df289274ffbf06e8bd0fb33c9650c3c3a550581a6acd0d8662b0aa6770b93c9d4d04a070c55408b0ea4ee96cc239ce958bd67 SHA512 b51c54e543b3a3fe0d3a66e1219aeefcc1ee58eac65a9df12a4a5a7ef14c702d47b3cdfeb8d7903444afe12d531a5b2ed77bd36ab2277960ef8af6faea2a40d4
+AUX vbam-2.0.1-changelog-update.patch 3547 BLAKE2B cd9c3aaab79e4342d7bdbc903331ef0d7fd54b63422715e8d0dfe27cbbfcc729804ec018beb434faa9b89ca5bce417f382debfc74b111a5dae4e8974e2cec38f SHA512 792ad5848a373a0a5040132417e7a9eb4cccf3155e31beda61b6236edc80ce74018ad8d7bd67829c981b60a8940904629c64b3d392ca25d0bb58461d64e228e3
+AUX vbam-2.0.1-read-version-from-changelog.patch 2701 BLAKE2B cf9c826bc75fb956becb99decadc36e41a1944b64095729826e732341c36aef1df9ef73b424501e9d0dcb9e8146d50c0b91641237b2b3c83e13d2bb2ab375311 SHA512 2a1793c8c4f0dff020337eccc9ff94c357b8f1ce2dde8aab612c4a06b5adbfbf3261b91643bfdab958ddf77f2e5f751997840cdcd89dd4d77744de8caf1f4285
 DIST vbam-2.0.0_beta2_p20161211.tar.gz 3075570 BLAKE2B 69b1272f5e048fe96a7a6798a3f934395a607439ba3ede992f8d49557a4ea8ea64ed512f11440200548eb039d3b1f4b4129603e5a897f3e04fac48d4d39906f1 SHA512 1130a976e6e9e504af96ec9218cd35af10ded7ab184ec468ba40b641faaefac47cbb225c6221278031015081632be04ae125a2653379d2b08877f162c6cb4a40
+DIST vbam-2.0.1.tar.gz 2926632 BLAKE2B 3a2d44b76a9b03eadcce530a955e6b2ebde48340d8462e1ad339f4a02b1d19b8f8fbd0d9671f12eb5ed14ee600dba6e6bb6d167f9ca1cfb192ffb734ace72752 SHA512 d6cdc1ab1fbc20f81483fb4dc316d65dc9d7c0f378d5c85c1c5ca1251fbd1e7aad9f2f6bd5ecc2ff0b832e42c010cc82b9b1ec68bbb0a49aa8e00683fb5264bb
 EBUILD vbam-2.0.0_beta2_p20161211-r1.ebuild 2580 BLAKE2B e2e69c1c1906088b1eff9bed1a9ff8a26082ed4cf8e90188cbb11a3f2e64fd79de7aa2ad87a3d1cdb9f04965adc0d74e075f1bfb33807dce091a0d5aeb00ec16 SHA512 feb01ee124b29500b73e44da4b319572fe8a6ac7fe1f2e66bb072007bf786a2b0d7f9b2a447817ef665d95ce68219020ed7538400c741485dcc8c167db7e5cd8
-EBUILD vbam-9999.ebuild 2456 BLAKE2B 10684733cb5dad8d9391d3e6e86afc76a788500d551ac8e2089f1676a6103ca2d089df71c151e6d7900511c8f2a75dbf72ca5f65a1bafaa140f4d60d580f4d8e SHA512 75b2f006494b40c56c500f7298eab9cbfe7840a8bd2045ceff92e1846273ab4c3a547b776f2e4bfd0e12d056bb6d4600e5c6854609d66a3307c346c2b369d61c
+EBUILD vbam-2.0.1.ebuild 2366 BLAKE2B 33bda59f7558d59101cf34cf74d445fc56e73f3bb299e364eddf982f6a37628dd4b23d316172b9ee6d564901b40a11a6d32847f9c7eadfca62104cf9815c41c4 SHA512 afd5b1028b4fc9adbe75100a25f93ab5596b155f52926c78bc4e78ab9e62a9a29162aeb210a81c1742d85872431dd1fd844a8ef781e4692b866211a4d72f825f
+EBUILD vbam-9999.ebuild 2177 BLAKE2B f37220942362e8e0e74095924a5235eb27b49342b52a8b9a3558eebb0ae2f35f049518bb43bf444663a870907e969a2c66e61f7913a2590b6ab73125fedacf61 SHA512 7f2b286d17ec25edcb3e0b2c2d9ef1500d973bf19afa514a7fc8fba7c976e72806fd1e070dff4e6cf68b03beb54c8582cb4000292f5899733d9d71dac1dd9a2c
 MISC metadata.xml 479 BLAKE2B e5a7706e8db6c8c05cf4cf691d294c4bd54f3cc7aee5af270cce39c2d924cc81cc97a1b3d3612c1cf95d0b4b485181717d0f0daeef11a21b0c7ce0cf4d9eafda SHA512 6bd2212bd5ae35dd11f35322879f067981cac94c0c2d8f0c87e1e67170b5df245bd3616e5bb076d2892453c8b75537ee15aab49134029c0daa31d89d8aedf1d0
diff --git a/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch b/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch
new file mode 100644
index 000000000000..6d4f87f2d772
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.0.1-changelog-update.patch
@@ -0,0 +1,98 @@
+From 30b6ecf1a5c0eac73aaf3dabd98e41c908daa94a Mon Sep 17 00:00:00 2001
+From: Zach Bacon <zachbacon@budgiemedia.rocks>
+Date: Thu, 12 Oct 2017 00:49:05 +0000
+Subject: [PATCH] Add a changelog
+
+Gonna try and keep this up to date as often as possible.
+---
+ CHANGELOG.md | 81 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 81 insertions(+)
+ create mode 100644 CHANGELOG.md
+
+diff --git a/CHANGELOG.md b/CHANGELOG.md
+new file mode 100644
+index 00000000..c24ac560
+--- /dev/null
++++ b/CHANGELOG.md
+@@ -0,0 +1,81 @@
++# Changelog
++All notable changes to this project will be documented in this file.
++
++The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
++and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
++
++## [Unreleased]
++
++## [2.0.1] - 10/11/2017
++### Added
++- initial installer script
++- gitter.im badge in readme
++- 32bit cross compiling support on 64bit linux
++- added support for GNUInstallDirs to cmake
++- Include new translations from transifex
++- Added WxWidgets ABI compiler check
++- Add linux Joystick reference to issue template
++- Add #ubckyde <cmath> fir std::cell()
++- 
++
++### Changed
++- Fix 2xSaImmx.asm linking issue
++- cmake: default to ENABLE_ASM_CORE=OFF
++- libretro merging from upstream libretro fork.
++- better fix for clipped video in GL Fullscreen.
++- Fix flibc crash: add log message on fopen failure
++- fix gameboy header-detection in libretro interface
++- hotfix for potential buffer-overflow
++- delete memory in common/array.h on destruction
++- SDL: improve error msg for unwritable config
++- SDL: fix deflt bat saving, improve dir checking
++- fix portability issue with strerror_r()
++- Windows doesn't have sterror_r
++- wx/wxvbam: fix GetAbsolutePath 
++- fix a memory leak due to wrong syntax
++- regenerate translation files
++- fix errors reported by SUSE's post build linter
++- SUSE Lint: fix a few classes of warnings
++- let cmake escape -D preproc. definitions
++- fix memory viewer xrc on wx 3.1+
++- Improving README
++- SoundSDL: lock conditional code cleanup
++- remove the default F11 keybinding for save state
++- hopefully fix resize artifacts on game panel
++- soundSDL: write silence when paused
++- cleanup SoundSDL  #139 #130 #97 #67 #65 #46 #47
++- document how to provice symbolic backtraces
++- "no throttle" fixes/cleanup
++- only use -mtune=generic on x86/amd64
++- installdeps: use -j$(nproc) not -j8 in info
++- use -fabi-version=2 for GCC turn off LTO
++- installdeps: minor refactoring/cleanup
++- improve Wx GCC ABI check
++- minor improvements for Wx Compile tests
++- fix wx ABI check for Win32/MinGW
++- installdeps: fedora fixes, including m32
++- cmake: wx and cross compiling fixes
++- restore wx 2.7 compat, improve string processing
++- rename CMakeScripts/ to cmake/
++- work around gcc lto wrappers bug with gcc 7.x
++- update README.md
++- remove doctoc title from README.md TOC
++- improve win32 dependencies git submodule handling
++- use num cpu cores to parallelize LTO link with gcc
++- fix huge app icon in Win volume settings
++- fix deadlock in SoundSDL:deinit()
++- added executable extension for sdl binary
++- default LTO to off on 64bit MinGW
++- minor code cleanup
++- deps: dont check result of apt-get update 
++- read version and subversion info from Git
++- fix error and version info in shallow git clones
++- refactor/cleanup GitTagVersion.cmake
++
++### Removed
++- Cairo Renderer: it never performed well to begin with
++
++
++
++[2.0.1]: https://github.com/olivierlacan/keep-a-changelog/compare/throttle...v2.0.1
++
diff --git a/games-emulation/vbam/files/vbam-2.0.1-read-version-from-changelog.patch b/games-emulation/vbam/files/vbam-2.0.1-read-version-from-changelog.patch
new file mode 100644
index 000000000000..5dce58395343
--- /dev/null
+++ b/games-emulation/vbam/files/vbam-2.0.1-read-version-from-changelog.patch
@@ -0,0 +1,76 @@
+From 46486381f0c18110002ec62108969be957b419be Mon Sep 17 00:00:00 2001
+From: Rafael Kitover <rkitover@gmail.com>
+Date: Wed, 11 Oct 2017 19:17:25 -0700
+Subject: [PATCH] read version info from CHANGELOG.md if no git
+
+If git tags are not available, set the version and revision by finding
+the first version tag in `CHANGELOG.md` of the form
+
+```
+```
+
+Where N.N.N is the number version (number of components can vary) and
+the revision (as speicified by -REV) is optional.
+
+TODO: support named revision without a version number of the form
+`[REV]`.
+---
+ CMakeLists.txt               |  9 +++------
+ cmake/ChangeLogVersion.cmake | 25 +++++++++++++++++++++++++
+ 2 files changed, 28 insertions(+), 6 deletions(-)
+ create mode 100644 cmake/ChangeLogVersion.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index bd09527d..4ad859b2 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -112,15 +112,12 @@ if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git")
+     # of files that depend on version.h
+     include(GetGitRevisionDescription)
+     get_git_head_revision(REFSPEC COMMITHASH)
+-else()
+-    message(WARNING "Git not found, cannot set version info")
+ endif()
+ 
+-# no git or no tags
++# no git or no tags, use ChangeLog
+ if(NOT VERSION)
+-    set(VERSION  2.0.0)
+-    set(REVISION "unknown")
+-    set(VERSION_RELEASE 0)
++    include(ChangeLogVersion)
++    changelog_version(VERSION REVISION VERSION_RELEASE)
+ endif()
+ 
+ # generate version.h
+diff --git a/cmake/ChangeLogVersion.cmake b/cmake/ChangeLogVersion.cmake
+new file mode 100644
+index 00000000..101d23bd
+--- /dev/null
++++ b/cmake/ChangeLogVersion.cmake
+@@ -0,0 +1,25 @@
++function(changelog_version version revision version_release)
++    set(${version}         "" CACHE STRING "Latest ChangeLog Version"  FORCE)
++    set(${revision}        "" CACHE STRING "Latest ChangeLog Revision" FORCE)
++    set(${version_release} 0  CACHE STRING "Is this a versioned release without revision" FORCE)
++
++    file(READ CHANGELOG.md changelog_file)
++
++    if(NOT changelog_file)
++        return()
++    endif()
++
++    string(REGEX MATCH "\n## +\\[([0-9.]+)(-([^] ]+))?\\] +- +[0-9][0-9]?/" match_out "${changelog_file}")
++
++    set(changelog_version "${CMAKE_MATCH_1}")
++
++    set(is_version_release 0)
++    set(changelog_revision "${CMAKE_MATCH_3}")
++    if(NOT changelog_revision)
++        set(is_version_release 1)
++    endif()
++
++    set(${version}         "${changelog_version}"  CACHE STRING "Latest ChangeLog Version"  FORCE)
++    set(${revision}        "${changelog_revision}" CACHE STRING "Latest ChangeLog Revision" FORCE)
++    set(${version_release} "${is_version_release}" CACHE STRING "Is this a versioned release without revision" FORCE)
++endfunction()
diff --git a/games-emulation/vbam/vbam-2.0.1.ebuild b/games-emulation/vbam/vbam-2.0.1.ebuild
new file mode 100644
index 000000000000..c564e02df5d5
--- /dev/null
+++ b/games-emulation/vbam/vbam-2.0.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER="3.0"
+inherit cmake-utils wxwidgets gnome2-utils eutils xdg-utils
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}/visualboyadvance-m-${PV}"
+fi
+
+DESCRIPTION="Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance"
+HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
+REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
+
+RDEPEND=">=media-libs/libpng-1.4:0=
+	media-libs/libsdl2[joystick]
+	link? ( >=media-libs/libsfml-2.0:= )
+	sys-libs/zlib
+	virtual/glu
+	virtual/opengl
+	ffmpeg? ( virtual/ffmpeg[-libav] )
+	lirc? ( app-misc/lirc )
+	nls? ( virtual/libintl )
+	wxwidgets? (
+		openal? ( media-libs/openal )
+		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
+	)"
+DEPEND="${RDEPEND}
+	wxwidgets? ( virtual/imagemagick-tools )
+	x86? ( || ( dev-lang/nasm dev-lang/yasm ) )
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${P}-changelog-update.patch"
+	"${FILESDIR}/${P}-read-version-from-changelog.patch"
+)
+
+src_prepare() {
+	default
+
+	# fix desktop file QA warnings
+	edos2unix src/wx/wxvbam.desktop
+}
+
+src_configure() {
+	use wxwidgets && setup-wxwidgets
+	local mycmakeargs=(
+		-DENABLE_FFMPEG=$(usex ffmpeg)
+		-DENABLE_LINK=$(usex link)
+		-DENABLE_LIRC=$(usex lirc)
+		-DENABLE_NLS=$(usex nls)
+		-DENABLE_OPENAL=$(usex openal)
+		-DENABLE_SDL=$(usex sdl)
+		-DENABLE_WX=$(usex wxwidgets)
+		-DENABLE_ASM_CORE=$(usex x86)
+		-DENABLE_ASM_SCALERS=$(usex x86)
+		-DCMAKE_SKIP_RPATH=ON
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	if use sdl ; then
+		dodoc doc/ReadMe.SDL.txt
+		doman src/debian/vbam.6
+	fi
+	use wxwidgets && doman src/debian/visualboyadvance-m.6
+}
+
+pkg_preinst() {
+	if use wxwidgets ; then
+		gnome2_icon_savelist
+	fi
+}
+
+pkg_postinst() {
+	if use wxwidgets ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
+
+pkg_postrm() {
+	if use wxwidgets ; then
+		gnome2_icon_cache_update
+		xdg_desktop_database_update
+	fi
+}
diff --git a/games-emulation/vbam/vbam-9999.ebuild b/games-emulation/vbam/vbam-9999.ebuild
index 0af06c4e2c8c..357c94893101 100644
--- a/games-emulation/vbam/vbam-9999.ebuild
+++ b/games-emulation/vbam/vbam-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 WX_GTK_VER="3.0"
-inherit cmake-utils wxwidgets gnome2-utils fdo-mime eutils
+inherit cmake-utils wxwidgets gnome2-utils eutils xdg-utils
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://github.com/visualboyadvance-m/visualboyadvance-m.git"
@@ -18,8 +18,8 @@ HOMEPAGE="https://github.com/visualboyadvance-m/visualboyadvance-m"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets"
-REQUIRED_USE="|| ( sdl gtk wxwidgets )"
+IUSE="ffmpeg link lirc nls openal +sdl wxwidgets"
+REQUIRED_USE="openal? ( wxwidgets ) || ( sdl wxwidgets )"
 
 RDEPEND=">=media-libs/libpng-1.4:0=
 	media-libs/libsdl2[joystick]
@@ -28,13 +28,9 @@ RDEPEND=">=media-libs/libpng-1.4:0=
 	virtual/glu
 	virtual/opengl
 	ffmpeg? ( virtual/ffmpeg[-libav] )
-	gtk? ( >=dev-cpp/glibmm-2.4.0:2
-		>=dev-cpp/gtkmm-2.4.0:2.4
-		>=dev-cpp/gtkglextmm-1.2.0 )
 	lirc? ( app-misc/lirc )
 	nls? ( virtual/libintl )
 	wxwidgets? (
-		cairo? ( x11-libs/cairo )
 		openal? ( media-libs/openal )
 		x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
 	)"
@@ -48,15 +44,13 @@ src_prepare() {
 	default
 
 	# fix desktop file QA warnings
-	edos2unix src/gtk/gvbam.desktop src/wx/wxvbam.desktop
+	edos2unix src/wx/wxvbam.desktop
 }
 
 src_configure() {
 	use wxwidgets && setup-wxwidgets
 	local mycmakeargs=(
-		-DENABLE_CAIRO=$(usex cairo)
 		-DENABLE_FFMPEG=$(usex ffmpeg)
-		-DENABLE_GTK=$(usex gtk)
 		-DENABLE_LINK=$(usex link)
 		-DENABLE_LIRC=$(usex lirc)
 		-DENABLE_NLS=$(usex nls)
@@ -79,28 +73,27 @@ src_install() {
 
 	if use sdl ; then
 		dodoc doc/ReadMe.SDL.txt
-		doman src/debian/vbam.1
+		doman src/debian/vbam.6
 	fi
-	use wxwidgets && doman src/debian/wxvbam.1
-	use gtk && doman src/debian/gvbam.1
+	use wxwidgets && doman src/debian/visualboyadvance-m.6
 }
 
 pkg_preinst() {
-	if use gtk || use wxwidgets ; then
+	if use wxwidgets ; then
 		gnome2_icon_savelist
 	fi
 }
 
 pkg_postinst() {
-	if use gtk || use wxwidgets ; then
+	if use wxwidgets ; then
 		gnome2_icon_cache_update
+		xdg_desktop_database_update
 	fi
-	use gtk && fdo-mime_desktop_database_update
 }
 
 pkg_postrm() {
-	if use gtk || use wxwidgets ; then
+	if use wxwidgets ; then
 		gnome2_icon_cache_update
+		xdg_desktop_database_update
 	fi
-	use gtk && fdo-mime_desktop_database_update
 }
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 1df8f332c9b5..d29ab5c2adb1 100644
--- a/games-engines/Manifest.gz
+++ b/games-engines/Manifest.gz
diff --git a/games-engines/scummvm-tools/Manifest b/games-engines/scummvm-tools/Manifest
index 8bc74dfaa767..840736aa0c6b 100644
--- a/games-engines/scummvm-tools/Manifest
+++ b/games-engines/scummvm-tools/Manifest
@@ -2,5 +2,5 @@ AUX scummvm-tools-1.8.0-binprefix.patch 539 BLAKE2B 8c3ebc7202e209552fe2521e445a
 DIST scummvm-tools-1.8.0.tar.xz 864048 BLAKE2B 7e3184bda33c582708be204493cd99504ef7286305ba01d052a95bf317c56630109e963ecd8d26d4f8868bb75e5b0cb22154fe4cb794a01dabe25b11568babbb SHA512 eed0aa0cceef59c42aabe94fe382a4494085c479d310cb624131746a1cbacc37d4a43603a5321167eb5fd4d9d8235fc794bdca5a3417fc4d224213e5409347ed
 DIST scummvm-tools-2.0.0.tar.xz 866668 BLAKE2B 51e6a771f0b1902f9cadc1e84da4b97aa42bc810c781ba238b3dad9ce242792d0de805e6d129607bace36b7a3cb8dc7a7a1a6fd13211320afe6546569b49f0ff SHA512 a4c645f2a05b5f208658bad1a3122115a3077809141f5d4b281414ca32854d14987a8b6d4579f3bdd9d3eeeab880d98e3b540c3f69155197f20a2094a7812c60
 EBUILD scummvm-tools-1.8.0-r1.ebuild 1304 BLAKE2B 4b785438ab857a6f5e91cafc38321d6da9564c4158cf836dff9de4f48532cb107a66e6cd0e510e8635ee889c5c5f57589bcfe44ed7014360f03c5a0d6802f1c1 SHA512 42ff6659c2505d40df6b107958e138d3e346402b1bbed325a10a30bb5041091096a07e78114fdb8ac597b76aa5a9fda3f01b76350d1416565185738bc18c4cf1
-EBUILD scummvm-tools-2.0.0.ebuild 1311 BLAKE2B 83be112619d4c37adee8d27d06b9d54731440bc9c543fcc8fd0e49e48d29d7ad9b7dea477870c38079ce553267dd3502bd1fb749c763788b041126e5f42ae5d4 SHA512 8a7cc89365d797f4c5b7ad46fded9df81fd07834c1d3bbe17a31e7068a8b13485fc8ff7100fdb53b5b83ac864abef9612b7260346a0c338f8779cc1e0811e13a
+EBUILD scummvm-tools-2.0.0-r1.ebuild 1329 BLAKE2B e9df7435834d8c821d9c1d9474e1db6548660a7e8bc63b4afb3a5030129e8ccdb161a6b91f018b49a8486dcd033ee5503109ad980e446ac7d436071e5d15d99e SHA512 c374224b21960b1645d56bf215373054a8bfbb2b6a92e524e0afb936c3609f397d8540b26b3f51ea8b39acb0dd4d2ca967626bb35fd3659dd2aef21613c841a8
 MISC metadata.xml 330 BLAKE2B 4f070e6c8bc4c2f6b4efb4f0eb84ea861773fba85acda1f4dec223a6594e2cdf4ac90c895a98819e2fab2ba2cd30081aee591554d2e932025a9da6d3c16a275b SHA512 4541c93daab84bd6d0764adccf44bb4986ba02303e731b5b9a7a8060bb88a32c1cef91e2b2910e15915b67cf3ea2b5f31b4e637909d1d0b7c3b627f1134206dc
diff --git a/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
new file mode 100644
index 000000000000..66e28b742a40
--- /dev/null
+++ b/games-engines/scummvm-tools/scummvm-tools-2.0.0-r1.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+WX_GTK_VER=3.0
+inherit wxwidgets eutils flag-o-matic
+
+DESCRIPTION="utilities for the SCUMM game engine"
+HOMEPAGE="http://scummvm.sourceforge.net/"
+SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
+IUSE="flac iconv mad png vorbis"
+RESTRICT="test" # some tests require external files
+
+RDEPEND=">=dev-libs/boost-1.32
+	sys-libs/zlib
+	x11-libs/wxGTK:${WX_GTK_VER}
+	flac? ( media-libs/flac )
+	iconv? ( virtual/libiconv media-libs/freetype:2 )
+	mad? ( media-libs/libmad )
+	png? ( media-libs/libpng:0 )
+	vorbis? ( media-libs/libvorbis )"
+DEPEND="${RDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.8.0-binprefix.patch"
+)
+
+src_prepare() {
+	default
+
+	need-wxwidgets unicode
+	rm -rf *.bat dists/win32 || die
+	sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
+}
+
+src_configure() {
+	# Not an autoconf script
+	./configure \
+		--prefix=/usr \
+		--disable-tremor \
+		--enable-verbose-build \
+		--mandir=/usr/share/man \
+		$(use_enable flac) \
+		$(use_enable iconv) \
+		$(use_enable iconv freetype) \
+		$(use_enable mad) \
+		$(use_enable png) \
+		$(use_enable vorbis) || die
+}
+
+src_install() {
+	EXEPREFIX="${PN}-" default
+}
diff --git a/games-engines/scummvm-tools/scummvm-tools-2.0.0.ebuild b/games-engines/scummvm-tools/scummvm-tools-2.0.0.ebuild
deleted file mode 100644
index c673ff3f6e8a..000000000000
--- a/games-engines/scummvm-tools/scummvm-tools-2.0.0.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-WX_GTK_VER=3.0
-inherit wxwidgets eutils flag-o-matic
-
-DESCRIPTION="utilities for the SCUMM game engine"
-HOMEPAGE="http://scummvm.sourceforge.net/"
-SRC_URI="http://scummvm.org/frs/scummvm-tools/${PV}/${P}.tar.xz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~x86 ~x86-fbsd"
-IUSE="flac iconv mad png vorbis"
-RESTRICT="test" # some tests require external files
-
-RDEPEND=">=dev-libs/boost-1.32
-	sys-libs/zlib
-	x11-libs/wxGTK:${WX_GTK_VER}
-	flac? ( media-libs/flac )
-	iconv? ( virtual/libiconv media-libs/freetype:2 )
-	mad? ( media-libs/libmad )
-	png? ( media-libs/libpng:0 )
-	vorbis? ( media-libs/libvorbis )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.8.0-binprefix.patch"
-)
-
-src_prepare() {
-	default
-
-	need-wxwidgets unicode
-	rm -rf *.bat dists/win32 || die
-	sed -ri -e '/^(CC|CXX)\b/d' Makefile || die
-}
-
-src_configure() {
-	# Not an autoconf script
-	./configure \
-		--disable-tremor \
-		--enable-verbose-build \
-		--mandir=/usr/share/man \
-		$(use_enable flac) \
-		$(use_enable iconv) \
-		$(use_enable iconv freetype) \
-		$(use_enable mad) \
-		$(use_enable png) \
-		$(use_enable vorbis) || die
-}
-
-src_install() {
-	EXEPREFIX="${PN}-" default
-}
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 61511aed0500..e73cd21e7868 100644
--- a/games-fps/Manifest.gz
+++ b/games-fps/Manifest.gz
diff --git a/games-fps/doom3-cdoom/Manifest b/games-fps/doom3-cdoom/Manifest
index f6a179909a43..e2142c546a58 100644
--- a/games-fps/doom3-cdoom/Manifest
+++ b/games-fps/doom3-cdoom/Manifest
@@ -1,3 +1,3 @@
-DIST classic_doom_3_131.zip 212329377 SHA256 32ed98f373573906d5f5082ad9a09ae0d65e4ae7c47e42cee8468b95e4ce8171 SHA512 6e997b6d3c35296b1d0c9ece288cc9d8d8dee1dcc42b38e068e7c101c79ab01475093777bfcd6ffeab1943fef3bc1f62e5917288c4a28789448454db9e656e51 WHIRLPOOL dd6740d9315c3f94ff05519a6661fe154239207ff016c7510427a89deed5a49840b6b1be70411931ae03fef9900c64bb478d1a1f7425855c4dac3ab6289c9b92
+DIST classic_doom_3_131.zip 212329377 BLAKE2B 285bef3185c18cbc2e40f3cf54843dc1e37fabcf032453f8580308e8efb1da59a7d5815ad53a71752ff019671fc2949d10cf89a4ac9c21f292513af3f0c4b6f9 SHA512 6e997b6d3c35296b1d0c9ece288cc9d8d8dee1dcc42b38e068e7c101c79ab01475093777bfcd6ffeab1943fef3bc1f62e5917288c4a28789448454db9e656e51
 EBUILD doom3-cdoom-1.3.1.ebuild 642 BLAKE2B acb3d3585d7480062e984a935fa33188c4d925b70ddf4529c7f3d7985f890d8b220f80e1bd25ad72b07dd10f46006f280c8e518088074db068f749bf18f6a024 SHA512 55cd50bad742401c644476569a04a16ba7ca3ddeba99cd7c45d0f4fbcac898a4f716621ac569c819aad1df4963898172977fb877995d526141c34e1989376763
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/doom3-chextrek/Manifest b/games-fps/doom3-chextrek/Manifest
index b7b2423c1aea..68669c5e0db5 100644
--- a/games-fps/doom3-chextrek/Manifest
+++ b/games-fps/doom3-chextrek/Manifest
@@ -1,3 +1,3 @@
-DIST chextrek_beta_052.zip 97683796 SHA256 ddaecd0d9868a38455682c6fd870aac4724c53d8ac84cc93b9d8405fe7d72396 SHA512 b8dcb80bb4d945c42acd446f7e9f07e1f4d3c0048b386709577b77233f7a971b6be6a9e1be7cd17d7d8491cd558f73ee82b94785de122bf781078f6705d04457 WHIRLPOOL a20f7576d28345e512fa8c455b9f4709f8927be7a9cbf16a266757902b304bf4aa70b5db83d72453687c53aadcf9a4c1e179e6440875728ef30a83a6a9e0f0b5
+DIST chextrek_beta_052.zip 97683796 BLAKE2B f26d9ac130b202fc9b8142d2b7b78eef18b4b27caf8bdc6fa7a525d11c77645d03c397773de95718eb7c69145318644463d26dd17775b2aeddd14cb6be59706d SHA512 b8dcb80bb4d945c42acd446f7e9f07e1f4d3c0048b386709577b77233f7a971b6be6a9e1be7cd17d7d8491cd558f73ee82b94785de122bf781078f6705d04457
 EBUILD doom3-chextrek-0.52.ebuild 771 BLAKE2B eae7a8a7420519f0f1453889f07c8521d7fca859451605dccd611c5380f8cd1682549cb9a07accfe9df19f7e447ed5fda501f9e8976c63abc1ddc5d9ece67017 SHA512 0957231db9c3e7211975c760ee839077fd4d59e83001c60305571692bcc8bfb4d87e48bbacebbe54751a6bc6db99474e073cf0ec49661c9348e564d0cbfa3b56
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/doom3-eventhorizon/Manifest b/games-fps/doom3-eventhorizon/Manifest
index 39ed30ffbe1b..a93da76289b0 100644
--- a/games-fps/doom3-eventhorizon/Manifest
+++ b/games-fps/doom3-eventhorizon/Manifest
@@ -1,3 +1,3 @@
-DIST event_horizon_xv_1.3.zip 108659988 SHA256 3d653c61801348f8e58c80fcf1c29411987a311e64df23d873f40ededd242fac SHA512 af8d406b8b87ba22a43558cec034b5810bcee2a7dbb4bf87fd879d25f67b247e0d751443b4fcfe0a1b5072376f3941dd8e59d6d10e9ae9304c05b7ef6ae31944 WHIRLPOOL ff0fa512dac755ec7769d2b6e1ed495c59d0cf497d2ec61c4e04bfd3dc39a84017f7281d9d2c062b6078277584bd353a0251b046c7481cce9e93b74fc2c03441
+DIST event_horizon_xv_1.3.zip 108659988 BLAKE2B 6779fdcfb35b70872d7c7f1a94a4c177ff8904cc8dd39f5daad2af75874d9b39042d1e41a596acf48ae0aef549fff93bacffee1a7ec76de3bbf49f6e83b2efbb SHA512 af8d406b8b87ba22a43558cec034b5810bcee2a7dbb4bf87fd879d25f67b247e0d751443b4fcfe0a1b5072376f3941dd8e59d6d10e9ae9304c05b7ef6ae31944
 EBUILD doom3-eventhorizon-1.3.ebuild 651 BLAKE2B 94bcfc6a8f90f11c14e68d74b9e4c07c2fe9f1937ecdb51370f7e12bd379f58a5cd3489d01e7a7961a9ac9508e9ed6bcda86f4bf8a17c4692270be47dd494acd SHA512 42655f46815d4922bb050f918678e089a4784ab1ddd7694960dad51d01af95144e041f1500837581d77db84f53a5303d05cd6acf0796be6095cb91c218f6df5f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/doom3-hellcampaign/Manifest b/games-fps/doom3-hellcampaign/Manifest
index 8c17a7a126f2..fbb256737c6a 100644
--- a/games-fps/doom3-hellcampaign/Manifest
+++ b/games-fps/doom3-hellcampaign/Manifest
@@ -1,4 +1,4 @@
-DIST hardcorehellcampaign_patch.zip 532844 SHA256 98d0619e0dcd8f12bbb596c635831a37b396cab5fd49e004e95f6b8d0deefd92 SHA512 643d883c1e114af49dc573c90c19b6793cfb6f399a0050bd0c084aa56773c1a72b54cd22ec147f1981cfd1400a3253be44fc0add7b8bb1d5add8fe8163a781a0 WHIRLPOOL 7a2dcadc9b190151814b6c596e7dc85c4ae0c3b9160f066c3ec56b1541a3dcc1223b1efe6093942fafa4a940f182bbeb8b13dc3811da3c7f2664b33b8aa9ab78
-DIST sp_hc_final.zip 113992555 SHA256 3b0c4b19139f5c3341a09d4169760f1eac1029e87587a44651cde4a4bc46bcd4 SHA512 3af8466822882fda9094fd64ec50bbe7afa0e70e8e6dafa649f7798a14da37cfa1f725b855980e16cbe3cc48799363784f762782612617fdcd008b9490f07f2e WHIRLPOOL cc5b0b9e4a1d737d01ae8bcdfe031033709d7783e2bfff44e3d6fc0280ce4c417ae63508e5c02b706790f4a8fdcfb29e4c9b5ea02230362fd2c5605fbeb3d6b3
+DIST hardcorehellcampaign_patch.zip 532844 BLAKE2B d6f4ac0bf3aa5d1cda257207c8645689d0e55ea35e91f8964d7b18a067b0bf65950a5a6fa771862fab4820f648526b08eae1195a4ef5bf87041f9a0f39e98c3a SHA512 643d883c1e114af49dc573c90c19b6793cfb6f399a0050bd0c084aa56773c1a72b54cd22ec147f1981cfd1400a3253be44fc0add7b8bb1d5add8fe8163a781a0
+DIST sp_hc_final.zip 113992555 BLAKE2B b2864f2d2961e84c1335e97bd1106614c7d501cb7a95d9f3ac4c634f7c5437a67e4714a8b1931e144ca2dc2f7cd00c84272a65ec03e55f159f1e8af63cee1ab3 SHA512 3af8466822882fda9094fd64ec50bbe7afa0e70e8e6dafa649f7798a14da37cfa1f725b855980e16cbe3cc48799363784f762782612617fdcd008b9490f07f2e
 EBUILD doom3-hellcampaign-1-r1.ebuild 1113 BLAKE2B 108a65210916b6baa5a62473903f3689e93ec8a96040cb44b948258dba60fb749e4981ef9ea9f6dc5f55434fd2e4bb2b4fb27a717ca0d849b4f561baa5a4ad54 SHA512 d2657eb1428d642b36b65dc996e6a988133e8cee1fc0ee0413d4f4833ff12ba24584a814742bb90404ac075c6b86875ef0ccfad93851a144246083afdcf520ef
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/doom3-inhell/Manifest b/games-fps/doom3-inhell/Manifest
index 401a04709053..5d33bebcd23c 100644
--- a/games-fps/doom3-inhell/Manifest
+++ b/games-fps/doom3-inhell/Manifest
@@ -1,3 +1,3 @@
-DIST in_hell_v11.zip 356652597 SHA256 47437c4335b77e89705617841d3af9479ab4dbef124a4590c3a7ed9e92934cbe SHA512 6d97856f518161a445eb1b01eef9a987b9e0675729734539b57c56ff798cb257a6e337cd19c3b37dbea5bf5b22ae6694957a08e3fe8bc3207ea1b7982e3f8624 WHIRLPOOL c3fde484f74bc8c7470a1211168603f9cac5359e7e031202af76732872ff315a8086082862074d3f7c0c65fec225836fd656149e75dbe2e49cc2b84d6da2cd4d
+DIST in_hell_v11.zip 356652597 BLAKE2B af2f072413d417a3d06d099b4c5c2b2ac5c3fde9e54a90be81ad12d2103252476ee048f4b38dc241b73f82099f58568c02ceb4e754f7a8fa3b1ae2193b8d161f SHA512 6d97856f518161a445eb1b01eef9a987b9e0675729734539b57c56ff798cb257a6e337cd19c3b37dbea5bf5b22ae6694957a08e3fe8bc3207ea1b7982e3f8624
 EBUILD doom3-inhell-1.1-r1.ebuild 582 BLAKE2B 9799b55ba36c9d42e8a63f96fd555231a0a114f4c07e372237e8f206d98ccda21c731f8ab52798809b8fd4cc58dd0773b4b3f4badd63b01c106f90c9a0cbe93a SHA512 2d68bd3abca0b55390497f72b05c436335442aad7a5da056bd6aa205d52a9a928ab187c79909840c65c2aabdd0c56249e088c090620d414ff4911a91f1cb97f0
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-action/Manifest b/games-fps/ut2004-action/Manifest
index a8bbc65a0086..087af9d820b6 100644
--- a/games-fps/ut2004-action/Manifest
+++ b/games-fps/ut2004-action/Manifest
@@ -1,3 +1,3 @@
-DIST aut-r1-msuc.zip 323878282 SHA256 8ebd6746e3db888085a02cdee4524a2221d7dd6ba38c53bcf439db25c921f75f SHA512 50aafff330839c9b8fe8be2e6a98d9532f8429e2a8f258a9a6dabd39f555a9ce11f9178592575996ebce2629ff5c7f3046777bc1605f21c2bbefb80e11ca4f65 WHIRLPOOL 91779065372716cf076f4b2c5a3a77cbaec366f48fb1fc5319a2f3827ceeed4f5d668f40c6fb75b8ae60fa2b7076758c995ff82fb698e13894d546525bc15838
+DIST aut-r1-msuc.zip 323878282 BLAKE2B 509036928b33697926d81e920cb9ca3496549d1024f33912d8de48d5328cd4a20cf5412b4c3ebf4d3e0f3dbba347d486c3d2ed4a14185e817e7aad4b560312ee SHA512 50aafff330839c9b8fe8be2e6a98d9532f8429e2a8f258a9a6dabd39f555a9ce11f9178592575996ebce2629ff5c7f3046777bc1605f21c2bbefb80e11ca4f65
 EBUILD ut2004-action-1.ebuild 535 BLAKE2B 503d1a22ba22666fd212ef25cdcdee4ef8780801afccde2f860271d52356efb8ba90ae1342f64a7bce5345e312d35ac95e2f46d61ccbf52098c4c4edeb37fb0d SHA512 10fbf2eb7b8d0d1cb1b0521032ec4dba3e9a6c904aeed75b6d042af1e0bba0a268a49a99d4f3ce995d27fbd1e350be86f3ee7fcdfa38640f4d83be0f66c5119a
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-cbp1/Manifest b/games-fps/ut2004-bonuspack-cbp1/Manifest
index 4d123b484cd0..018ddcc3682a 100644
--- a/games-fps/ut2004-bonuspack-cbp1/Manifest
+++ b/games-fps/ut2004-bonuspack-cbp1/Manifest
@@ -1,3 +1,3 @@
-DIST cbp1.zip 144163647 SHA256 c952dbd5a0fbe986b77bd56a57218733ff26ce8f5d074feb557a69c44ec1e863 SHA512 e2ead75796fd68b3f0d6ea50b4ed9988fef043730c6b81487d34c45aa26f63cac7b6a43991b673fbd6315f1496d2eecc52a5845c12f244411cd71fedab93c6fd WHIRLPOOL 9ee46970dc69b32b77ccc8707d1b2879aaa49ee98edf5b64f26097353eaa878e49bd4daa54aafe8a89b6034e8a73e63d1508482d9dd9632295eb65acb0cd0d26
+DIST cbp1.zip 144163647 BLAKE2B ff32fbf431475ae2c24920574e5d158c4242fca2359bf1817131e189c0cd25e52d17de3232acb0b118d7f689ee67821cf6707a2e416e1a9b3f2b5f2e8fbcca86 SHA512 e2ead75796fd68b3f0d6ea50b4ed9988fef043730c6b81487d34c45aa26f63cac7b6a43991b673fbd6315f1496d2eecc52a5845c12f244411cd71fedab93c6fd
 EBUILD ut2004-bonuspack-cbp1-1-r2.ebuild 472 BLAKE2B 5f266316989b450ac506c3701a2cf79a135b7312ab18d51be449f80a6e4e6072bb8c09cab751a89f6a7ce745edda8407564366ec7132c768368ebafd39e10634 SHA512 0e06854eb7a97e3aa5cede0c216501d9d20c70205da7e5304ccc42c6ac6964c4631aca577fee6b9091ea94a8c522b697d582f2c73a589c77138e9eeb3ca67589
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-bonuspack-cbp2/Manifest b/games-fps/ut2004-bonuspack-cbp2/Manifest
index 648382fd6b9f..169535377ec3 100644
--- a/games-fps/ut2004-bonuspack-cbp2/Manifest
+++ b/games-fps/ut2004-bonuspack-cbp2/Manifest
@@ -1,4 +1,4 @@
-DIST cbp2-volume1_zip.zip 203766207 SHA256 94e21360d2f87489822468b6e037931ec0a2d9d3653259d90a58cabaacc3370d SHA512 9e425985640f9fcf9c1696d75e0794b31110715ba3bf664087ede1f1925a68e76e4ee87d248b245429702c2bffc1fb16362fcc43f795681efcc5880a2a7c3213 WHIRLPOOL 7214e089c76a19f14c88e763434e5505f6a71180a9293600f200e521daeb4a209c0fe032d2a2e616152e758bfb7223012c680873cb40a66c3528a2d0aa673ecf
-DIST cbp2-volume2_zip.zip 200444127 SHA256 62af666645205c256caf539646483fcaad24af91cb5cfb283fc9e6b48f18c79f SHA512 52982b302bb2d8f0839392f8bad05935bb8c5cae9e98528dfada7fa80f595050829ff6872b834197486c3401256f60c6c023133f6446299cbd72e1fd7ec3c8f4 WHIRLPOOL 878c75ab02c21042c3d76be46fae7caf01cd9f226703d0335fdf3f96e5c175e0904828a5d7a0a6f7418b3e03dfee6f964c40261b928d2ab1616d784831df2ce0
+DIST cbp2-volume1_zip.zip 203766207 BLAKE2B 7f7d19f4a1a1caaf388eccecadb8123a103d4aafbb95f2b344e106b881507f9bac0ffdda48435be7c2303b8bd70545d3d74ca7971f97a989bfa955d3155d956c SHA512 9e425985640f9fcf9c1696d75e0794b31110715ba3bf664087ede1f1925a68e76e4ee87d248b245429702c2bffc1fb16362fcc43f795681efcc5880a2a7c3213
+DIST cbp2-volume2_zip.zip 200444127 BLAKE2B 21d61d09af54e86047d46cc8d136cd6ba746098c4d0a53ade1e8e5c4143b543f0a90eb0dbca2cb00e29754f916dc84e7040a5d64f582bedd2a0107bb4c182291 SHA512 52982b302bb2d8f0839392f8bad05935bb8c5cae9e98528dfada7fa80f595050829ff6872b834197486c3401256f60c6c023133f6446299cbd72e1fd7ec3c8f4
 EBUILD ut2004-bonuspack-cbp2-1-r2.ebuild 856 BLAKE2B c69029c2ea4edb1c8f8f656e589c60c15a641e36b99faf6b5cdad88897c1515b5faa0581e4cf0c94ede9c12ad409a0682dcdbe53dbeb912ca58b7a46253135f1 SHA512 f35be19938883818c31c46a343476efb8b9c67d958022d73280032744a50b41f56ae2faa99f78fc9d00ce428058a68cfb3ac069e520820be9ad6da51f7e6907d
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-cor/Manifest b/games-fps/ut2004-cor/Manifest
index 58d22a4c6a43..a8c7eefb01dc 100644
--- a/games-fps/ut2004-cor/Manifest
+++ b/games-fps/ut2004-cor/Manifest
@@ -1,4 +1,4 @@
-DIST cor_beta_v1.0.zip 278979612 SHA256 bde2f6acf241ff94ce59cfa87271c71168cd82c00b55ac9de1c6f2317690f4e1 SHA512 04a8db1b31478785052d162e2007eb336d1d99c76f96098163c71616d3951e4e3c7b95c1b29a05e9acf2e0554c5bd20e5e2df10b93325b0e2cabf3a5a60640a6 WHIRLPOOL 66de704405e17cf4394a66a77941537141092b8c0478227276f5e9cf56cae6b5af3e66cc750002f725dca04c3327b83cd8d5839696f924ec1c0961566eb00676
-DIST cor_patch_b1_to_b101.zip 20386490 SHA256 78034844cda02f96faf178fac8ed05c64aaaa7390d67877aed334f320b9ff903 SHA512 7b7243727a0e4570545f9d3f93a141b61da5e4cbe458894602925733396b3f9037c7a9a21a1ee9c9638181b4c321a9030a29837e1e808826a70bb52f54e2d6a6 WHIRLPOOL d672a928a14b70f0f6ebd6955b8f92868aa9b250a5835ea2401ef09f187e3be919ad0fa3416370eba74722c50d0421c2cff5fe3f86b2d523f48182f2bf666cac
+DIST cor_beta_v1.0.zip 278979612 BLAKE2B 39cc74b36bb8b752d6390c320077f5c6fa43de835fa490cad7156a57e2c5406f6ba2f15d8991a4bcb5605e5c722d221a093c11df1d47455568a804ab3d34df0d SHA512 04a8db1b31478785052d162e2007eb336d1d99c76f96098163c71616d3951e4e3c7b95c1b29a05e9acf2e0554c5bd20e5e2df10b93325b0e2cabf3a5a60640a6
+DIST cor_patch_b1_to_b101.zip 20386490 BLAKE2B 03091a14d15d749e33d92e5fa98a46b5a4d0c3fef83ab84869da490cff8395bef7bfabe42903271cb91324ad3931461d9f3080a267c0c2ea0c03faf692991471 SHA512 7b7243727a0e4570545f9d3f93a141b61da5e4cbe458894602925733396b3f9037c7a9a21a1ee9c9638181b4c321a9030a29837e1e808826a70bb52f54e2d6a6
 EBUILD ut2004-cor-1.01-r1.ebuild 559 BLAKE2B 5084013a1169fe830fd4d276881bddcfa5c2de8e7391f9dec005e38d91c59468a7206c6f4e02599f4456e16b5a427983b3850ecc9a2c84a9b6742897579c6b00 SHA512 9f41c6b5e7ebb5fb95e53bf1d2cfc269907cfed0444caf04c7aebd1efa9066df2a49a6265d0b1bf17aa90ad860f86710962fe6af79d78cfa5415252855f29cef
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-fragops/Manifest b/games-fps/ut2004-fragops/Manifest
index 62932545f550..fb9261d861f0 100644
--- a/games-fps/ut2004-fragops/Manifest
+++ b/games-fps/ut2004-fragops/Manifest
@@ -1,3 +1,3 @@
-DIST fragops_v220_fulllmw.zip 554114758 SHA256 5daa8d8cee9e9ec11e4a960a811928a61bd6ef6f61717d2bb24863ba729a6f0f SHA512 f2a0b1a8e035e038a5241053c30761f725003aba8c45c862348ab8a8895c2db056bab45e2a1791080dcf54234923d736bd7d7361bb38bb2b67ebf5e077fc83e5 WHIRLPOOL b7e97860441f6f4eeb469034a5dd644dc253da5aa593d4e2e08f2e31f5e4a18aa5343307d31300191f92d2a87bdba84b5daf59d0ca7f78ef05c382e8344c0df6
+DIST fragops_v220_fulllmw.zip 554114758 BLAKE2B a3cfb94b64e6bb114077a0c802bbafe7d374c943c9524fd52a5982ab46c7c5e2c9d72622ea79ad0058c15ee3aa5e27fe0bb5a74e9c88847f8477cf7890a1fdce SHA512 f2a0b1a8e035e038a5241053c30761f725003aba8c45c862348ab8a8895c2db056bab45e2a1791080dcf54234923d736bd7d7361bb38bb2b67ebf5e077fc83e5
 EBUILD ut2004-fragops-2.20.ebuild 477 BLAKE2B 568cd731fe630169f5506fd7c983ad3e34f5a856d9cb19509724d30d3c8f853d96080502faadcba23399beabbe056549ce772791ff654098f2ae0e893e4ecf02 SHA512 a45637b50e2d6dc585d86e1a8d644fb0c8fb63a0fa30e877da8a8a9604f0a462d753228a13871f1a5ac7452a4ab0d5df008966baac6425524e52a21bf855e615
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-muralis/Manifest b/games-fps/ut2004-muralis/Manifest
index eec5eb042a2b..2f5fa655c1ec 100644
--- a/games-fps/ut2004-muralis/Manifest
+++ b/games-fps/ut2004-muralis/Manifest
@@ -1,3 +1,3 @@
-DIST muralis-v1.15-zip.zip 62575050 SHA256 99d3d86585511cf0b9a37fb3b475a6685d1a4a414684def9e82befdc793fd77f SHA512 b50477e3ef221241a430f95a390e34d5ffee3ea460e62bafa30b534d6499ef1a616d8ca35f77179e8f7a50b5e69f82441cb9779d38e71388c2868add45822330 WHIRLPOOL 73d5ce13cda9095548745d3a766058d24192b062399db588bfabd7b2696a7bb6ac697193458370ef081714f083196e1110b43b7ecd535d9c7bbd9bfbc4597777
+DIST muralis-v1.15-zip.zip 62575050 BLAKE2B e168053472e63507667707295b3bfee261f802017cdd82e3b35b33855747fa19b75c4861f991b7678861cf8bfe84ea00ce697d979cd19c297c05c06b1c87d910 SHA512 b50477e3ef221241a430f95a390e34d5ffee3ea460e62bafa30b534d6499ef1a616d8ca35f77179e8f7a50b5e69f82441cb9779d38e71388c2868add45822330
 EBUILD ut2004-muralis-1.15.ebuild 488 BLAKE2B 1b48664d5e6aca346301aee7e901edbe892e4e30cd85d3fe63416df5e0bdc777873b293df12101c910bdf599661449c4f818895902857d29eb2e4dafc54a2cf1 SHA512 b2cf0c62a86efbec4e3d5769aa8e3d996a4a4523db8076ee544b5ec803ec06edca364b309d499df171dbf89f2b4c05c5948c0f31af1e2afa052d8c3f5932aa3f
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-strikeforce/Manifest b/games-fps/ut2004-strikeforce/Manifest
index 9b05416e431d..91da946981e3 100644
--- a/games-fps/ut2004-strikeforce/Manifest
+++ b/games-fps/ut2004-strikeforce/Manifest
@@ -1,3 +1,3 @@
-DIST strikeforce-ce-v4.1.zip 452020366 SHA256 cdd171a5d22ea17536e74c9fbf8430498098987a320e2e6247a27abfa327178e SHA512 758de1fa2a39b822114b7f224668acdbeffba6d62cc1b1a31104fcac4f84b6859cfa9a024d4d682682cf4f52de7118c1cbaa080a4887c6d882c0c7fb78ef3b49 WHIRLPOOL d52cbd78186afe46765bf11027bcf660fe11caf6304553a97c2c75e336f04201fe0579316bb93934bf149ee5cfdb157cc04210022a1834496542881f699fb233
+DIST strikeforce-ce-v4.1.zip 452020366 BLAKE2B de157150409c0be828241c06eab56cd75af777dd52eecf0c0aefa47970a693606428cef84d1c6e6f85730f6e95b1c165cb56cf2801ca926888d308ff0309b68b SHA512 758de1fa2a39b822114b7f224668acdbeffba6d62cc1b1a31104fcac4f84b6859cfa9a024d4d682682cf4f52de7118c1cbaa080a4887c6d882c0c7fb78ef3b49
 EBUILD ut2004-strikeforce-4.1.ebuild 476 BLAKE2B 988cbcf80a492a957928782d47323d733a658d18331a02ba857fa2f20a5e67481b766b862c4a902fa1bedef4ccaf6e9381c367db8506b3105229c9e9bfbafcbc SHA512 b3cd74810c9148bc28ad141c0fcce86308046388b48c57cb47a2112260bc2290da469b92d8229dc0b5fb35f1c2255637f51cb06c015fc2e61a373da408a6b244
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-fps/ut2004-unwheel/Manifest b/games-fps/ut2004-unwheel/Manifest
index 18afe545c829..4b3a8791d416 100644
--- a/games-fps/ut2004-unwheel/Manifest
+++ b/games-fps/ut2004-unwheel/Manifest
@@ -1,4 +1,4 @@
-DIST unwheel_r5.zip 596390232 SHA256 30473f57f9da9b1f1da27f44c181f2e284bb22141163847100ce3ac446fa264d SHA512 4cf319b1e20c9faa5e248e3a39a015b9a37d6defe4a8f31d634931a426dec957a1330d559d45333fda9a2451f9f3a0f7161d94c101d46950f6921fcfc0d87ee3 WHIRLPOOL 248fb9c8bea19b258f027720459b96da6018b603f4aaae1f2cd3496dd04a909d16d261a58a3cdfa7e167ab0dc958d6815435b8896c52c5ee3e09054c9eeac800
-DIST unwheelcbpvol1.zip 138178365 SHA256 dadc3538071b9853b11202ac1cdb7769bbbacde4ae03f78919b469dab997f2b5 SHA512 0cb1c3a64d8cd4448ebdfde175a25afa253336102831fa8a2abc113064cca4a0afbe90e806b4c1d1fa898142496070349566e2bcf5aad42ba12dec2c947e6fcc WHIRLPOOL 4f3bf78642e05c0c8143cd88a9dad2e74c96c4625f7ba20158913eff1c8d950cda5a903ef1a83328a0178b567da2d4e47ca0c345a63f7b78b4b3962ad1b43beb
+DIST unwheel_r5.zip 596390232 BLAKE2B 583b89cd10962e09084f66d85ba437cc336fc3818a9af1cab30d553dc213efa23f88692d555842dbf5c5a7fc27fe607066695163503131d4cadff548d1bb5f91 SHA512 4cf319b1e20c9faa5e248e3a39a015b9a37d6defe4a8f31d634931a426dec957a1330d559d45333fda9a2451f9f3a0f7161d94c101d46950f6921fcfc0d87ee3
+DIST unwheelcbpvol1.zip 138178365 BLAKE2B 25f3f61803c63e7cf6f5e4dd7da29ff9c3d90481677416bcb10cc3fae26db5aa6b0065fe945e46b632852b6e9853a7263f97bfc6de2a2a8b13067d1e917d12b4 SHA512 0cb1c3a64d8cd4448ebdfde175a25afa253336102831fa8a2abc113064cca4a0afbe90e806b4c1d1fa898142496070349566e2bcf5aad42ba12dec2c947e6fcc
 EBUILD ut2004-unwheel-0_beta5.ebuild 683 BLAKE2B 02783e72db4eeaec6dbf093832892e3a1468827e1315cede9d270b824eaaa3adc7442f92c56bc5aa61c1ace31cf1001875fc718f30dece8ae7f2b5dcdd5bb573 SHA512 eebf817d5c1a42a175d51322262327849f76e038881dc0bbe44c86bd3d4d2fc7af38e631fd71f2110fa0b0c853c603cd8bfc2e0bdedf600b6a790430fb2873d5
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-roguelike/FTL/Manifest b/games-roguelike/FTL/Manifest
index 8a8c7f8c9fde..d2f870f336b8 100644
--- a/games-roguelike/FTL/Manifest
+++ b/games-roguelike/FTL/Manifest
@@ -1,3 +1,3 @@
-DIST FTL.1.5.13.tar.gz 197569383 SHA256 babdfafceec744f36dd663966813098669a983f94d243265dd57104ffbfb7055 SHA512 129aa9ea13b6889520cb637bcbda0452f3dc2e8d93fb0e4d1c7938436d776b39a0a33b4e9d943e058ab5c80dcbb6e7bb874d0a78bd8a2a5a3a7e34159e1faac9 WHIRLPOOL 23f9af234d3f81555fa2ca1533708e785fb82ba992c5fc836b6db1fe330e43c1b22927837a0cd000718e9adda8d3d9feb3abda8ca72463e9dc2aa75378db4c00
+DIST FTL.1.5.13.tar.gz 197569383 BLAKE2B 29b61c92dc242c6239e236761a89c464efc3889e1d28bbcd3466548090f4ba23450597ef9cd0a7130d0caea1d45a9cfdd87a56a65998dd4da146f1ade5d9a68d SHA512 129aa9ea13b6889520cb637bcbda0452f3dc2e8d93fb0e4d1c7938436d776b39a0a33b4e9d943e058ab5c80dcbb6e7bb874d0a78bd8a2a5a3a7e34159e1faac9
 EBUILD FTL-1.5.13.ebuild 1498 BLAKE2B 91e25c44e253d2802813c7e56a7372fafbc52db36835b9093c58ef20e7f27979cedafadcf0081a830674b3713137752804940e4213f417d6899714282f326537 SHA512 d7dcf52b3f59868e79a273c34edf4e9988ed36729e1fd32cb6faa5660d632177ccba553951006a1c2d4a361313794f105e6b40bb7c11df471c479d622889b54a
 MISC metadata.xml 593 BLAKE2B af5a93a19607268af1c0087e8cba59e4bb16beaeb6ff3237a1b4a78940f8cb1ac3ae4285c53f844d862e255389e247c40f868b7060f43e88682b7fa266bab747 SHA512 b7d805ccd3aa99a771370190fd33f6254fe3e5dba0be56379c3fbebda94a10815750a41e47f696d76e2e927f951f20d292d378c15cd73e1a5700aa0059eb7a3d
diff --git a/games-roguelike/Manifest.gz b/games-roguelike/Manifest.gz
index e88b693eaf0c..60d6574ed0b0 100644
--- a/games-roguelike/Manifest.gz
+++ b/games-roguelike/Manifest.gz
diff --git a/games-roguelike/dwarf-fortress/Manifest b/games-roguelike/dwarf-fortress/Manifest
index f3ceb5ba3574..495ad9a9b0de 100644
--- a/games-roguelike/dwarf-fortress/Manifest
+++ b/games-roguelike/dwarf-fortress/Manifest
@@ -3,8 +3,8 @@ AUX Makefile.native 1016 BLAKE2B ea40a1f90bf52e52c7cf88e99c73c981c00506eddb4ad9c
 AUX dwarf-fortress 516 BLAKE2B 9d2faffac265e99698fa1c481eec8598fbe66b4ab205b18c76d285cd16fe1b32d3bfa9bc415bceae6e1e350e955ac3b3cebd7d46943a06ff71715fd1cb5402df SHA512 1f1fada35e33cb99c28835d600f6567ecaaf7b2c6111a2e96b1a88c54e5d727f94ae1c0213327bc70a623dbdf19a8433e3c59edcab5a40e898b0124eb2eb9006
 DIST df_43_05_linux.tar.bz2 11580594 BLAKE2B 7157f8ed5f8798a533d992811c804515acc8abb3bb84b25af6905fd6b2338e95879e318bec0dade18f1eba1421d17a781d1da8b49c719988d2cb6d7046b0c3be SHA512 502e6bac0bdd5586fb6b4e1117caf144a0336a7eed3ed9350ec316e4a286e309a15e0738517c0dd7d32f182984c501c7a8756e942d3dde9fb87f72b153f38e7a
 DIST df_43_05_linux32.tar.bz2 12158550 BLAKE2B 4c1f5ad834aa0a2b6438b8aaf0b0ad6cfc60656f58845a274ac3d8ad7e09182d7263e3a495d1bff0b1fb5499097569216fac0bc87cff95fc6a85e3211acc297d SHA512 d0446ddb5c37ee45ade36b18b815595e8d7bfd9749af4ecd2f25b45859d797a9da70f2344e2c58544feafc7df06882ade8a10534c37754359747c0d37f084b7c
-DIST df_44_03_linux.tar.bz2 11945628 BLAKE2B dd4fd2ce847a0214fc0ce49c84775a64c112354eb7cede8b4cc45390bd9c9f590f1295b0242009ed38284851494e50a6487414b5cecb5d84cf824f2a9f16dca4 SHA512 7f1ed0407414b6716b5a172a5b9cfc002462b68a86e7a3ad3774728922d1439b78a04bdd3b0a17d996c3777ef6e0b4274da83a417572b22813e1c93d3cd2ddde
-DIST df_44_03_linux32.tar.bz2 12548954 BLAKE2B 8191806b3695562b4f6716fb2e090fd21a6d0cb9dedf1e812a9c18a7ca663112bf291f616c25fd53a92d14f1fdc586520b9c7a3493440bb3ec9f7c1c06e2cdcf SHA512 67312d2b29697d215f02f21ef3c08e9b012c24e43b17743a67610a47288e69a3eb9fe6a5ec56c9882c05412f889aed4de7bc3f2f98635d94ee805ba2328778cf
-EBUILD dwarf-fortress-0.43.05.ebuild 2320 BLAKE2B 6cd9da51415216f6c86f2e4d3bf08cb543f89873263b956a7b8f1c1548d2af4f4d943ca8997daeda859ed6fb2317da03253fa73cfa17a0057aa0c814915d87c0 SHA512 81a4f5c4fe27f5f53344b2d3b889930863ae221b1cd7342be05f75e9b04fb956fcd05251cf21288898d37675b5b35821f69cda0721aaa601755cda7ae629d3ce
-EBUILD dwarf-fortress-0.44.03.ebuild 2320 BLAKE2B 6cd9da51415216f6c86f2e4d3bf08cb543f89873263b956a7b8f1c1548d2af4f4d943ca8997daeda859ed6fb2317da03253fa73cfa17a0057aa0c814915d87c0 SHA512 81a4f5c4fe27f5f53344b2d3b889930863ae221b1cd7342be05f75e9b04fb956fcd05251cf21288898d37675b5b35821f69cda0721aaa601755cda7ae629d3ce
+DIST df_44_05_linux.tar.bz2 11949333 BLAKE2B 7b4acbebd02fedf5d7310c0f2226fede11c53ba3d6c5ef584eee5ce41af1c3abd1dfb25c5f3a4ce06cc071812e9d1f78819aa211f2512f2d66bb7c7161ab226f SHA512 050037c5b21d95aac972efa6c7df6f608f5bb962c9855cfb1ecc60a6aa4f5b49bf0c3a43790d34dbb460b5cc1f56122c1e84249455f4f7d800e6ec8f1e1a5574
+DIST df_44_05_linux32.tar.bz2 12553133 BLAKE2B eb536cb638fc43579bc50539a641b06f6d37b2f9d33c7bd35df7de032a831e31d6c18fb69dedd1191736fc50a8256568015b5b5d769c254d0f6d8060c3c0f48d SHA512 d13c0172ca0981f2e3042005a4945e05c75207ff23082c6dea274f1f0f263e6f8fe2a1eecae5b737d79a7d27940bf2101d9c859a190e0903eb8e4d0ae0b8fbe9
+EBUILD dwarf-fortress-0.43.05.ebuild 2336 BLAKE2B 97411ad8ae7ffb1841a58be8cdb503e827bc570cf795e9b48c3236f59c4d81e9ea6825329775d7c1421aa112d3d8238446fe946d58808987649b4f9ef4a8cb96 SHA512 9fb15d69e8df35916919d4cd74ea05cfa0e721cda80260fde0d19c2bff32caa81fd449216d584e3059987ca7892f3553da8c9646f214e9ad2e2dab41bfe351f4
+EBUILD dwarf-fortress-0.44.05.ebuild 2336 BLAKE2B 97411ad8ae7ffb1841a58be8cdb503e827bc570cf795e9b48c3236f59c4d81e9ea6825329775d7c1421aa112d3d8238446fe946d58808987649b4f9ef4a8cb96 SHA512 9fb15d69e8df35916919d4cd74ea05cfa0e721cda80260fde0d19c2bff32caa81fd449216d584e3059987ca7892f3553da8c9646f214e9ad2e2dab41bfe351f4
 MISC metadata.xml 583 BLAKE2B c146d313f3f7192527b5ae2bd81a12db0c4587b3cd479bc68fc15a44a7a77dd1d45558ed632e4e979d9ff018e74860dbfae88ab6f3f45eb88448f9cf66890090 SHA512 084c03470208f5439a6831d3340d1f8a37c46f4f00fc0c3f00a834ae2faee9ee2e8dcb711943b095cae602c15eda1f45517d28f9416d65b55de63206094213f4
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
index 6352e7dba598..a8f36028ee27 100644
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.43.05.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit versionator
+inherit versionator toolchain-funcs
 
 MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)")
 MY_PN=df
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.03.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.03.ebuild
deleted file mode 100644
index 6352e7dba598..000000000000
--- a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.03.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)")
-MY_PN=df
-MY_P=${MY_PN}_${MY_PV}
-
-DESCRIPTION="A single-player fantasy game"
-HOMEPAGE="http://www.bay12games.com/dwarves"
-SRC_URI="amd64? ( http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
-	x86? ( http://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
-
-LICENSE="free-noncomm BSD BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 -*"
-IUSE="debug"
-
-RDEPEND="media-libs/glew:0
-	media-libs/libsdl[joystick,video]
-	media-libs/sdl-image[png]
-	media-libs/sdl-ttf
-	sys-libs/zlib
-	virtual/glu
-	x11-libs/gtk+:2"
-# Yup, libsndfile, openal and ncurses are only needed at compile-time; the code
-# dlopens them at runtime if requested.
-DEPEND="${RDEPEND}
-	media-libs/libsndfile
-	media-libs/openal
-	sys-libs/ncurses:5[unicode]
-	virtual/pkgconfig"
-
-S=${WORKDIR}/${MY_PN}_linux
-
-gamesdir="/opt/${PN}"
-QA_PREBUILT="${gamesdir#/}/libs/Dwarf_Fortress"
-RESTRICT="strip"
-
-src_prepare() {
-	rm -f libs/*.so* || die
-	sed -i -e '1i#include <cmath>' g_src/ttf_manager.cpp || die
-	default
-}
-
-src_configure() {
-	tc-export CXX PKG_CONFIG
-	CXXFLAGS+=" -D$(use debug || echo N)DEBUG"
-}
-
-src_compile() {
-	emake -f "${FILESDIR}/Makefile.native"
-	sed -e "s:^gamesdir=.*:gamesdir=${gamesdir}:" "${FILESDIR}/dwarf-fortress" > dwarf-fortress || die
-}
-
-src_install() {
-	# install data-files and libs
-	insinto "${gamesdir}"
-	doins -r raw data libs
-
-	# install our wrapper
-	dobin dwarf-fortress
-
-	# install docs
-	dodoc README.linux *.txt
-
-	fperms 755 "${gamesdir}"/libs/Dwarf_Fortress
-}
-
-pkg_postinst() {
-	elog "System-wide Dwarf Fortress has been installed to ${gamesdir}. This is"
-	elog "symlinked to ~/.dwarf-fortress when dwarf-fortress is run."
-	elog "For more information on what exactly is replaced, see /usr/bin/dwarf-fortress."
-	elog "Note: This means that the primary entry point is /usr/bin/dwarf-fortress."
-	elog "Do not run ${gamesdir}/libs/Dwarf_Fortress."
-	elog
-	elog "Optional runtime dependencies:"
-	elog "Install sys-libs/ncurses[unicode] for [PRINT_MODE:TEXT]"
-	elog "Install media-libs/openal and media-libs/libsndfile for audio output"
-	elog "Install media-libs/libsdl[opengl] for the OpenGL PRINT_MODE settings"
-}
diff --git a/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.05.ebuild b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.05.ebuild
new file mode 100644
index 000000000000..a8f36028ee27
--- /dev/null
+++ b/games-roguelike/dwarf-fortress/dwarf-fortress-0.44.05.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit versionator toolchain-funcs
+
+MY_PV=$(replace_all_version_separators _ "$(get_version_component_range 2-)")
+MY_PN=df
+MY_P=${MY_PN}_${MY_PV}
+
+DESCRIPTION="A single-player fantasy game"
+HOMEPAGE="http://www.bay12games.com/dwarves"
+SRC_URI="amd64? ( http://www.bay12games.com/dwarves/${MY_P}_linux.tar.bz2 )
+	x86? ( http://www.bay12games.com/dwarves/${MY_P}_linux32.tar.bz2 )"
+
+LICENSE="free-noncomm BSD BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 -*"
+IUSE="debug"
+
+RDEPEND="media-libs/glew:0
+	media-libs/libsdl[joystick,video]
+	media-libs/sdl-image[png]
+	media-libs/sdl-ttf
+	sys-libs/zlib
+	virtual/glu
+	x11-libs/gtk+:2"
+# Yup, libsndfile, openal and ncurses are only needed at compile-time; the code
+# dlopens them at runtime if requested.
+DEPEND="${RDEPEND}
+	media-libs/libsndfile
+	media-libs/openal
+	sys-libs/ncurses:5[unicode]
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_PN}_linux
+
+gamesdir="/opt/${PN}"
+QA_PREBUILT="${gamesdir#/}/libs/Dwarf_Fortress"
+RESTRICT="strip"
+
+src_prepare() {
+	rm -f libs/*.so* || die
+	sed -i -e '1i#include <cmath>' g_src/ttf_manager.cpp || die
+	default
+}
+
+src_configure() {
+	tc-export CXX PKG_CONFIG
+	CXXFLAGS+=" -D$(use debug || echo N)DEBUG"
+}
+
+src_compile() {
+	emake -f "${FILESDIR}/Makefile.native"
+	sed -e "s:^gamesdir=.*:gamesdir=${gamesdir}:" "${FILESDIR}/dwarf-fortress" > dwarf-fortress || die
+}
+
+src_install() {
+	# install data-files and libs
+	insinto "${gamesdir}"
+	doins -r raw data libs
+
+	# install our wrapper
+	dobin dwarf-fortress
+
+	# install docs
+	dodoc README.linux *.txt
+
+	fperms 755 "${gamesdir}"/libs/Dwarf_Fortress
+}
+
+pkg_postinst() {
+	elog "System-wide Dwarf Fortress has been installed to ${gamesdir}. This is"
+	elog "symlinked to ~/.dwarf-fortress when dwarf-fortress is run."
+	elog "For more information on what exactly is replaced, see /usr/bin/dwarf-fortress."
+	elog "Note: This means that the primary entry point is /usr/bin/dwarf-fortress."
+	elog "Do not run ${gamesdir}/libs/Dwarf_Fortress."
+	elog
+	elog "Optional runtime dependencies:"
+	elog "Install sys-libs/ncurses[unicode] for [PRINT_MODE:TEXT]"
+	elog "Install media-libs/openal and media-libs/libsndfile for audio output"
+	elog "Install media-libs/libsdl[opengl] for the OpenGL PRINT_MODE settings"
+}
diff --git a/games-rpg/Manifest.gz b/games-rpg/Manifest.gz
index 0c76514e5ba4..c0d1467d88d6 100644
--- a/games-rpg/Manifest.gz
+++ b/games-rpg/Manifest.gz
diff --git a/games-rpg/baldurs-gate-ee/Manifest b/games-rpg/baldurs-gate-ee/Manifest
index 1a41eb6bd753..6cf7823e0ea6 100644
--- a/games-rpg/baldurs-gate-ee/Manifest
+++ b/games-rpg/baldurs-gate-ee/Manifest
@@ -1,3 +1,3 @@
-DIST gog_baldur_s_gate_enhanced_edition_2.5.0.8.sh 2877122979 SHA256 ddd4ad12a340db1fe74f68532565df216577ffd76ce9190da0a288594b161e7b SHA512 b129e7c8e656092ab731410e0776576f28e497958e84faf02095d0a22ee72a2c8c9d1563b8c972959f6f9d4c2cb9dacd13358d5aee1c53c3f198d9b362c19d3d WHIRLPOOL 730218b67b6f026bbd3f40d2f0d382c60b10be48ca0e13f6d705ca96e6edebe21e0fb3131dd1c07aadf3c7396f56e8dbd55b0c19074bd7564ea7d533cb98ace2
-EBUILD baldurs-gate-ee-2.3.67.3.ebuild 1370 BLAKE2B ccc947663e6503e47421e9eecfdc10300394c8ff9272d851f89eab97f1175c105cd46e356fae2f48c65fe56e44684285734af298d5620f52dec4376d5ad6a2c1 SHA512 3f1a7e41c762f95e884351e6248b9205e066f3a86f096f932b4643cb8b57f8ace9fff1c02dcb9f0140d8c84ac2489d468502eb0a4077133e6e1cb8e1f8cda061
+DIST gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh 2877124067 BLAKE2B 244e93ae089703c9fae3dcfcad4fb9c1eb32695e7288f7a05b3f2996887f90d6912e745e9b47a93ba45ee3ddda8363e69d22e62c57258ee54c24c47f07b2f619 SHA512 56d4796a959658f29cabef6e7339db5ba9fa792d9fd899ebc375c9b5cf94305b6d11c21d41a8809fcb1cbe38ecb4bc7152158ef19c87395374ab9060f48756a6
+EBUILD baldurs-gate-ee-2.3.67.3-r1.ebuild 1370 BLAKE2B c250d9d87cf58a4906b8a6933d32ace06730fdf5e8b092baac03bfcfb9e688216723b7633818d8977b94575d1a86f751e5d30b77d055e79ecf8da7f620981aa7 SHA512 853b672a76099fd98ad78d368ab9c484ad39c4e323d1a893c7cd433daa8c6e0562c454e38dcea7fb852c4036509a2af1be03feb716a2b9f36a460f0414b06915
 MISC metadata.xml 784 BLAKE2B e6527c6d760208259a31037ffb51533b2fa07d40be2f62bd3c08c63acf1418841abf657b678cfff42650430f75b1430a5f9bcf849e8688af57b853fa911aebb1 SHA512 d92e2613876c7c8840f640ba778f1cbdb62d2e65caf38a1e931bd7ffe6ab3bcacf6093155b01036f1cb3f18583842761242105019fbf1e72df34e096d7f5bbde
diff --git a/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild b/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild
new file mode 100644
index 000000000000..4e3bf5f6ec9a
--- /dev/null
+++ b/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3-r1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit eutils unpacker
+
+DESCRIPTION="Baldur's Gate: Enhanced Edition"
+HOMEPAGE="https://www.baldursgate.com/"
+SRC_URI="gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh"
+
+LICENSE="GOG-EULA"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+RESTRICT="bindist fetch"
+
+DEPEND="app-arch/unzip"
+RDEPEND="dev-libs/expat[abi_x86_32(-)]
+	dev-libs/json-c[abi_x86_32(-)]
+	dev-libs/openssl:0[abi_x86_32(-)]
+	media-libs/openal[abi_x86_32(-)]
+	virtual/opengl[abi_x86_32(-)]
+	x11-libs/libX11[abi_x86_32(-)]"
+
+QA_PREBUILT="/opt/${PN}/BaldursGate"
+
+S="${WORKDIR}/data/noarch"
+
+pkg_nofetch() {
+	einfo "Please buy and download \"${SRC_URI}\" from"
+	einfo "https://www.gog.com/game/baldurs_gate_enhanced_edition"
+	einfo "and copy it to \"${DISTDIR}\""
+}
+
+src_unpack() {
+	unpack_zip "${DISTDIR}/${SRC_URI}"
+}
+
+src_install() {
+	local ABI="x86"
+	local dir="/opt/${PN}"
+
+	dodoc -r "game/Manuals/."
+	rm -r "game/Manuals" || die "rm failed"
+
+	insinto "${dir}"
+	doins -r "game/."
+	fperms +x "${dir}/BaldursGate"
+
+	dodir "${dir}/lib"
+	dosym "../../../usr/$(get_libdir)/libjson-c.so" "${dir}/lib/libjson.so.0"
+
+	newicon "support/icon.png" "${PN}.png"
+	make_wrapper ${PN} "./BaldursGate" "${dir}" "${dir}/lib"
+	make_desktop_entry "${PN}" "Baldur's Gate: Enhanced Edition" "${PN}" "Game;RolePlaying"
+}
diff --git a/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3.ebuild b/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3.ebuild
deleted file mode 100644
index 9dab4cbf46ba..000000000000
--- a/games-rpg/baldurs-gate-ee/baldurs-gate-ee-2.3.67.3.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit eutils unpacker
-
-DESCRIPTION="Baldur's Gate: Enhanced Edition"
-HOMEPAGE="https://www.baldursgate.com/"
-SRC_URI="gog_baldur_s_gate_enhanced_edition_2.5.0.8.sh"
-
-LICENSE="GOG-EULA"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-RESTRICT="bindist fetch"
-
-DEPEND="app-arch/unzip"
-RDEPEND="dev-libs/expat[abi_x86_32(-)]
-	dev-libs/json-c[abi_x86_32(-)]
-	dev-libs/openssl:0[abi_x86_32(-)]
-	media-libs/openal[abi_x86_32(-)]
-	virtual/opengl[abi_x86_32(-)]
-	x11-libs/libX11[abi_x86_32(-)]"
-
-QA_PREBUILT="/opt/${PN}/BaldursGate"
-
-S="${WORKDIR}/data/noarch"
-
-pkg_nofetch() {
-	einfo "Please buy and download \"${SRC_URI}\" from"
-	einfo "https://www.gog.com/game/baldurs_gate_enhanced_edition"
-	einfo "and copy it to \"${DISTDIR}\""
-}
-
-src_unpack() {
-	unpack_zip "${DISTDIR}/${SRC_URI}"
-}
-
-src_install() {
-	local ABI="x86"
-	local dir="/opt/${PN}"
-
-	dodoc -r "game/Manuals/."
-	rm -r "game/Manuals" || die "rm failed"
-
-	insinto "${dir}"
-	doins -r "game/."
-	fperms +x "${dir}/BaldursGate"
-
-	dodir "${dir}/lib"
-	dosym "../../../usr/$(get_libdir)/libjson-c.so" "${dir}/lib/libjson.so.0"
-
-	newicon "support/icon.png" "${PN}.png"
-	make_wrapper ${PN} "./BaldursGate" "${dir}" "${dir}/lib"
-	make_desktop_entry "${PN}" "Baldur's Gate: Enhanced Edition" "${PN}" "Game;RolePlaying"
-}
diff --git a/games-rpg/to-the-moon/Manifest b/games-rpg/to-the-moon/Manifest
index 2361b6b832c9..eed3a69bd4fd 100644
--- a/games-rpg/to-the-moon/Manifest
+++ b/games-rpg/to-the-moon/Manifest
@@ -1,3 +1,3 @@
-DIST ToTheMoon_linux_1389114090.sh 75823678 SHA256 8272e4693dcf553f4285de4c46e89e1e2e4d5a59a088396b7ea188f935407970 SHA512 bed844f143ef9c3ff8fe93da186422e84d259229874c331315d8f1c7538fd6c417d6ca1aeecbe6c2a664fad98aff51f4723227d0ef07612acf29f86313f9aa1a WHIRLPOOL a3ebaed2e50636d2692ba1b893001cdb327c650d2b5336e928c6f6b74d3a382ed1c392b748e61d7037aa08f4029a524b5b83933f77da57177a9e1bc968385087
+DIST ToTheMoon_linux_1389114090.sh 75823678 BLAKE2B de63a8c5eff7d99f5af4fbc85c8e416c7bd7a07fad03dfb0424bf43f410bdbc9a0d064c8892dbb6c9fdc637391f2b2ef6ef40c72c501790ffec0aac8448add21 SHA512 bed844f143ef9c3ff8fe93da186422e84d259229874c331315d8f1c7538fd6c417d6ca1aeecbe6c2a664fad98aff51f4723227d0ef07612acf29f86313f9aa1a
 EBUILD to-the-moon-0.ebuild 2492 BLAKE2B bc3017c2c0e28f78d084a6bbea466ceb3e3411db3a0b5134a8e4bccdc5acfcd7fc00b80e5db0083fdc60320d1c7b75a09968bb3e2e68febbdafa72a147f47883 SHA512 940033be5a9114f29d9e0f8f6dca75e9b68b3d5a0980710a02159cc66ab1f01fab2e208223a3492ed70103052680b86c52dfbc88ef5409d654b512f1f0e475ce
 MISC metadata.xml 325 BLAKE2B 27d3f66c92edf0dda747247d5a31972620750facfbad0d6f82c51c5ca5a99327a0b3918264ab590da1e7250ee8aebb85393981049a33843883238734df348d31 SHA512 a8068b353b7597ae988ad3fd9855339beb981eb11a392483129346d2ee51d658934fb772e8b3f3062e1d14d553e73de9f6bc2f456b4bf5de15902257c22e69ce
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index f7988a8d37dd..a7bdf170f050 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/bf1942-lnxded/Manifest b/games-server/bf1942-lnxded/Manifest
index 3cdf4d6246de..5e6c56b6e62c 100644
--- a/games-server/bf1942-lnxded/Manifest
+++ b/games-server/bf1942-lnxded/Manifest
@@ -1,4 +1,4 @@
-DIST bf1942-update-1.61.tar.gz 7768635 SHA256 6c60b6af994fba9e98f8e3a20ca04602f6f0ad2b40b4c549441918217bc02160 SHA512 041c1ad03daab592b799dec1560e15156e1da583919aa270220d53d308b5c1b8e7da771176eea6e3e1558407dbad37388d480199847c68ecf94b58f29d64a26b WHIRLPOOL 0d1e29b491821e349c7e586e2eea8186c7c6999f682c5a60ef4d6bf94f8a180d58b97c8ccea8b48b260f602fb17e775314549e79f6b12d2118203bc10a4a244c
-DIST bf1942_lnxded-1.6-rc2.run 108138508 SHA256 ca6e754a028e8d12a4f3efbbc90892d979035be7d144de1f64d99884902568f3 SHA512 9171eb8f729bd36fc76133563201332d91e434aa6a54813eb0ec5278f04e7132d4e5b74c92d69ad1e542c37a586aae6ee8d12b2e92d5a853d2682de530ad1db1 WHIRLPOOL 2cfb858500431c584f2c0b5a4ebc495239909240db716f28179f8b900fd7c17336fa2b5eb50f7eaa41662523bebe65eebeba550d93bdeaaa79b34574f6178da7
+DIST bf1942-update-1.61.tar.gz 7768635 BLAKE2B 14427516f4c1d0ce8777f51cd09cef8392a255f5695043e67d961c54a8161bccd4f0b24719bc80f46f725e98efa6e708b3556371a4f0c3499c4e13149ea09d59 SHA512 041c1ad03daab592b799dec1560e15156e1da583919aa270220d53d308b5c1b8e7da771176eea6e3e1558407dbad37388d480199847c68ecf94b58f29d64a26b
+DIST bf1942_lnxded-1.6-rc2.run 108138508 BLAKE2B b59bad9c2ae15ea30974de376f8809dd43cfa6f7a01aa81c7a3b603d8c6308ff022ff7af3cf15d5825e9959d09e750d38b6bdd767ffd062cfc880d4942be1570 SHA512 9171eb8f729bd36fc76133563201332d91e434aa6a54813eb0ec5278f04e7132d4e5b74c92d69ad1e542c37a586aae6ee8d12b2e92d5a853d2682de530ad1db1
 EBUILD bf1942-lnxded-1.61-r1.ebuild 947 BLAKE2B d1d1b0c4c23eccebd7e63e7126b86aaae96f6e44a16e6928b111a86ea36f1ab31c32117b3ea0c016f62d00cd1424e7147437d612f476cab7598449d75f118918 SHA512 b0c2ef2b8854c5118588e3ce765bdde6b3a697bf3c428c6a034835d9138043aba106c0ee943828412333524955ab378a69ca883b2ad308acd4a451a08a6930bf
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-server/ut2004-ded/Manifest b/games-server/ut2004-ded/Manifest
index 14dde07739e8..a157bc10833f 100644
--- a/games-server/ut2004-ded/Manifest
+++ b/games-server/ut2004-ded/Manifest
@@ -1,7 +1,7 @@
 AUX ut2004-ded.confd 228 BLAKE2B 18e5f0d823b266a4463cc5b83c4982fc662c4bdfb4b8f9f9e6ae22256d0ac2d463d0987db2fdf419dbcc9b3fbda777511adbf6ac7d0ad34a09184a08fc28f6b1 SHA512 f304c134139a29e43f6a297969462d8ca667071be898bf0b5495785eba7b0042e7103b5df2dc2c1fa333f4c16f75efcfdcd8ddc2dc88bf46d93cf8a9739eb300
 AUX ut2004-ded.initd 561 BLAKE2B a30dfd055e00d42df3b5214c7429203fb1188617ac469e1cb9e3fa66c99df3ed3691eff0a1d932b0cf1a44f300623d720e8c87ce47e8999d5607f969c883f7c9 SHA512 0d5be8488cdbb357ab10223c4a5c6a3f302622782c0432d28e0a5ec7c38e886a44ea2931cde82403db807225bf6cf2ebcbb7f3abf62b8ea6bfd8ffb41c316c58
 DIST dedicatedserver3339-bonuspack.zip 914213907 BLAKE2B 883253d9817b4ee7f9594bf611e9d440d7e90c8cd43d34b366cfb4e781d4ad78e2812a0aa4f5acaed4880b1bc47f0dffed6fbb0caf9cc53477c01bc92d891325 SHA512 353161a7c811ac5c688c6438e3ecfad1aa37bcfd13a3e17f2a9deaf510eda9311a423524bd4635fcf972001cfe24c1a1b71a2bb6a060c37a24351f3bce0c7f26
-DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 SHA256 438b9b13a367d46f23cce12b065382a55afa2fc68add1f1dd3db03b015f60bb3 SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1 WHIRLPOOL 2e04124aa7eb4e2689b048aceeb8c085a5756bad4c0f084da764055ea7a403623107bc6bb29d00b9b93b45675f4475e145edb4e6a3faf208d9fe36f4a65c9e78
-DIST ut2004-v3369-3-linux-dedicated.7z 5013927 SHA256 799f00deccb7ee1e3db3963deeb50a41b05a262e6f7363654c4f0438e06d7192 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf WHIRLPOOL ef459d7c053ac70be6313c65edaff095053cab840588d5762834b4402e299d8782401ebf1341ff61a150efed8420bf377b7a7ba10dbed6608d86791e2569e733
+DIST ut2004-lnxpatch3369-2.tar.bz2 22465217 BLAKE2B 9852f9d55804b7f2927a31be86aee1552aaebeb38d2a40fb206154c236e9d6eff47f7594024c0d9b25c7216d3ca62571b1f89f23f72ee9e135b2e6451bcb006a SHA512 0d6f26d5a811efd64be8c304e928e03f546d9a8eaba6b074843e2b7e76e0670b39df95200a2fe2040d72bbd204c7157ed0115649a5c85396a76d9e0b7ec284b1
+DIST ut2004-v3369-3-linux-dedicated.7z 5013927 BLAKE2B 72d24d7bc37c777f3697b767a03e052ad9b547005dd6da73833e439496e87a9c1ebbe01f88d62b29a41b2bf6380a3b3bd745e6883fbb6d0f2b7e52998d4af276 SHA512 3b2a7b64934a3647c02c9fec48565c5c2c35370d635b2af4059eb76587bfa13f46e6a4e14fdb0494ba7a4182497ed5963601986f4fcfa318e69a8a8a8c0178cf
 EBUILD ut2004-ded-3369.3-r1.ebuild 3273 BLAKE2B fc052f2618f8b77af31011463c30cdd2b7e681afd036bac582f7dc1e5bea4508456d8558ac7236eddaffea27a659dd70c142c5527f1716267b6d21ca8886b93a SHA512 840a3b1b7294e5007e04dbed8803cba6f209b43013e7a7fca3637cbc4f3bec8299cff1ad26ef08befbadc2f5e469d8eae07d2b4da8e3788f472969bee04c7c16
 MISC metadata.xml 641 BLAKE2B 6f4b33ffb4810e9161f185859d8a822bf655f70f40220968a1638398072506486a72180065d2f1589446f09d61416b2cc379bdfafd540162bf8b817834002849 SHA512 637588c313e117912d01da6345324d455f7c1c658e413d936b60f1fcceff88d8ecae084e11727479c8cf72438f14412336d9c81d94cccc1ffb54a5ec2d69ebc7
diff --git a/games-strategy/Manifest.gz b/games-strategy/Manifest.gz
index bf491ce81712..82edd5e3ee4d 100644
--- a/games-strategy/Manifest.gz
+++ b/games-strategy/Manifest.gz
diff --git a/games-strategy/colobot-data/Manifest b/games-strategy/colobot-data/Manifest
new file mode 100644
index 000000000000..490a1cdd122b
--- /dev/null
+++ b/games-strategy/colobot-data/Manifest
@@ -0,0 +1,8 @@
+DIST colobot-data-0.1.11-music-flac.tar.gz 298829480 BLAKE2B 2a041df82b295433257dd0358b6f83d585cae086a7c1f7e891964a4ffca2e1ca71bb68f7f01160c8dddaeb3b553fcc0082ab746177836d8b9494376a9a9b4451 SHA512 0ab613ea8ca59771b5d93b9c8d96ad88a0fe27f6171be0cb1d6d2eb60b820fdcad83f8fdc5d2f968e8091a6f3e727eb202c4dd09f86afb3eb2e325756eb40873
+DIST colobot-data-0.1.11-music-ogg.tar.gz 55596353 BLAKE2B 63be871fc2000c1cb041658b7395d5175cefc24c81661b366396965951efdadf1cf064211f3f543c4a4b1b7da5bd91db5e397844f1e8771318302c9d80788eb4 SHA512 486d084adc1b28a9fe36c530d261e48a89553c822989f493b0a92dabb9c3435953bda6fe98fcdabc72c6969b5e9be4ff9f3803066f6115fc7740c3de5d183764
+DIST colobot-data-0.1.11.zip 55796087 BLAKE2B 2a1a6fc57bb61423360f89c8bac597754cab872b3154f9b3464bef88555e4dcb9e0296a4b6f85271ef95e71c69d1c31737c8ae3b932a0b64dc8d7cfa8393481b SHA512 2024759af47b4c406325e1d72d119391712ec9d53b4059f3e942e0bd2b3881fdbc9613f79510b9b012cdbc76bebd8a008531da4f94be5d6107887bbcb330417f
+DIST colobot-data-9999-music-flac.tar.gz 298829480 BLAKE2B 2a041df82b295433257dd0358b6f83d585cae086a7c1f7e891964a4ffca2e1ca71bb68f7f01160c8dddaeb3b553fcc0082ab746177836d8b9494376a9a9b4451 SHA512 0ab613ea8ca59771b5d93b9c8d96ad88a0fe27f6171be0cb1d6d2eb60b820fdcad83f8fdc5d2f968e8091a6f3e727eb202c4dd09f86afb3eb2e325756eb40873
+DIST colobot-data-9999-music-ogg.tar.gz 3686106 BLAKE2B c1565dbcf1aab0e29014623c924ade2ac1b5da9ae9d9231afe3299dfedab0678c3d222e58665fe3ac60291972b7c2d763437246d7816ca7c16e69766a52e9490 SHA512 2ec22944857ccc5276b93d0da4684bfd9d2a80ac712e3396cb01ccbf21a582c22d525e8af9d12828e224ee948173bffb5e31f664cc9333b79b6f3062dd2466ac
+EBUILD colobot-data-0.1.11.ebuild 1417 BLAKE2B e7e337a06bcc0f427ca48686a89b7153b1af7a3a50d20d2dc5c9b7a173d3efd3aa21636af625839673d884431eb8cc46b3425bda2493c2d5b73045f0601c6d52 SHA512 7533d79e52f93510df6c96ff8599d852e8c09b7e6a3f8ecc2d327817d7c3f488314ab797df770a27a558dce480f12c6ef878ade5175d02ce924de25dfbd5763f
+EBUILD colobot-data-9999.ebuild 1298 BLAKE2B 2a719b8b29c7d02b569d452baa874506eff9c1140ee44dd239e5777b7c2f1b240da13de87fce3f3692116d17ec84727999fba6ccd354704986e2b9a3ee6f6731 SHA512 8c580974e4bfb3d5a93540cf08b792aa966f934707edacb5825409d88b3133fa2718fac006bf577b4cceb0717e65f0369eda31e2cf4d3c6689d4ed0a29402805
+MISC metadata.xml 517 BLAKE2B 3f7a70c01e3fedb20ce8ae9ea680b5382ac852ed07684348d506c8c402d18a60ed201b314a3f923ac1974d91498543cd68e89460284148bde6876c303706b8d3 SHA512 abf5513f23d51b18ecc3f7c49148734e90eae4d9e3aaf16e35e0837c245313366ec10e2ada0bd5d5f41e4b297f3bb96d1fcf85c26dd812fd83597db1a9379427
diff --git a/games-strategy/colobot-data/colobot-data-0.1.11.ebuild b/games-strategy/colobot-data/colobot-data-0.1.11.ebuild
new file mode 100644
index 000000000000..b60210f63c30
--- /dev/null
+++ b/games-strategy/colobot-data/colobot-data-0.1.11.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Data package for colobot (Colonize with Bots)"
+HOMEPAGE="https://colobot.info/"
+SRC_URI="
+	https://github.com/colobot/colobot-data/archive/colobot-gold-${PV}-alpha.zip -> ${P}.zip
+	music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_${PV}-alpha.tar.gz -> ${P}-music-ogg.tar.gz )
+	music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_${PV}-alpha.tar.gz -> ${P}-music-flac.tar.gz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+music music_flac_convert +music_ogg"
+REQUIRED_USE="
+	music? ( ^^ ( music_flac_convert music_ogg ) )
+	music_flac_convert? ( music )
+	music_ogg? ( music )"
+
+DEPEND="
+	app-arch/unzip
+	music_flac_convert? ( media-sound/vorbis-tools )"
+
+S="${WORKDIR}/${PN}-colobot-gold-${PV}-alpha"
+
+src_unpack() {
+	unpack "${P}.zip"
+
+	cd "${S}" || die
+	if use music; then
+		tar xf "${DISTDIR}/${P}"-music-*.tar.gz -C "${S}/music" || die "Failed to unpack music"
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use music; then
+		sed -i -e '/find_program(WGET wget)/d' -e '/if(NOT WGET)/,+2 d' music/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMUSIC=$(usex music)
+		-DMUSIC_FLAC=$(usex music_flac_convert)
+		-DMUSIC_QUALITY="${COLOBOT_DATA_MUSIC_QUALITY:-4}"
+	)
+	cmake-utils_src_configure
+}
diff --git a/games-strategy/colobot-data/colobot-data-9999.ebuild b/games-strategy/colobot-data/colobot-data-9999.ebuild
new file mode 100644
index 000000000000..63f52ef31b0f
--- /dev/null
+++ b/games-strategy/colobot-data/colobot-data-9999.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+EGIT_REPO_URI="https://github.com/colobot/colobot-data"
+
+inherit git-r3 cmake-utils
+
+DESCRIPTION="Data package for colobot (Colonize with Bots)"
+HOMEPAGE="https://colobot.info/"
+SRC_URI="
+	music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_latest.tar.gz -> ${P}-music-ogg.tar.gz )
+	music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_latest.tar.gz -> ${P}-music-flac.tar.gz )"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+music music_flac_convert +music_ogg"
+REQUIRED_USE="
+	music? ( ^^ ( music_flac_convert music_ogg ) )
+	music_flac_convert? ( music )
+	music_ogg? ( music )"
+
+DEPEND="
+	app-arch/unzip
+	music_flac_convert? ( media-sound/vorbis-tools )"
+
+src_unpack() {
+	git-r3_src_unpack
+
+	if use music; then
+		tar xf "${DISTDIR}/${P}"-music-*.tar.gz -C "${S}/music" || die "Failed to unpack music"
+	fi
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if use music; then
+		sed -i -e '/find_program(WGET wget)/d' -e '/if(NOT WGET)/,+2 d' music/CMakeLists.txt || die
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DMUSIC=$(usex music)
+		-DMUSIC_FLAC=$(usex music_flac_convert)
+		-DMUSIC_QUALITY="${COLOBOT_DATA_MUSIC_QUALITY:-4}"
+	)
+	cmake-utils_src_configure
+}
diff --git a/games-strategy/colobot-data/metadata.xml b/games-strategy/colobot-data/metadata.xml
new file mode 100644
index 000000000000..f19541007ed9
--- /dev/null
+++ b/games-strategy/colobot-data/metadata.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fdsfgs@krutt.org</email>
+		<name>soredake</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">colobot/colobot-data</remote-id>
+	</upstream>
+	<use>
+		<flag name="music">Enable music support</flag>
+		<flag name="music_flac_convert">Fetch flac music and convert it to ogg</flag>
+		<flag name="music_ogg">Fetch ogg music</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
new file mode 100644
index 000000000000..c19e2de20169
--- /dev/null
+++ b/games-strategy/colobot/Manifest
@@ -0,0 +1,4 @@
+DIST colobot-0.1.11.tar.gz 1430595 BLAKE2B 6e4a23f17631031a6f502b045637949d99bfcf8aa723f11c406c8cdb9b201b9a2771de8b8c92829bc890848a19eb182bc30a45a51e6d281ce64370f6c7a0d8a5 SHA512 fe32bc56b6fae9435c74a73b694b7d2b93667e5d15b1c57a7558e492613f0a5d4cab72ff341ab4c921150137282cc71292a1e31eb1ed06c752de33c50120f20e
+EBUILD colobot-0.1.11.ebuild 1372 BLAKE2B b40e81306d7fc183e9d523db5d60cd19a88880e010584bc4ccb762734ad34fe7ffc1ff50660cdd80e38edca4edfb915c047d4da93caafb82d1fec0c5779879e3 SHA512 19012df06321273072c51cd9408c80f487f53e979c0eaf31edf1fab574d3a41d4a37582a05888f4486891ae057e5341905f28dd686a8e94552d9fb38062cd0cd
+EBUILD colobot-9999.ebuild 1372 BLAKE2B b40e81306d7fc183e9d523db5d60cd19a88880e010584bc4ccb762734ad34fe7ffc1ff50660cdd80e38edca4edfb915c047d4da93caafb82d1fec0c5779879e3 SHA512 19012df06321273072c51cd9408c80f487f53e979c0eaf31edf1fab574d3a41d4a37582a05888f4486891ae057e5341905f28dd686a8e94552d9fb38062cd0cd
+MISC metadata.xml 411 BLAKE2B 1fe6b4d93d539ff408830e300bed7f331f3fa6e90771a9577b8583a087ea36ed307122055143f6e5c7433d5ee1f4c4fdc074bac1f9370ef02ac501f33cb7312d SHA512 1b88f6c73c05a01b8184779585d3e5720abfb2dbcf0948a22d1cc7d16faf68579f13262891bf7589b918c67139d8b4d6ff53536d12e4f79fef19aa2029db13e4
diff --git a/games-strategy/colobot/colobot-0.1.11.ebuild b/games-strategy/colobot/colobot-0.1.11.ebuild
new file mode 100644
index 000000000000..02e4757ef02e
--- /dev/null
+++ b/games-strategy/colobot/colobot-0.1.11.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop
+
+DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
+HOMEPAGE="https://colobot.info/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/colobot/colobot"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/colobot/colobot/archive/${PN}-gold-${PV}-alpha.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${PN}-gold-${PV}-alpha"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="devbuild test tools doc +openal"
+
+DEPEND="
+	dev-games/physfs
+	dev-libs/boost:=
+	media-libs/glew:0
+	media-libs/libogg
+	media-libs/libpng:0=
+	media-libs/libsdl2:=
+	media-libs/libsndfile:=
+	media-libs/libvorbis:=
+	media-libs/sdl2-image
+	media-libs/sdl2-ttf
+	media-sound/vorbis-tools
+	sys-devel/gettext
+	openal? ( media-libs/openal )"
+RDEPEND="${DEPEND}
+	games-strategy/colobot-data"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEV_BUILD=$(usex devbuild)
+		-DTESTS=$(usex test)
+		-DTOOLS=$(usex tools)
+		-DINSTALL_DOCS=$(usex doc)
+		-DOPENAL_SOUND=$(usex openal)
+		-DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin
+		-DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon -s 256 desktop/colobot.ico
+}
diff --git a/games-strategy/colobot/colobot-9999.ebuild b/games-strategy/colobot/colobot-9999.ebuild
new file mode 100644
index 000000000000..02e4757ef02e
--- /dev/null
+++ b/games-strategy/colobot/colobot-9999.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils desktop
+
+DESCRIPTION="Colobot is an educational real-time strategy video game featuring 3D graphics"
+HOMEPAGE="https://colobot.info/"
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/colobot/colobot"
+	EGIT_SUBMODULES=()
+	inherit git-r3
+else
+	SRC_URI="https://github.com/colobot/colobot/archive/${PN}-gold-${PV}-alpha.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/${PN}-${PN}-gold-${PV}-alpha"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="devbuild test tools doc +openal"
+
+DEPEND="
+	dev-games/physfs
+	dev-libs/boost:=
+	media-libs/glew:0
+	media-libs/libogg
+	media-libs/libpng:0=
+	media-libs/libsdl2:=
+	media-libs/libsndfile:=
+	media-libs/libvorbis:=
+	media-libs/sdl2-image
+	media-libs/sdl2-ttf
+	media-sound/vorbis-tools
+	sys-devel/gettext
+	openal? ( media-libs/openal )"
+RDEPEND="${DEPEND}
+	games-strategy/colobot-data"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDEV_BUILD=$(usex devbuild)
+		-DTESTS=$(usex test)
+		-DTOOLS=$(usex tools)
+		-DINSTALL_DOCS=$(usex doc)
+		-DOPENAL_SOUND=$(usex openal)
+		-DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin
+		-DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	doicon -s 256 desktop/colobot.ico
+}
diff --git a/games-strategy/colobot/metadata.xml b/games-strategy/colobot/metadata.xml
new file mode 100644
index 000000000000..16f1e43ba0d5
--- /dev/null
+++ b/games-strategy/colobot/metadata.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>fdsfgs@krutt.org</email>
+		<name>soredake</name>
+	</maintainer>
+	<upstream>
+		<remote-id type="github">colobot/colobot</remote-id>
+	</upstream>
+	<use>
+		<flag name="devbuild">TODO</flag>
+		<flag name="tools">Build tools</flag>
+	</use>
+</pkgmetadata>
diff --git a/games-strategy/gorky17-demo/Manifest b/games-strategy/gorky17-demo/Manifest
index a74bc47cb652..cf26ab12cdc6 100644
--- a/games-strategy/gorky17-demo/Manifest
+++ b/games-strategy/gorky17-demo/Manifest
@@ -1,4 +1,4 @@
-DIST gorky17-demo-1.0-1.0.1-x86.run 955547 SHA256 557bd97400101da9b557a5bfc5e6b9d352a9f10f79c927f31d74581ba7acc16b SHA512 ffd054aa1b169de5cca3c85d58ce2cba127f0caca533f8d4f0046ce63e5505a0ea25c3bbea9a2dde863a8fecefb7f8d322968f90ab3f688dee70a2f0d44826ba WHIRLPOOL c133f6175cfaf5e71c183687fa78b49ab7df1816f6ec9ee8696f9be0c7d5ea2b4e0d39decbb7561db9a7e5ceacb78958e11072fbc5812f7c6627b58dde03cf4a
-DIST gorky17_demo.run 158781516 SHA256 35cf62e06747bfe3445c1d3a61ad1644922528c264ff2ec7b5b510f9bc9dd51a SHA512 7e7bf2a6a9f815381381ef5c50135232db7c6ec734300b807794107ab1b902d659f55569ea03c7d68c3e6dbf98e366de8bca4fd13dac3c688ba48d2f244e9f00 WHIRLPOOL 5e4188d85efb60f3abaa56941a1005c14de26ba4a458cfb2dd3753cde825a1f3945351a06c82b934b4f1c94c9dacf1e2d9b00d17852eb1e140166131dab66192
+DIST gorky17-demo-1.0-1.0.1-x86.run 955547 BLAKE2B 702f4ce40b7a272ee39f8b1e59a0bd559bc4c8520a7406f6d0d4f5a153f4610e54fa628289634c848d30dfe67e56ac59da0678c143f02208847e71b94454b647 SHA512 ffd054aa1b169de5cca3c85d58ce2cba127f0caca533f8d4f0046ce63e5505a0ea25c3bbea9a2dde863a8fecefb7f8d322968f90ab3f688dee70a2f0d44826ba
+DIST gorky17_demo.run 158781516 BLAKE2B 7ccb91362bc9d4463a15ad7f47a2c3af9670d0b80655d4a97ec7ab9d7eb861e42dcd39b30fb381b013cb87b853ead8fc3751c1c5d769f8b2bc9465f352339266 SHA512 7e7bf2a6a9f815381381ef5c50135232db7c6ec734300b807794107ab1b902d659f55569ea03c7d68c3e6dbf98e366de8bca4fd13dac3c688ba48d2f244e9f00
 EBUILD gorky17-demo-1.0.1.0.1-r1.ebuild 1842 BLAKE2B 9c20bdfe15f7110e28e0cac1234109346d29cb4e841871f619824c47681e0184e7d8410c41f17d51b69a1e7ea702ac15c4e9a1d02d3c0a06a85f70739cba77cf SHA512 bfa408ffe721ce04e2df65e4a02c9bc981a0ca796b93b12affc63ba4d75fce7f1b88110af0b7be73bc84fef1cd1f2656ec8aa06343837f525a70a60e8163aed7
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/games-strategy/mindrover-demo/Manifest b/games-strategy/mindrover-demo/Manifest
index 29a83a2aceb0..14f2b2370beb 100644
--- a/games-strategy/mindrover-demo/Manifest
+++ b/games-strategy/mindrover-demo/Manifest
@@ -1,3 +1,3 @@
-DIST mindrover_demo.run 25266633 SHA256 049a70cb220e6a2cc5fcd4b1175d7cfb1727e960c9d300b5dfedd3755603e44a SHA512 ddb78f6a40bd42dd3b3ce0a6793f5e217937d3be1dd294d7d8596f8409eee506522a64d9396db2d93fa3beca197d85c7a6507a8f2ae773d0b9b123e9be1e761c WHIRLPOOL b3f5c684fed28cbfc1d0b815c8e2051b792384d9fbd22428b206b20029d8bd5e903d25a4466ebc545df94a7bc25e770648819caab3c61f22360878d733e46c98
+DIST mindrover_demo.run 25266633 BLAKE2B 427dd9a808309634ff59c5cb756b7433225f15f4bfed8ef6ed5ebf0f85db1a0db5e488b4041c04aa3b75a6f651bd0a013e89d70b8c11b1cab262861888d26bb2 SHA512 ddb78f6a40bd42dd3b3ce0a6793f5e217937d3be1dd294d7d8596f8409eee506522a64d9396db2d93fa3beca197d85c7a6507a8f2ae773d0b9b123e9be1e761c
 EBUILD mindrover-demo-1.07b.ebuild 1102 BLAKE2B cc5f9cd09c652dc9576824bfa46b4fa851d0f7c39db84ac1573f4fbb5a7b2a578eb5c11d4c125ef33c981f44fd65bd9e3478d261d4436e590c10f4240d7edc51 SHA512 b778ebbe2c38346ca1a0e1ce4c7a60308a08809c930df095eb9bef7fc941b219c20a4246cad746ef7b718e1ff22d60a19aa6c95e639a3dae8badc174c6f4cb89
 MISC metadata.xml 249 BLAKE2B 7113a758d7abc93accec998a8843d8ef51ca8b72d72e659e224d5cec2a1a6a63e6c0605958091532ac6e51fa0d501ca4fd9f3f4a9e55baeb31519a02971b465f SHA512 895577c3a805c40581da03057b94e3f28f05f23012bf350c1e3575847d1a0fe40bb044a46f909012a200d991a400f6389358a60e9c2b5bef0da01fb26f846118
diff --git a/gnome-base/Manifest.gz b/gnome-base/Manifest.gz
index d1f5853de233..cf9d55666005 100644
--- a/gnome-base/Manifest.gz
+++ b/gnome-base/Manifest.gz
diff --git a/gnome-base/gsettings-desktop-schemas/Manifest b/gnome-base/gsettings-desktop-schemas/Manifest
index d4a8ff67c041..637fd28f27f1 100644
--- a/gnome-base/gsettings-desktop-schemas/Manifest
+++ b/gnome-base/gsettings-desktop-schemas/Manifest
@@ -3,5 +3,5 @@ DIST gsettings-desktop-schemas-3.24.0.tar.xz 620780 BLAKE2B 0d1585c394d3c08e20ee
 DIST gsettings-desktop-schemas-3.24.1.tar.xz 638780 BLAKE2B c1857636e18c69658458aa9dfd65a7c3983791000f16eba08f706c243a0b804ed20dfde58f9cbe879f41348dc8257ecab86d5111c89bc1aacca1d8b62f2c0332 SHA512 c3970d61cc1c29bf97a39c439b3e0ba5c5d5c0f811e17b8884f106f095b159dd0c43cb90e02561edcc26e15b2b887e960d38de1c0e7498413db0c63102f15833
 EBUILD gsettings-desktop-schemas-3.22.0.ebuild 762 BLAKE2B e0502aa9126fc0808e90ecf18ec028d00edbaf9a813db4d4230f5c4572dadf4b5dc26afda75cb76902022341a4b3a55e541f14a84b1a52da0ed0ba57821f48f6 SHA512 66a5ff681cec7c66941ce08292117c26d2314499f55daea0f87c95d3f4d73ae4c3e0ac166717bc793c9d4f9a03593c317b5c0ddbd065146b35992334a1c8e209
 EBUILD gsettings-desktop-schemas-3.24.0.ebuild 771 BLAKE2B 4ecee752265adaa2257e31458a154a9bd1201b3aa899d6f493db57566ef7b8a651e1f5eab46f0507fe133e705f0da43f3c186cc3f49d7aed07bed8af582ea8c7 SHA512 60ea82cc84d4574941718a501a4cc9e116f1612d33e27a650ac1f36059c4ede5826ec25b936f3d0559be6ad50105bc299e6099b0b94e080f68e1b750ba96b15d
-EBUILD gsettings-desktop-schemas-3.24.1.ebuild 771 BLAKE2B 4ecee752265adaa2257e31458a154a9bd1201b3aa899d6f493db57566ef7b8a651e1f5eab46f0507fe133e705f0da43f3c186cc3f49d7aed07bed8af582ea8c7 SHA512 60ea82cc84d4574941718a501a4cc9e116f1612d33e27a650ac1f36059c4ede5826ec25b936f3d0559be6ad50105bc299e6099b0b94e080f68e1b750ba96b15d
+EBUILD gsettings-desktop-schemas-3.24.1.ebuild 770 BLAKE2B 13479a21f0a67a50d3b669fa2943d687393686cba83ed14a394188b26b0a9629ce304db02015e05c0e61d19c2b008f71a503b64694ee27d5433fc8ee3e309ed2 SHA512 7e0c82acdd488bdbd01d824d20f67a19e53ce266d468a78e29dca2a860537e97d6c3096e168176814ac32ddadce7a1b1add231ed57c559eedc2ba46ed15b4f0b
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
index a22fd1f8239a..e3a72c202742 100644
--- a/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
+++ b/gnome-base/gsettings-desktop-schemas/gsettings-desktop-schemas-3.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="https://git.gnome.org/browse/gsettings-desktop-schemas"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 IUSE="+introspection"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.31:2
diff --git a/gnome-base/libgtop/Manifest b/gnome-base/libgtop/Manifest
index b4c05fb806a4..ece70ca1f1f8 100644
--- a/gnome-base/libgtop/Manifest
+++ b/gnome-base/libgtop/Manifest
@@ -1,5 +1,5 @@
 DIST libgtop-2.34.2.tar.xz 725720 BLAKE2B fc69a6d64f86e16490f417748937b196c090de7afb68052a42258c06b7b65b686edb41abbf69ad42065a44b5811def0776969c2caa01009c2087355e9b1b2e9f SHA512 22ae4792236c47fda265f1b16f66f8685122f84a76e14adf2fd9e5e669c1f9776a58a2ec00564e37add98084d7e3cea621b38b8ad09b15e348f9c74f5345f19a
 DIST libgtop-2.36.0.tar.xz 727072 BLAKE2B 46f24573bde0bcfeb2210ea08446f6e6590fadc5697745178133ce5f3aec2e464cbce8446d2dbddb9f05d4a16eb7daf110c4554778a28573116b2b59edcf556f SHA512 2768c628fa3e872a940246042b2c78ad4618612ecb2cf2b95fb70343a4f1a01bb558d0ce9e5b3468f395349f338ca33d460e1d91f2c123ad39243cd0ff20d5e5
 EBUILD libgtop-2.34.2.ebuild 695 BLAKE2B 721a1692bcc264ba0b3c70a283b522f15e02a24d03c8b96086e51729c0c19932259c0f90542c0ed05b7225bb4f0a1733492535c6d33e78a246c475c4b7205ae6 SHA512 748d1283986bc38c5ab86e5d91996c1149e02f31339898cc39c8eab2b72c056e8569854a751487bd1d8c54d4f7fe8c03b6ed8fbe3cbb63a1a6d95dd1ded42e77
-EBUILD libgtop-2.36.0.ebuild 777 BLAKE2B 8361666f0aeb75f4d84b27ef36ee625e4b38e19a6438ccf9ebb9c7b6cc85ce48239534e1564ed4774c4f09ba066f4851df5d1799083812f5e7807e52345b51c1 SHA512 d275742ba88fbb6aac09fe4bdca179e98d1a1a541841059a8710003fd02f7319aa67243fbc7ed44582b6e9854fcfe3b0784f61c8f6b44692d82d571f35d534e1
+EBUILD libgtop-2.36.0.ebuild 776 BLAKE2B ef92d2a362a8e2edeb01d8a6a8077cb034c87a0dc794f71a4e98ccfaf53d1e908ee4923f6d6a09539b50e5248ae8f122bd77d4849fabf8d94285c71f71b52c5f SHA512 2d4d5aa26b013aea465b35f2b3ef41c66b964a6e555d7121283a7fef34ea190a103c25a380baf18bc89c668cc5b3b5542ebb85f2002f841446a0ccbb859a2cbb
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/gnome-base/libgtop/libgtop-2.36.0.ebuild b/gnome-base/libgtop/libgtop-2.36.0.ebuild
index e2c0e9485328..b2cd8636da48 100644
--- a/gnome-base/libgtop/libgtop-2.36.0.ebuild
+++ b/gnome-base/libgtop/libgtop-2.36.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ HOMEPAGE="https://git.gnome.org/browse/libgtop"
 
 LICENSE="GPL-2"
 SLOT="2/10" # libgtop soname version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd"
 IUSE="+introspection"
 
 RDEPEND="
diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 4b402aa183fc..3352af7e6963 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kalzium/Manifest b/kde-apps/kalzium/Manifest
index 2bbd03ac7c62..7ad78c0bf445 100644
--- a/kde-apps/kalzium/Manifest
+++ b/kde-apps/kalzium/Manifest
@@ -1,5 +1,6 @@
+AUX kalzium-17.12.1-knewstuff-optional.patch 1614 BLAKE2B 66cb70494818194741b53e979292bb018730f0e21d5054d156fac7b77e4820172e3b7a449bd2ac4ba5c6af1d5b4e8ffec4070fabcb0c7141e0cfce837738aa5c SHA512 20b0278fe8d569bd609be10cbfdb6a95951616d2cee448d51b286c5d745af4e20fc4c4effec0afe82aee098992ab97f250f004906a588966e307f00b07b14f22
 DIST kalzium-17.08.3.tar.xz 24450828 BLAKE2B 2586dd46a0847e6ef7becb5773e6b32f67bc24e3d91166287fd6df10c498eaeb0f8d2ba777d951db3226b47b2a94a7ef1e01a5623ee7c3c89ee6f035ae3567f5 SHA512 a421091154d9de89ce70c79b093e716c925c6573958bb8b3f02279d890d0c7c7dbf91ff3ee455688df6628059804a377d571bb8b75a68748d1b9f4eb003b1dbe
 DIST kalzium-17.12.1.tar.xz 24451344 BLAKE2B 0bd94b87dec53c37f170765e302e2b8cb948c8a4bd2203bc0ba293552f1dbabd4cf0d8668ab63d7b840b34e88692e539165cd946f2992929427cb89a0ef5bfa8 SHA512 35d5cdb803d261da248276746fea8eedf2eb16b62cfdde7320a6c1383b14b4b13654671e5775a1db00b533a645a98b1638f05009b661894554c6bd5539a4af50
 EBUILD kalzium-17.08.3.ebuild 1559 BLAKE2B 308da3c1790106361a169df03109b8f60666763e36f1d8d39fa3e094b402cad5ae4839195909237fca26f9899faee2bc63b6bf990fd1b65c21d4b306cafb4df5 SHA512 6a21f9fde13a7f7d36df5b99a70dc5c58f7e4c4b27e338b61117a72832fcc5fdd087f89e72b763265cd3b59f4b38dced9345a667d7ce47376e0c157e779cd02b
-EBUILD kalzium-17.12.1.ebuild 1561 BLAKE2B b056267968f93850bf53797a4dea44c96a1c91873a2776b5031ee0fa67c2ad9c15f5dbc976342fa53b191b42a52e62186260232ea4ea18b88e06a241fe3fb5ea SHA512 989687284fad983f81a731d2eb5a1f50dcead0587098e7ac85b1aae865457e050a089fb203d1ec2ff05a2a374bef2682bab26aeb5e27b28f357f779a2804e01d
+EBUILD kalzium-17.12.1-r1.ebuild 1622 BLAKE2B 89ab7537e35ae06da459c2c8060f1fe9b7f812d29ccd3bec8d3c6e9863f0cc7af582f78e2629eb318b5a548473a7902530d0a4b25ec243be5019457aca313f52 SHA512 5af6784cf7ba5a4295492c136b73cd4891f87cf999c670e9db5d56dbd5e84d8394eb4198acabd9149c4465dad29a2c22a090443b3d41d09e03205814e120c10d
 MISC metadata.xml 392 BLAKE2B d3bb6dbac8507afd2fc52a1e0725c36ed612987649dd16c63a631db35f7e8be5e08bac163d8be7b0705b247d9d219d096497adc066dbeb0bd5674f79849c5001 SHA512 424599782ee8fb9703d159dab7551f94785dceaae5e0a7e09b3b0bc8488b8b278f378d0041da0742f45812b3e0bbacf06db8e10447c2ec28b1393b1f8d6894c9
diff --git a/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch b/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch
new file mode 100644
index 000000000000..e60a6594a34c
--- /dev/null
+++ b/kde-apps/kalzium/files/kalzium-17.12.1-knewstuff-optional.patch
@@ -0,0 +1,58 @@
+From 4f7922a93bbea8582d29eebb194932708f9e21cd Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
+Date: Tue, 16 Jan 2018 12:53:56 +0100
+Subject: [PATCH] KF5NewStuff is only used in moleculeview, conditional on
+ Eigen3 and AvogadroLibs
+
+---
+ CMakeLists.txt     | 2 +-
+ src/CMakeLists.txt | 3 +--
+ 2 files changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4309a683..a12d4e36 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -55,7 +55,6 @@ find_package(KF5 REQUIRED COMPONENTS
+     I18n
+     KDELibs4Support
+     KHtml
+-    NewStuff
+     Parts
+     Plotting
+     Solid
+@@ -93,6 +92,7 @@ add_definitions(-DUSING_DYNAMIC_LIBS)
+ endif(MSVC)
+ 
+ if (OPENBABEL2_FOUND AND AvogadroLibs_FOUND AND EIGEN3_FOUND)
++  find_package(KF5NewStuff REQUIRED)
+   # avoid compilerwarnings about redefinitions
+   # todo: use check_function_exits() ?
+   message(STATUS "Kalzium molecular editor enabled")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 623ba2e5..0b1936eb 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -139,18 +139,17 @@ target_link_libraries(kalzium
+     KF5::Plotting
+     KF5::KHtml
+     KF5::KDELibs4Support
+-    KF5::NewStuff
+     KF5::UnitConversion
+     Qt5::Script
+     Qt5::Svg
+     Qt5::Quick
+     science
+-    ${OPENBABEL2_LIBRARIES}
+ )
+ if (OPENBABEL2_FOUND)
+    target_link_libraries(kalzium ${OPENBABEL2_LIBRARIES})
+    if (EIGEN3_FOUND AND AvogadroLibs_FOUND)
+       target_link_libraries(kalzium
++         KF5::NewStuff
+          Qt5::OpenGL
+          compoundviewer
+          AvogadroQtGui
+-- 
+2.15.1
+
diff --git a/kde-apps/kalzium/kalzium-17.12.1-r1.ebuild b/kde-apps/kalzium/kalzium-17.12.1-r1.ebuild
new file mode 100644
index 000000000000..9aa752c327f0
--- /dev/null
+++ b/kde-apps/kalzium/kalzium-17.12.1-r1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5 flag-o-matic
+
+DESCRIPTION="Periodic table of the elements"
+HOMEPAGE="https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor solver"
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep khtml)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kplotting)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kunitconversion)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	editor? (
+		$(add_frameworks_dep knewstuff)
+		dev-cpp/eigen:3
+		sci-chemistry/openbabel
+		sci-libs/avogadrolibs
+	)
+	solver? ( dev-ml/facile[ocamlopt] )
+"
+RDEPEND="${DEPEND}
+	sci-chemistry/chemical-mime-data
+"
+
+PATCHES=( "${FILESDIR}/${P}-knewstuff-optional.patch" )
+
+src_configure(){
+	# Fix missing finite()
+	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DHAVE_IEEEFP_H
+
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package editor Eigen3)
+		$(cmake-utils_use_find_package editor AvogadroLibs)
+		$(cmake-utils_use_find_package editor OpenBabel2)
+		$(cmake-utils_use_find_package solver OCaml)
+		$(cmake-utils_use_find_package solver Libfacile)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kalzium/kalzium-17.12.1.ebuild b/kde-apps/kalzium/kalzium-17.12.1.ebuild
deleted file mode 100644
index ea7cedd67ed8..000000000000
--- a/kde-apps/kalzium/kalzium-17.12.1.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="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? (
-		dev-cpp/eigen:3
-		|| ( sci-libs/avogadrolibs sci-chemistry/avogadro )
-		sci-chemistry/openbabel
-	)
-	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/kmail/Manifest b/kde-apps/kmail/Manifest
index e4b84c9caac9..c483d855558c 100644
--- a/kde-apps/kmail/Manifest
+++ b/kde-apps/kmail/Manifest
@@ -1,5 +1,6 @@
+AUX kmail-17.12.1-applyfilters.patch 1623 BLAKE2B 34cbf7cb63fef036f8f775afbb0c7183f91d7f433532b9dd4ce4dc58389d9a03cda0f537efce4fe2ad11b7b68b282db75d4dc41f5e4b15fcb71bd1357c2de1b3 SHA512 3ef62d848dc7efa3b8d295684ce6cee12ec076e0b41548ecc6407d5b4aed898bad9a2263bbe2d9849eacd4970ad243bcffebff2d25f5205f77d7edf8f9cad561
 DIST kmail-17.08.3.tar.xz 4735776 BLAKE2B 7a83cc6cd7a00b4aa17521f4b3d8af95b8b6c1d229888a5d1b95279ab32615901619a816cc108dc56fa2009f7c52a8b8f8844762588731f30aec28de1ea7a58a SHA512 6b3579469ffc106bf22b22d541373ce2cb5f1fcadf4158c660c22d38d6bab5983eabba38c87c26a61951860b00d02c99daa546a599317db71b16d7e4718e3ed7
 DIST kmail-17.12.1.tar.xz 4752528 BLAKE2B 1693e819d48eaf10fc1cf61a6e487c47cb0682d5f9cc423501f4576d119ca3668f89a7dd98e379a493b06b204082cc8880c259403132dbd5ddb1ee89b5e091e5 SHA512 2c67cb9f67b11a532309aeea7386c516be413ec2a5670c4aa18ad241edbaf00fb6a7687f57d1771f0aff57208cf43969cc7270060dcd3f0f6fd73fc8aa43645c
 EBUILD kmail-17.08.3.ebuild 3160 BLAKE2B 3383cd41dfc78f384fbbd213502989dce0003ece10ead6ed03256078a017aa5de27a61440431bce8040d56d5ea51d4d6480a0d193171b460d76526e992ac7602 SHA512 775d88af08392905b6f6446f5297128c8aef7ededa45f52dbcf46e7fc17f8fd1753075e43b5b4a7ff4ce35578b5a47dbc45082b74d652c0e50c0ac3e47c5bf99
-EBUILD kmail-17.12.1.ebuild 3203 BLAKE2B 6f6087dc3b093c54c0c467d9284d01627ad77be64a688fc64bec6c94a526e69bf4a17b6b45032a806da1fdb319db7fb8b96de7431a23fc315d03d0d5825f84d1 SHA512 862190655ee234de81599e453aae86780a3164487a05cd45015d4a12c1fcd07a0ccb8882c942418575445c8cd36e251e594b8c54cfd2838926c478b90364dfff
+EBUILD kmail-17.12.1-r1.ebuild 3254 BLAKE2B ccde7c0a6f49a80f5bb5d658c1de083208aea91c9a7c269e1e25467e0cc1781ab7a5bc155794967a67f4253bf51db5cd008e3f37e07584eed4c354c041eac6de SHA512 cac7ca7ac4d9fff3d8ed3986eb9d16c49c0faec7e84b5966422655ce749f6474a2e6bb53e7b4e6513005366060fad8c96df924b082f1dd5650f6810ccd424b33
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch b/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch
new file mode 100644
index 000000000000..4952628ecc68
--- /dev/null
+++ b/kde-apps/kmail/files/kmail-17.12.1-applyfilters.patch
@@ -0,0 +1,36 @@
+From e0c1bf6570537086628d455cab22c802d663344d Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Mon, 15 Jan 2018 13:50:15 +0100
+Subject: Fix Bug 388953 - Apply filters on folder doesn't work anymore
+
+FIXED-IN: 5.7.2
+BUG: 388953
+---
+ src/kmmainwidget.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/kmmainwidget.cpp b/src/kmmainwidget.cpp
+index d0edc48..ab0996e 100644
+--- a/src/kmmainwidget.cpp
++++ b/src/kmmainwidget.cpp
+@@ -3310,7 +3310,7 @@ void KMMainWidget::setupActions()
+     {
+         mApplyAllFiltersFolderAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this);
+         actionCollection()->addAction(QStringLiteral("apply_filters_folder"), mApplyAllFiltersFolderAction);
+-        connect(mServerSideSubscription, &QAction::triggered,
++        connect(mApplyAllFiltersFolderAction, &QAction::triggered,
+                 this, [this] { slotApplyFiltersOnFolder(/* recursive */ false);
+                 });
+     }
+@@ -3318,7 +3318,7 @@ void KMMainWidget::setupActions()
+     {
+         mApplyAllFiltersFolderRecursiveAction = new QAction(QIcon::fromTheme(QStringLiteral("view-filter")), i18n("Apply All Filters"), this);
+         actionCollection()->addAction(QStringLiteral("apply_filters_folder_recursive"), mApplyAllFiltersFolderRecursiveAction);
+-        connect(mServerSideSubscription, &QAction::triggered,
++        connect(mApplyAllFiltersFolderRecursiveAction, &QAction::triggered,
+                 this, [this] { slotApplyFiltersOnFolder(/* recursive */ true);
+                 });
+     }
+-- 
+cgit v0.11.2
+
diff --git a/kde-apps/kmail/kmail-17.12.1-r1.ebuild b/kde-apps/kmail/kmail-17.12.1-r1.ebuild
new file mode 100644
index 000000000000..86fcd8766e47
--- /dev/null
+++ b/kde-apps/kmail/kmail-17.12.1-r1.ebuild
@@ -0,0 +1,113 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
+HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
+LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kcrash)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep knotifyconfig)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep sonnet)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-contacts)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep akonadi-search)
+	$(add_kdeapps_dep kcalcore)
+	$(add_kdeapps_dep kcontacts)
+	$(add_kdeapps_dep kdepim-apps-libs)
+	$(add_kdeapps_dep kidentitymanagement)
+	$(add_kdeapps_dep kmailtransport)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep kontactinterface)
+	$(add_kdeapps_dep kpimtextedit)
+	$(add_kdeapps_dep libgravatar)
+	$(add_kdeapps_dep libkdepim)
+	$(add_kdeapps_dep libkleo)
+	$(add_kdeapps_dep libksieve)
+	$(add_kdeapps_dep libktnef)
+	$(add_kdeapps_dep mailcommon)
+	$(add_kdeapps_dep messagelib)
+	$(add_kdeapps_dep pimcommon)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwebengine 'widgets')
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	>=app-crypt/gpgme-1.7.1[cxx,qt5]
+"
+DEPEND="${COMMON_DEPEND}
+	$(add_kdeapps_dep kcalutils)
+	$(add_kdeapps_dep kldap)
+	dev-libs/libxslt
+	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-common-libs:4
+	!kde-apps/kdepim-l10n
+	!kde-apps/ktnef
+	$(add_kdeapps_dep kdepim-runtime)
+	$(add_kdeapps_dep kmail-account-wizard)
+"
+
+RESTRICT+=" test" # bug 616878
+
+PATCHES=( "${FILESDIR}/${P}-applyfilters.patch" )
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	if ! use handbook; then
+		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
+	fi
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	pkg_is_installed() {
+		echo "${1} ($(has_version ${1} || echo "not ")installed)"
+	}
+
+	elog "KMail supports the following runtime dependencies:"
+	elog "  Virus detection:"
+	elog "    $(pkg_is_installed app-antivirus/clamav)"
+	elog "  Spam filtering:"
+	elog "    $(pkg_is_installed mail-filter/bogofilter)"
+	elog "    $(pkg_is_installed mail-filter/spamassassin)"
+	elog "  Fancy e-mail headers and various useful plugins:"
+	elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
+	elog "  Crypto config and certificate details GUI:"
+	elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
+}
diff --git a/kde-apps/kmail/kmail-17.12.1.ebuild b/kde-apps/kmail/kmail-17.12.1.ebuild
deleted file mode 100644
index 446bd9837650..000000000000
--- a/kde-apps/kmail/kmail-17.12.1.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Email client, supporting POP3 and IMAP mailboxes."
-HOMEPAGE="https://www.kde.org/applications/internet/kmail/"
-LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep sonnet)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-contacts)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep akonadi-search)
-	$(add_kdeapps_dep kcalcore)
-	$(add_kdeapps_dep kcontacts)
-	$(add_kdeapps_dep kdepim-apps-libs)
-	$(add_kdeapps_dep kidentitymanagement)
-	$(add_kdeapps_dep kmailtransport)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep kontactinterface)
-	$(add_kdeapps_dep kpimtextedit)
-	$(add_kdeapps_dep libgravatar)
-	$(add_kdeapps_dep libkdepim)
-	$(add_kdeapps_dep libkleo)
-	$(add_kdeapps_dep libksieve)
-	$(add_kdeapps_dep libktnef)
-	$(add_kdeapps_dep mailcommon)
-	$(add_kdeapps_dep messagelib)
-	$(add_kdeapps_dep pimcommon)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwebengine 'widgets')
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	>=app-crypt/gpgme-1.7.1[cxx,qt5]
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_kdeapps_dep kcalutils)
-	$(add_kdeapps_dep kldap)
-	dev-libs/libxslt
-	test? ( $(add_kdeapps_dep akonadi 'sqlite,tools') )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-common-libs:4
-	!kde-apps/kdepim-l10n
-	!kde-apps/ktnef
-	$(add_kdeapps_dep kdepim-runtime)
-	$(add_kdeapps_dep kmail-account-wizard)
-"
-
-RESTRICT+=" test" # bug 616878
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	if ! use handbook; then
-		sed -i ktnef/CMakeLists.txt -e "/add_subdirectory(doc)/ s/^/#DONT/" || die
-	fi
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	pkg_is_installed() {
-		echo "${1} ($(has_version ${1} || echo "not ")installed)"
-	}
-
-	elog "KMail supports the following runtime dependencies:"
-	elog "  Virus detection:"
-	elog "    $(pkg_is_installed app-antivirus/clamav)"
-	elog "  Spam filtering:"
-	elog "    $(pkg_is_installed mail-filter/bogofilter)"
-	elog "    $(pkg_is_installed mail-filter/spamassassin)"
-	elog "  Fancy e-mail headers and various useful plugins:"
-	elog "    $(pkg_is_installed kde-apps/kdepim-addons:${SLOT})"
-	elog "  Crypto config and certificate details GUI:"
-	elog "    $(pkg_is_installed kde-apps/kleopatra:${SLOT})"
-}
diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index f9ae6e723b0b..6b4d1b1450cf 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,6 +1,7 @@
 AUX kmailtransport-17.11.80-deps.patch 1450 BLAKE2B dfb1e3c3d0e232986bd187e0bd1b623a0f1895750af69b9aa03876dce49c0baf09c2d2dbb83c40241da280d40045f9898ff218f4e8cafc4df09daee8f3fd27f8 SHA512 037a7efb891883cfa388d252a8e4fc12994a851eea56770c0f6c7acc368fe507d66937392ff6a401cf2781c30cff748e2521f014024ca2f61c690664b63b5af9
+AUX kmailtransport-17.12.1-draft-message-fix.patch 1103 BLAKE2B e97cdf8f44390c5d0cef047203ad43a9fbd492f6ce305a572f8c6079de27979bfe4854418312b665237c0b724b94785283dbc3c69fed869a2bc5afcd99436c36 SHA512 f96c698b375d60c0eb855993c9d9d44034b8f5686cdbb9a0210d940cc91224dd44121512e10e47cd5895aa7e588882a87acd514628c0e8fddf9b546bc5c2201f
 DIST kmailtransport-17.08.3.tar.xz 232936 BLAKE2B dd6f69e110dcb775e6cfacaaeb51acabda8d50a471e64ea9579313fef4a641a250245b8244c43f9c648a2e38d175d70012af0ca2a7be6ca7918d147e0f79693c SHA512 ad7d4edfcc63945c270e4b89f0b48be47ceddb1962e8051a6d3419bf41ada6c00739e6c75d8af1e30240c01721088e2e78e53227f96dd118da2d243468cdb66f
 DIST kmailtransport-17.12.1.tar.xz 165220 BLAKE2B 0939b06f55aea75ede4121b9f6a8215c018ecf65e35e2a356948316df338fb783008818d4c66e89dab59fdf4076439517e983d73a1c56af7c5d6a9e7c7ec7215 SHA512 56a9e2dffe6418f71587aadd98a98044fabb1fb5818aa52597904071c2301c53425e42759c240ef36c49df70708bbae83b1ebb78b31869ed65624e6eb09c892b
 EBUILD kmailtransport-17.08.3.ebuild 1157 BLAKE2B a76e53ace05dc677a12306349d303d55332b87c39c0fff5a86d515cd1bf3d16f31dd4e27bb1d46e5dc059a707152ac36460b88192bfe7c1cb1055108bd269f1d SHA512 700d660d2d56dd5ffb051d1bbc6041928e043264bb99253613dff7612a5da0541242c2dd84ccb1d71be538a09e4f34a8a600794270c2b955a3b69964fb781ced
-EBUILD kmailtransport-17.12.1.ebuild 975 BLAKE2B 78c0711458f21b99171236609866cf45af83d565cff74e784ec90b863f526f17144c252b4e544f1bef3984e3460f07d0368e87987de0d74290bdbd3f8d792800 SHA512 48a9c8bc71c3f7dbefe2f8c0a239ad4deede5446aafbdd60e2262270579cb7ca7f1317d4fc81f5274d0331272b0885ae08008c6a45730299a628e432bcdab982
+EBUILD kmailtransport-17.12.1-r1.ebuild 1020 BLAKE2B ae4ef51604991d2a0aaacb033f05b171a92c66d42761a93120c62192a118c78a7d3d2a3c2c584d2fd21fbee8adbb7641b0d4abb15234fbb35e73bd52838adcee SHA512 3f9368deac629a549ceca710a2210b77b74cd645fb7d7e2eefc6bded56946fdcf18638eff93b0cae74ccd7f4ae6fcefe92d80a6ef52d6566842ed3f36eb26c80
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmailtransport/files/kmailtransport-17.12.1-draft-message-fix.patch b/kde-apps/kmailtransport/files/kmailtransport-17.12.1-draft-message-fix.patch
new file mode 100644
index 000000000000..78a52547561a
--- /dev/null
+++ b/kde-apps/kmailtransport/files/kmailtransport-17.12.1-draft-message-fix.patch
@@ -0,0 +1,27 @@
+From 424f0273dbebd115da6812e0b680fb911f282cd4 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Mon, 15 Jan 2018 07:04:47 +0100
+Subject: Fix Bug 388573 - Draft message is confused about mail transport
+
+FIXED-IN: 5.7.2
+BUG: 388573
+---
+ src/kmailtransport/widgets/transportcombobox.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kmailtransport/widgets/transportcombobox.cpp b/src/kmailtransport/widgets/transportcombobox.cpp
+index b538f98..f198c4e 100644
+--- a/src/kmailtransport/widgets/transportcombobox.cpp
++++ b/src/kmailtransport/widgets/transportcombobox.cpp
+@@ -37,7 +37,7 @@ TransportComboBox::TransportComboBox(QWidget *parent)
+     : QComboBox(parent)
+     , d(new TransportComboBoxPrivate)
+ {
+-    QMetaObject::invokeMethod(this, "updateComboboxList");
++    updateComboboxList();
+     connect(TransportManager::self(), &TransportManager::transportsChanged, this, &TransportComboBox::updateComboboxList);
+     connect(TransportManager::self(), &TransportManager::transportRemoved, this, &TransportComboBox::transportRemoved);
+ }
+-- 
+cgit v0.11.2
+
diff --git a/kde-apps/kmailtransport/kmailtransport-17.12.1-r1.ebuild b/kde-apps/kmailtransport/kmailtransport-17.12.1-r1.ebuild
new file mode 100644
index 000000000000..a954a87a9c26
--- /dev/null
+++ b/kde-apps/kmailtransport/kmailtransport-17.12.1-r1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="true"
+inherit kde5
+
+DESCRIPTION="Mail transport service"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kwallet)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_kdeapps_dep akonadi)
+	$(add_kdeapps_dep akonadi-mime)
+	$(add_kdeapps_dep kmime)
+	$(add_kdeapps_dep ksmtp)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${COMMON_DEPEND}
+	test? ( $(add_frameworks_dep ktextwidgets) )
+"
+RDEPEND="${COMMON_DEPEND}
+	!kde-apps/kdepim-l10n
+	!kde-apps/kdepimlibs:4
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-17.11.80-deps.patch"
+	"${FILESDIR}/${P}-draft-message-fix.patch"
+)
+
+RESTRICT+=" test"
diff --git a/kde-apps/kmailtransport/kmailtransport-17.12.1.ebuild b/kde-apps/kmailtransport/kmailtransport-17.12.1.ebuild
deleted file mode 100644
index 1cd4221e5d16..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-17.12.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="Mail transport service"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_kdeapps_dep akonadi)
-	$(add_kdeapps_dep akonadi-mime)
-	$(add_kdeapps_dep kmime)
-	$(add_kdeapps_dep ksmtp)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${COMMON_DEPEND}
-	test? ( $(add_frameworks_dep ktextwidgets) )
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-apps/kdepim-l10n
-	!kde-apps/kdepimlibs:4
-"
-
-PATCHES=( "${FILESDIR}/${PN}-17.11.80-deps.patch" )
-
-RESTRICT+=" test"
diff --git a/kde-frameworks/Manifest.gz b/kde-frameworks/Manifest.gz
index 085038df9a51..3cfc4d0f402a 100644
--- a/kde-frameworks/Manifest.gz
+++ b/kde-frameworks/Manifest.gz
diff --git a/kde-frameworks/attica/Manifest b/kde-frameworks/attica/Manifest
index 85ad383cd71d..ec00de516370 100644
--- a/kde-frameworks/attica/Manifest
+++ b/kde-frameworks/attica/Manifest
@@ -1,5 +1,5 @@
 DIST attica-5.40.0.tar.xz 60612 BLAKE2B c9b251b01ed6215f5f16be2956cde75b1cc09632d7072b5d38ec1a983d13777d6a1e67df5fb171849f8596134e385b22508d37dd63ecc8be0fdef74fb6db1ad3 SHA512 860a33820f3ad44b079bbd1c72a5dd751bb7b23ac26f729a72241dac5167fa63f43c9184c07494036ae2a0a39819afd24094c18c18fbc330e9b3679c1eaca5ff
-DIST attica-5.41.0.tar.xz 60588 BLAKE2B 64601f95621aad564fae7f11abca0f63f0fc7b07d25c5f2f2d6c50e1a840d8abe8aeca9f0d2a0145e3b0a5ced1fcebce4ee78a25e47b0398c14676211b882e22 SHA512 9e9fc456bd1e7853140c71fead1ac6205e4f572d1d69d485d95188355e3b2fc775fa85c6d115564bd444f9925526a77da1decf990226ef46302fa5f605d73b09
+DIST attica-5.42.0.tar.xz 60488 BLAKE2B 386306540ba33716e9ec241285d7156fa8b391e9e6e88a95c1b11f7faf232493125f1cff9aea93160885735dea6021e5c0fbd9e2169546406285e1a6e0b4a3bb SHA512 289fa868e0c79b2075d1c60472fcab21315cf5fb1ae48b28475a13492967fdef38a25f037ff63e4e66bd18da7bf1f618a4a838d36fbe6b47523a4c58d46a017e
 EBUILD attica-5.40.0.ebuild 321 BLAKE2B 1b2d7f4a25ee2c7ba7388f2a9e53755e1c7bdec090e13af8759133c7cac582c1f7b51c6365945d739e7aed6ab97ec703d30079944a84aa4a97dad33938322576 SHA512 d3cd744fbe3bc24974c8093c97e19067f8e95f4f1991b56a79593a7cc6d0e7eaf67a91cae6b156feb152c7b7b0acd06d95beac505f75f94629a9ab5636ded24b
-EBUILD attica-5.41.0.ebuild 323 BLAKE2B fe4d1ff968cdf2d9042151a58445fb68e9d8a707164756572d23cabf48890d496114b7f498b56adb8f5a81686785ba52ac4eb1d89dbd62ee8a4edfe1ed88f11c SHA512 fee4a77560f9d2042f10ceaa7b9f7e63c556fa574d0061b51a79ef0c21c63d95c71e777c23ba6d09d3c74a85b44ca959d57e6fc49e72ee8a3389332d7bb1d1af
+EBUILD attica-5.42.0.ebuild 323 BLAKE2B 10d24bfc3130b477b0a80f9310fe263d355a874013d0b340ee7a1c4ca6dac9aa21f26148a0e7b391d510906d4877d8774dc1cca7ccf3f127cdb529863496f9a7 SHA512 798f06b78cdc2d373579ec994fbcab32b33560ed7674412ca4039c0d39ac337d9d5c74f2e47b0337bdfa71aa0f0288518fd5ea110225f01c8f2af424164df856
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/attica/attica-5.41.0.ebuild b/kde-frameworks/attica/attica-5.41.0.ebuild
deleted file mode 100644
index 053c76108032..000000000000
--- a/kde-frameworks/attica/attica-5.41.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
-
-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}"
diff --git a/kde-frameworks/attica/attica-5.42.0.ebuild b/kde-frameworks/attica/attica-5.42.0.ebuild
new file mode 100644
index 000000000000..d88c4abe8dfe
--- /dev/null
+++ b/kde-frameworks/attica/attica-5.42.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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}"
diff --git a/kde-frameworks/baloo/Manifest b/kde-frameworks/baloo/Manifest
index da1c1e7fc0e6..c70f886e81c5 100644
--- a/kde-frameworks/baloo/Manifest
+++ b/kde-frameworks/baloo/Manifest
@@ -1,5 +1,5 @@
 DIST baloo-5.40.0.tar.xz 198976 BLAKE2B 55411bca6ad06e4267f7421a3f75b62bf144bba51e4198127a393d19b86bff8b4bdcdd3634cc0b37d93f18d2eaebdf2c21d3af297878fe7fd2a9614a70fbe86e SHA512 5853246ac632ef6e528956d35e4b0a0321dd62e266e6e7f4f6c3be2ef1650191dacd248cfdc1b7cdc35f6d6eb0e4cb763a8336d5bde9329fbb27ca4f2a0b7e50
-DIST baloo-5.41.0.tar.xz 200084 BLAKE2B e3f149afa77b08001639ea583cc7f791a22379b9dbf7b60671499054665e0a2b080ab07982b9daefd1c5548f33f79760db1e0bd9c746117efaa9d97f015758e6 SHA512 15f03a62d1525dc7062b4361e883ee4170a1ea36d8bc10846fae0bf73549504bdcb7cff2349b3f0fcbc1da77102b0383d1140c00191823884d719c18771a858a
+DIST baloo-5.42.0.tar.xz 200144 BLAKE2B 86d0baeea0abd88996296896ed9add8cbcbd4022580a6c50ebf703664e0aab65b134d5a123c2e5137710ea6d2d8bbfe852bb3362aff78fce01462141e4dd4172 SHA512 a21b9e09f07b296049fe46a00ca22628cb7148e1619aa6575304100f3abb2622eedada6d64712bae484995c623db5d0dedb775667c127b6edd82c4558701ea08
 EBUILD baloo-5.40.0.ebuild 789 BLAKE2B f5f0304711b345756b52826f5756c9474926b4251380cac610c5de612cd20e625610c45d08ce3e4ba2c873d636b8fec6300c51a70ac544378158a1a6e3a5d7f9 SHA512 222be451e522aac82c5c85d6b5a52b50f0f8505427b30e73cdda35085d0b2574d7f7a0f2f004ead91f5167f7f37ac93025a0dc3e5f173680df1bf42ff6e71ea1
-EBUILD baloo-5.41.0.ebuild 791 BLAKE2B e43c18594bf103dacd7b8aa660e0ac37cd996003abb02213cc9d154acd7579579e186aa1b4eec9da98fdf350a7ee13dad0dea5dc1f2a2bc672cb8065c4e08939 SHA512 b9620dd3748d1f79685bb3ef11619c833b74532306e38fbce1e77f8d44b3177fbf6eb7051cf7d2419d9f67e46a9c254f1e6360fc469e13deefc099096b0d4fed
+EBUILD baloo-5.42.0.ebuild 791 BLAKE2B 396c35df159caf113dce902dc0a252afab6e6661c537c1cbdcbc451e7df32656e246b540cd93f1587dec60dd0e4c0e5c0c71fba932f133291460877cbeeb827e SHA512 2ff91122affc58c8a014d332e685ec93f8ba6d8cfd80dda43c0c35b0e11b0e5972666cdb2ff359c7535188e0aa51c7ac695d705e6a2d529645aaeb98f47b030b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/baloo/baloo-5.41.0.ebuild b/kde-frameworks/baloo/baloo-5.41.0.ebuild
deleted file mode 100644
index bb4bfb428531..000000000000
--- a/kde-frameworks/baloo/baloo-5.41.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/baloo/baloo-5.42.0.ebuild b/kde-frameworks/baloo/baloo-5.42.0.ebuild
new file mode 100644
index 000000000000..564ee8abea0d
--- /dev/null
+++ b/kde-frameworks/baloo/baloo-5.42.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 13eaf0f44c2d..b4bd9d8eced7 100644
--- a/kde-frameworks/bluez-qt/Manifest
+++ b/kde-frameworks/bluez-qt/Manifest
@@ -1,5 +1,5 @@
 DIST bluez-qt-5.40.0.tar.xz 75084 BLAKE2B abc377c66b04f509e8566554e35333f4a55c68d5ef623e29473d77a1ee564de340d7b434fafe634c8e9f15b86c5b8456533915d960630eeace4761b38a0093f1 SHA512 72743afb56b9d393b9ef6d03c42869a416feca3f543ef6d8b6aef9be23203fe8d28a2371d9d79a3a2ebb6e48a2ddce63b7010dfe736c8e3e4e706be84d12a09e
-DIST bluez-qt-5.41.0.tar.xz 75112 BLAKE2B 75b1f28d67ecd98b22fb2785a53d3e5b8d0441ae596221cb83187561a88b1d71e997c9a9c890519aeaca72581c6fc805ae29e31f3ab19db28be94d97cae5283b SHA512 d6404e42db1988624a53292fcb395896b8a43c5187d5ba3ccf96ade797fb4a4972023b674dd6108055302aa1e975503a0f945f9a48714a1c8057a4bd9d3ee7a2
+DIST bluez-qt-5.42.0.tar.xz 74940 BLAKE2B 761614821e0de988be54ed954e9f133fca751e3edb67a393c790ceed61b35c48f69a73f2bee7d315c9f5dd68c8e83e3706bc227e40a2eacef32a0a0d7943be53 SHA512 86f5ff8ae56f1846ea969b8769ed458db3140fec887659a4dbaaca500914b8c8997a943997ab041b44d87221b45b4e4429defd0a64b3910eade87aafa84ad79e
 EBUILD bluez-qt-5.40.0.ebuild 557 BLAKE2B a29e1bf9ab9514b61973235de668eab23b06e9ded36df13fb15995c50435e38534fe5f777c5a684aad87c63af4c7efbc97a7529990612fdf495ae20864350b19 SHA512 440464ca9784f727869bf542c07405f3e4ea016b15ca8861395f07b682e17e2be80e2a936252c76e3ed9ca0b6903598930c8c122277c24c926091df7fa33dc88
-EBUILD bluez-qt-5.41.0.ebuild 559 BLAKE2B 58e962719a13be408a890ad5e54de6a6d867eaf8aa3f2138ea8f0d5fa348c001197133622da81ae47f988dece608ef41df4de06782bedac9f1d22d9abef8adab SHA512 893396b816b1f2cedd5c68d6ad142e28ee53267ba28371f2eb8ad787aca7b0a46e4c8b9ea3365396c79535f2dda8153fb648e00766d9e1b4ce4da1563686a431
+EBUILD bluez-qt-5.42.0.ebuild 559 BLAKE2B 09d6e4ca6a265de4ae4f04abad0fde059ce6e656acd57c8640e14cfa82d72056e4ed924ea103f5d0872d60b97f5c11f5cbe618a39b484eb92fc01c5c3942a688 SHA512 246d327d235bf3d896bc14dee45889655eb841a30954373927d900a058b8f327def4aecd1dd7357e0f80f4cf11c684f77ed7c8d6a1f78238198e4b97eaa522fe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.41.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.41.0.ebuild
deleted file mode 100644
index 25ac72373a6b..000000000000
--- a/kde-frameworks/bluez-qt/bluez-qt-5.41.0.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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() {
-	# bug: 609248
-	local myctestargs=( -j1 )
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/bluez-qt/bluez-qt-5.42.0.ebuild b/kde-frameworks/bluez-qt/bluez-qt-5.42.0.ebuild
new file mode 100644
index 000000000000..adc7a124e0af
--- /dev/null
+++ b/kde-frameworks/bluez-qt/bluez-qt-5.42.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5 udev
+
+DESCRIPTION="Qt wrapper for Bluez 5 DBus API"
+LICENSE="LGPL-2"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtnetwork)
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DUDEV_RULES_INSTALL_DIR="$(get_udevdir)/rules.d"
+	)
+
+	kde5_src_configure
+}
+
+src_test() {
+	# bug: 609248
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/breeze-icons-rcc/Manifest b/kde-frameworks/breeze-icons-rcc/Manifest
index 4f0cae8049cc..61d159449b84 100644
--- a/kde-frameworks/breeze-icons-rcc/Manifest
+++ b/kde-frameworks/breeze-icons-rcc/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.40.0.tar.xz 1498952 BLAKE2B f6da50e392b2cfb2a2de1207b07d24ab6c0f93aac31dd9a21e82d6d00cce920577e6e90fdc3fb7778a62fcf3b4cf511672c9c434bf84fcb39c3bf0eb13e42d5a SHA512 d24fe6eb77bbb4a37c128cc31a2a30c7257304ffa2fc48130fe4bfb5d117108f08510113b0328cc0b5edc5de9bb3fffd4f63431583bdc62513249c9096421263
-DIST breeze-icons-5.41.0.tar.xz 1499396 BLAKE2B 29e4914039668980d01fe4aa6d9d835bf1c3d00056331cdd2b7ced548bc863924c11b090bb9cca0a21d1cc6f3499ebf7bdfed5b596a03c454bddb897748282b1 SHA512 880d05d0dc69d3ea521a1b7e572a1af249733f05d541e58684e2ef004644444b9d498862a679b3e5279af93e3180df0c0a74922b42dbea54b7a004c1e7dfe4fa
+DIST breeze-icons-5.42.0.tar.xz 1521352 BLAKE2B 2d899ed0f87ad54174170794813dc8de8295b816f0409375719c3b8fdc55ddcb1d252ff48a4bee9f1a12458ffca6ea8645e758bef0d2a98dd8a68da8208bee10 SHA512 344234615c96a865a37f662c0f197ff0953f80a06666166e3580e3afead0fe4976ddfe5e3dbe0467bc89faac12c699b4b8a9e003bd16e849a85357da32c35890
 EBUILD breeze-icons-rcc-5.40.0.ebuild 569 BLAKE2B 021e75b3b73378fa68c0faff0d7a05334e452fc47fe36d261cc67a82061600e622c787a1483d6418612923ca6997e19c8ce9bd429f27da287f79df6d39a993f1 SHA512 78339e09171f24f36b2080b5495fc6dcab066b1e299654c9f0d050192ac31ee047b66e05a92b94ae95f94f08eb55c63353ec84b9e150847a12744cebe6093552
-EBUILD breeze-icons-rcc-5.41.0.ebuild 571 BLAKE2B 6676fb7f39c88948c013a33b00dd165bad9788f1d34e5d3d8f0ff482789b917b468c5915facd03e2cbec063cea282c64ad83b673f9ae8dcf508aab55b0189e5c SHA512 8a2afee307981d57d4ebab4e17b1278e26aa9b4f70f5ef57c663fa9c1cc278947406e26f0a0c3212a837d2f31a980b643db23ddfd9c34cb0810b94c131580208
+EBUILD breeze-icons-rcc-5.42.0.ebuild 571 BLAKE2B 478ba0537ce2a381e9fe24e461525419e8aa35b11b79d250848094bb5c06441b332139827e8521235f70fa524bd256a5d8f8863f45dbad2618a47e469d10cd2f SHA512 3ae8d5969305e5e99256102a67d41571bfab241166a1e707a40b6f0502f1154b01d12e006b2b8c04948fc742a85e74a663cd7e35fafef8886e9c15b3793e97c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.41.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.41.0.ebuild
deleted file mode 100644
index 3fe7f7bb5061..000000000000
--- a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.41.0.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-KMNAME="breeze-icons"
-inherit kde5
-
-DESCRIPTION="Breeze SVG icon theme binary resource"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-	test? (
-		$(add_qt_dep qttest)
-		app-misc/fdupes
-	)
-"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINARY_ICONS_RESOURCE=ON
-		-DSKIP_INSTALL_ICONS=ON
-	)
-	kde5_src_configure
-}
diff --git a/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.42.0.ebuild b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.42.0.ebuild
new file mode 100644
index 000000000000..93736a98856c
--- /dev/null
+++ b/kde-frameworks/breeze-icons-rcc/breeze-icons-rcc-5.42.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+KMNAME="breeze-icons"
+inherit kde5
+
+DESCRIPTION="Breeze SVG icon theme binary resource"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+	test? (
+		$(add_qt_dep qttest)
+		app-misc/fdupes
+	)
+"
+RDEPEND=""
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_ICONS_RESOURCE=ON
+		-DSKIP_INSTALL_ICONS=ON
+	)
+	kde5_src_configure
+}
diff --git a/kde-frameworks/breeze-icons/Manifest b/kde-frameworks/breeze-icons/Manifest
index e59c6dc88468..004885fa4ee5 100644
--- a/kde-frameworks/breeze-icons/Manifest
+++ b/kde-frameworks/breeze-icons/Manifest
@@ -1,5 +1,5 @@
 DIST breeze-icons-5.40.0.tar.xz 1498952 BLAKE2B f6da50e392b2cfb2a2de1207b07d24ab6c0f93aac31dd9a21e82d6d00cce920577e6e90fdc3fb7778a62fcf3b4cf511672c9c434bf84fcb39c3bf0eb13e42d5a SHA512 d24fe6eb77bbb4a37c128cc31a2a30c7257304ffa2fc48130fe4bfb5d117108f08510113b0328cc0b5edc5de9bb3fffd4f63431583bdc62513249c9096421263
-DIST breeze-icons-5.41.0.tar.xz 1499396 BLAKE2B 29e4914039668980d01fe4aa6d9d835bf1c3d00056331cdd2b7ced548bc863924c11b090bb9cca0a21d1cc6f3499ebf7bdfed5b596a03c454bddb897748282b1 SHA512 880d05d0dc69d3ea521a1b7e572a1af249733f05d541e58684e2ef004644444b9d498862a679b3e5279af93e3180df0c0a74922b42dbea54b7a004c1e7dfe4fa
+DIST breeze-icons-5.42.0.tar.xz 1521352 BLAKE2B 2d899ed0f87ad54174170794813dc8de8295b816f0409375719c3b8fdc55ddcb1d252ff48a4bee9f1a12458ffca6ea8645e758bef0d2a98dd8a68da8208bee10 SHA512 344234615c96a865a37f662c0f197ff0953f80a06666166e3580e3afead0fe4976ddfe5e3dbe0467bc89faac12c699b4b8a9e003bd16e849a85357da32c35890
 EBUILD breeze-icons-5.40.0.ebuild 518 BLAKE2B 087b62c6ce19fbf2843c8d3792f612c431dcf528cd2b9da16118e4194d96748b3e21e7ec2a55eb6395d0b915c3fc25e026d4469910075b3340c2a75c03789e11 SHA512 249ffcf270b91df18a0a027f29d879bf0f47f5d76b4855081cfc41032f8b18d678490448bfc1b9f6d8b9938c70dc71a2e02f6afbd23f89f40d1fa4246e56b485
-EBUILD breeze-icons-5.41.0.ebuild 520 BLAKE2B 167319ee4c5cbf4fb389122d2a30e25eefadf67ac4bd35fd85624e52ae0fc0c0b20bf7fbd7bb5f478e19a23274ebca51f6128c3ec965d82bdb5914b3760d3604 SHA512 0b6fe5e76f68cc4d60cd18f697f35bf85d1ea922e8e68f420fb0a8e6bf07bd02ef8661cf1d596e035ff6d42873357e56ea188cf7385e2790ad6f86c19d98d304
+EBUILD breeze-icons-5.42.0.ebuild 520 BLAKE2B 28fccdc501d57456712777ee0fc16c28e55fe25926fa03a110690bda6e1741b687df71a887796fa5245f16f7698b66ff1f6d51c6fdd0fcd08e763cd7f446d21b SHA512 baddb289a6fef59de8c062915a1bbadb88d1a582c0ce8ae9d35cebb531191dc8108298dc81794a6d66ee1fc9f5f114dfc0fcb5ac2ab4028bab9bb719d636ee35
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.41.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.41.0.ebuild
deleted file mode 100644
index 4ecdb71a3516..000000000000
--- a/kde-frameworks/breeze-icons/breeze-icons-5.41.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="Breeze SVG icon theme"
-LICENSE="LGPL-3"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-DEPEND="
-	$(add_frameworks_dep extra-cmake-modules)
-	$(add_qt_dep qtcore)
-	test? (
-		$(add_qt_dep qttest)
-		app-misc/fdupes
-	)
-"
-RDEPEND=""
-
-src_configure() {
-	local mycmakeargs=(
-		-DBINARY_ICONS_RESOURCE=OFF
-	)
-	kde5_src_configure
-}
diff --git a/kde-frameworks/breeze-icons/breeze-icons-5.42.0.ebuild b/kde-frameworks/breeze-icons/breeze-icons-5.42.0.ebuild
new file mode 100644
index 000000000000..f35c78d7beb2
--- /dev/null
+++ b/kde-frameworks/breeze-icons/breeze-icons-5.42.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="Breeze SVG icon theme"
+LICENSE="LGPL-3"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+DEPEND="
+	$(add_frameworks_dep extra-cmake-modules)
+	$(add_qt_dep qtcore)
+	test? (
+		$(add_qt_dep qttest)
+		app-misc/fdupes
+	)
+"
+RDEPEND=""
+
+src_configure() {
+	local mycmakeargs=(
+		-DBINARY_ICONS_RESOURCE=OFF
+	)
+	kde5_src_configure
+}
diff --git a/kde-frameworks/extra-cmake-modules/Manifest b/kde-frameworks/extra-cmake-modules/Manifest
index ac6110b25432..9e5a35b26d27 100644
--- a/kde-frameworks/extra-cmake-modules/Manifest
+++ b/kde-frameworks/extra-cmake-modules/Manifest
@@ -1,6 +1,6 @@
 AUX extra-cmake-modules-5.40.0-qmlplugindump-path.patch 1270 BLAKE2B f07e75e7558f85f2b1bf0ec49258c489ac64dc8efb0b9d897fec790a91d36e6e44d75cdad5aa34c9f45f269b49531cb82bcdffe7a0627b6f092317ac5ffb01aa SHA512 cbfd90b802f9629573c6bf1b51b2bb46d2d5991ffe41381f8867fe094c43a8f2d80175f70d7372a1df05a835df34faad5049ae87971b581f3fe0ba12e41724db
 DIST extra-cmake-modules-5.40.0.tar.xz 312532 BLAKE2B 0054ee4d3d17f238c4940404c6f5e00c951d305b0fce3e206bdc84dff0be683d4dc7e7043db61019422d182385ec2990e05b2df384b14e7b248d492cf918e691 SHA512 5390edfde7acb4c89abd2f5abc4fb533f2f4b45061127796b3a2f9d7ab65d7b8ba5cc0aee0543a28886118af8f1c7aed4f5b51c33f20223d9948ca39944c399c
-DIST extra-cmake-modules-5.41.0.tar.xz 313940 BLAKE2B 550a1d99471dd5698d978ee48218eb853b28d86ad3f4156073b373cd871ad9a384e3f4c0fb6f14ffc3f8c3dc6e0d5791e0d8798cd8582897da767f2a613d827d SHA512 034c67ed56ee4f6002ff2f0bfca2d7eb7877180b5aa5cf5eb3babb6e40c0669eb0728f45832bd8250ff304647f9a6555233bff4fdf6eccc9b14b420f4b1c3924
+DIST extra-cmake-modules-5.42.0.tar.xz 313692 BLAKE2B 1758744fc97bc47ff4cb6f9cc1838843b2de53f687d768ea34feb66d057d97403f354483bacfd829e3e974252c1478902ac201be35e8a6c52de7abf81108bad3 SHA512 43bc1afb0bdb5fc74771e9ea30479995c43d7b74c7469c4d4e04303e209cfc1982834d085c6f4586271761832892fb0b3cb8e0723c332d01e544a4cd26e21e14
 EBUILD extra-cmake-modules-5.40.0-r1.ebuild 1319 BLAKE2B 51f4dd46c267d65f194eb8608bb7fd3fb7762827826bbe7bf9c1dc451d9b451ce4498c68cccdc714d8e47861d4e54728a401c3c40e206d69162c169849da9ef5 SHA512 8c227a7e9ec6085e03e6249c4397389320b5d054538f833194ed2a20d886b5b5c57dc70a62ffc4c4e70aed46c881c1c971e19454c16ac119eca3fc15f2b1b300
-EBUILD extra-cmake-modules-5.41.0.ebuild 1332 BLAKE2B 3aa84386f8c3a53cf21abc5165d7fe1774a8a92bbbe26e24c9915364ceb83ff5a39ba4b51fe1456b571eaf716e0465abface711633b2d5ea6473cbde55499649 SHA512 63c21754689351a36430e2e10ad6dba50ec2e695997e017bd0f742cf57947f4a7d39797daf99c244b98132dbc0ce9dab637ac4918e7b662b91810230837ece90
+EBUILD extra-cmake-modules-5.42.0.ebuild 1332 BLAKE2B e2ed1fa7566b9e171471d58449598ffc9bca186d09da0ff6763eadda6023d1e52ea92345009f8ccfe834628a650432ad0d243608b4815908f8cffd4bc2feb0d2 SHA512 4e379286cd6fa455232d85395218f826f00293ee8840e04aaacefa975aa1ef12b973b92e34ab9b507216129ff6035fb63fec808f826f34239dd00e949d2c3ccb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild
deleted file mode 100644
index 06e3c7ef27b4..000000000000
--- a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.41.0.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-KDE_AUTODEPS="false"
-KDE_DEBUG="false"
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5 python-any-r1
-
-DESCRIPTION="Extra modules and scripts for CMake"
-HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
-
-LICENSE="BSD"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="doc test"
-
-DEPEND="
-	doc? (
-		${PYTHON_DEPS}
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-	)
-	test? (
-		$(add_qt_dep qtcore)
-		$(add_qt_dep linguist-tools)
-	)
-"
-RDEPEND="
-	app-arch/libarchive[bzip2]
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.40.0-qmlplugindump-path.patch" )
-
-python_check_deps() {
-	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use doc && python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_HTML_DOCS="$(usex doc)"
-		-DBUILD_MAN_DOCS="$(usex doc)"
-		-DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
-	)
-	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
-
-	cmake-utils_src_configure
-}
-
-src_test() {
-	# ECMToolchainAndroidTest passes but then breaks src_install
-	# ECMPoQmToolsTest is broken, bug #627806
-	local myctestargs=(
-		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild
new file mode 100644
index 000000000000..fb96d8450171
--- /dev/null
+++ b/kde-frameworks/extra-cmake-modules/extra-cmake-modules-5.42.0.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5 python-any-r1
+
+DESCRIPTION="Extra modules and scripts for CMake"
+HOMEPAGE="https://cgit.kde.org/extra-cmake-modules.git"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="doc test"
+
+DEPEND="
+	doc? (
+		${PYTHON_DEPS}
+		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+	)
+	test? (
+		$(add_qt_dep qtcore)
+		$(add_qt_dep linguist-tools)
+	)
+"
+RDEPEND="
+	app-arch/libarchive[bzip2]
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.40.0-qmlplugindump-path.patch" )
+
+python_check_deps() {
+	has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_HTML_DOCS="$(usex doc)"
+		-DBUILD_MAN_DOCS="$(usex doc)"
+		-DDOC_INSTALL_DIR="/usr/share/doc/${PF}"
+	)
+	use test && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_PythonModuleGeneration=ON )
+
+	cmake-utils_src_configure
+}
+
+src_test() {
+	# ECMToolchainAndroidTest passes but then breaks src_install
+	# ECMPoQmToolsTest is broken, bug #627806
+	local myctestargs=(
+		-E "(ECMToolchainAndroidTest|ECMPoQmToolsTest)"
+	)
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/frameworkintegration/Manifest b/kde-frameworks/frameworkintegration/Manifest
index 771d4e449e8b..7c0e8f409999 100644
--- a/kde-frameworks/frameworkintegration/Manifest
+++ b/kde-frameworks/frameworkintegration/Manifest
@@ -1,5 +1,5 @@
 DIST frameworkintegration-5.40.0.tar.xz 1752732 BLAKE2B 8c5e10a9a295ec89092fcba9fbc6ecaa715fdb5a681e351ef46ce23e6600b665b3d46047774e325c642cdc7de950a2dc32a06e4bdb1f417c8791ae0dfadf8231 SHA512 2ef108ca6738c4f9f9d164bd79449a4baaf9d343916f9fad98925ea0bb1ac5bed57fbe239f2ae8d1ab8ecf251dc3329e7e96ce0f9c55e607d0bbf5c59c697e28
-DIST frameworkintegration-5.41.0.tar.xz 1752828 BLAKE2B c16513b84703f4a1a8f2efc4433e7ed215517230cc967363415f7c003288a31a194dab317c30ff3a63c5dc8fd2e3e41c1c22851a62bd92d02a74fcc693e19b90 SHA512 aa0c5b98bbfb287a850145c760d116c6d7d61d0a3ec966ebec27ebe27a82ab65e71e5d3f12702c0bd927ba07d9ad07874cddebc947ed073afe514d73e83ef402
+DIST frameworkintegration-5.42.0.tar.xz 1752732 BLAKE2B 7258ee2012f54a988c0af752c35420aade3983b6be05472a8a5d6500e352a3ab17b087ee93df9ba638d7180bd82be980d265f9c35c5f3befb904d5200b2595e7 SHA512 15e3b69910bc57ecad4d7287ffeb3108b421e7e931fad0fe02d4250ff55c6a4aead886f42fa5f03bf9c314900cad37dd61cf5cef65e1a90dbd0fe3be6330b936
 EBUILD frameworkintegration-5.40.0.ebuild 1140 BLAKE2B e0f9e9e7ebc73cfdfecb098fe22d76b60a59102cf1b217d694b4af91d0f6a69bbb092b2be1fccc88ad575236df8234820899eccb8a1bfe606d6353294f7822a0 SHA512 fb8a890782dce345ea7ea6d4346daa795c336069eed1d39425285521d2f847dc79ebdda94da4fb115e91c9c58b1f9bf53a883101f639d8d89f170f4da548fd31
-EBUILD frameworkintegration-5.41.0.ebuild 1142 BLAKE2B 4c70444f4f8fcae14b8ba3d4019167543b13bcb75c6d4e1c4df6e0b9f04e003e3b1a30d8c76fcb7671e70f0900b273047c3f251be7c3cf5f8a5a9f3c8d485412 SHA512 eca77073320a290099502c1ab2b5d5ece8a837f5cc7fda9840ca3a3cf81508955fa427154e92974974fa7e47ee9e7f58b805d71bce22bdf7b1fe48febd9bfc9b
+EBUILD frameworkintegration-5.42.0.ebuild 1142 BLAKE2B d528803f92a758bf3cd512ad02471faf883616675e29874fa60b03da085657f2b788043d97fa786cd64a9c775e90ded45ee880ac2dc1edb77b71e518c669ff9c SHA512 1d19ead18ddc1907524740ce2c7f685b2ed8dbf8c12a25c5a1b5df426c93df013702a44e0d36f09d998fb28d35e8e417ab54ffc9407e385548a8a32082a94cfb
 MISC metadata.xml 339 BLAKE2B 9adff6fc4d48a8e94cd7701e7a3b956963b25af1538793345846c70186d7536597bcd9a1cac92b292220de5d6c2562864b64556c36cd579041b567d970db6828 SHA512 cf6eaaca36d7a193361608ad80cd1a4e79f71952926fb01c8905879422c91d38d6988e473a14960437491e5b43d227497500b79ff3696f0d96cbc1b69f9165c1
diff --git a/kde-frameworks/frameworkintegration/frameworkintegration-5.41.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.41.0.ebuild
deleted file mode 100644
index 9062d6d3800d..000000000000
--- a/kde-frameworks/frameworkintegration/frameworkintegration-5.41.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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/frameworkintegration/frameworkintegration-5.42.0.ebuild b/kde-frameworks/frameworkintegration/frameworkintegration-5.42.0.ebuild
new file mode 100644
index 000000000000..b6c0da034de8
--- /dev/null
+++ b/kde-frameworks/frameworkintegration/frameworkintegration-5.42.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework 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 cf7006c56344..c7ffd66af48a 100644
--- a/kde-frameworks/kactivities-stats/Manifest
+++ b/kde-frameworks/kactivities-stats/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-stats-5.40.0.tar.xz 60896 BLAKE2B 41c94737d80e5c84bd75813573ec6b150e63e3e7f811f01e8651f14fdca3547398641496eff393fc77326a2f8b867b1a27d7a956723fef073800535c287da39b SHA512 1c5285038247dd778579daef2b4bc4663b67a18364670ef953c52311931e0f1c5147bba2f699a316be52a41d641ee7b9db4fd78c6f96db47883c95a442ecd907
-DIST kactivities-stats-5.41.0.tar.xz 60884 BLAKE2B 6bfe239abe0b84f17500f7bcf8be302ce3cd30dc49d4e3e07484cf849fa6ce52d120b290cef8e9e4d40a845c9f2e7f5b855ee144b273ad0ab19e923be7627402 SHA512 1a6a605d87215677f94a048cfb17081ad32e4d8fa6f791fe29a15eadd4095652fdc9bb69c7315235c8b1abc2cf93c37541c17944045af5be52473bb62c00de89
+DIST kactivities-stats-5.42.0.tar.xz 60896 BLAKE2B 1f5bd345b63cf3f8546fc3615bfc3f35292c94cffbb4316cba9b9d7bc072703fb8eed2bb9399b8ed149ce126095fe2fc3a9976ed86b4c0b2f02e9615460d2051 SHA512 29e3a0ff72663620b8bdbeb5c84aaaa3d0987bb990c7907b95c391e2658c63b3b910384ccf46c368dfc6980a9ed8f7ee9b6bfe87842015cf726c34ba6294a115
 EBUILD kactivities-stats-5.40.0.ebuild 441 BLAKE2B aeddaf2dc0e14861e892e5d1d2eade2c52bd3f86464fa97b8ef95b41e7d92da5f306640a9dba87e16d1239aa1c548df80d1b42f5601972c7f1f3730febd5916e SHA512 7734197d1f2c6ecb9add6a805738b561ff8732136a27160b10fb72ea9bc574b7e27d72c769aa542b957efd559b0a6a95f2c83535b681741a28f9f5f09baa7619
-EBUILD kactivities-stats-5.41.0.ebuild 443 BLAKE2B a4382d01a9285f0a45c93064b444c70dac2f5350edc628b070c62101c52866085f3c668603b8ee2708afd06851db8a2e431b0f4673111ed91ebc0656f4477801 SHA512 e50ddb7eceb3b6b560dfe63b7ae76e1d775d16f3980ed7552229180645b734be213a7eaaed3d4c14c287b08c35b0e0360542507f00cc860e505daca78c096b6c
+EBUILD kactivities-stats-5.42.0.ebuild 443 BLAKE2B f6e568d599bce73a28377cdaa3533d351e6c4de0cbb7ff7dc4b7a1b8a82c2f958f83126212d2ac50c67c5c10bd62f7be42b1fde66b8bdb31b20b81546bf69852 SHA512 cd3aa20166e5103153928d9450ed70aea8ef05f061d453a7a32af8f33b1a8f77f8b39f748df5059615942e209c5c92615362a7553a02a4f20e0847ac14de26ec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities-stats/kactivities-stats-5.41.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.41.0.ebuild
deleted file mode 100644
index 989cc6ce39a1..000000000000
--- a/kde-frameworks/kactivities-stats/kactivities-stats-5.41.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=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-stats/kactivities-stats-5.42.0.ebuild b/kde-frameworks/kactivities-stats/kactivities-stats-5.42.0.ebuild
new file mode 100644
index 000000000000..2c93cf434f2f
--- /dev/null
+++ b/kde-frameworks/kactivities-stats/kactivities-stats-5.42.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 488608116827..b4fe1b63b2a8 100644
--- a/kde-frameworks/kactivities/Manifest
+++ b/kde-frameworks/kactivities/Manifest
@@ -1,5 +1,5 @@
 DIST kactivities-5.40.0.tar.xz 61272 BLAKE2B a21e9858572be9ec8e6d09bb46213cd42ed33925ed0f527290a0ac232d3594ab5d0f8d66ed3764cb2e4440e06f57f002ef7ec7939d1fe98c2846c1516e7766f5 SHA512 030c3678c2971c9d499c9cdb863363ae82e35295d88aec141149988aa1596996cf0a32863db6024ac2ed15879d8edc5feef4b72ee89d2efe5641b33690ecfbce
-DIST kactivities-5.41.0.tar.xz 61336 BLAKE2B ef532541317847034c74ab13038d50e33d45ef966a6b2dc8afcf7e09a356445b0a126ac5be84e3ca40913b954889ebc707949c25c83a46f73403216def98500c SHA512 942fe93f27ca1549be881dce8374f32b04cadaf4690a9bb966189a4daeec0768366f465f5fffbd26d48f4102ebd7d7dcc0482ed177d372473b232f07e22960d7
+DIST kactivities-5.42.0.tar.xz 61304 BLAKE2B 2c0336bf5cce55cc43616f3d80f263f542aab7668eb7f651dbd58e8589292b40001be89335d33091ec151fff1d45de3ee8aa8e4c04f1c0a2973bb7769746bddd SHA512 9ca8fb9aca5eb62eb1f3ea7c0d930289657ea3c9f035ef6dba3c8d528de1e966e4ecbce4393c93d8e980c50a0538e024cbd00964a88d77841f19e77bb40fbbaf
 EBUILD kactivities-5.40.0.ebuild 561 BLAKE2B 8c26d1e3a674a78ca2df663a3fd275261654c5227138802440551d0e1c22fd6e698dac0c115b07d04bd9c8539b7bba8e06987aafbae78f8846b9c5db7d72225a SHA512 2da42eb3ca20c8e217e1c1fce85d26a1ecdb121ed25eaad477e8c98551f1f9852dfa84b668fdb4492a118289a0fb5570659eab3cb0cab0734048e8eca46070bc
-EBUILD kactivities-5.41.0.ebuild 563 BLAKE2B fcb2f8366f9c9ddff68fe2af21095d40d5f357943485dd69352b01be0c48f97f998c7e029e1f2589a2200b65973f58bdc76a45c79fbe12f9aa3faed073183230 SHA512 f9b4a0b6dfced27a191f1020325681a76f0150a8c5acf46ea3bd12bd3144809ebfd44f77d120c64576d5aa5eefd04aa09887a7887a0968553e9fe92cc58089ef
+EBUILD kactivities-5.42.0.ebuild 563 BLAKE2B 742199041c61534fb38071daff0cd54f104c0304dd2b2b98b82a906645b31f18111bc50a910fa1182636c4abb8921878e482c60b7187864c2adb92b0f2638455 SHA512 73c7961e252f51ff244387fd59b0d4923ea6059cf380ba1f9ea663acd95e9d40696dfaa3f4840f29d81b9b7925deabad8c6d55fdd90e14677ed4337da78a88af
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kactivities/kactivities-5.41.0.ebuild b/kde-frameworks/kactivities/kactivities-5.41.0.ebuild
deleted file mode 100644
index 1e732d8b6460..000000000000
--- a/kde-frameworks/kactivities/kactivities-5.41.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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/kactivities/kactivities-5.42.0.ebuild b/kde-frameworks/kactivities/kactivities-5.42.0.ebuild
new file mode 100644
index 000000000000..9bc7ca2a1803
--- /dev/null
+++ b/kde-frameworks/kactivities/kactivities-5.42.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 4d057337999a..f9ec9243a897 100644
--- a/kde-frameworks/kapidox/Manifest
+++ b/kde-frameworks/kapidox/Manifest
@@ -1,5 +1,5 @@
 DIST kapidox-5.40.0.tar.xz 395756 BLAKE2B 89adbf55ce32a0a1960ffbfa7e4055ac57826beeb8a8a370f3e283892efb54ed53171c119907bfcae7976605b198ab66d523c5c039ea601ab77bd374d2359220 SHA512 267d96b874f51da99f10a220601128112c7907da2be317d0acbaed5be0530414762e8aeeff9560696e22b357cb3c95c3427d83b951217fcb34088f0b473926be
-DIST kapidox-5.41.0.tar.xz 395724 BLAKE2B dbb2946a258d6adf901d75d57a5f5b5bfa5ab132bd6263b29b993b75c9dc8fdcf2833763cfc93b32145cae7ec8119721cfc225b9060da579a3a74caffc67615f SHA512 27bd08f74a6c882278477eafc4e211f15d23eef29fc1aa72b0ec2e36672559d79f716ca0eb345227b17987a98f2e47c8083c2a48a2042708b0f25dd8ca422d25
+DIST kapidox-5.42.0.tar.xz 395576 BLAKE2B 7218d24593bb8c94593c3712ed0f804d8f62dddfb1b4718f2562e0d4b8f8c48e34d21d445d396f9b4d4e75985a237432b1999800e02810a1517ea1239887ffc6 SHA512 ff53ac2c4389146abe9c0e4e0bb421fe59d1f01542a4fb42179bcb3bdcf0ae96e283c26bc609214c3f6102c058a5ae78edb17c050b90952d445fc5a14ee48517
 EBUILD kapidox-5.40.0.ebuild 612 BLAKE2B cfb8751fbc1b5616aeb23764b5bbc36c2d4036d5e2f212a3309a00780a6714b195eac0a56aca21498e82ae98516f38ed0ce2e546cf6a3adcf9807a8ba2a3c862 SHA512 c4d49dd0e0bd0e87e1d365db08580889f9c30006e3eec33660b3abc4d72481a2578449efec8ec6a3e4352ed79c24669f902ba899269cadb0310069434062d2cd
-EBUILD kapidox-5.41.0.ebuild 614 BLAKE2B efe15a7f57f7f61e228abfb27be34f9e876b171d3a8b7ce4726a259b90e628f2a7fc39d0dab2f06163cc5c5d3bb5eedd1c9a834a7b6328499f1024c32d7ff664 SHA512 16614dfd8e429a658f46188e331858b0bfa93eb630ec2cc3440d385a292f98781795c79727993900e3a70cab91de8ae36f2e57513cc45d8eb719f5f7fce633e5
+EBUILD kapidox-5.42.0.ebuild 614 BLAKE2B e702f3dfb2f341ae8d628e9a81efa2759644adeb3532aaac4858b7eb049d006d333168170a072e3957ae122878ac99ecabe1d819d6d576280098a334a089775c SHA512 cfef53e48797b9f09c990a7b83a0486562fc4f61e136409bdb45deef19229f81d89c3793638fe051a81e017ff3966da9e9be249938271368eb8a2d88f7e99771
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kapidox/kapidox-5.41.0.ebuild b/kde-frameworks/kapidox/kapidox-5.41.0.ebuild
deleted file mode 100644
index 76dbe6925037..000000000000
--- a/kde-frameworks/kapidox/kapidox-5.41.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kapidox/kapidox-5.42.0.ebuild b/kde-frameworks/kapidox/kapidox-5.42.0.ebuild
new file mode 100644
index 000000000000..c0551adddf60
--- /dev/null
+++ b/kde-frameworks/kapidox/kapidox-5.42.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_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 ba9a5640fff7..69414fdc87bc 100644
--- a/kde-frameworks/karchive/Manifest
+++ b/kde-frameworks/karchive/Manifest
@@ -1,5 +1,5 @@
 DIST karchive-5.40.0.tar.xz 113576 BLAKE2B 92d90369c8ccaa819e1e78efabf7b7bf634de15281f5c0b78be084dea967bacf4a8102de3eb40673681860938c8cace0b96749f5f8f65f4b570b7cc93f250a7e SHA512 edffe71f985b0d7c6cc84d6549447734c717de9f8be4685badee47d94464cf29373cfbfc3662d81c9e0071321c50c4459840c316c08144972e1fab1c295d8a22
-DIST karchive-5.41.0.tar.xz 113596 BLAKE2B 2cfe57622d1eabc0713887712b5d337995c152b316b1f8b7a455c1b9b4db135bbb3f1098628c8891401a5088006eec2fced22bcef03994ef5c7bcf470d6666ec SHA512 fd28292b0076ef516ee695c057b026c3601386f1f4733f4ddc6ad21e416c27e891ffb2339f31100105834a84dc9adf4cef518d110e84f9f2d56ac92abe440f05
+DIST karchive-5.42.0.tar.xz 113488 BLAKE2B cb519d894d1fea369a82876532f709a54da1162a0d6f51f06c25c92b32a71bc2049b12c6d59ab19c45a7276d3b38ea222fb0740db3a9763bc694ed8ed654363d SHA512 4599c6e5018f51b84062fa84bb312f5461d6b7209b3e5f10e701ee7b7e9fe54b5bd2820de188e779dd70eebc73219ca47e7e14c994b9a49b3ca1f900fabe6e57
 EBUILD karchive-5.40.0.ebuild 562 BLAKE2B 3a8ceab91d91fa2dc1c11e22462082e96a5d574266d17220b1ba4bcf3542c3fd501c1cbc59f9a520eb0c9943bbdd935d18952cda9580e0c652da7b5feaf2530a SHA512 5937a65170ef8ad79b489e746e181c4dd0457ee5904be7ec438c365385569c67bfe631b4a795b08995ea607edfd3db7f96fb321544016b709436ec9b0b10250d
-EBUILD karchive-5.41.0.ebuild 564 BLAKE2B 14a886c1d0e5f47aa06e850b733467c21279dbfde498c7250a045195e7647e725369fcd79b7957dfbf25466c2f173f7b8e79c53ba4d652f573e0badfb91e2035 SHA512 6208c2d8dccaf07e31c9529ac2531fbff77ff20914a6732f290cbfb9bd4dd715db55d295a45ce5d5c702076de01115cf206bb3c423496c7e4f9e03d775a5268b
+EBUILD karchive-5.42.0.ebuild 564 BLAKE2B c69b255b92618918991a020ebba7e3edf1cf83661481c69f5e2e35bba27ddb14ab167c3f05bf601c21164554ef9173b88df823388d8d22f17cd1d1efbcad6298 SHA512 8e5254bac367ffdf036da94e4a445847a3a5cfc7d171bd09356513d4502d97ed4338b9d5d35cc1ed1a4109e5a9e512707b4a7acac4983f68a4693c1d63c8186b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/karchive/karchive-5.41.0.ebuild b/kde-frameworks/karchive/karchive-5.41.0.ebuild
deleted file mode 100644
index b3d6486e82e1..000000000000
--- a/kde-frameworks/karchive/karchive-5.41.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="Framework for reading, creation, and manipulation of various archive formats"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="+bzip2 +lzma"
-
-RDEPEND="
-	bzip2? ( app-arch/bzip2 )
-	lzma? ( app-arch/xz-utils )
-	sys-libs/zlib
-"
-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/karchive/karchive-5.42.0.ebuild b/kde-frameworks/karchive/karchive-5.42.0.ebuild
new file mode 100644
index 000000000000..2a172249f306
--- /dev/null
+++ b/kde-frameworks/karchive/karchive-5.42.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~x86"
+IUSE="+bzip2 +lzma"
+
+RDEPEND="
+	bzip2? ( app-arch/bzip2 )
+	lzma? ( app-arch/xz-utils )
+	sys-libs/zlib
+"
+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 e3a783ea14b0..11bfd09490d4 100644
--- a/kde-frameworks/kauth/Manifest
+++ b/kde-frameworks/kauth/Manifest
@@ -1,5 +1,5 @@
 DIST kauth-5.40.0.tar.xz 84900 BLAKE2B f0445740ec66abdde52839f84f7eb709f926ff1e678de8a0f0a5ee7e0c88f8c724255fe46a5281d1c9b3f4591eef6d210881147e3b81b5f64fe82ccd958b427f SHA512 912e45a18f98086a35caf7b65316e4fe0defbbcc80f334bcdfd146a398cfb40abe2aa6b358d2057d457a51ba9fb61b05b1319ca3ff00edea82014919f632116a
-DIST kauth-5.41.0.tar.xz 84928 BLAKE2B ee049d0bb7243381efe68204511d5e78dd7fc3938ff9c877df82fdbb3a8954bccf6a1d567b717227d3f59aae1d9561ad84d5220f7c37a93e677a1d3b205f9a5f SHA512 cbdd40ccd9c0cf067cb08b0db252f4cef1ea58a810246e232038caabadd92111e6b8cd3947f1591cd5e69e5ee00f8b9d93fce6ef0c063cb7991e0d88948d6bd6
+DIST kauth-5.42.0.tar.xz 84892 BLAKE2B b39a6e3942633f481785b4893269348a0e1933b56592fe357fc11bb37b96d1933d9fb4ace64a1bdbbd9c0254810e0eb479f238401c55ec9f9d19b064bcefd42a SHA512 68d9f5ccc14e368ebff6e7081eaeb6d1511fe2cf99146b87876fb94d9c4151764204b023c3c0d2915bee11e02a99d2d1a2ef332589bb027d9b0dd8bb5bbc0be5
 EBUILD kauth-5.40.0.ebuild 705 BLAKE2B 4103e98faf55bb587735fdd4cae05b1c1d6b4ccf0557dee96791979f562ebcaf7b8073653238be0202318ef7420f9cd25aa3053563822d33074a3f3f0bf12be9 SHA512 f679ef29e4e28f193f24a2cda2ef7894ef6f510f5f3cc1ff315badc1324090abef9c41d93875dc66af71e90cdb25f21426ec1217386daae31670881341ec202b
-EBUILD kauth-5.41.0.ebuild 707 BLAKE2B e74db012a92cbc06e46b4f3764885c63556188e402348016df81aaff764e321a63a8cedbb4ed37e265e86cfd7f88e34c30d2a8d851c87226cf7246d5ca6ec3d2 SHA512 0b2f7d9b553e19ba156fecc64369b5a6768ff4e9b7c94ec8c2cc808ff52ff33f78b04a39f031401bd05b51afbb0cfcb5ee051f79bddeb6300bf973053811863d
+EBUILD kauth-5.42.0.ebuild 707 BLAKE2B ca4e23e1948d087e5c6212679d7b0943a046fa44eefbc1d27e8413f8eca98de0d2002e677cde891f3a724ca3dbd19fe080c7890db65d9526cdddd449516dec47 SHA512 6035e9705c662791c1370b9d5f36a23f0e32ca5f38263d36977841ccb58eccca66226ca68ec40596a438cf4e13a69a73146e47ba19eab999d5dec05bc66db2e1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kauth/kauth-5.41.0.ebuild b/kde-frameworks/kauth/kauth-5.41.0.ebuild
deleted file mode 100644
index 4852c2fb783a..000000000000
--- a/kde-frameworks/kauth/kauth-5.41.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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
-}
diff --git a/kde-frameworks/kauth/kauth-5.42.0.ebuild b/kde-frameworks/kauth/kauth-5.42.0.ebuild
new file mode 100644
index 000000000000..ee6570cb1d6b
--- /dev/null
+++ b/kde-frameworks/kauth/kauth-5.42.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
+}
diff --git a/kde-frameworks/kbookmarks/Manifest b/kde-frameworks/kbookmarks/Manifest
index 43d0a98b00bb..8c3b232d7ca0 100644
--- a/kde-frameworks/kbookmarks/Manifest
+++ b/kde-frameworks/kbookmarks/Manifest
@@ -1,5 +1,5 @@
 DIST kbookmarks-5.40.0.tar.xz 117596 BLAKE2B 0ab2956369d9b76a02ae1824c064a5e3cc7c0e92b35376dd6205b3af09a1ac958e366a82d5ad41d9afc932c4ecd81fd9d29c386285988bbb64676b8129db3549 SHA512 b9adaab77f3104ffb0f470ccae25db75b1e73f54bbf49a5b8bdb7bf1271911c8a296cf68d1dc17a0b3e44e9fccc11e44ef2c90d2f03bd504488e2b6a832c097d
-DIST kbookmarks-5.41.0.tar.xz 117728 BLAKE2B 7697a27de66c0cae04d142f4099bca205ee8c1cd3c2468f8efd55726188751979a548e9f626781d0f3c4f3d53518f9c4aa697de87500a76c2d45822ba7f740de SHA512 3ff852733019099e7badd8647f8b58522877e3e47bb0a0e9edac210ea40590731cc801870e6c0ba2b4cbbc20673d13f39c558ddfd5c8ed05dec5de66ae5baa0f
+DIST kbookmarks-5.42.0.tar.xz 117964 BLAKE2B 66f6399e8f4c88d50d26719d0f93d7eea6d990041e63d6acb7d0d8af3f2bf2969901120c2e59aa83a7490b55151d9cff8239dd09c7fe42db960ad49d8412107a SHA512 88dc1b3e949a3907156140bd5c736750752d3a7ea5d582ad4423498ce14c190969d0ce39fa32b4f3701fd047b6178e4daf791fcb8ba51d518b41f3f3554c27bf
 EBUILD kbookmarks-5.40.0.ebuild 687 BLAKE2B 34a68d654c3201b3035972a7036f00c837dda3490ef111736d9e89fa0936d3b729ddb6159d41311a80065af3de8b9523eba3fb2f23d5688975ddd9b23d5ab940 SHA512 c872d2b2c485aba45cf6abc982dc656eaec83d4685444060b3f99fee97dc8c7cd6055da2bfde5def38dea5e187c08e2fab1c6b16eb81b61ab28f3db95a41e14f
-EBUILD kbookmarks-5.41.0.ebuild 689 BLAKE2B ec08e27175f42a3b6872d96b9a52f68b1960e6877ca7b32cab7f6e13d26019e0a131d64e9c7e122314c54840224ce87e9c4398e53ea7721ccb4c205eeffcf10e SHA512 7fa0476c58fae5d33950d464b2b2b4fad9fb410bfd4494f1c864ff6fde7a532a9192ce16ca9e13f59c666a55f9f0bbdfcc50bd77b0dd0415e25abd2525c48e48
+EBUILD kbookmarks-5.42.0.ebuild 689 BLAKE2B c11840739a9d33d45eb49ad1c21ed133bd7c6a57b303fef43e4a6c4198013bfa819f262eebd2345b7d3509b0d44667cb83a1a0b99895ea766d365102aa69c5b4 SHA512 df48f821747ba8ede0bc91fd79ecd91d4a49a20e269f9b2cc1fe5a889d7d596e3218333d62fbe432bc50092dcb515c5938c435ab4e43fcb86c250f74fcc4ae00
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kbookmarks/kbookmarks-5.41.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.41.0.ebuild
deleted file mode 100644
index 47d95581d0d2..000000000000
--- a/kde-frameworks/kbookmarks/kbookmarks-5.41.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
-
-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/kbookmarks/kbookmarks-5.42.0.ebuild b/kde-frameworks/kbookmarks/kbookmarks-5.42.0.ebuild
new file mode 100644
index 000000000000..763576f16e6e
--- /dev/null
+++ b/kde-frameworks/kbookmarks/kbookmarks-5.42.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 97d854db2efc..06b70a03811a 100644
--- a/kde-frameworks/kcmutils/Manifest
+++ b/kde-frameworks/kcmutils/Manifest
@@ -1,5 +1,5 @@
 DIST kcmutils-5.40.0.tar.xz 235428 BLAKE2B b466237ffd804f77a00c2f25af2f901dbd01b783c19408a3d42ee3272c6548e3769d7f42647efb1957a20e6f2c50733bcb524c1575594393414eedc111aadbf4 SHA512 d59e225438d8c43d3c62ed15a3cb38fc08e05a2af4cdf6c1d0100347dd29a1e34906447eb96f9ef4c50bcb81c76e62d951df7d42e30a6214e9db5b3690880324
-DIST kcmutils-5.41.0.tar.xz 236008 BLAKE2B c735b5cd0a983f612e6383ae3a68da6b1a4795c071a9c95481b98b2787d536e82bcbcd358361f27d86d24ed0c33b780035877553f5bca7c012a3eaf2262c00a3 SHA512 65c12664c93bb2405f9570db8e961149c019f28b50b145bc166ada20bf97548f334c1dfad401b57352fada5cadcfc34aeb3d23db84cbcbba4ab4b3355f3d24f1
+DIST kcmutils-5.42.0.tar.xz 236096 BLAKE2B 1fc02cb4d0c4dcb08160ebfe4b9d146c3551ccecd327b4640af8339059f173715851aa9a0a8cfc88bf60d1bb97db33b53d192979a5797d07bf5d5a4d2bc1df5c SHA512 4afdb39d17393d16de3dee72a990c1a3419cab6197cbdf3d545fd10fd079018d1cecb19254a8554a2fce09695d17983953647cdb0c1db343c227a05a683eadb5
 EBUILD kcmutils-5.40.0.ebuild 784 BLAKE2B 1910abdd4f3a8354176df78e0d73cca2c83fa06676b77a3dd0680637a6a0d8b077b16f56cfbdc9e1c43b085770411530c9e331b2b470ac02f17cbd6114b1e7ca SHA512 4f26d023f0a461e1b26b9fb0766aed16fe3f6f0c4007ff01d3868844d76704a756fddbe1161f234898803b488ff6e4ee6967541ad721456a91ce136a86a76f46
-EBUILD kcmutils-5.41.0.ebuild 786 BLAKE2B ccd50f2791ad9eca8260277d3d245b3176932101be7ee500c6eb27849993f6bddc518759454a4a99f5578463eea7eebc598c1ac334592790786a564e8721274d SHA512 021bd33e18128804c42c82b62846346d9db5e4257bbcbd43aba6ace93da8ef278fd97506f3dd7c745eefd8d3da1783ca61e208d5cc097cc6fd75d73037d31039
+EBUILD kcmutils-5.42.0.ebuild 786 BLAKE2B 7bb7cc7c96a7432a1145dfb4cb3891e8c11fdc05f6bf2f27c6c16c6df546c3e5bca7420b3a5b1f6905732f7cc44fba0700271635bc0152707c7f46232a290a13 SHA512 f493a4d18a82e702964c5e6f6a49dfd2e8f4a042ae05133b02d61a9f0ef9172411a07b054b30b4c46d194971aaefe04a4940ec6f7e0cd70540cc86044869a0e7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcmutils/kcmutils-5.41.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.41.0.ebuild
deleted file mode 100644
index 3bf55741864c..000000000000
--- a/kde-frameworks/kcmutils/kcmutils-5.41.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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/kcmutils/kcmutils-5.42.0.ebuild b/kde-frameworks/kcmutils/kcmutils-5.42.0.ebuild
new file mode 100644
index 000000000000..e6daae33a2d8
--- /dev/null
+++ b/kde-frameworks/kcmutils/kcmutils-5.42.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 27304b42484a..d96b41d31d4b 100644
--- a/kde-frameworks/kcodecs/Manifest
+++ b/kde-frameworks/kcodecs/Manifest
@@ -1,5 +1,5 @@
 DIST kcodecs-5.40.0.tar.xz 218852 BLAKE2B 9fc8fd30ac8844e13fb89e8e4cac316b2e4467bbcf08996c95c23c6c5875193a1fc3b1398ed06fdc6058d0b018cc192e07d36a3f1d326b90bf336d11c5dade84 SHA512 575872407dcc0da771a7c43e9a751793bee8ac7b36bf262251c00ab7f8af1bcebba3010c3b0a62eddd678b0cea4c4bc58fbcbc7f9382264a06c6186004d96aa6
-DIST kcodecs-5.41.0.tar.xz 219328 BLAKE2B 2aed16fb96ac51d24b5c450e2e1e83642e33aa0e098a4ce1a3b59c6c9105f2e124c22441816a925c07e95b06a47bba1944c86eed6bcd8ef6d83130454485eba2 SHA512 1ad2132ee20012cbddbc5281dbd88e41c0247201d6ff32580068842fbb6acec25b34d80a3f236799f9000ba6c5474858ed16ca1892bec45a54a395bd2d835793
+DIST kcodecs-5.42.0.tar.xz 219116 BLAKE2B 06576d95143f6fe00ad52407441d669d7def2d41927dbb6f4c5c0f991286dc4ca939d2205a9859b37fecc63ffd3371bba89a6626cc6e503e7633a68ddd1e328b SHA512 235c6b7b3a447b3bb87db5900048ed7bdb35b900c6ca486461ff01f8f2b020ae9757788d772bd886709b545be7d463730e143fa5fa91d08b8ec564428aaa3e58
 EBUILD kcodecs-5.40.0.ebuild 320 BLAKE2B 55c81622ef98d5981bba41416b08d9656c6ecb31bc19cbe2cb3be646f585f26749b4270dac5e6be3e99f9795bf743e2d7ad3558e958325219eae7c9c47502470 SHA512 12a6a85f861d51e6cf6174a2267eaca25067746441345aabb52adea5677b70e932d5d0400aed32587ce4f4732577c82d6508df819845274232e272f7f8e710bf
-EBUILD kcodecs-5.41.0.ebuild 322 BLAKE2B 711a77b7a8c27333aba3182951ec81054dd3b966c438af2dd5964a6d7463c230121e033c031d14642055ef1296f18dd7017b26a34326d71c07035a374bd4b2de SHA512 8a137c09d6a0e303145e78bb178c55f042a1da00d8920f2d0c4ba523485eb6d2012fada88645ea6519639fc0360238c42602e0d6046899175af5234944e01976
+EBUILD kcodecs-5.42.0.ebuild 322 BLAKE2B 20b8d5d6dc57f77cbce0dea110769052685c76a298937ad677aed56ca6c73be00f5c03b987f16b116afdf1529e5ed48ffbad16484f3e8c2cae5ffc0e4abc2af6 SHA512 64c4a38d03fce05a49c35905016858a78ed98c5e614e3e0a1d51adc2e7f61ee2e256c44ca8c3ad900a61d423dc3c9abd99b980c8db6bbb3b563028a7db770b6f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcodecs/kcodecs-5.41.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.41.0.ebuild
deleted file mode 100644
index fc57f8bf6d61..000000000000
--- a/kde-frameworks/kcodecs/kcodecs-5.41.0.ebuild
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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="nls? ( $(add_qt_dep linguist-tools) )"
diff --git a/kde-frameworks/kcodecs/kcodecs-5.42.0.ebuild b/kde-frameworks/kcodecs/kcodecs-5.42.0.ebuild
new file mode 100644
index 000000000000..007c0d0de0b7
--- /dev/null
+++ b/kde-frameworks/kcodecs/kcodecs-5.42.0.ebuild
@@ -0,0 +1,13 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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="nls? ( $(add_qt_dep linguist-tools) )"
diff --git a/kde-frameworks/kcompletion/Manifest b/kde-frameworks/kcompletion/Manifest
index 0442cc9239e4..c87b0693db7c 100644
--- a/kde-frameworks/kcompletion/Manifest
+++ b/kde-frameworks/kcompletion/Manifest
@@ -1,5 +1,5 @@
 DIST kcompletion-5.40.0.tar.xz 118516 BLAKE2B e4cd2965f69d5d48b846af10cc6c3a1ba6041f5df5c6db4ea2885e14764f2b31811f3ca0b12e0c74253e9afd7942fd144ff6e6c2dd355e4fec07e73073ad6d60 SHA512 ffd59f3a9803856f43e2c9e7c125f789fe4ef5d261daf05e02c4f95df121b5854a1ac57d1249e734180ee205b49a742a717aee9572f5a69eb104a11aaa839b64
-DIST kcompletion-5.41.0.tar.xz 119060 BLAKE2B 64dddf596a26262ed1d1f0357763727926470cc77a2e86691ccee8fe99e08c72c5e05affeeff1d437dbd1eaa13b5268f41b8a938836f6e28d7ce0a2a69b71ac4 SHA512 5301f19fd2d8b18652b5ec1d0484514cbc696e7cbc747f4e71dec66f801c42c80fede9809d917bda89a074b4aa5ebf1e2b6e49541df5cbbce0306e2e79b4aba9
+DIST kcompletion-5.42.0.tar.xz 118988 BLAKE2B 10d84cb3728f3bb9edcb26c2f2304522fe89dd1af68cd9491e84c893113614bb8ac404dbe0e1c6da8928517d3f913be47cec8abab4043d2d14027aac20b4bc99 SHA512 b40a4e00b9c49747e7b530d2d56d66d50c723608d4705936ffb7d846450fc943069ae3ae89316883e1ad6c64c66af6cffb7bcf5e6b65fab0466629174547aae5
 EBUILD kcompletion-5.40.0.ebuild 474 BLAKE2B c0ad60ca1d0228b70a95bce882de7253a1228715c3d276176bca9facc9bbbb4c564866c0a209391cd59eb83692e322e44b9267687dbb4fb59ab3b1371a922c86 SHA512 8f9d60ba0b9ee172547b6fb4607b4d9ac28b55630a0fae3837b6e8817ae1eeb97d6382163f6f5a7b0312fdc299364e9be0bfccacac29396fb4547b6427b93e90
-EBUILD kcompletion-5.41.0.ebuild 476 BLAKE2B 33bae9365c605aca597ca2d4188fb53fa2036a0cea6d160567149655a7e7de7a530335d60734adad9cc343e4100097de8e6f5ede16ad70f59240664a7215b738 SHA512 fefcb7f798fadb5e0757a549aeeac511d31575e90c4bc63460e534083a7f94f98128a24459867ea3fce10ebdf8cdd38f505e400438b840ae18d1f936e0d3b0aa
+EBUILD kcompletion-5.42.0.ebuild 476 BLAKE2B 94c0be2d8e1306f28e3b8467b20075ae88a23da3f0467ed9324ebec6446495e7fb15e6132f04b3acdf6ac4ca2ba211933a141819fdc19c42687ce0648d31840d SHA512 7304e20bb9bf338ba133d25525348b791d9d7f388543a932dd7c16726f57c5cfb53b74ca4d77e699309522f989085b8048065c04065aa365b8026f9d678ac311
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcompletion/kcompletion-5.41.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.41.0.ebuild
deleted file mode 100644
index ccc50ad4d14a..000000000000
--- a/kde-frameworks/kcompletion/kcompletion-5.41.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=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/kcompletion/kcompletion-5.42.0.ebuild b/kde-frameworks/kcompletion/kcompletion-5.42.0.ebuild
new file mode 100644
index 000000000000..89c636704e5b
--- /dev/null
+++ b/kde-frameworks/kcompletion/kcompletion-5.42.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit 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 c7fab41ddc45..a2ebf02b336a 100644
--- a/kde-frameworks/kconfig/Manifest
+++ b/kde-frameworks/kconfig/Manifest
@@ -1,5 +1,5 @@
 DIST kconfig-5.40.0.tar.xz 234752 BLAKE2B e71f1e29d5edf5b5d0948814abd4735a1287cd5ddd164a563fecae18a976265c656a003f313bb9ed800e993eadbf343c94056cb3056f90538c65f3b9655665ef SHA512 c61f86144af8aba52341be2f2bd80dfa4a3a68fbf7daf65f49441c9ad00385080e161965bfbdd190e52cad023e8b7774bfb9e13546a9e909cc09de15c55fdfac
-DIST kconfig-5.41.0.tar.xz 235148 BLAKE2B cc223a022e80afdad8fc7163c2c3d5ca7455eb9a94b17514590ef73db79297a250f4a446508a9bc5f5e1f82fc9fcf83c40d7b2e91d9428f705bb77efb27e04b7 SHA512 966f88c7c02390551cdf072159cf7e224719cc7cf20f3bb90acee7fa46a82b80f64a3c4c6bfdcdf779451f2a42e92ec51212cf8442bd360fa2ac30dd1fa3487b
+DIST kconfig-5.42.0.tar.xz 235412 BLAKE2B fb7d1ab853f430e843a3a2422b0cb00fde76c7f1966c8fe6f3c69ddaaa88ffb50b4b2eccf119b66b0d8c7c4f835f40f30221d63db90d00ceffb03fdbebe07eea SHA512 632b1acd159353ddcd6a7715068997240690ec6352fa1f5164f1c2cb4e34ff0b8e4a0e8e677987b651ba12b9cb7b46f3768fecc1c7714a3dac9167bf689791e5
 EBUILD kconfig-5.40.0.ebuild 517 BLAKE2B 8a81dea47dbf3969ea65d736900ccaf07f5bdeeb39a018c17cf1ccc900af4356ff26cf9124f66cd8019e80d7302cf472f64518d0ae31b53a6307f2661425c0d1 SHA512 4ca432b092994c6ee01c2de4991f0a76fc3db959b7f6fcea15c64e79cd50447dce0c27cc880a2d463b11ff602ea70a005829a574a1c8dc72aa5f3248d1147422
-EBUILD kconfig-5.41.0.ebuild 519 BLAKE2B 90449d94869f68c3a0fc3a9a2a066e50b25a5a61f154718a26c352eec70186fcbcc130bc3a4bfd60b82e93b4ef9f92d211ae9acfc258022c760334bf8245fe16 SHA512 82df839ab09d3dc5aec700bb1de929a184103d4a59e278d22c8f489250d5fb4e373c6e4147e50af6b8b3f7fa18c85669fbfae2f2b5659247f7cfaa48c72a2582
+EBUILD kconfig-5.42.0.ebuild 519 BLAKE2B 75c292f0deb2722661203e0e6ed992a00efdf2f06dd7067d34373318306cd48a306650dbcc0c01a3751625b773795a48c2ffd4cd490354525ba273022e803b7a SHA512 1cd9142d8005378bb724a927db5f70bcfc0d79e73bbabc34f1eba8133e16fec859647483f8d32f4b5f92ae40f0026a19188359b41c30cd9bbe99f402a8e0c873
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kconfig/kconfig-5.41.0.ebuild b/kde-frameworks/kconfig/kconfig-5.41.0.ebuild
deleted file mode 100644
index e8447d66f025..000000000000
--- a/kde-frameworks/kconfig/kconfig-5.41.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kconfig/kconfig-5.42.0.ebuild b/kde-frameworks/kconfig/kconfig-5.42.0.ebuild
new file mode 100644
index 000000000000..9701c9a50636
--- /dev/null
+++ b/kde-frameworks/kconfig/kconfig-5.42.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 3c8f6c991c42..418d2bfd0fa5 100644
--- a/kde-frameworks/kconfigwidgets/Manifest
+++ b/kde-frameworks/kconfigwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kconfigwidgets-5.40.0.tar.xz 375048 BLAKE2B 597608e9bde4d2552d1580b2fc9821846744af3cc3536c4f393daeb9707645e4ecc87db8950f80e6375887119d1e64c0de651b0901063161504f02016184acf5 SHA512 af8cb1aaddb69e21e6b0dcaff0caeb5f0e81d3b6db9b34216011f82872fe129cc5029b84fa90a54194d2c4270e35f868b24326e86a2a776e9e73b985fcdb09c3
-DIST kconfigwidgets-5.41.0.tar.xz 375572 BLAKE2B c5fe2249e3a97496971766703058b7c5d4116ce20e5d5ecbc96db49283eb26a6fd9d5d2bcf17df0f66d230bfc1e138bc8fb6945a329f2a2e84610e2be5a247d0 SHA512 58e9a86211832694b920680550b7ba61769bacfd56cd6469aa6423504a9a72bf3c0f0beb04bc64cc1a852590db74589195477b57ec1ac55111267046031739ae
+DIST kconfigwidgets-5.42.0.tar.xz 375376 BLAKE2B f7ef04f50eb80bd3e01d6777eaf666d18fb8ae2a81dbd7a5cdf21f6b0929b5036b3b23984f7491aa57dad27db47a01dfe41f4cf912b4f00d34b6f60df5683eab SHA512 92a8b68be081cf40a54b7993cd9f0ba9f5d9a9170b3b13f8fb211f8770c0e2b5131be922f79d5e14157f1e655435a4f4d786426dae35c37dd69b52d58cecb62b
 EBUILD kconfigwidgets-5.40.0.ebuild 786 BLAKE2B 862a55ef8a1b0d0c8ff6caa925afac316aa878410d8506cc127896082aaa59fd1a6e2ab978227d669f7d00cefb0cf58973b6c7c7f657c0150975a437f2d1d984 SHA512 50387a362e040aa927a8ba71bcc412be63bdab0e3436ccacd7e4d96210b8ff023b7be991519caec88263f0ceaeceb43e66d862691fdf404dffca31cb26ef8fc0
-EBUILD kconfigwidgets-5.41.0.ebuild 788 BLAKE2B f932f8f9dd534943c857e5f973a3947dd8b1cee1b161d78ebf506aa65a6007568f2a7aaaf5384e21c11e2650a1dce263ed8e0a36ac89f49838bc0caa2d42abc2 SHA512 41f9071de38185bff195fc2e7942c8d0e14e256d475b1e9e61dab77d288c5c249016eedde235c0759598187b860fc8c44eded09b1871f1ba735f14924795c12a
+EBUILD kconfigwidgets-5.42.0.ebuild 788 BLAKE2B d57e6bf1c8677c3ae022a7fdb965e8653c844cae7770b18667474b3569ec0d05b47eefa7936b4f188bd8c7d42b0564cbb2ae744aa94bb81342c31b6a4a074a4c SHA512 1be37951043db369624882c37ce67bc89f0f6d85dc6381bad17538d762c234d96775093af834cb53b8ae5926c0a354acd1627e10f8f7c71eb716899d568507a4
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.41.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.41.0.ebuild
deleted file mode 100644
index a979d71e04be..000000000000
--- a/kde-frameworks/kconfigwidgets/kconfigwidgets-5.41.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kconfigwidgets/kconfigwidgets-5.42.0.ebuild b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.42.0.ebuild
new file mode 100644
index 000000000000..1c61d3a252eb
--- /dev/null
+++ b/kde-frameworks/kconfigwidgets/kconfigwidgets-5.42.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 9282c15c9101..3a887e6a21f6 100644
--- a/kde-frameworks/kcoreaddons/Manifest
+++ b/kde-frameworks/kcoreaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kcoreaddons-5.40.0.tar.xz 351348 BLAKE2B a999b49f5a184a4d1ed012fd7f21bae73c40614f9ea90d5fc19454b2134f2a79cbfe10c8e6d4a91f2951d055c150df3a8e1636c0de4d8329f41775684b9b1436 SHA512 e003cd743db0b7843f0cd293e73f1868123549d8872149e46d8d8a9733370642da0f0ec89c3794b1bf372d52e103612893875accfc954e28400088d4f3400572
-DIST kcoreaddons-5.41.0.tar.xz 352660 BLAKE2B 4bb14a133af64d53377c27d31c5919ff42028b1884364ebddfebebf69393209dc8cf9e654fc5209223ca5a97d258fa9647f886fe1b11d8fd6c9fbacdcbc18b28 SHA512 86d6943c303786e4c7b5ea3e2f5c17dae89152597e305316b5e5977e7a037727579a25fd4d6e6f8c272bcae24af5185b06d87189a0a6a8ab8b8232cd059c030f
+DIST kcoreaddons-5.42.0.tar.xz 353800 BLAKE2B 6f3bd8a216683cc99908588c5d1de90903cd5b5b187f34e1bf2cfc9955b08ffb95fbf8508dacf0e8a69924cd3fc142a2c75d2f93e9614ace7e24ef43ff95e004 SHA512 b92fcf79bbe4c2549c22d3eda457733a22f7df33838c63f444091168de6325efd6273139cee4ab372f7d51a2e9a24112f1ae899489b52c5fedfbd095292c3205
 EBUILD kcoreaddons-5.40.0.ebuild 654 BLAKE2B 504c7efe326a062f1385b2130376207cfcddcc141230387a25a5a94966a2e82564a02a4b6efe739f619a3374cdee2ae5b27dbcccd92f2e12331647814b98af83 SHA512 7b5df2f5912922d9c903a336d8867e322f38753127d1ecb180293899c9f3ce98855297e5b9366fd4f7e3c5c6be5f13242e52eaa3bc8f50c40b0eea06afe40787
-EBUILD kcoreaddons-5.41.0.ebuild 656 BLAKE2B ff0733bcd8d8f7863bad6ba70e714010167071ac72dd4c35a93c8a2343cd5b3e603b4636886271e1535850c58f60eb28707fb1f557eebcbbaa2275d205c674db SHA512 146d4cc921e2e7efdb4bad39e3574cf6bd1071af38ae28846c705722b9c018f7b19c9665703af3d3d8ad7beb003672b4f65856335982558cf27c7b632afda7e2
+EBUILD kcoreaddons-5.42.0.ebuild 656 BLAKE2B a26a468dd1987defb8f253907d85a1b3bc89978b03b03b56cc8fd116d35d27685c018d3d85f2a05c540cf3d34f6d824b0c6c7fddd7e1954986d32c720dac648c SHA512 d7fb25de5b2b4e057b24e3f97e1e5f0be3f53aa128724c982fa96aed94d83998e06c6e8834a69b1ac409019ffc3072e017e8b09c8ee78e961d1c390a45d2675a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.41.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.41.0.ebuild
deleted file mode 100644
index 08d8f6b52cee..000000000000
--- a/kde-frameworks/kcoreaddons/kcoreaddons-5.41.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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() {
-	# bug: 619656
-	local myctestargs=( -j1 )
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/kcoreaddons/kcoreaddons-5.42.0.ebuild b/kde-frameworks/kcoreaddons/kcoreaddons-5.42.0.ebuild
new file mode 100644
index 000000000000..3d7d47b799a9
--- /dev/null
+++ b/kde-frameworks/kcoreaddons/kcoreaddons-5.42.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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() {
+	# bug: 619656
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kcrash/Manifest b/kde-frameworks/kcrash/Manifest
index b9fefd85b6ec..702f836d12e2 100644
--- a/kde-frameworks/kcrash/Manifest
+++ b/kde-frameworks/kcrash/Manifest
@@ -1,5 +1,5 @@
 DIST kcrash-5.40.0.tar.xz 21700 BLAKE2B 818e5f0fbf13a084cf42ef278775e04e8ed6b9d625f8dbd0e64dc18c4a9cf74c5d2bbe92731b18e4bcbdc5395877ada20783af9013396e06eba10979b791e815 SHA512 2440b64e5ec6dd38682a9d7fa92e112faa41c6190faae42cb291df4fe8c77ef4013d06a333a997fa25fe15ca2f8dc1bed36973f7ef44d7bc2b59c3bb9427403a
-DIST kcrash-5.41.0.tar.xz 21688 BLAKE2B 477b3df81dac00a744b15b7f08f255c05faf9fe9989ba2702bace3051d9386064ba20f883900af4a9243ab817394c25c6dc1da503adf08f12d4cc33a52a5c52d SHA512 ff21f33d14813aad00a2cc231cb889eb219555ee0302a3575d0ea5e237d7b5d6b9a50c354b289b087ccbce9bd4b5c76e8c94e7bde6a00e8148c63a13e79780ef
+DIST kcrash-5.42.0.tar.xz 21768 BLAKE2B baa49a533baca10866a96985ff928e415710c23c55b59631f75f53d4d205b7c9b5a852295bfe213d34d4194bcf3ffce49f94ee27df3426d41b40cb65d17a39d7 SHA512 f7cc51aa370f5bee09d8e005cca11b097a7091a21bf946ca7879de81557298b019d99c27ece12539727674fa200f315c08382fa01bfc6861f87a558ac475c95c
 EBUILD kcrash-5.40.0.ebuild 608 BLAKE2B 127632b4ff23ebc1681df8c921467e9883a86bdabdaee25c6d72a84a4853c6a38fa6ff1f6d6033d9a9baa8423bdf216f83e33c384e65502d56bfda84f027fd92 SHA512 2c9e40ddc9a54eb720bbb61ef0d580d100d4e34d810316f7427947925892fb792632550445867c0f8efcdb100a8d2770db490675663d4aa4ee2927b7778571fb
-EBUILD kcrash-5.41.0.ebuild 610 BLAKE2B bdc5a7feab8b69d1413a4654f0b5f0122e8c1bdb790ef7a1501296ad6abf99e3ad7b104c5b579eeaec794a1ca79f8a8e001aefbdf8d0b29579f9f082838aaf64 SHA512 c599035879d1bcd3069e6f5528c782da942e95be8bfe0a5fdd5fcaddb3d676c4aad0b921ee4167c23bb3808523ae54dbdbecdc3568f6e36c61f90db63058c5a7
+EBUILD kcrash-5.42.0.ebuild 610 BLAKE2B 25897f27b4553d1a2c8be4bb69f3fc80e7bed3fbb3c6b02ba9b7930d93d32cf628f0438a955fedea07c4edd8cd410654395f010485a677dc8dcc0274adde28b1 SHA512 06c1bb6644b31a09d4de449cb7e012c182546c8d2accc65675f77e0579a475faef24f17bde8531a39af058566f3e4ab2f8db746ee96665a6e00ce6e1f06ff990
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kcrash/kcrash-5.41.0.ebuild b/kde-frameworks/kcrash/kcrash-5.41.0.ebuild
deleted file mode 100644
index 6fa9f34fe4c2..000000000000
--- a/kde-frameworks/kcrash/kcrash-5.41.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-proto/xproto
-	nls? ( $(add_qt_dep linguist-tools) )
-	test? ( $(add_qt_dep qtwidgets) )
-"
diff --git a/kde-frameworks/kcrash/kcrash-5.42.0.ebuild b/kde-frameworks/kcrash/kcrash-5.42.0.ebuild
new file mode 100644
index 000000000000..48dfa9269f8b
--- /dev/null
+++ b/kde-frameworks/kcrash/kcrash-5.42.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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-proto/xproto
+	nls? ( $(add_qt_dep linguist-tools) )
+	test? ( $(add_qt_dep qtwidgets) )
+"
diff --git a/kde-frameworks/kdbusaddons/Manifest b/kde-frameworks/kdbusaddons/Manifest
index 30f08e36de1c..8a777c0c59d3 100644
--- a/kde-frameworks/kdbusaddons/Manifest
+++ b/kde-frameworks/kdbusaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kdbusaddons-5.40.0.tar.xz 36160 BLAKE2B 6814bbc026e3abc06fbf70e5f71529231b373c5fefcb15eca9c61fe7000662daa6756201d8620ddba6fd4df38e46f6b2335161ae075f1c2444304240cf9c2a87 SHA512 439c0baa9531ae93606e24dcdbc1fbda4a04032ccdcb2c218c0e12f97c34a0b9522bde377f0763d800f8b17ca41b6893f3854d7e8c494ad2809f493023368a7a
-DIST kdbusaddons-5.41.0.tar.xz 36416 BLAKE2B 3b5986c59a83fc78bca01ef067d92637c43bc090ebda17aa0bb8a5dff60668a45d2cd7308de3b3d1ead520b1c55f8d683f502fe2ad85227d1aad9a392b5ed343 SHA512 52323367b827268e0ed8319184d93066663bbe2b44e1f72833107f8c695ab0024a6c9bbff1fcad66add79d341fe22085c07c0c5f4a0032f0bb3bf9208d95732d
+DIST kdbusaddons-5.42.0.tar.xz 36844 BLAKE2B de651c701158a17f0173006a3e301a29799b8db386087d4f952faa1ee1e08498d69ee700c5abf5c992848e0079c8807bf0375abdb74d53b4e199b593e8276b41 SHA512 41b9ba48d85a21e204184c78cd5a006c002592448051e0d23398aa3ffc3d9c0f646d21e4c1e541c2fa04177956e69eedc41ed62a26ba9802b2957ce9426ed23c
 EBUILD kdbusaddons-5.40.0.ebuild 554 BLAKE2B ca49acd0836bf2af5b7bf803db5afda0e5c80370c041b5a7b67ddbec8be902bb83edde9697d2ff89d1fb11c53948ab764d66f4ac8e41d7f9699c2fc8a0590a16 SHA512 ba286a42f176904f7c4610e9d5fbd949a65e5371eb9197fb77e05f8b58df62473eb9e88bb56bb19002c1b29ec1e5132cceab3bb631bdce0e008658872ad38082
-EBUILD kdbusaddons-5.41.0.ebuild 556 BLAKE2B b3eef0b2b883d966f7c0b526488bf1a0359a3f648bb63cded0714de35d07d674d00318fab3364e79f14e570c05794375d816c0bc7949224222f0faa6898adb8c SHA512 b0bc4ece2097e65ae84ab5920362223584534f051c84fc363c9c1dae1ef0b6257962f5b4680fa49ee1408f7983bab22aeee6ec3cff93d13678615fe980cfbd6b
+EBUILD kdbusaddons-5.42.0.ebuild 556 BLAKE2B db32605b1f65dd47933ec1d56992b083a747e0266a8b141cebea4d329a9810fef15049b1b92c821506143086c1a7bcd6cd5fe54153ff2f311f8c75b926f518f5 SHA512 3f0dc6246596332bf35ce927473d218ba0b633bcb4d593dcf3bc170631000a59c639f5566e3742a58d6195a95ac27707ff82e981f5de1173e0c9b518f43e60dc
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdbusaddons/kdbusaddons-5.41.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.41.0.ebuild
deleted file mode 100644
index c817cca4406f..000000000000
--- a/kde-frameworks/kdbusaddons/kdbusaddons-5.41.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kdbusaddons/kdbusaddons-5.42.0.ebuild b/kde-frameworks/kdbusaddons/kdbusaddons-5.42.0.ebuild
new file mode 100644
index 000000000000..0bc5ed5c0fef
--- /dev/null
+++ b/kde-frameworks/kdbusaddons/kdbusaddons-5.42.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 f803596987ed..24d96c6ad946 100644
--- a/kde-frameworks/kdeclarative/Manifest
+++ b/kde-frameworks/kdeclarative/Manifest
@@ -1,5 +1,5 @@
 DIST kdeclarative-5.40.0.tar.xz 167988 BLAKE2B 1d5582c1df506401ba09c60f3e41b2628e09c028dfea7b967cf021cb6a4926766332ec78f59edb703b5d77e9827c69f97b49c7f5e2cf19248aace8df4e3433ab SHA512 b934a4404717d2c47a28282937ef04e724e0b492e6838974765ccb3cd1ba62ac2d598c5e55e4e6cdd7831f521ae95c67dfeaab04353b89fb46393d9610d65e66
-DIST kdeclarative-5.41.0.tar.xz 168424 BLAKE2B 01bb5612fc38c729ee3575b5949c3ab93beffbc605ff962aca47afae77f7e34702776228ae5f6e7d8ab4a4bd49a8b1dfde1ae1b35d36ce49ddff3331ee63162a SHA512 e52cf32828cc94132b07844707ca3bb12b87457aa4978380e39655206164002b889e5dfb49151a2c6717a7d65d273f259eca7e35147d12b9c46d0755c6cabea2
+DIST kdeclarative-5.42.0.tar.xz 170928 BLAKE2B edc99a7594952c5d69d8dec05cc41f0422a25fd1811343e13d61c2a953e5f03659ed4a11666523f0c83b4b593b3810927bc2d94199bf4bbf31232425938e5ce8 SHA512 da7feedb87131bbee2e526610dcd97ca557f5e4d0143e4664da2b210c727e85d300a768392f27cd115e9db750d34d7c524720ad39e84ec12953db653f832efea
 EBUILD kdeclarative-5.40.0.ebuild 838 BLAKE2B fc7ef1b732dbfd16c3b33cd00e3656a18e4507fd4c468be2439d9548869f435bf10f573ecf27d721b27fc5c458c0acd818f559b24e172dbd146e5e44b76d7987 SHA512 adc429ba03e96a2431dc01b76f20370945fd2867b10ebcc4a4755f1831081bfa5eec53e30ea095568ff0f20f112aa06dced6629184b6efb2a211ef3b3fb57ff0
-EBUILD kdeclarative-5.41.0.ebuild 840 BLAKE2B 62aa0ddc8795a410a2b1e21f5a8a3f6c777466571c59b785c4b20d1e4489433b6254962004cec6674535371da7d6198bc21f9df1f5137bceeef098001421fe78 SHA512 4bb6980290a2000aa7a39c983495bb85c9e5149826ac47e74a46d1b7db9f61aac5453e39b1bb750b7ed3233a99a7545057c80a5cdf5604d7418ca5d68b290e3d
+EBUILD kdeclarative-5.42.0.ebuild 840 BLAKE2B 16f715a30731c95e086b8696ae24878e937269cff42708695179ce5a1da301b8a9ea4700297cdb770c7f81d42a615386342bf77fc59eb1b6d3502718e2969343 SHA512 8c6273f399059726636c5bc960ef7aab80770b7f33afc8d04ed7f6915268fb0a060ea6c8dca35a76813fc0e138d7273ed06e2fb2670f9e450185d74e48a39d27
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.41.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.41.0.ebuild
deleted file mode 100644
index 0414dbb62394..000000000000
--- a/kde-frameworks/kdeclarative/kdeclarative-5.41.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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=""
-
-# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.8.0
-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 '' '' '5=')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	media-libs/libepoxy
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/kdeclarative/kdeclarative-5.42.0.ebuild b/kde-frameworks/kdeclarative/kdeclarative-5.42.0.ebuild
new file mode 100644
index 000000000000..4076d6e93916
--- /dev/null
+++ b/kde-frameworks/kdeclarative/kdeclarative-5.42.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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=""
+
+# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.8.0
+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 '' '' '5=')
+	$(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 aa3847fb74b7..6ade87435e95 100644
--- a/kde-frameworks/kded/Manifest
+++ b/kde-frameworks/kded/Manifest
@@ -1,6 +1,6 @@
 AUX kded-5.40.0-obsolete-dbus-calls.patch 2320 BLAKE2B b117043acb993095e9519c651b51dea2f33d326fd72793c6429062fad6b18f83bbf2f02c3347a75a6fb9fca2f19a844fc9e48e7478259dd01aaf07cc57f9cc5a SHA512 23cc995c40ace5f1a9d6156d229c68ad3fd590cbb7f6ca58cd2a1a503acf8852b786d4d604ca2e9b8a5e4722e2a7f9179b4c27e765339ac5d1d3e61e966420ba
 DIST kded-5.40.0.tar.xz 38152 BLAKE2B 12e23dcf366fac8714abbfdfe19cac818f5b127b4d44e142363c6cd005924b14237420352314bb0e6f95b9d990b4844ae0ead4a511df46f5316483892a94ae73 SHA512 559cc4bff3d18104326fdcdb35eca16e36b06c6a8547e77ac78833931f32f22c8497e4db08434bf889a7cdfaf72affaff342487e2387748705b49b6feb9e30a8
-DIST kded-5.41.0.tar.xz 37908 BLAKE2B 0e921f1c09b410e2147248c2f8cc9f5381bfbfc0aa1750439158369d5138a04b834c4a9fbcb82f00403d7f533ca01f261e34c68d8bfd1ea71b88bbd8bca93bfd SHA512 d904f730ec15c04bd4db0c628c3112da942c46923ceb93faab2c14c049ac7f3f3e9955c5d1a4c16405184662f2170935141ba01f2e76f1f3e9367892fd54d7df
+DIST kded-5.42.0.tar.xz 37744 BLAKE2B 59b9aa905d379f45c3b5c80522af158cb701b65cc3955fc87842d6bb680b90afae98ed01c93970df878919d98eb842fc6cff37fd704fced58a65163d7b1931bc SHA512 4be85b01fedb05f864d2711ebc5fb85d769a10cf7ca5e902eaf633d6fc9e574a771bd727ad4c94d25d2b18f8d3fed7d6f004ecc793fab612bc714e775983d073
 EBUILD kded-5.40.0-r1.ebuild 786 BLAKE2B 9d2ac90bc4c0ded693829c5eba8e7b89666d435140783eb0fbed84dfd6934476a748acbb5f0cedb0e5866b6358c92fee00502c5893e1d70e257422ecc91c5609 SHA512 c4f6d7ab6758c88918463919edfc4d5160977c157201af5cfd8dd27885b06bb331a207bfbb3c28e918d951de330754feb31d7d26f0ffea5815c0e2041c3fd6f0
-EBUILD kded-5.41.0.ebuild 730 BLAKE2B 7393aa446f52c6fb54fad5c6222ff5b5d67d7f6f48443a8a0b25461af3eda2b0237a12c191e22d259f2de9754d874f4836b0bb4ba7feee0d9db28713e96cb766 SHA512 d27b0c628c386ee6671b85b8fc075ae40aab27a064dcf86329bb83237254bceedaa9ff372c6139bb9f53f8a80d86e76ea708582253062d3e2b686b888504f2a8
+EBUILD kded-5.42.0.ebuild 730 BLAKE2B d59c107719ae86761236ff045fda245eed71eaa0593b28e27318f022bc1e2187248d6962a1180977be3bff1a8f7682015fc927070d950818c0f0d5424f2ff8d7 SHA512 a046039d2414126ff57beca58b0bd45f5e2da9c81641aab9b04137114f144c4c337d2a6c0b276ffc6cf20c3a0a125e85ee8ad831905cc5de78f1d8b4f5e84ff8
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kded/kded-5.41.0.ebuild b/kde-frameworks/kded/kded-5.41.0.ebuild
deleted file mode 100644
index 7eb1ce3f4ee3..000000000000
--- a/kde-frameworks/kded/kded-5.41.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kded/kded-5.42.0.ebuild b/kde-frameworks/kded/kded-5.42.0.ebuild
new file mode 100644
index 000000000000..56820aeda550
--- /dev/null
+++ b/kde-frameworks/kded/kded-5.42.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="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 7e8a8ba0fb8f..c44566a374dd 100644
--- a/kde-frameworks/kdelibs4support/Manifest
+++ b/kde-frameworks/kdelibs4support/Manifest
@@ -1,6 +1,6 @@
 AUX kdelibs4support-5.40.0-libressl.patch 8790 BLAKE2B 31d9bb613f355716990b0d332b1bc601a4f29047fadd867e94b430552ae2d6654830b7383d81d34ca5ec8618028a611655f20eb32fcaf1adbc796ad10121dda5 SHA512 a6c47354094326a0c665473a563bd0c24ee74ca5206bb6fecb661723cdddbf65c2d39860efb91f401fbb4d723638dfa89cfc20fe461ef8d4beb0c233e5b4d200
 DIST kdelibs4support-5.40.0.tar.xz 3341884 BLAKE2B 693816728db15b9e8d28fa2c01634083d11d4b3da942fd06606eaf7715e75ac14978bb9020df37ae154e4dddf740e0672fc90f561f2d467307a24f0362bb282a SHA512 ea6758a42d993af312f0231c75b77f00c0a4938dfd8efa82d443d60e553865ed59621413a651aef1443ec1d07bcc273532b11f1699382b66c0ea91e2bfdf94d1
-DIST kdelibs4support-5.41.0.tar.xz 3341980 BLAKE2B 9ee78a624bff5a732e18b286699e128ebcbbd6d5a5ea8c6fd0072043215078ca23c14369c815667c48d20e6e62568afcd1d69ca479205b3247c43d95b373f092 SHA512 ecda32a36099bc6b7fcdb56a7608cabb20fd30ea591a47c789b499924c7beda37f9479b8321d5e0a09094cd1274060e9546f4fb089cad70b80991e7f9a6fdc61
+DIST kdelibs4support-5.42.0.tar.xz 3342008 BLAKE2B 629517452e829eed3ec90d2ad7d6bc20f4bf615fb8570d3ec15a5d7121da4cfd1b22509b52ad344a257fdc55a93866028bb27bf842733eaed8a5bfdd6af5a991 SHA512 eb4ea8ab7828197615ee35ebff259c30e52142cc8cbd964e8cc7fbd9745174f199e3c53b2bd3d31a216f16ad3eba06806c669b3d4d6aeebd2b89c8a124737994
 EBUILD kdelibs4support-5.40.0.ebuild 2149 BLAKE2B a73f8b8ef0a28e9dcd65229756329ff1c49a4e3c5aa74f2b1a0b8f597a6cdb43c2abb23cb9d4b708344bcef883c76fce4f8f1b3af8ffa8c5eabe374f524c195b SHA512 ab8b693e5f1311eb78f615176b0b36d64efe6b65f1b66e59cbfe7f4bc3ebf8352bccd39c08b2f15e8a94861e2620f1f70bb92597c682b7b98b771221d776e47e
-EBUILD kdelibs4support-5.41.0.ebuild 2074 BLAKE2B d9f84ebdfd4aef3046cdddfd0c06677cdcb186c770fe23c2918a6e8a416b3bcc0d033ce1c6cd7a2ef2d97f791cfa5571e2d748bd115dad84be622862b26c1cdd SHA512 3672c8076fe14fb5c19930bf3fdf49aa3651f232c25b14806d847c8a96184ea5220f84da361772e023a220f853d343d7582f14f58a67a33fea6fa53a33c173c3
+EBUILD kdelibs4support-5.42.0.ebuild 2074 BLAKE2B 9ad6f9bfe8d8a63f0eff7bd2416b08f8fa5749e2f823f4c5a7e1b4fc74be9f31e594c130b54e9fc1af7bb1a343e4ee005c8b267bfb57f29a29440cf3453fefca SHA512 e7f612bbb97d69eb0201e4bd25c116e7455f3486e2d12591e56e50cf6fd0268c76e6a1d8432a17a020a72407d71ee73af84ac909da20d2106d771e664a33c7c6
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdelibs4support/kdelibs4support-5.41.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.41.0.ebuild
deleted file mode 100644
index d6b4fa29b42f..000000000000
--- a/kde-frameworks/kdelibs4support/kdelibs4support-5.41.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework 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-proto/xproto )
-"
-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/kdelibs4support/kdelibs4support-5.42.0.ebuild b/kde-frameworks/kdelibs4support/kdelibs4support-5.42.0.ebuild
new file mode 100644
index 000000000000..111c1d3718c3
--- /dev/null
+++ b/kde-frameworks/kdelibs4support/kdelibs4support-5.42.0.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework 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-proto/xproto )
+"
+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 407114517ebe..4d1dba787094 100644
--- a/kde-frameworks/kdesignerplugin/Manifest
+++ b/kde-frameworks/kdesignerplugin/Manifest
@@ -1,5 +1,5 @@
 DIST kdesignerplugin-5.40.0.tar.xz 90812 BLAKE2B 2b1a0cf79ab47f228aa3234f11e613e91e1b3543bce471cc61f06193cbb4d41b817fae78fa4f01625d87a5eefdf13edcd170a216e3c90954fb0c39a1111bf3d7 SHA512 e9874339ac1d694f249a20fe86504b776959b4e225b5377ba27df8cea14ffd35a42516308cb2daef0a9595c0f57ecb1328c35778d00fa05add19f7e5cce4dd99
-DIST kdesignerplugin-5.41.0.tar.xz 90804 BLAKE2B d72a240deb7f59245fd4c291ad35194beea3a7e18671ed13d6519a45f3b13af5de7830da8cc479e6f0b50e87b7e96be03529a277a8bdecb2e664f9af31d4f2fc SHA512 dc981f77b154ce33de111d7cfe7193f35fe58c7e92bb8e72306d67e35ca633ccf3ad9c7c92361f136cf3df618980c0df2bbcd636a7c9e556d08f6c91d0b423c7
+DIST kdesignerplugin-5.42.0.tar.xz 90736 BLAKE2B 5b36f5962a1af0b8419e3fe5481bd98332cb1264d8ac38e41a67ee6f180fca6729b45ab58be361848f1865cca82a8c0b255fcda6c3a72489c0f21402a92b9f00 SHA512 060678e1d670df0acbebbba1c313ca970c21d7ba237d1460379999e13563d164b5a1ac52fd1cd9991dcc11f3463cd58fb80c60458388d10b2c8cd415e10cb390
 EBUILD kdesignerplugin-5.40.0.ebuild 1440 BLAKE2B 43856c7ae1d5bc3b6492cea23348b67cda7fc696a6f54771d905b445e3620727d2d18ff331c1fe0206eff41cb9d646779d9a0d121682a50f83f54edc0169f7bd SHA512 76733eae5aeb0bae9869dc4cf7d1e270de6b03d155fb59765b6ca7557af543a02b6638f7b83bf6a7fb43a28874ab6d610f992bab1743a65dcfbb82aaa1e94307
-EBUILD kdesignerplugin-5.41.0.ebuild 1442 BLAKE2B 80c33ac6939da7e30f618b66297903b5f4ad7170b368636ced6ca91d6c525a144abe3122cfe1b9e2cab8c5c498a1f88e95317cd3d3d6318d3858995f649f4b75 SHA512 46f7f080ba291ae597a916a986f1484ea8b89869ad9f0c223af87922b9bb18f6ad419cce221025e3ceddda7f9825b787eceec7616ce9d6248bfea54297f8fd3c
+EBUILD kdesignerplugin-5.42.0.ebuild 1442 BLAKE2B 2375faf6f71b49436b9466cae0333afd2adac41f422a10570a09eb8171597ec67d4a0cc911b54607df9e70078bc371ee67389b940c5dd9328f3ee0304e6b52b5 SHA512 9c54c99c262a0692b4c83633cf44e1fc683808f4e91c3ef6134ef7a3206b5df1f9322733a31f33403da83b0eead99ea47d33c876a35b2ef61018a6fdff386e1c
 MISC metadata.xml 402 BLAKE2B c6bd347d2ec708beeff1a5e62dd8b6915a884afb3810841adf5bda651d5fa2caca0f3375e63d01e4af4b87fc955b6df0483d569746ece2d8b79948fd3b009b1f SHA512 c53b159358adf3556c50482484c631542f17a968d9b9481b6efb6552ab1244753f86fb3b992bc47119a1f6df3c4dab0f003887ea9c45207cbb1d19878dace05b
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.41.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.41.0.ebuild
deleted file mode 100644
index 74c0ebb52435..000000000000
--- a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.41.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
-
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="designer nls webkit"
-
-RDEPEND="
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kcoreaddons)
-	designer? (
-		$(add_qt_dep designer)
-		$(add_frameworks_dep kcompletion)
-		$(add_frameworks_dep kconfigwidgets)
-		$(add_frameworks_dep kiconthemes)
-		$(add_frameworks_dep kio)
-		$(add_frameworks_dep kitemviews)
-		$(add_frameworks_dep kplotting)
-		$(add_frameworks_dep ktextwidgets)
-		$(add_frameworks_dep kwidgetsaddons)
-		$(add_frameworks_dep kxmlgui)
-		$(add_frameworks_dep sonnet)
-	)
-	webkit? (
-		$(add_qt_dep designer)
-		$(add_qt_dep qtgui)
-		$(add_frameworks_dep kdewebkit)
-	)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	nls? ( $(add_qt_dep linguist-tools) )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package designer KF5IconThemes)
-		$(cmake-utils_use_find_package designer KF5ItemViews)
-		$(cmake-utils_use_find_package designer KF5KIO)
-		$(cmake-utils_use_find_package designer KF5Plotting)
-		$(cmake-utils_use_find_package designer KF5TextWidgets)
-		$(cmake-utils_use_find_package designer KF5WidgetsAddons)
-		$(cmake-utils_use_find_package webkit KF5WebKit)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdesignerplugin/kdesignerplugin-5.42.0.ebuild b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.42.0.ebuild
new file mode 100644
index 000000000000..1f32a3140029
--- /dev/null
+++ b/kde-frameworks/kdesignerplugin/kdesignerplugin-5.42.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework providing plugins to use KDE frameworks widgets in QtDesigner"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="designer nls webkit"
+
+RDEPEND="
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kcoreaddons)
+	designer? (
+		$(add_qt_dep designer)
+		$(add_frameworks_dep kcompletion)
+		$(add_frameworks_dep kconfigwidgets)
+		$(add_frameworks_dep kiconthemes)
+		$(add_frameworks_dep kio)
+		$(add_frameworks_dep kitemviews)
+		$(add_frameworks_dep kplotting)
+		$(add_frameworks_dep ktextwidgets)
+		$(add_frameworks_dep kwidgetsaddons)
+		$(add_frameworks_dep kxmlgui)
+		$(add_frameworks_dep sonnet)
+	)
+	webkit? (
+		$(add_qt_dep designer)
+		$(add_qt_dep qtgui)
+		$(add_frameworks_dep kdewebkit)
+	)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	nls? ( $(add_qt_dep linguist-tools) )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package designer KF5IconThemes)
+		$(cmake-utils_use_find_package designer KF5ItemViews)
+		$(cmake-utils_use_find_package designer KF5KIO)
+		$(cmake-utils_use_find_package designer KF5Plotting)
+		$(cmake-utils_use_find_package designer KF5TextWidgets)
+		$(cmake-utils_use_find_package designer KF5WidgetsAddons)
+		$(cmake-utils_use_find_package webkit KF5WebKit)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kdesu/Manifest b/kde-frameworks/kdesu/Manifest
index bdee5293e498..5a77c8fda39f 100644
--- a/kde-frameworks/kdesu/Manifest
+++ b/kde-frameworks/kdesu/Manifest
@@ -1,5 +1,5 @@
 DIST kdesu-5.40.0.tar.xz 45172 BLAKE2B ad77dda07ce78fa1042835f43846e992bfc3291570ddc91cd05331fd167b4be2f62515d7e65b498a62e57759761bb8be0ab98440cb63199954d4ec2f6a571034 SHA512 53ecfc0388a8246ec6b29de63ddb580071eaca33f7b1806e77b1200d79bbccb2bef38e4b482f0dd53e4767c873dc64d8cceb03d9ae75be41e8fe5a56ec90ebf1
-DIST kdesu-5.41.0.tar.xz 45192 BLAKE2B bfee5759a568c08a08dd318f842475fa5031451e17e602a482590d3a3b3825920f0003903a39622dd4f99f0f086e0e7cabb604216420d750acfdd55d8e5a497e SHA512 a94f9433906669a64d12c4ebf7e895fbcec6b77e64dad1d810cfe5be2404632352466753d2453dbca930becfeefbc6b1426c72b262fe7189f575fbd8dc05ad57
+DIST kdesu-5.42.0.tar.xz 45080 BLAKE2B 21c95951400d33fc58f3bfd85c6c0442d6003cb559833affa7d3c8167eafb898c1e5c77bbd8511ed8a88044f2db1464b69963193eb8cbc2945c2bfa5f680a2f1 SHA512 f0321834692439e62e35204a7e301f4aa8c20d9798522dc1c2ea969a493505a71e8fd5b1b41ab7586b277606f57cec41495bb683130f78d73f556e48fa012156
 EBUILD kdesu-5.40.0.ebuild 603 BLAKE2B f8ff986c695b577e5894a766567b286bc7fb51fc61e14c57183d3dffbb9e841d2b5b13a4dfdee2fe036b5469a97acaff6bb68a3c347b17a71f1cc73a89921a43 SHA512 75720b6ab8f88d7b73cd43225c5f8bf164f1ee890ec8fb8899dece6ee152f69c6313c524bd6cfa99f729998554ce54691e9000157df0625ba0cbbeb61b1cb22e
-EBUILD kdesu-5.41.0.ebuild 605 BLAKE2B 4eb7f8d14d432a4f47da931315616860b673792a944ce270d3b453b3d6586960bd69914c22fb1501254fd06239c58914e5e7ca490330a67ee2acba5fdf9c2c82 SHA512 1b9c9d25ec5263ae0f83db73e6c2410bb1e90768a69df3f05ca8d499930591c4ca346b705dcb821012f8d9a0110ad4b248671d38b4b7b4cce513fe6ec51b4f18
+EBUILD kdesu-5.42.0.ebuild 605 BLAKE2B 8496a0d9fa809057d5a0ac2cd76a266519bfc45b433780ddce6d11a9b6b44ae490e9ece9de0fa7d8e885663ee5706f4e6a0c8fcb8d3abf7ec037a3d6c6d9ff8d SHA512 675ad4d87a86179039f888f2e1a9ffa8ca3d27fe5f822193c35286001e07af8509b1188da1c668ad161a17b31e64fbe99430ad16ef4c0ce731d00ccb8c8bea57
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdesu/kdesu-5.41.0.ebuild b/kde-frameworks/kdesu/kdesu-5.41.0.ebuild
deleted file mode 100644
index bcf4e8b0b47e..000000000000
--- a/kde-frameworks/kdesu/kdesu-5.41.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kdesu/kdesu-5.42.0.ebuild b/kde-frameworks/kdesu/kdesu-5.42.0.ebuild
new file mode 100644
index 000000000000..77596093feb2
--- /dev/null
+++ b/kde-frameworks/kdesu/kdesu-5.42.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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-proto/xproto )
+"
+
+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 33174df31ff4..dd11fd2ffaa8 100644
--- a/kde-frameworks/kdewebkit/Manifest
+++ b/kde-frameworks/kdewebkit/Manifest
@@ -1,5 +1,5 @@
 DIST kdewebkit-5.40.0.tar.xz 29392 BLAKE2B cc67ebaa82c35c673d0f502c3b1267b52ced914bf6b7ab1d676fffaf34cfa41255333b81f55443474f9db77c5a477e4429c8d3790f5f2ab8f5479f1b50d0b262 SHA512 4074dbfab85ca4421b447eb1ad5f262bb54d79d98c934ad57a9cb35f7c624e93af8ad22ee4979404c6d743750b8fca85f4c7533f4cb577356e0d011ff75c06a1
-DIST kdewebkit-5.41.0.tar.xz 29396 BLAKE2B 79e68c39f1b5488a51d0a7657e99bb306909ba78d9b506e149deeddec4aab0ba58f807a8b6d26150d46b359f6c56959dd4a8464f6728d78caeeb28aac4255628 SHA512 c012ba9b1e4d450b693ce3c0e5d3a8c8c7eddfce809fc2dd50ef23e3cefecefd222f36eb88b2af44874782939613ca6942829f17c06e0e95aa3b6698aa9cf90e
+DIST kdewebkit-5.42.0.tar.xz 29284 BLAKE2B 8d32ad876aa2076d7ce4b92be4092d790f3b99f2efc59abaa4922f0fd07d9e51706d1ce3ed1f3cf2349b55d0dd87585903450f8eacf0562dfa2f52e7d7b51806 SHA512 1c53af251ee2d96cda6244c148c2595a3e28c50e3481a75d08c056ff18a5b001982ba677e31d4e2fdb41c3adb668f45b8582c80844d8a438eb3ee8aec686d744
 EBUILD kdewebkit-5.40.0.ebuild 662 BLAKE2B a6a84e0bbab98f12c20737905b18e4c1e276376f3286ac8aa88331d4a87d5ec0952c92e15ed64f36445f6a49614436ba17e79fc5fb830d4c59b92fdf9b022dfb SHA512 5cff01874a04cfae65074cd8e61e1ec7bccb9572c594d9be8c63bdc74eff8bc96047caa6a8088e3ca6c9cef726ab94e5fefee660ea7f850fda93029311cefdc0
-EBUILD kdewebkit-5.41.0.ebuild 664 BLAKE2B 48f2c54cf5817191b0a4b872b5b54b9fa497e2f819888b0009dc2a79f180c3438084460099ff8de0975da57d94a89745954de707e0cd41c474bc190208900c2a SHA512 e9d3631f00623dba257d1d4e4a1b602c9eed47f3773371f59a152911289c03a0f2f8dc6bfd6c5772e21ab8b94669f7aac38dca709b1a8f5f9569c4ad0d6e8e33
+EBUILD kdewebkit-5.42.0.ebuild 664 BLAKE2B b9dc7852e095918c65ebbf038521af47c6790d53a1f74bcf8a6034187c5544e7a40fe17eb4440572de2248cb119d7fd724f9907d0fc2f3d937574f069243fe3b SHA512 869bccd6cc304c2c5a07320f4f98049042a95ab39002078b05480e7898ee30f08b959d0d6de68d8309cd5276bf6f60c74af12837a9e25adf91c7cc1f2522e460
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdewebkit/kdewebkit-5.41.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.41.0.ebuild
deleted file mode 100644
index 329737ec2043..000000000000
--- a/kde-frameworks/kdewebkit/kdewebkit-5.41.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_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/kdewebkit/kdewebkit-5.42.0.ebuild b/kde-frameworks/kdewebkit/kdewebkit-5.42.0.ebuild
new file mode 100644
index 000000000000..1fb4c4ccfb80
--- /dev/null
+++ b/kde-frameworks/kdewebkit/kdewebkit-5.42.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="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 8e7dc54145ce..105f63166390 100644
--- a/kde-frameworks/kdnssd/Manifest
+++ b/kde-frameworks/kdnssd/Manifest
@@ -1,5 +1,5 @@
 DIST kdnssd-5.40.0.tar.xz 56676 BLAKE2B db806d3a416eccd33cec8282c08a2443dec1f5e10e392e244c407597cfdc2ffb1ea52633b1414f71d9e80c285ea88f19363b56768e5550f8c406682f17646e75 SHA512 409860a7ffc753780c26d62c89dcade8674393edfcbf817403386f437f23e9495455e6c29c179901820bd9eec5fe3d7622d12fa2d0b06f79ce8f0a4664a36726
-DIST kdnssd-5.41.0.tar.xz 56732 BLAKE2B 0e91b23eb2c3087f29d15dfc84e168a62959e2b4127a0e483946e09977b7ae9dad5c5d9e198512ad20a254431ff283cb9b6b2fe83fb0df4abfefa94107a25339 SHA512 f1e0136baaf5dbfe8578654a2a7c71acfb002c38b745a50d4574dd4855b2f470afe44aa88b11c94f5d366ee9d4cd6603abf68d367234f3348cc0a70405708aee
+DIST kdnssd-5.42.0.tar.xz 56652 BLAKE2B d702ef866c51d31820905cae53b1f5cdac13c71682460d56d9403b70fe1b1822319aa8c5a1e3f3f6387bceeaebc5d280ad7f0f04f91e47f358d4e14337c92496 SHA512 40e48758642c68b83d3c94e3b0a1c747a2c40510dd7b30c0f65f37bde0bb2fdce74331123719eb008f6f6702cecd6454b405eb6c1d5417e1861b25167ad78b85
 EBUILD kdnssd-5.40.0.ebuild 600 BLAKE2B 17e11c218aa81069dea4385ef6409950b7e83010da29a34f710df8d9cf19f059921c8c66e51efff3dacd61e7b9e114182882d06f920d09ab3e6ea4e401aa8ec8 SHA512 a77faa85612c6b5d96956452dee7eb7fbeff5fb5d78955dbc968a555636532dd3a752b2f75cd02a1a17a585cf22ee6399af9c27d25de52168eb39bb7b3a60c54
-EBUILD kdnssd-5.41.0.ebuild 602 BLAKE2B f6385393219e1b615cd8b95cc02f3da4c102c16b7ff787f29cede317b0368694a049a024faf23123bc61272bf3b192d28d6291667e92291042ec28fb90f8dc10 SHA512 1ec85ad6a20e1ba7b12e8cd179eece52fc8bec76f0bf318679665981c7225a56416fa6f3464ed23ee8fa07a077b2d2942a842043d5ad9f7ffa28b6381254b04b
+EBUILD kdnssd-5.42.0.ebuild 602 BLAKE2B 9b947562cbfc330f5b1d8c1226f6ab6e0e24e95ee2b23d3c2f1e95534caf7d391c381bd9d3a222340267bf1c92426386df07e0bf5cd30ac439e09685c0451d65 SHA512 0f1fd8a29d7fd707e52a39d46e154ec04c1531a4f0ab7c47f7384bffc0bbd8f656156d72fcdadbca9856f36dbb9b35a80de4896a8b4f34bdc624773526256793
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdnssd/kdnssd-5.41.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.41.0.ebuild
deleted file mode 100644
index 9b4e417669ea..000000000000
--- a/kde-frameworks/kdnssd/kdnssd-5.41.0.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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/kdnssd/kdnssd-5.42.0.ebuild b/kde-frameworks/kdnssd/kdnssd-5.42.0.ebuild
new file mode 100644
index 000000000000..4abdda53e524
--- /dev/null
+++ b/kde-frameworks/kdnssd/kdnssd-5.42.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 3193ed9076e8..4a45c7e1d482 100644
--- a/kde-frameworks/kdoctools/Manifest
+++ b/kde-frameworks/kdoctools/Manifest
@@ -1,6 +1,6 @@
 AUX kdoctools-5.40.0-pt_BR-fix.patch 1233 BLAKE2B 7be5ab8eb1288a41062176ea9fd6b492faedab084bb4fca8439651deae8fe54f59e3611b78dd3b49930abe3e5af3e7b60842fdd98ebd672d18ddbb1afffa815b SHA512 985a418fb078dc697c20ef31f5b9f4c1c84e09d81703035bb2b142ea7086d2cca97e1426df6c8172502e877fc17d8377a1ada7abdf88f49d76a3b6e05a594695
 DIST kdoctools-5.40.0.tar.xz 421668 BLAKE2B d3dc3dd85b8883042064ca68f9de9d575210adc0055113bb9cd71a5086edb732897039b29ef47df0861b9bb73ed5493e2ee146420e53db9237ae7f6592e40f9e SHA512 7279a2bbb01c9b6e31e4c7c1b9b5b1a14d9ba8ec78e63d4bf635838fbf01bc90e88ea9eb0788886548cd6c031b6c7d270c667c13f2c14d4fda6a786bc94d641b
-DIST kdoctools-5.41.0.tar.xz 422052 BLAKE2B 848a5777d79e476a214c360d28476548c216037e75d611e2b5ca3b3f3232b6a323624e57eca04055a2e0598b32d251641cffe48d3c187d297ef98e8c4487d2b0 SHA512 8e5519bc6872d2c6da226d95c9d69e17a19b587e48cfb2de881e1bd735a869b2055b25c5121ce024f65237b1c1f886e93da6992e2213b163aa2940ee04eb6866
+DIST kdoctools-5.42.0.tar.xz 421980 BLAKE2B 3624af67abd95d6bfa2fde810efc566fbeb4a6b338c265f9fec1d80ff1e854b8d01e65ec0b9e546afd2ab78b6f6f68b16d4e028b705aa9f77b5fec1e64962029 SHA512 347fb09e2e13bdffb1d1daff145eb1f19f563efd121dcb946576bbcb27a761b4ae8575a12e1a378a1fc0151e02b825dac144a2e19c6214ede6954a8c8ef7850e
 EBUILD kdoctools-5.40.0-r1.ebuild 605 BLAKE2B 355bae4c78774343c0ca564f540e4d8c42be6671e4bf53b19948ca2a9c19804cd5553d855ba17c631387dc15d2a7142f2d1fe5a8aff4336a450a3bd714ba4ce5 SHA512 4cf0287b8f761b34c79945852279fb3e8584d68aaee135988c8fa2a8917d4b3b5c4bbed18ec7715bb4f8170ac2e774923b42a57ff72cd3a7653fc5e4dde26647
-EBUILD kdoctools-5.41.0.ebuild 509 BLAKE2B 6ed35b916e0baa1900303f284959f5e6f78ca46de5d3977e0de015919f118123d64ed02716699025872de8c4934fa91a8ab7f99d7991e686bd02ec5b463a6ec4 SHA512 e42f6bdc0e094eba514d182b8f8791bea04bc8bddac3209af94437ef70957aa058e3665ff2d222c5feb721d7a82f1288798cb45df059fed41978d55198007174
+EBUILD kdoctools-5.42.0.ebuild 509 BLAKE2B ada2440d5d4d13f53ba7cd3bc33fe4c2d4e129eac496d640383b6509492be6c2f0709ca8639fc8a9961e5f16412900f14fd973582872ee9ecd142b7119d675ea SHA512 defea11e426d4388db65acf493fc67b0aae8cf870edf31f9a8bda8f64b7c31d597079cd0990d5d74fd0e4cf78bdd130831895d2858cdee7cc9173a5159491e41
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kdoctools/kdoctools-5.41.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.41.0.ebuild
deleted file mode 100644
index 9cb56de3d013..000000000000
--- a/kde-frameworks/kdoctools/kdoctools-5.41.0.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="Tools to generate documentation in various formats from DocBook files"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-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
-"
diff --git a/kde-frameworks/kdoctools/kdoctools-5.42.0.ebuild b/kde-frameworks/kdoctools/kdoctools-5.42.0.ebuild
new file mode 100644
index 000000000000..02032df43e84
--- /dev/null
+++ b/kde-frameworks/kdoctools/kdoctools-5.42.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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=""
+
+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
+"
diff --git a/kde-frameworks/kemoticons/Manifest b/kde-frameworks/kemoticons/Manifest
index 10db3fc9b25f..9856a808a169 100644
--- a/kde-frameworks/kemoticons/Manifest
+++ b/kde-frameworks/kemoticons/Manifest
@@ -1,5 +1,5 @@
 DIST kemoticons-5.40.0.tar.xz 1695752 BLAKE2B 18622f98044f1930822ed5d40fb0331b8ea15ad5bbf68b0d42c98e8f6ede97348de22d4e6f9cadd2c14ec06c2b82b20ef975bc6191a484f999b10ce5b99df817 SHA512 47dc8f65f29d297a3229fba0a63d5f0eb959fe072e44dfc831f33b4a778cfae1f267abe6cbf264a69d3ea677a8cd2d94898ba9f7e0852bfcb7573b368cb1c289
-DIST kemoticons-5.41.0.tar.xz 1696232 BLAKE2B 485aa6f97ea4f2da1f555c8bd2ba4d059529df9ee9fe12c4c9474db0d4e3a4c010d7fdd53bf02d5ca08d325724820db2e8c99e9b464907a5786401d3496dc221 SHA512 4f21d7fc428dcaeab1f82b40c60125590f5b077729a9b2995abfc153a044dc9d71dcdbc34adf53f5b83a434a421d86022a15df8c6e4a0e03b1d3c095d7718d88
+DIST kemoticons-5.42.0.tar.xz 1696168 BLAKE2B b3583e87eb3a152f18deea161dcb2ae7fcd416ea1af8713e84f5456768e34c933c069625e1d184799437ae243079c46d7c2bfb9a33592a8d26d1dfe3f5e67a5f SHA512 72015859b74201a3e6f6cb38863fa53ad5fa753f0866147c6c6a76edd8b637d1903ed2e0ef0d581ae191dfc642acf626ab010e6f72594f13f294e7c71da8bcd9
 EBUILD kemoticons-5.40.0.ebuild 580 BLAKE2B 03e302f6ad5226852ce0710d9d4fd276718ab26ec384526683da29be0524fb6cf2ccea31e00e8c2ae73d5b4f10150d47b56ea9ddd12b078c755ed2c561949782 SHA512 e673b08ae402da0f5f7eef32a0d652ca897556c3d1c4cefa412e7276152ed25bfaf3748e20780eb7054599f23a14de865b0a7fd5538d015d7b44d29017dd3d6e
-EBUILD kemoticons-5.41.0.ebuild 582 BLAKE2B 2a9b9999b0796d04daf5e662cd0e086fe269e72a0033a1a6a4d494edb3d2fa79bee1bb3f3e3543bdd277df6f0932795afe247abf2fd1c1119c30d6b0867c4192 SHA512 47d11a591135652a3cc4986864c23457ffd0d8f9595c7e03c771d1aebae977b9d04b5346ea943264415561d4380f1ce88b8d78548d9ab4f1614a6939690a22b1
+EBUILD kemoticons-5.42.0.ebuild 582 BLAKE2B f7f557358069e8601480b79b5e61ed0427479e3d3e3b6180171042c7ff435e33edb7697652624b6874e1d21537c0eff78921a2e694489bf8797aeb4c2bb3c849 SHA512 bf636755a1b881c8f399f91dbc232577d7427aa5bc108d6d01a4beb1d9e3808e1b95da62484600f76b12c3c384d330026cb02e060801cb6cc86ac85552f1a93d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kemoticons/kemoticons-5.41.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.41.0.ebuild
deleted file mode 100644
index ae4e91d1e6e4..000000000000
--- a/kde-frameworks/kemoticons/kemoticons-5.41.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kemoticons/kemoticons-5.42.0.ebuild b/kde-frameworks/kemoticons/kemoticons-5.42.0.ebuild
new file mode 100644
index 000000000000..a3ab980b96f9
--- /dev/null
+++ b/kde-frameworks/kemoticons/kemoticons-5.42.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 04de2de1cc6f..a241aeb91bc6 100644
--- a/kde-frameworks/kfilemetadata/Manifest
+++ b/kde-frameworks/kfilemetadata/Manifest
@@ -1,5 +1,6 @@
+AUX kfilemetadata-5.42.0-xattr-header.patch 1287 BLAKE2B fbd50deb4236630eddaaed84c3ea89c8b4a41efb1ef5c960f7668a03a5bb6f152239cc88e6e4d3957986f21ec4958ba202cee5c43fe97191f3f169f5443d89bd SHA512 f18b3b336b913abcb4fb6428aad9a4b32f094f1760454d9fd366d659889fda3bcc549f0ce81bdde084cc40d95db013e9fd869927c1d579d386d1e040f7bd7621
 DIST kfilemetadata-5.40.0.tar.xz 219196 BLAKE2B abeda591043350e1b11de352f897f76110b1ea472ccfc210739c68d50715fb8687fae4d9c6281c48592f563a82ad8f454660349dee020a80bab2b967e598367f SHA512 b3f632af0847dd3bed8bf0214e3786fe72ffbdc90454d7a2117e8b30023c43b594a27c5811a6e77d1e46a68261e950a5dc016b9ae6f80f3db539c29eaa53297d
-DIST kfilemetadata-5.41.0.tar.xz 220236 BLAKE2B 366866964b44e02c61f9918860e8582fa8a55e9f1e0ad80aeb4361afcfc7f6738709a211cc6ffdbf0fa63cfbd91753c6d1846e5c9c1b4f104f514e2824ab74d9 SHA512 79d9322b1b7c21809f287a555b4577eb885248becb7bd7236b40d446c0e5fe154778d9784d3bc06efd8697c485b01a2bfa042aee2911d49b2f31faca0706af15
+DIST kfilemetadata-5.42.0.tar.xz 218916 BLAKE2B 03d5ac621d4cd032ff58756069861a045c5a2236ad3c1dc75f82cef9b6dc3eb7c263cf98865899a4d69c31582afd221373a07ca8538c718ff6ef91c2b7267547 SHA512 496876dde432e0884b883e112daaa11c2fe85d2a97bde2124b04571e4f9d1516cc81ef1d80eb3043a5d43f2febe79481f1a2c299ee9e96883342f8563002c62f
 EBUILD kfilemetadata-5.40.0.ebuild 1613 BLAKE2B 174f3bb47d94cb4af9c302d0523e21436f1f1d0c9f177ad2b157346b1ff8633db8c429b795c5c0ae539870d9d893487d34b499ccdbdd2bece9f96006cf561e58 SHA512 65aa9bbfa840db315245a0cfbe9ad51ac4d791fec92d1d7e29a9fa91189703a962a9aa530220828efaf0e4a3e3af09b617ba22280440e89ce46481a851b6760f
-EBUILD kfilemetadata-5.41.0.ebuild 1601 BLAKE2B ddd062e337c1c37df3b18bef67e2d2c5289bc0935e840f6e700fdad4c66e75d564c29c2936f532fc2560b936483b7b28292c8055deccc8cc5ce0d7f3d900187d SHA512 36a1dcf40cba78fd4fb8ecdc133ee458ab16f2d290fce3811e0da01d886bb3fb0a65c1577abc4fbf7662cf1a88ae1d6f8cddb4fd661c12b5f52082dc36b5e22f
+EBUILD kfilemetadata-5.42.0.ebuild 1536 BLAKE2B 6e77df2ddde0969548b5fc84475b1b507c87d58f246c3ccd9307b83bf955080098560915704f1eb74a942ce4bd0e17adfce48b8f5d54748d6a8b7e7485f8b888 SHA512 0404bedf61583d6f844f8f037e140676d8b7a4c303eebceca9db7de09fe65bce6c4f218beaf5934af78a2a2b121cfbe9f5124b7a21329fd543cc890b4f1f5d9b
 MISC metadata.xml 417 BLAKE2B aa8d6d559e73a1d2f892c261e89d5f1d7505c79cfe9d96fb10c82a12ed689b13272b71f734960c43b462f52ace1393b500a8df1730b40755c43a3c49844ddf0e SHA512 aafd2b414edbdd487c969a1f4adf8cc6ed8152df7b05c68182eb9f9ab891068afd3a0afe3edbc61645678cfb687e4b95e4b8ba30b0f13744c4d84cc2a0958eb1
diff --git a/kde-frameworks/kfilemetadata/files/kfilemetadata-5.42.0-xattr-header.patch b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.42.0-xattr-header.patch
new file mode 100644
index 000000000000..4d86297b19ca
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/files/kfilemetadata-5.42.0-xattr-header.patch
@@ -0,0 +1,46 @@
+From 6de64a4e3f2713c0096eb7ee1ba52e5fbbbc401f Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Sun, 14 Jan 2018 22:29:25 +0100
+Subject: [PATCH] Fix build with >=attr-2.4.48
+
+It was looking for long deprecated attr/xattr.h header.
+---
+ cmake/FindXattr.cmake | 2 +-
+ src/xattr_p.h         | 4 +---
+ 2 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/FindXattr.cmake b/cmake/FindXattr.cmake
+index 3004061..a33f316 100644
+--- a/cmake/FindXattr.cmake
++++ b/cmake/FindXattr.cmake
+@@ -13,7 +13,7 @@ if (XATTR_INCLUDE_DIRS AND XATTR_LIBRARIES)
+     set(XATTR_FOUND TRUE)
+ else ()
+ 
+-    find_path(XATTR_INCLUDE attr/xattr.h
++    find_path(XATTR_INCLUDE sys/xattr.h
+         /usr/include
+         /usr/local/include
+         ${CMAKE_INCLUDE_PATH}
+diff --git a/src/xattr_p.h b/src/xattr_p.h
+index 4663347..542c021 100644
+--- a/src/xattr_p.h
++++ b/src/xattr_p.h
+@@ -32,13 +32,11 @@
+ #include <sys/types.h>
+ #include <sys/xattr.h>
+ 
+-#if defined(Q_OS_ANDROID)
++#if defined(Q_OS_ANDROID) || defined(Q_OS_LINUX)
+ // attr/xattr.h is not available in the Android NDK so we are defining ENOATTR ourself
+ #ifndef ENOATTR
+ # define ENOATTR ENODATA        /* No such attribute */
+ #endif
+-#else
+-#include <attr/xattr.h>
+ #endif
+ 
+ #include <errno.h>
+-- 
+2.15.1
+
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.41.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.41.0.ebuild
deleted file mode 100644
index c9b9c841b040..000000000000
--- a/kde-frameworks/kfilemetadata/kfilemetadata-5.41.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-inherit eutils kde5 python-any-r1
-
-DESCRIPTION="Library for extracting file metadata"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="epub exif ffmpeg libav office pdf taglib"
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_qt_dep qtxml)
-	epub? ( app-text/ebook-tools )
-	exif? ( media-gfx/exiv2:= )
-	ffmpeg? (
-		libav? ( media-video/libav:= )
-		!libav? ( media-video/ffmpeg:0= )
-	)
-	office? ( $(add_frameworks_dep karchive) )
-	pdf? ( app-text/poppler[qt5] )
-	taglib? ( media-libs/taglib )
-	!taglib? ( $(add_qt_dep qtmultimedia) )
-"
-DEPEND="${RDEPEND}
-	kernel_linux? ( sys-apps/attr )
-	test? ( ${PYTHON_DEPS} )
-"
-
-RESTRICT+=" test"
-
-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)
-		$(cmake-utils_use_find_package !taglib Qt5Multimedia)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_pkg_postinst
-
-	if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then
-		elog "To get additional features, optional runtime dependencies may be installed:"
-		optfeature "indexing of Microsoft Word or Powerpoint files" app-text/catdoc
-		optfeature "indexing of Microsoft Excel files" dev-libs/libxls
-	fi
-}
diff --git a/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild b/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild
new file mode 100644
index 000000000000..5b26202d02f7
--- /dev/null
+++ b/kde-frameworks/kfilemetadata/kfilemetadata-5.42.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+inherit eutils kde5 python-any-r1
+
+DESCRIPTION="Library for extracting file metadata"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="epub exif ffmpeg libav office pdf taglib"
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_qt_dep qtxml)
+	epub? ( app-text/ebook-tools )
+	exif? ( media-gfx/exiv2:= )
+	ffmpeg? (
+		libav? ( media-video/libav:= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	office? ( $(add_frameworks_dep karchive) )
+	pdf? ( app-text/poppler[qt5] )
+	taglib? ( media-libs/taglib )
+"
+DEPEND="${RDEPEND}
+	kernel_linux? ( sys-apps/attr )
+	test? ( ${PYTHON_DEPS} )
+"
+
+PATCHES=( "${FILESDIR}/${P}-xattr-header.patch" )
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+	kde5_pkg_setup
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package epub EPub)
+		$(cmake-utils_use_find_package exif Exiv2)
+		$(cmake-utils_use_find_package ffmpeg FFmpeg)
+		$(cmake-utils_use_find_package office KF5Archive)
+		$(cmake-utils_use_find_package pdf Poppler)
+		$(cmake-utils_use_find_package taglib Taglib)
+	)
+
+	kde5_src_configure
+}
+
+pkg_postinst() {
+	kde5_pkg_postinst
+
+	if ! has_version app-text/catdoc || ! has_version dev-libs/libxls; then
+		elog "To get additional features, optional runtime dependencies may be installed:"
+		optfeature "indexing of Microsoft Word or Powerpoint files" app-text/catdoc
+		optfeature "indexing of Microsoft Excel files" dev-libs/libxls
+	fi
+}
diff --git a/kde-frameworks/kglobalaccel/Manifest b/kde-frameworks/kglobalaccel/Manifest
index fc4eca41aa6a..3f0adf308737 100644
--- a/kde-frameworks/kglobalaccel/Manifest
+++ b/kde-frameworks/kglobalaccel/Manifest
@@ -1,5 +1,5 @@
 DIST kglobalaccel-5.40.0.tar.xz 83628 BLAKE2B 774596c4b6c29cc208053b54227093120e1cc7efbb794f29d260626cc5337587f62537ffd3ec9269338fdeb417af0f538ad845888cd8345b08410ac5b181c2fb SHA512 5b4a5d557338eb149257448cbabd7df9d7969ce2d977e13a4d104fe4c21d262b952f820614aad9012f6d4c2d28898f4d77daa4dadece39275383e35b6a84e9bb
-DIST kglobalaccel-5.41.0.tar.xz 83884 BLAKE2B fb6b5d2e6a40fd2316f98360525e9713c0ab078f690dd1eb7185d8c9fd5d8a33146e0b6ffa3d414b08010c501347939c7331e25077432e9eb8d10dadf4a1e973 SHA512 d0a36a9aee6bbf4198f1324e98174750c914caa72c0ee33076875c41e4a41e0cfc9fc1f1d395bba595f1bb397b27597cb1356c3654230e6d1958f8f9ecf0c4a6
+DIST kglobalaccel-5.42.0.tar.xz 83824 BLAKE2B e799b78b11aedaa42295df445a1a5951cfc5c30c781468a2cd6dc0a7592204e530d3c6927bb0c7bc58a0db67c0dea2026c35535a80c3e72732bdf7c32fd02a86 SHA512 31e9528e8823d69a0a80ee504225bd07860f91becc3aff4192a82f81dfe5b63beb895390eaf386a9e589bb7b7bb29787a57621574aced39b9d1d58f5f6ff649e
 EBUILD kglobalaccel-5.40.0.ebuild 650 BLAKE2B 2e13426cb410f90a2d45f3b287c62b8bd24e0a3acdb3b7e2b8f8fa2f5ca5d44eaa34a8c89866ce927bbbe9b68011c51d3d0beff149c9ff32c0dd7edc380ac3fb SHA512 cb0481f8e14891849d4f654fd06f8e9de71136b5b8e593a1cb1f67a132a2f7091b1dcac02539079a6612f6146ea993af3fae75ce5f1e97aa214d6acd97f041ab
-EBUILD kglobalaccel-5.41.0.ebuild 652 BLAKE2B 9a9edfda2153dbd26cd89fc7c451551e61c9b645b78ac8a2b667bfb96be2d85febb64f0037712b1105b5dafe00a89d135f689602a4328f12565f791fc0d3dbc5 SHA512 00f0dde034596bba227e841bd127646994a342bd4f7e27540811101b40990f387edcd2a28c532fcf7df478250bfd95f7f0418cf8754b2232ec1989633a0f2367
+EBUILD kglobalaccel-5.42.0.ebuild 652 BLAKE2B e76866ad28a82d05aa8aba479c578bbdc637cbd886d40d9b2c431a23a0c3a3ba515cdfeafc77fc18f360f0a66f27eefb50550b922f5b5a087671fc4c55bab12b SHA512 6bf39b923fa8e7acfe2187f4aa79d37eb6760daefb95faec21c92e8fbfdd37957d89bdf5c7d643dda0b2437746c3497042e433b8fbe44a85f3c8e2a2862fac42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kglobalaccel/kglobalaccel-5.41.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.41.0.ebuild
deleted file mode 100644
index dd7ac3199c16..000000000000
--- a/kde-frameworks/kglobalaccel/kglobalaccel-5.41.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
-
-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/kglobalaccel/kglobalaccel-5.42.0.ebuild b/kde-frameworks/kglobalaccel/kglobalaccel-5.42.0.ebuild
new file mode 100644
index 000000000000..5e6065dfe91d
--- /dev/null
+++ b/kde-frameworks/kglobalaccel/kglobalaccel-5.42.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 600242314679..87f440266f3f 100644
--- a/kde-frameworks/kguiaddons/Manifest
+++ b/kde-frameworks/kguiaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kguiaddons-5.40.0.tar.xz 40180 BLAKE2B bf8133a926379096e625326a5bf2bb2ba6b347ce8f0205d4bda3378e433e1a1cab838f35da34561fd7781de3941ec21cbca427168a3e1d46c874ff99b98515a1 SHA512 42543c4b29355d5998abd4bee14530a9e96b7d3f4378ea11952af67a157be23acf45b5c801e80909546e7903c73df3a650a05fa6ee8594a2cbe9e8ce66146976
-DIST kguiaddons-5.41.0.tar.xz 40208 BLAKE2B a982967baee034df038b3c901d79be1917f8d1b3f50f6c9e220aa08e5d31511fd3866271430bd1073a45cca84b193031c1be18a235fd67fc1d0b7625265d0be6 SHA512 0811bbaafad90109cdd18bc188fda7f99c2e2f53a399d823af333a052b6999cae612ecd1cdfd373f3cbc3b79133d10abd28e8c909c2e933883293ed93434f1a0
+DIST kguiaddons-5.42.0.tar.xz 40104 BLAKE2B cbb1ed7e3f0c25b9d680cd8997e721020369e1f8cdc28b2be8f9ea74c88d78a97dc442efb25b7b7bd6d9a6adf8038d210bc739c1345b9b0133d208083c853218 SHA512 b67f88b897bd385541b3f481af899ac27fcbccde92e3f4699955e179fec290340b7f196b3753619cfac284d203f9e6c13d3cb8ffa6990ae02f87c044c7a056f9
 EBUILD kguiaddons-5.40.0.ebuild 428 BLAKE2B c8dcb3a4098222f57b7e3b7f49ad11811c0b679180ca73b03fad9776fc3ac432125d1f8533c8bc5b726d15231752bbd68303393a15776b543aa04f82161c7ac3 SHA512 66a0bddc26607413242606d340e7b4ab80a28e64f103d450fdd9fcea18c665d119c75e4fb896da4863ac1fdef1305a380365b33dd98ea1b9cfcca6f9967ba288
-EBUILD kguiaddons-5.41.0.ebuild 430 BLAKE2B a27ba183d2bb8be28b46ad5098d617148b48e1287e7ff7f2b8b052171d94a05db4cc709f8f87360bdc973d40b2127d3c5fc2f8cecdf43844b7bb14b4dab625a2 SHA512 ae383469dc2ae7af279c2c67c456c6cbd256c485c8e7867a71bedbf3ee257158c7cdcb49e8aa45696afa95803249d129534a5a39b5edb37c2e6b4df98effccc2
+EBUILD kguiaddons-5.42.0.ebuild 430 BLAKE2B 0512562c5497975d8d6d48e8f812f8e8848d3dcc26f8b2aef100169eba046f0c98b0242403c45f315968962c5383f1e03e9fd6aff0b1ee550c95fd143062934e SHA512 09e88fb5f5f44121a7ec8fd6de3892e4e331471e91b8a7b732264d8461c631bb8adcab3f038fb73ea82aacb9d80c2ad2432e6ba101c7fb2a668e2288cb76ee42
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.41.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.41.0.ebuild
deleted file mode 100644
index 26fe9e0524ad..000000000000
--- a/kde-frameworks/kguiaddons/kguiaddons-5.41.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-libs/libxcb
-	x11-proto/xproto
-"
diff --git a/kde-frameworks/kguiaddons/kguiaddons-5.42.0.ebuild b/kde-frameworks/kguiaddons/kguiaddons-5.42.0.ebuild
new file mode 100644
index 000000000000..68c87545da44
--- /dev/null
+++ b/kde-frameworks/kguiaddons/kguiaddons-5.42.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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-libs/libxcb
+	x11-proto/xproto
+"
diff --git a/kde-frameworks/khtml/Manifest b/kde-frameworks/khtml/Manifest
index 6f8a35ec5742..2c6914173718 100644
--- a/kde-frameworks/khtml/Manifest
+++ b/kde-frameworks/khtml/Manifest
@@ -1,5 +1,5 @@
 DIST khtml-5.40.0.tar.xz 2081588 BLAKE2B 14fa9c0bb27263bdd4be9663575569a7ceac8f7699cdc7ac67e6a9df7464549155d7348b51490cabd87e1e0b8028cae361f7d88bdf6e90bdae015c05739c9cb2 SHA512 e64cc9c32944c6cd1f45c745f4e653ca1b6023061ede3ed87886e3ed95e9d2d7a7753b396631d256b7f1a4c34b788e9a9b80253f151f73b3fdec3f862f8adcef
-DIST khtml-5.41.0.tar.xz 2081692 BLAKE2B bc4570e0cd4e2f69b68e5dfa8a49c9ff61bb2e0db74cc091d71d2c7db1679c104e5abf798c6c719aa0b6b91b4e2b7da2dc5b6d009718bfa8de6ace58f0e7e284 SHA512 64210f2b9b17a8abea88c71e78abf2456578292e62350e93f62b8c690344399779fa1e2421d97dd9a6d5306270b071e1d6d7faebf6273ca8118a09b059469d96
+DIST khtml-5.42.0.tar.xz 2082316 BLAKE2B d629b04d72864f0ff277394af74cf5a948e0857554e6b926b73c87ad588ab88f934a76095d4cd93b5d44193a73790b27ccfc330dff4f4b8aba804f9309129f6e SHA512 f3bb46d7b44101a55df6ac54254c1e00c2e8d719de6f99870879f752c037b11cb5b466cb9ef387a2316323324061d5e9c3dc5fafb1e047c8de14a52a8bdcbc71
 EBUILD khtml-5.40.0.ebuild 1584 BLAKE2B 7f5188bbfd3fe48e566202978c450a4fa5fc12caa7b3e304a1efcf3bc69ce1ab0d91bf5a883ed843d6341549d54f2b8dda4340412f509a4666ba3a90e8f72ca2 SHA512 7fbf2ffae2b11249c27280f098bf7523adf4c338aba36389313bbe26ab9dd608b05a427130f8c8b6a87305b8325cf188dc9af869f94466af89659dfc3bd15a35
-EBUILD khtml-5.41.0.ebuild 1586 BLAKE2B c00cd4cdf94972f5431a5e7ea7efd0cb938429511479c7e4239eb9b2e62491ec1ced95aeb4d3152c27191b4ba0563cf6502bdac1c089c6394baf9b16f03913e7 SHA512 cab92babf2597ddfe51392527a4af3f1f3e2de2b7dde18b4b08807b3ab82e98684fe3630d239f30b24dee39fd10d3b1bb98315ffe400e87f4cd60bf95edc9af2
+EBUILD khtml-5.42.0.ebuild 1586 BLAKE2B 90377bc8e703523500a9a0e1393f46f05d5ca0cecfcd3a340120dcd02678abab6cf7650033f3a982704ed57419a317b3ced4532879dd0ef8f730ca9d5500e19a SHA512 8a91af60d354ba14a6030edf1d124a637a8e8d7d3becd83f14d0a82288648d73481129733d12bc09f04eb7237c7b6563ce458565c461716795907f22f94dcc6f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/khtml/khtml-5.41.0.ebuild b/kde-frameworks/khtml/khtml-5.41.0.ebuild
deleted file mode 100644
index cc2820c61d18..000000000000
--- a/kde-frameworks/khtml/khtml-5.41.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/khtml/khtml-5.42.0.ebuild b/kde-frameworks/khtml/khtml-5.42.0.ebuild
new file mode 100644
index 000000000000..0252c7e3ccc8
--- /dev/null
+++ b/kde-frameworks/khtml/khtml-5.42.0.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="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-proto/xproto )
+"
+
+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 abad383d618f..307632a1f3cc 100644
--- a/kde-frameworks/ki18n/Manifest
+++ b/kde-frameworks/ki18n/Manifest
@@ -1,5 +1,5 @@
 DIST ki18n-5.40.0.tar.xz 586876 BLAKE2B 22878b121d8894b5e90db831fa13c41d1ff13d6065281c2d2169c973e6f94aae94faafc714f67f49f873f02b10b54a3080b89e3f6be22a1e0f6760106f7e09e5 SHA512 cfdabb1c22d0ae275c274b4e0d40af94305364bf69a8152c6d9064dcc4d5b8d208eace8b2679c4eb97f095ce5af5582350fec1564ace049d2f63e852b4249bd3
-DIST ki18n-5.41.0.tar.xz 586784 BLAKE2B b18c8a87fa05b8f1c6a9fa63705720544974d4ac1858cb66d896ed06508b28249bc944230073dc2f7f2b057d5cee9cd75df3bed38db3dae05108491e213808a6 SHA512 9e108cd8f9cc32c3fe1447415b427981baac58c01cd3127fe0df58b8f7b6ebd6716d48e87b99561c220178f3e6de6e557ce935326451e632028cb6253afd8488
+DIST ki18n-5.42.0.tar.xz 587480 BLAKE2B 9e8b875348cd290a3bdff176d7aacf8569c04786cf05b8e6e21def536b6b2844e37b78c54ed5bbbbac8d24248ce7744716bbf34ea4a083fcdcbd4a4d58c07b98 SHA512 31d6a548e6d6b0643a063030823d399c956f95a7403939ae63f1d9b03c70b38804bdba9332a473d7619f22fe6c5f65a33ff64f3ac5e12557ed9e1540431f6b87
 EBUILD ki18n-5.40.0.ebuild 727 BLAKE2B 2b151eb140beaf3571decc3f6bf8ef1b145a77209df0f9401cc6dba62f13bc075f275f2af8e8d7209a717693155c40f9351cb66d02d77d7107acbdbe75cc798f SHA512 b3e4de4e74d1466f2661f3d288661a6cd5765a4412af91d696b8f9dc98fd592781c582d99d457b6342969306e7e643a0b2fc0d1907a91f6dd1a4b3cfb1dd1c78
-EBUILD ki18n-5.41.0.ebuild 729 BLAKE2B a5382701576e6a8410466918b52683be586a3b38a9339ec233b073b4b6a5c58e13461d82c581c57655f92916d83a89b73abbab47ed41d073131b21ea6aa1fc3c SHA512 b3c363ef2ffe3b05617ff924f3cc8bcffadef928ab028e6647ddd8ead013fb49fcdd879fd2d10460a6dfbe453f90d95640393bd1a6d61ec00c73e1ea9537657a
+EBUILD ki18n-5.42.0.ebuild 613 BLAKE2B f4979242fdcc0e4134a4b538a06f6f3a04297e7a477b49d560f011602c940524444829625e4428c3ccfe5199bbc4fc0569b714b803d52f67acdab38c43ee9fec SHA512 c9c80f98e5da1622ad094582da394ee61fbc474812612d00d0ddb4764b7b5f700a144a2ca29b079f1827b877a2138953f7c40ba5b3148902aec03e7d6728d5cb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/ki18n/ki18n-5.41.0.ebuild b/kde-frameworks/ki18n/ki18n-5.41.0.ebuild
deleted file mode 100644
index 100efc693c26..000000000000
--- a/kde-frameworks/ki18n/ki18n-5.41.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-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 qtscript)
-	sys-devel/gettext
-	virtual/libintl
-"
-DEPEND="${RDEPEND}
-	test? (
-		$(add_qt_dep qtconcurrent)
-		$(add_qt_dep qtdeclarative)
-	)
-"
-
-pkg_setup() {
-	kde5_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	kde5_src_install
-	python_fix_shebang "${ED}/usr/$(get_libdir)/cmake/KF5I18n/ts-pmap-compile.py"
-}
diff --git a/kde-frameworks/ki18n/ki18n-5.42.0.ebuild b/kde-frameworks/ki18n/ki18n-5.42.0.ebuild
new file mode 100644
index 000000000000..8f03e6fd4a5f
--- /dev/null
+++ b/kde-frameworks/ki18n/ki18n-5.42.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+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 qtscript)
+	sys-devel/gettext
+	virtual/libintl
+"
+DEPEND="${RDEPEND}
+	test? (
+		$(add_qt_dep qtconcurrent)
+		$(add_qt_dep qtdeclarative)
+	)
+"
+
+pkg_setup() {
+	kde5_pkg_setup
+	python-single-r1_pkg_setup
+}
diff --git a/kde-frameworks/kiconthemes/Manifest b/kde-frameworks/kiconthemes/Manifest
index fbdecedf160a..3acb5d4d7857 100644
--- a/kde-frameworks/kiconthemes/Manifest
+++ b/kde-frameworks/kiconthemes/Manifest
@@ -1,5 +1,5 @@
 DIST kiconthemes-5.40.0.tar.xz 205516 BLAKE2B 53d952fa3311bd251ec46d6a1f81987c2f3ba457f846108ebe1921dad4564cace85549c6b4277142eee828c8e501bedf598bd4ea513b1200d1868b3b5b078d4a SHA512 bed22e1e1173e5838a43cce8305b0df3b6c7f5f90d958feaf14a8a9612de2d81bdc57a2e6807ac9375cdd8a96a433672484a931ec30c6816ba58f752b2b8c2cb
-DIST kiconthemes-5.41.0.tar.xz 205364 BLAKE2B 090c735d32c8d4b6760fca33de6e199cdafd36ea8560b40f496c7ca1f3625786c5cb9405e7c2f5246a293c36254d8f7d01ee99dc04104c26ed0f66c220cf8be8 SHA512 7cf106a044c2ec2b61bc8e8f138d158de707066059926ed1cbac323a58024ee2cd99a79400ab9fba0661e9835f8ce34ea75748de02c38cd7699233850177573e
+DIST kiconthemes-5.42.0.tar.xz 205316 BLAKE2B e5e4548225c12a39d9fc4ca77c4a4f22b36da723abf564c39331e345d16e02e89ebef8ee90d6611e496f4c1d100bc461a6054af5f5bfda7e2a860050df5f7f32 SHA512 7a4eebecc5d7af9498bab9729a4998b0c7032422ca0d7dee7b9fa9e217d287f0745a1e26f030ae758b903b91ac061f175db4ffb3097d9ba5906404a227617c08
 EBUILD kiconthemes-5.40.0.ebuild 664 BLAKE2B e65dc5c8dd6b96ce79cf5de4c16a4bcd1cc0711a4728c9e388e55bb3b99fceee208706532228762bdd09d3c7952ca3429ef9d2479a2fe1cc098da7619a4b136e SHA512 4180c9c0ec2d88c892e8bcdca9fd0be1de4448d694d486c956f62a7518551739942ed09002dcbed5e027cf1b41f81478b93e663512c13dc982733ee327ff4cbf
-EBUILD kiconthemes-5.41.0.ebuild 666 BLAKE2B 868c839a9d8e12bbf1afe2f1fa1555d2b95aea787585ef40aeed94a5fd32019fe5113be563ceb87bdb9a0b00fc404b915dd23247cb902084aca55580ec16ea0a SHA512 db6b58aeb0e509335ecedaf786b979afb2f23604cc4cdc56bf1bf0f3a197a55436bb63078f53b2a6b2d691ea84d2743d8cb87f69952e223a5262ab2c6f488cea
+EBUILD kiconthemes-5.42.0.ebuild 666 BLAKE2B b81137fc0da34c533d40972777bec6c5bfe5960b0a6b1be72b73e0c4c8cdcd65e388f0e2ca148d6639cc5dc4a1f214a665f321b6c7cf9830a6127241365f2874 SHA512 70ff3a80b3ee5afc0efd42c15c6a4a862c5ed191323eb1b075a4ca1794b6bfdf129de4b4485a580aef52e582fb24c31f615bfbbe24e9a9beb301802ccee0db43
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kiconthemes/kiconthemes-5.41.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.41.0.ebuild
deleted file mode 100644
index 308b6a45474e..000000000000
--- a/kde-frameworks/kiconthemes/kiconthemes-5.41.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
-
-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/kiconthemes/kiconthemes-5.42.0.ebuild b/kde-frameworks/kiconthemes/kiconthemes-5.42.0.ebuild
new file mode 100644
index 000000000000..56a0ecb3948b
--- /dev/null
+++ b/kde-frameworks/kiconthemes/kiconthemes-5.42.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 80d320fd5d21..6d275468b9f8 100644
--- a/kde-frameworks/kidletime/Manifest
+++ b/kde-frameworks/kidletime/Manifest
@@ -1,5 +1,5 @@
 DIST kidletime-5.40.0.tar.xz 26616 BLAKE2B 17c3e7d87156ad732f38ed0e4d0bdc4e4eb816d10686fd084a553216ba8ac4e5d0fc35590d5bcccb9deb100619539e79ec417643c31105e26b13ba392ff702b0 SHA512 b8c8c1de1c2261ad52ba80a11388a90ffa18c80153b58b0063184e14fe1c744465c150ef4e9be6692ca81330c52230029b406e8ae240e6738300f8977411a6ba
-DIST kidletime-5.41.0.tar.xz 26612 BLAKE2B c501488b442e3127816d870f6273f69f6c6fa1378003ccc96400b0e9110808a3b25b7a8f8f18990709e3b555ac439464be13d048bbd98d7748f809ff0138c411 SHA512 7dab05f459592ff4b81f56761cd04845c4c236a1674cdc273aef5604fcf5b649cc3a9ca6092d9222dfafaf2b38d9d783820e632d44228b5e5e26d1337f98f9ec
+DIST kidletime-5.42.0.tar.xz 26496 BLAKE2B c9815a7b09c526c67b43b33630573ba05193215d468ac7ed7fc91aff802bcf4d766490fff8a777c9c18fa3c78b3a6d5c0d76faa1c56eb568e76346569d7efb93 SHA512 78c89d83f7f46ef2c0a5c5adeb32b2f46129af1ae06ed29009cc6677876bcdf4441179bc3e760b4fef82a5a19b194017b4e12eb122403dd661e65d59f303663e
 EBUILD kidletime-5.40.0.ebuild 854 BLAKE2B f3ca435bdb9bd4165f9508f27dad19f15c8401f5c25c40a9985538ba295ee15be293420c45ab97cb3c17559905b144b4c7384ffb884cfa1de029228c6811be6d SHA512 f6f111cd2156340f0c1f1eb241cd8d2fc1e5046b9bd41155b948a2315f2f25beb9152956e34f1638c832374ec275ae9f7ba28561b3fad43856c245a1fad170a8
-EBUILD kidletime-5.41.0.ebuild 856 BLAKE2B 6b71eb90b450f32e2d18e37143afda59c4227041fff18744780216b912be6ec5c4c85e934c6d10a4e627d7ac2efe76ea3cba1093b0fa4856b03ebe74fa024a61 SHA512 6ec16458eb70ad62bc3cd7eb5c4106ba4055cbc67f697d6745e4b0b5903edc97dd2bb1dc7f19b67ce342fad60317df77a2fdb1961325910d4e8581c07ef195f5
+EBUILD kidletime-5.42.0.ebuild 856 BLAKE2B 076ebc288a1213b71be7e0cc9e51affd2b625ab9b8bb652cf1be7c75b152b6196af8adeda80dd63ca0f62a9e58d7b1aadc835612dff96c9d2a291a4836b770db SHA512 3b0eb427def2739b46eac981d09d498e719bf237c7bf78dd5ce42d3112014011c909b80848dafb17c1d2cec9a8350e02359f66207cca0020caf2900a5efe5d85
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kidletime/kidletime-5.41.0.ebuild b/kde-frameworks/kidletime/kidletime-5.41.0.ebuild
deleted file mode 100644
index f9b3ebb4a974..000000000000
--- a/kde-frameworks/kidletime/kidletime-5.41.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kidletime/kidletime-5.42.0.ebuild b/kde-frameworks/kidletime/kidletime-5.42.0.ebuild
new file mode 100644
index 000000000000..10865cb9fe0d
--- /dev/null
+++ b/kde-frameworks/kidletime/kidletime-5.42.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 50aeea497dca..9b4e99de7001 100644
--- a/kde-frameworks/kimageformats/Manifest
+++ b/kde-frameworks/kimageformats/Manifest
@@ -1,5 +1,5 @@
 DIST kimageformats-5.40.0.tar.xz 204748 BLAKE2B ff8d45dea9694d0b20f3320c12b295dfa5846db85a19f6c28b37f530c8d2b97026533d33fd15d88f78c7d148fa4310649d7cf71a9ae94e53cd2f1b0c07f17b53 SHA512 e971d02b34c1a63d9ccefb10e5c12b21e6a68330230ca06fd7e55b390fec6ef7937b5e404b446b9ec65e5b1f962a601c1ec03a7783d1e06f004ac5f6ff428ea4
-DIST kimageformats-5.41.0.tar.xz 204584 BLAKE2B 0081f6985290078ade1343a4b330ce0ec5eeec16d5b18d9fa01f06f88a7e25be55ff03578b5582794556e876691557e876e9e93e939294259736df448d4d8750 SHA512 19963055ec7129fc3b4c61fd4af1cac955eeecc6a70d73cc197b1e503e994e5bc9a52fe47951eb8a79008da0ac22fe805b64094d59fc4ff29f75bfb066ad7460
+DIST kimageformats-5.42.0.tar.xz 204920 BLAKE2B 2d939ce02aa10693528e5a8b59ba1beb1c016afd620df88851893d76922d37f6ff2a7097e3ed262e06f04fd693851b83d76c3f444181ec7cae9d60492ae8608e SHA512 3c83e0bc7b45019cd7de9282b7f3eaefad912009c073a6b35b6d518639de4b591e2f5a93ee3e4d76285e9c5778b34905dd40965af0853bcfa76ee526c29750a5
 EBUILD kimageformats-5.40.0.ebuild 714 BLAKE2B 33867e7e063da02d76374ebd9912d62e0b5f25158d97ac613b269616247e97091a46d97fcd9fb91d0f46522ec02c2c9de2bd14e60557aba78bdeef40e22fb38c SHA512 8f7a0d45787faf57dfcd816d6362cfb96ba7ebccf8a73332149ad12abeef6549a9d7fc4ac2b46f3c6630999e85da1e934a04dfc4d9fedf60133af1b64e911202
-EBUILD kimageformats-5.41.0.ebuild 716 BLAKE2B d117a97099b0e616dc7b8b14317518e27f81ab5d5d3f059d61ba0b568f2b9bddbfc8b6aef440a09d7095599483af3bde488e5d103f060ce9693b1c1c8f83a44d SHA512 9228ff124b7a63c9ec126c5bbf170f0f87a8e36c91dcfa454a85db2ab9b368d8f1e40138bed198ab03daca0507a47aa8a3ba964c0d19e5745cbf6810e8ff41c3
+EBUILD kimageformats-5.42.0.ebuild 716 BLAKE2B b8534906d0b6d30afd19f770084128ca25fd96d0525543f31515d91c670eb3ba1f10ccca68ea6f47ea0e05bf263d8294dce39abd098df934fcb1504a48718644 SHA512 5bac523df223f3d0a564625a8858fe83d6b80f8276e061c7ef4c8958ca3e43f6c842d80701b0433eb705d45424541eaac482736b707030170ec9c14ad6613dc0
 MISC metadata.xml 327 BLAKE2B 830c0a5e6689cfb881f6c878199b45716bf683fabe3ef6cbe51c757efcb057ad253912930b1637d958e26dbe0072ed25fca3051b752084a634dab1d1f34c7e6e SHA512 269908d4ff42e80fcb50a3a3b9ab6caceed1068edb2469f3de5563b5505f8053c14c698299383686c752a3b43097d3eccbfbde7f0d41684e5270bb2281a24d69
diff --git a/kde-frameworks/kimageformats/kimageformats-5.41.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.41.0.ebuild
deleted file mode 100644
index 0173cfc5f438..000000000000
--- a/kde-frameworks/kimageformats/kimageformats-5.41.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="eps openexr"
-
-RDEPEND="
-	$(add_frameworks_dep karchive)
-	$(add_qt_dep qtgui)
-	eps? ( $(add_qt_dep qtprintsupport) )
-	openexr? (
-		media-libs/ilmbase:=
-		media-libs/openexr:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( src/imageformats/AUTHORS )
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package eps Qt5PrintSupport)
-		$(cmake-utils_use_find_package openexr OpenEXR)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kimageformats/kimageformats-5.42.0.ebuild b/kde-frameworks/kimageformats/kimageformats-5.42.0.ebuild
new file mode 100644
index 000000000000..a75c094c8015
--- /dev/null
+++ b/kde-frameworks/kimageformats/kimageformats-5.42.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing additional format plugins for Qt's image I/O system"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="eps openexr"
+
+RDEPEND="
+	$(add_frameworks_dep karchive)
+	$(add_qt_dep qtgui)
+	eps? ( $(add_qt_dep qtprintsupport) )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( src/imageformats/AUTHORS )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package eps Qt5PrintSupport)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kinit/Manifest b/kde-frameworks/kinit/Manifest
index 1eaddad4d63c..bfcc727d0daf 100644
--- a/kde-frameworks/kinit/Manifest
+++ b/kde-frameworks/kinit/Manifest
@@ -1,5 +1,5 @@
 DIST kinit-5.40.0.tar.xz 120920 BLAKE2B 0bf69e2440a21a1c803859080825e9e25b3657c8f7114701fb62f448982da9bbd830faea8b2654e60c7a1602bc55c56dd4d25a10179408a01a46694c09198e46 SHA512 1bfa884726e4379d9e0246e283dd7867bb404416eb90226f644b46e06c4bc17c898470bddafaf9f6ba9fc6be5ea4d975cacb0e5fc5ea4d1038616e91e7ddcb07
-DIST kinit-5.41.0.tar.xz 120900 BLAKE2B 868cb29fbbdf10f2b01666ed1770db2ab6703ed9602be2ac76f4f347851a3c6c8b2c2ab6fe1b8f12f627c0e325938a7d6d731b28e100684f691c42939fa27c32 SHA512 d8bba487b3cefba337bc1c5656f7fa0aeb6c0ee1cb18b3e394de29572af4fe5fbf14c833b7ca6e941687899e7828b9571cd76dfc6b64ff2e110ac5f9b6669a02
+DIST kinit-5.42.0.tar.xz 120732 BLAKE2B 889e8cf57e76c1e839a5aee20757055ca1d1d55197c09d4bbc017786b07754035779200944e72b490e8272d9c0d5f5e952ab787bbd4cbb1d680391a2b9cabe96 SHA512 73bcd8094c8dc39f6779b076fd3cbb9bb24a17094d0ed7ff4f3c4eaad2d728114606120e28764fea042c5b204acf95a3a9673ac10fb88652d6d9ed9ab61b8368
 EBUILD kinit-5.40.0.ebuild 998 BLAKE2B 3a97c96b58e0e61f045852f8d47c66962eae08378649ff298f7c3d2c471eae51462c5956f570239afe8cb2325b55f3bb0b1df989bc71d9348e9a9b2292efe9df SHA512 cd50651556f58d2d9da8f02a4e7b4cff13d182e3615b403c738971a6434e3d760b152a665c61011628edc0fe42ede13f0d9fa19c0858295ec38b675d5bc0ce35
-EBUILD kinit-5.41.0.ebuild 1000 BLAKE2B 5f1f97124a9d6d0febd7a20c41db8eaa5bd81d4f8976acca2c493e94b25363ef695728e6022213e312d8d1aad7a0a2c64b9326814347dcfad4ca4d5c7a222787 SHA512 58d88996b4af050ea968198a42c87057306abec524c0a47be12adec2bf7d6dd3013ea4846206970534f3b14eca8c08728b2873bd8e012b6a9ca1267ef1ced282
+EBUILD kinit-5.42.0.ebuild 1000 BLAKE2B 47f8b4bfa6f5a2889902821923e461b9dd48e8cae6b524d80883c61e401356645d3382e40b87a13c53fdd3448fa128f75ab67a01e07b92f67c3812410353c43d SHA512 1861916711f7b19aa24cd2e9e01f399883622d60a79ac824f28d8dbc6c66fe32c86e258e63067b0aebbba063670eea3b235102501b9bd68d51b3cff98fb2f498
 MISC metadata.xml 412 BLAKE2B 8029572bd77c6a7381c5fdce9d864c05616c1da9144e61385936a6678cc94f2279be1b551c148fcea8b58f98ce704521c0f02f3b7ad0f9b41a4ebd3dd7c469bb SHA512 f5e7eea56365a00dee0fd4983e10b7cb5a0ec42f68eff735778d69f59499f7b5f59289429a59e7ef6e2afa8a830261782f4e86db229224e442c8d83dcc1e635a
diff --git a/kde-frameworks/kinit/kinit-5.41.0.ebuild b/kde-frameworks/kinit/kinit-5.41.0.ebuild
deleted file mode 100644
index e0ded3c2fe5c..000000000000
--- a/kde-frameworks/kinit/kinit-5.41.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-proto/xproto )
-"
-
-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/kinit/kinit-5.42.0.ebuild b/kde-frameworks/kinit/kinit-5.42.0.ebuild
new file mode 100644
index 000000000000..f547e317952a
--- /dev/null
+++ b/kde-frameworks/kinit/kinit-5.42.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="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-proto/xproto )
+"
+
+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 0139d0fa0b7f..7ea5726cb5da 100644
--- a/kde-frameworks/kio/Manifest
+++ b/kde-frameworks/kio/Manifest
@@ -2,7 +2,7 @@ AUX kio-5.40.0-knewfilemenu-mkpath-qt-5.9.3.patch 2506 BLAKE2B 404ce0e81484a20d1
 AUX kio-5.40.0-mkpath-qt-5.9.3.patch 2481 BLAKE2B 7c98a58dfaa7f86cf83179f2615d54fa0c1ef81a226a6533a2c6d0a7c3247ca9414ee7a9863664411f51f4433152f1df6e076402463010f27e9cd656bea036fa SHA512 c8207d96555ddeddc6e8d387fb59d33d2a7a34fc068f6ad9ee30f92b16007d5f53696fcc83e8a3686af6314e127f6556088f418b16759f9a1eea812adce0cd46
 AUX kio-5.40.0-testtrash-qt-5.9.3.patch 1311 BLAKE2B 98bf9667d64e1f408adcde47e05d26c8774459679cd3ad67948dd4a245225ce9cef4c1030aaaa01cb3303d7589bd97565860df7bbe329578bb298282c771c184 SHA512 4761fbb0f7d5034dc66717c2578b095fdb6b85241c5e05fc0ab166c75aae9ddd1d9b3aaa0b9628a44c13cc6f4cfcdb0aa348f3e1c97b7780e53567a1392c11ef
 DIST kio-5.40.0.tar.xz 3100424 BLAKE2B 27f69f10febc327d1f935e2b8f3c24dc8b64e85ef35830841f99fdefb6238f590dc8a1284bd0896d6e0e2eb86f123e6788ebd277ca208df18312e8ac475221dc SHA512 e35a7fed3c38f91c056d5ac04b4839ebbf199e4509187e997d6d8a217175a9dc442c7beacccf333ec092c0d110f8f008144293364006888f25b570d697c10bed
-DIST kio-5.41.0.tar.xz 3108068 BLAKE2B ca8fb4827908b6ba00dc7558f48e60fddf93049fdedf8001b02ca096ee93773fc43167d8c5ec1a5c8d060190dcdf3dc0b11044a26e33309fcd44a068720a3611 SHA512 8f7072bf6268bf07c0c1266cdbee58aacdf43721d193aaa7574c683a4339de3d9701977c8bdd604f301d11393b8d2031e0b90e9ccc42a2c5e62050f41bc04216
+DIST kio-5.42.0.tar.xz 3119252 BLAKE2B ea5ba09229c3b8a055460d629aa222fee91f9ee9f50ae75c64fd0e6a582fb722a15739bac7c00c169b0f218e3e69dd53213fa13f8fb08fb34457e54a252cc59a SHA512 bff5b0dd393586a4da8f077298b51002c7accf4f72646557b5e1f68fe496003932e133c977980d5816dca73aa2e35fa8629cba87886518c319d4450edae323cb
 EBUILD kio-5.40.0-r3.ebuild 2049 BLAKE2B 1ada218376a92f1c844609293957423ca0bf1965fe3bf597d9809882795fc743e8acfc9132a3821a64e11d7ad6341f33078c4466a420337ecfbd3a13a44faf98 SHA512 91eb82ca9b5c9b2f82991a22b667957ee16101082c40a699338a47f0a28dbd54d0fdfffaafc606ac5d7b051072f9db8316b0c42ce2c103fd6660ce5f53982d23
-EBUILD kio-5.41.0.ebuild 1896 BLAKE2B 05402887a0107b41fa23472b55e58f9f2420051e61c010745cfebb9dc1257808c12bbf1aed6ca0e9619c597450a56dace4d23da8e1b4256b0a64e48c90e843f2 SHA512 594849f0a48a4c6f3b8cb3255e9dca8f9e1fd4e798125a026f101d05a8779d5782aec991e68a1fa6447f758e5b63c15a8677458b48c8d666e8a1c3ccc161355c
+EBUILD kio-5.42.0.ebuild 1896 BLAKE2B 3d8f01d59c5c0e13d7af7b7a54fecac750a484b3a8fcbed19494d8dbd278cdfe80596ab3e1d3c81d6cee4749067e94000ec23485b564d9adae66979420b8831c SHA512 8d3a1e6bd814b2c412a4734e969ef1d4686bcd24827c06052c2a305ef7d970676f58226a77430b983f775aadc4b872573fbdebb23691628ef3e1084407be1755
 MISC metadata.xml 389 BLAKE2B e0f1cc136204ab865eef4b3051c40b136fb2659f402148b8f7e48b80bd9c7156f0811a7fe80bda4a16ccf671e69d076afc6179dae6d34db695672534a0b9de5f SHA512 ae0874c02b207fad481d7f26a01186787d39e015dca650c4515b419f5d703ead48dd3250e3d0dc5d23660be9afe33e226d393c4d88246eba7e313763e6546820
diff --git a/kde-frameworks/kio/kio-5.41.0.ebuild b/kde-frameworks/kio/kio-5.41.0.ebuild
deleted file mode 100644
index 4c595b88b638..000000000000
--- a/kde-frameworks/kio/kio-5.41.0.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
-
-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"
-
-RDEPEND="
-	$(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 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')
-	$(add_qt_dep qtscript)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-	dev-libs/libxml2
-	dev-libs/libxslt
-	acl? (
-		sys-apps/attr
-		virtual/acl
-	)
-	kerberos? ( virtual/krb5 )
-	kwallet? ( $(add_frameworks_dep kwallet) )
-	X? ( $(add_qt_dep qtx11extras) )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep qtconcurrent)
-	handbook? ( $(add_frameworks_dep kdoctools) )
-	test? ( sys-libs/zlib )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXrender
-		x11-proto/xproto
-	)
-"
-PDEPEND="
-	$(add_frameworks_dep kded)
-"
-
-# tests hang
-RESTRICT+=" test"
-
-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/kio/kio-5.42.0.ebuild b/kde-frameworks/kio/kio-5.42.0.ebuild
new file mode 100644
index 000000000000..c1924a16a4fb
--- /dev/null
+++ b/kde-frameworks/kio/kio-5.42.0.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+
+RDEPEND="
+	$(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 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')
+	$(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-libs/libX11
+		x11-libs/libXrender
+		x11-proto/xproto
+	)
+"
+PDEPEND="
+	$(add_frameworks_dep kded)
+"
+
+# tests hang
+RESTRICT+=" test"
+
+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 033710ab8d33..a8cd23c579b1 100644
--- a/kde-frameworks/kirigami/Manifest
+++ b/kde-frameworks/kirigami/Manifest
@@ -1,5 +1,5 @@
 DIST kirigami2-5.40.0.tar.xz 291456 BLAKE2B d00d9df6880c45b1c74430fdeb9e09d2e7292e6b9512213969e5ff8c5668df1cc85b3c0116a86f546ec11f8e96a2a66fa599c29d46efafa3e2bd7db2a9329071 SHA512 689d91f23a1300afd9204173a40e2a100e83b0eb38d02962236ab1ff91fd4659dcc60d84c815766a38cacf38294488d82c5d0b9d540c1a0972489aa29e300974
-DIST kirigami2-5.41.0.tar.xz 292460 BLAKE2B 51195f79d37fc2832c6be5d31394823eb9d862217feec4259956cfa8d6579fe0683d7bfb4036eeabdbb1c4cfbc4fe134ff06bc523629cfcd02f4766299a76276 SHA512 987f666822aa2c137c57019aed6e811ddd6406318252cd48e71412ee3e6bcb22cd35042c5e3a0e0da5d12db48e4bf7168199d7c473f100a07913f32b1cd23bd1
+DIST kirigami2-5.42.0.tar.xz 297292 BLAKE2B 9d6fe061a55401f66ba7a83df92b0b7cb6d2c453b4e4cd6b20512aa8eee44c664098497d2468fb654bbd3bd3dcaf7bde10c6ca283d411fe8c118c1089ef14d17 SHA512 0d848b7e30f902df1d0454f056308a20b92a9437d113107b2ea342cf460c0d718f1e8f6f89e72b3e4d97ec617b324611921e01c5cc73422a0a91d750b559e23f
 EBUILD kirigami-5.40.0.ebuild 916 BLAKE2B ec5163018354ad62c8486ffb12b002f38bb80dae17a8b5f0c23750a23316ea2ce05204bd1da03ea4827d718aa94dff52ad043e48d05007160a80aec9fc731a1f SHA512 e492963b7c5e94f0118a1a151edea0f58c49f4616dbf64a3fc995d4d82e5e45e57cc6f1ec77dc3aa40b821a9e8a239254d88f8e89785fb0a4442a25a9a76e10f
-EBUILD kirigami-5.41.0.ebuild 918 BLAKE2B 7f0806d8e098131fe62d99c7e86265ef46f59594fa6d7f536667f11a45f28f2df40d99a464ddaaba11e87dbbf56ead2e312f3920ae2d85ac6c1cb142f28f6e3c SHA512 01fbf0721e85efa1656180d467d79cbe0e72c1fe71a845fe13f8740d56d9e80b8db013c4de7d71f058bd464b4d9f76497eea5581bdb1a7d2eabe05d7be9b0fbf
+EBUILD kirigami-5.42.0.ebuild 836 BLAKE2B 53cee3f7bf15fff9ca890a463988a5a92bd737053a8df59b53ccbeda0979289a42f5779c13e1fe65b01af965f10ef6aaf6836ad7697e56056ed11c9991fffdc5 SHA512 64989b2f4519c5e06268938319b8464414ee28124811e159e8ad6d894028da4e148f74c49ec48fcfb6b895fb331537786fe3d6e6545e990453609f3ef2c15c65
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kirigami/kirigami-5.41.0.ebuild b/kde-frameworks/kirigami/kirigami-5.41.0.ebuild
deleted file mode 100644
index d3fa319c2d78..000000000000
--- a/kde-frameworks/kirigami/kirigami-5.41.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
-
-KDE_EXAMPLES="true"
-KDE_QTHELP="false"
-KDE_TEST="forceoptional"
-KMNAME="${PN}2"
-inherit kde5
-
-DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
-HOMEPAGE="https://techbase.kde.org/Kirigami"
-EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
-
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="plasma"
-
-RDEPEND="
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtquickcontrols2)
-	$(add_qt_dep qtsvg)
-	plasma? ( $(add_frameworks_dep plasma) )
-"
-DEPEND="${RDEPEND}
-	$(add_qt_dep linguist-tools)
-"
-
-# requires package to already be installed
-RESTRICT+=" test"
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_EXAMPLES=$(usex examples)
-		-DPLASMA_ENABLED=$(usex plasma)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kirigami/kirigami-5.42.0.ebuild b/kde-frameworks/kirigami/kirigami-5.42.0.ebuild
new file mode 100644
index 000000000000..c337380d8365
--- /dev/null
+++ b/kde-frameworks/kirigami/kirigami-5.42.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_EXAMPLES="true"
+KDE_QTHELP="false"
+KDE_TEST="forceoptional"
+KMNAME="${PN}2"
+inherit kde5
+
+DESCRIPTION="Lightweight user interface framework for mobile and convergent applications"
+HOMEPAGE="https://techbase.kde.org/Kirigami"
+EGIT_REPO_URI="${EGIT_REPO_URI/${PN}2/${PN}}"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_qt_dep qtdeclarative)
+	$(add_qt_dep qtgraphicaleffects)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtquickcontrols2)
+	$(add_qt_dep qtsvg)
+"
+DEPEND="${RDEPEND}
+	$(add_qt_dep linguist-tools)
+"
+
+# requires package to already be installed
+RESTRICT+=" test"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_EXAMPLES=$(usex examples)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-frameworks/kitemmodels/Manifest b/kde-frameworks/kitemmodels/Manifest
index 900954710020..4ad54b009f7c 100644
--- a/kde-frameworks/kitemmodels/Manifest
+++ b/kde-frameworks/kitemmodels/Manifest
@@ -1,5 +1,5 @@
 DIST kitemmodels-5.40.0.tar.xz 389628 BLAKE2B 42ec268ca734db5dea7a380de739036028683e421a79987dec94c6f8243f9f6beae3d35c78c6be63d927328b69c171c8792b3dd1c078bfc3555faf871e0ea562 SHA512 17f78419b5860b6423a555d5ab529f68e7589e76b1f0c32f5ff0f581991a480cd9424d86d1384a85c221bb3037491a8fa4a0bf1e20ee7ed046d9be8c76e74446
-DIST kitemmodels-5.41.0.tar.xz 389792 BLAKE2B 627134932197eadb97249ff627826e516e406ee770bd0e5bbacdf7d74c88def1d0cd4cc4852977844a812da84e2d15658e095f08c5c2c41c2ae37c98b7f02fa1 SHA512 36d3d07c467cbc249f0554dc96866bfa136617893dbf543ac8f821c693ecbe7d79a24dfb5e99527a0c7f13594cfe5847841d1772fccb1f7cafbf734507f6d9e3
+DIST kitemmodels-5.42.0.tar.xz 389656 BLAKE2B 5a51dff4fd699c039fc914c81f3b0744039212a8810f2c48bb60c39c6fd5d4d78ab3f92fc274dfb989e556b7bc5254ad0e5337d4b63e2b995cae3d249be10fd3 SHA512 63b15e64eff849d13a13d300544e03ee24900f6f6cce8ab867fbf8120f81db744f961e86aecc3884e808eb37c4b9eb2aa61f45c7c2e9568b2bcec6c41a4cfaf2
 EBUILD kitemmodels-5.40.0.ebuild 353 BLAKE2B 8a2413743e526d44a9575a9cef011cd3c70822dc17c327140855e42b83dd8530923a42bab27641e6b4225cf6529b90bdb15a3776feaca863aa111bc5bfeba845 SHA512 704035766cff8bce455a4e72b29ee132acc6c8ef4a1e04f6cdcb9553a87356495ccd02d449fa2056b385561140e632cfe001b8d9efe0f22e3ec7d7021401a442
-EBUILD kitemmodels-5.41.0.ebuild 355 BLAKE2B d2e4cb72d588460b91243274c7e4f77d0645168199bedf557427cbd58d9d5013b226f2ce537d39cad94358f84a2043efea13ccae63df2d412e607115dd1c47f2 SHA512 08cd15763d11eee83254a3a467bb5ae2f41c24c57ec1bb8fea2b7f36709469d44f4e68ec54cbcca047b91d22491c4f74f73b66c3097184f19f2a6aa19c7b3b3a
+EBUILD kitemmodels-5.42.0.ebuild 355 BLAKE2B 223b251231dfbfd263a5c841288b1ca009c56d0e33dd8ebc3d58d750bcd0e1caf1c7ad75bd300bb0aed47caf4647e0f9f1cdb8cb2ac51a8fcb6f199cdfa38181 SHA512 d492e9cb63eace2d8618e65df7871a787c66725e982d06160bd466fc20dc2a4011e0b697a86792560f08792f923d712e6b741c7a6c3ee3efeb938aab50d79ba9
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kitemmodels/kitemmodels-5.41.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.41.0.ebuild
deleted file mode 100644
index 776ab481c87a..000000000000
--- a/kde-frameworks/kitemmodels/kitemmodels-5.41.0.ebuild
+++ /dev/null
@@ -1,14 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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/kitemmodels/kitemmodels-5.42.0.ebuild b/kde-frameworks/kitemmodels/kitemmodels-5.42.0.ebuild
new file mode 100644
index 000000000000..90d5d027232c
--- /dev/null
+++ b/kde-frameworks/kitemmodels/kitemmodels-5.42.0.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 3464bd5e845d..75c5f10e7415 100644
--- a/kde-frameworks/kitemviews/Manifest
+++ b/kde-frameworks/kitemviews/Manifest
@@ -1,5 +1,5 @@
 DIST kitemviews-5.40.0.tar.xz 74968 BLAKE2B d7a72f6902d6af9105e5a122caf76e4b703775757cecf9c03c0d1349a498f59811f5112c6785c07810cd7e137122fc26bd6dd90708839938e3359d762f53548b SHA512 54e7f7fe422c0750a20b9cbf4a44c8865513574ae79afea8a2bac70637d293514b0f3a386567fcb6ad559da18ff9a6589d5b55bdf8411606ad24592c857a110c
-DIST kitemviews-5.41.0.tar.xz 74964 BLAKE2B f687939d8be6a6676007ff2b9746039a59ee2dfb8d4122a62c294d4715bd02fc8f2ec925ff684eabf398c7bd902b9b4520bfb02a524e4ee7e7f2c7e4793ccb26 SHA512 81e8d1d158e7fc11e3afcf262a0da41f3c9b80a55134c315f7ebf610254d741d999a7ab3cc1eb8d8f63627c2c155282b0727e2ffefedba65f58a254a2e9d862a
+DIST kitemviews-5.42.0.tar.xz 74916 BLAKE2B 497b59bc18f02879c75f1644f5dac73cdb335e61f17ccc60e9cad2bd6d6a4e406a800a7e5da2378414ca356fab2bf8d81a4540ce3d5b7b14f11509438a9fa89c SHA512 d53f969dbcace3bec89331c1be04a22cbdade34983c89deb25490e45474a4d53f32783d3885783c45f3597fa7d08e9b60899d62802383b26e39990dc0d82d903
 EBUILD kitemviews-5.40.0.ebuild 405 BLAKE2B f749ec6148e43aadbe4b41caf28d3b87be0058e548cd5386f8976acf4bb0474b95ff58903ecb6452dcc6014fbe9b7a05c7c8c32622f1245e8c959e15d76d8720 SHA512 79dd367165031c500518814a0568b4be99d71e47f43ce37bec2661a4bb6700847979d15563d83969a84075b722eeb698277dfd7354dfd4032c044207570f0781
-EBUILD kitemviews-5.41.0.ebuild 407 BLAKE2B 18a4cc0933083ba279257d7924be9808b1eacbc7d592c60fca795df075a60c51ed3276dee7b2a4a1b6a756cbb039fe91cde68ccb669a6deed70cc5ccec8c2e81 SHA512 826dcd75962bd4cf323204fb0a92fe4090d71474e8c91d9a78f89383fae2ac453753b56f63e35cabdd7ec07f9ad6843ccd2292f3b3921fbe2d8fece0dcd209b9
+EBUILD kitemviews-5.42.0.ebuild 407 BLAKE2B 271b01263fd70e1169e8121a6a90dbde0168290157e2a8767b01587e329293c1efe77ba0d3abeaced58a05390cb56d02ebf8855a1c731a9a0d83e3fe531791e6 SHA512 aee015e8588d94ba13b9782217c95b05d95c416537034ff3b2957b4faceced6206a32e7dba3bf21116782dc4d00e13e6a6b3967dc9fddf8083ac1f3742cb7d80
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kitemviews/kitemviews-5.41.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.41.0.ebuild
deleted file mode 100644
index e1f1390aff16..000000000000
--- a/kde-frameworks/kitemviews/kitemviews-5.41.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kitemviews/kitemviews-5.42.0.ebuild b/kde-frameworks/kitemviews/kitemviews-5.42.0.ebuild
new file mode 100644
index 000000000000..029a533f9ea9
--- /dev/null
+++ b/kde-frameworks/kitemviews/kitemviews-5.42.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="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 678c200a34e9..9d0f6791c16c 100644
--- a/kde-frameworks/kjobwidgets/Manifest
+++ b/kde-frameworks/kjobwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST kjobwidgets-5.40.0.tar.xz 90004 BLAKE2B 2b30c58bf3b4e918190bb54e2a8a33de6d4428aa7d5d6b200b3b61474e9a948941b9926383a1aa2da6611f7b607f6da99b350803c94ae42570850a98acfff57d SHA512 ee0fe25fe1c8faedfa834f7a381e8e15dbde3adfb9c6aacef362c39b251a2a3ec84c966c9cfde7ef906a5bfa7bff71d3c5cf374e0d949fb4d18224afebd09c33
-DIST kjobwidgets-5.41.0.tar.xz 90012 BLAKE2B d1808caec705119267071244fcfe5db8684474bf79b9af6cd3efff16b4192251cf653a5a8df782dee40fe981371bd24fc69a57929f7dd612f627f9c81eb24d07 SHA512 0760da48a1f1db220b2c845f774195d143bda2cee451953840beb3d787294e39183dac9d06e4498bccb5ba0e15ff20a268b308c362c93cb38c04af7b53a7ccb6
+DIST kjobwidgets-5.42.0.tar.xz 89764 BLAKE2B 7ebb0e8e615b921f93cdd9696763b35049f9b16720817f24e99edf5c28bc5a9e64445ab01337fea156f41a13049632be8fa8cfa182a6c71d35141124b54e1d54 SHA512 26e3a0842d7ce439a557fee2c3d8efed196a6c9ef3494f476043cf2113e5280ffb7ca1765e4210ab42b543e30accee6cc650844d17767faa9656e8ec953455ce
 EBUILD kjobwidgets-5.40.0.ebuild 678 BLAKE2B 1bdee4da6683965301320e8d7ca27cc0ebd9902690285c975c9ec94cfaddb5987f364d6b8fdf6bd196ece5c09302b4cdee373eac242327ba077b7958be2d87ad SHA512 73443f67e43df69b89d234e12ca7d9b8d340e8c6bec88dd87dabc54aeaa3565db9aa265594837c64cf030102ef802774e3d44807aee5f7220697fb7d2526c632
-EBUILD kjobwidgets-5.41.0.ebuild 680 BLAKE2B 95d140f8b05259a3c898c3248db99b188a537e4d9eb2fd5d40957805d3d829c40b1cdd8d3f29c661e052d526e1fb116c6460bf5d16046fa7ac3b468e98b89bf0 SHA512 fea88e513d82fcdc5a7c16a7cc265eb15e4b5d8d14524ef0bcd5af6a2558a2ee8c6eb1806a0b36f4a12e5b8180a15ce8e28970cd8a8fd8679ca5b819f98041dc
+EBUILD kjobwidgets-5.42.0.ebuild 680 BLAKE2B ae8f397e2f35cc185b159bda2ca70a1affe50400e65d9d6d6c826c7a4918db229cec153af831ad5400bed7009454986a07d89e90bc8baffb59465ace2b9f5b79 SHA512 abb25c310a9c8f466da20e2d1fd269ba7ea505736d8b18ce0e02a2af4adccf21e126244c0437a3ff9b9d0017d2d425dfdb717951a8bc15e2a11c0e3d82475763
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.41.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.41.0.ebuild
deleted file mode 100644
index 9d5fa5ef96a3..000000000000
--- a/kde-frameworks/kjobwidgets/kjobwidgets-5.41.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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-libs/libX11
-		x11-proto/xproto
-	)
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/kjobwidgets/kjobwidgets-5.42.0.ebuild b/kde-frameworks/kjobwidgets/kjobwidgets-5.42.0.ebuild
new file mode 100644
index 000000000000..dead1c175035
--- /dev/null
+++ b/kde-frameworks/kjobwidgets/kjobwidgets-5.42.0.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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-libs/libX11
+		x11-proto/xproto
+	)
+"
+
+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 5699dda6158a..bd0fdca41a25 100644
--- a/kde-frameworks/kjs/Manifest
+++ b/kde-frameworks/kjs/Manifest
@@ -1,5 +1,5 @@
 DIST kjs-5.40.0.tar.xz 294940 BLAKE2B f2b3219dd32669e0fa4e46112339f4b87dd4d1f9a417700a1ff28870ff9f11d3eae56d76ab48ba6277b13c93cdb15f4e43a6018c1db69b007295c42e1c35488f SHA512 a9db958cb99f47d8fbc428ace36f050e191f47058ae1fc7f9f4f7bdb8d763e65870a79a1fac504706d26d1d5bbb1988543235519a1cefa46ca4e6e14323208b5
-DIST kjs-5.41.0.tar.xz 294944 BLAKE2B d5c1dd1ea13fb84100d0b26744449942f67577d20612b64c4e34f03feea4b4a7f7a4781ddd0fa5818d1046fca7cad7c4f4969987d37febe2d47a8d5b61dcb26f SHA512 8a3bc231f1595704f8ee92ad9680b5d6fc715f304bab311445bb599a2e0cadfaec95f9c04f45a6f2a2be186f51bf54d2de702289a2f02fbf3c1acd93ff06f91b
+DIST kjs-5.42.0.tar.xz 294780 BLAKE2B 61867f5d3aff5ef6eb5b164a336d84649310690c09ee58eeb0b7258b5632c9ccf752eb79797561c860abce3b17cd58c5aa9beb6ef780993c6aceedb13be2dba3 SHA512 af981d96ebd391ad802f9452a5aa1ea6bd0770af8f18901357d815504bb09f005099e6cb521d9e8a872d542222ca96cce74335afbec2cb087df3a51075dbcafa
 EBUILD kjs-5.40.0.ebuild 388 BLAKE2B 30e290264f5452106fed14cdc5d88b963c01ea15b0fe7035ea2fbe7ba0b9e0b1415abd2198cf3dab09d8fee3146c4b526579b30dfcc26e871a051c80bb086f7a SHA512 388cd6c3b6bbc37d9d146de2903e8fbc0a6601b09373615d4e27b2bd5e34809019900bdbe5c178487f0aa1af1ef257c5a2a281f376a34754ddfa45feae873566
-EBUILD kjs-5.41.0.ebuild 390 BLAKE2B fc8adfd0ad72d5db0be29c0dceb4f85f0f50dfeeeb44731a8c9ba206a66020780afcad6caec27cf2c7bf66bc7ea1a822a42617a723fa7d9b907ae56519efb7a0 SHA512 f37b751622b4265eaf7361e8aaf3d2fe623cad715c34345113849fb2bc360681aa38076cae192c117de91dbe4ef65a5e8f5db99de25e7c41137ba20d869c980c
+EBUILD kjs-5.42.0.ebuild 390 BLAKE2B 29f9ada109e42b941807ae9f7b9bb3d3d67e0a173ce67c4f949693e595800569f2bc09ba226d47978b283a941aabda85aaed6bc5f4284cda76fae8f720a1e454 SHA512 a18b1a5b56d8cf10b5b54187ee4ce04ebeff9e49cf40b19be82a3bca14a84b7c787f21c5019e4701804e11e575a62f4b5e923c54842aceddb3868992f64ad155
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjs/kjs-5.41.0.ebuild b/kde-frameworks/kjs/kjs-5.41.0.ebuild
deleted file mode 100644
index 5dc713b5658e..000000000000
--- a/kde-frameworks/kjs/kjs-5.41.0.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-inherit kde5
-
-DESCRIPTION="ECMAScipt compatible parser and engine"
-LICENSE="BSD-2 LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	dev-libs/libpcre
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	dev-lang/perl
-"
-
-DOCS=( src/README )
diff --git a/kde-frameworks/kjs/kjs-5.42.0.ebuild b/kde-frameworks/kjs/kjs-5.42.0.ebuild
new file mode 100644
index 000000000000..0dd6a9ecd3eb
--- /dev/null
+++ b/kde-frameworks/kjs/kjs-5.42.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+inherit kde5
+
+DESCRIPTION="ECMAScipt compatible parser and engine"
+LICENSE="BSD-2 LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	dev-libs/libpcre
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	dev-lang/perl
+"
+
+DOCS=( src/README )
diff --git a/kde-frameworks/kjsembed/Manifest b/kde-frameworks/kjsembed/Manifest
index 31668a342d66..78100c89a023 100644
--- a/kde-frameworks/kjsembed/Manifest
+++ b/kde-frameworks/kjsembed/Manifest
@@ -1,5 +1,5 @@
 DIST kjsembed-5.40.0.tar.xz 169680 BLAKE2B 37175390368c9a2e28e02d699b7bc70c583b4bd32852c0ad963b9249dd26d359e3c0aaaf8fe665bbe30523ea2f0505664c5fde598f694a5f76a4db2ee432b7a8 SHA512 4b14d85bf5d67f61eea08eba31e4c3891c418f9bd7af931c6c643672b765ad0714b39da23f8ec57e2d752cabcd04db5647cf1a088f8bdc06be5f606d93297078
-DIST kjsembed-5.41.0.tar.xz 169712 BLAKE2B 963f0c60a86962599630c215a4b95302d7fe526bdfabbdb74dd856e9a4d1fec053f204bf95e84a52be161cfab169870656bca1f1d760a325adcc1f7f0250600a SHA512 4029c45a86bc1e415d8bf9a2e6df019c6e4988d1c9935f1120966f04f2722627652d0fa856dd5a31aac2b848b71a3aabcb870ada5b24338351956d7cad43147a
+DIST kjsembed-5.42.0.tar.xz 169460 BLAKE2B 9890220d6bd2eaed125492a9d1e5febd2226360794d487fce92d79c4762f6b8572ac35045d3c6e25fd82727b2032a89301731b20bff8692dccff923e6c871492 SHA512 6ff1212dd5e14528b52bd509a6c362e8e3db4b5e6033a9179c5b97a3751c2c6c9209e9a3111307a7d04eb9c5d4b7987d61fc619b17208397a01ad9e03d7bd8fa
 EBUILD kjsembed-5.40.0.ebuild 523 BLAKE2B a1fd71e853414739f8825daf2195c1061e648bf336f869498551f6cfc5ccf2bf809ead3d2f87c1745d1157c5c50955b2bceeb478f185b0e98c8857ed2e8c9bc9 SHA512 dcbc129d1902c38a599b43d4f75c9b9c1021694993f79e65d65f9360b139e5229d73edf65440a49bef3839078f3d42a4a5388595372e3f77970525db84e082fd
-EBUILD kjsembed-5.41.0.ebuild 525 BLAKE2B 1f0350c8a0a0e226921ddd915bbbd647488f5859bf7186f2a16f2eb44255ebe8587206a93ac124fb6b43414158def082710bcb234b8ce22644007a9ec82e89de SHA512 c7802f98a56a73435e42f33f0ca70267c1c6b2435bc78ad2f8d9ce68e6c0a9668ceb36794799fabcafd2c7801993ba6589e21876483d4c8ec2a7ce4359797457
+EBUILD kjsembed-5.42.0.ebuild 525 BLAKE2B c2b8dbe4f91731b8ef1f9df4c90e08a24cdbf03e2bf803b41b6ec5d138094e25d555569129bef7c69f43449223c3f1c8256c2e37fe5a6e24564c1622e0a5da68 SHA512 2ac1f393f7da76d24da423494e5acd80ae5f507405ab29ce6f45cb7ee9d69d800175c1d4ae356360cd748f761eb853ba2bcc2a30b2fa3161f8e8935a81843f31
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kjsembed/kjsembed-5.41.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.41.0.ebuild
deleted file mode 100644
index f7e4cef3bdb6..000000000000
--- a/kde-frameworks/kjsembed/kjsembed-5.41.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-KDE_TEST="false"
-inherit kde5
-
-DESCRIPTION="Framework binding JavaScript objects to QObjects"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE=""
-
-RDEPEND="
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kjs)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtxml)
-"
-DEPEND="${RDEPEND}
-	$(add_frameworks_dep kdoctools)
-	$(add_qt_dep designer)
-"
diff --git a/kde-frameworks/kjsembed/kjsembed-5.42.0.ebuild b/kde-frameworks/kjsembed/kjsembed-5.42.0.ebuild
new file mode 100644
index 000000000000..1463fe8a59cf
--- /dev/null
+++ b/kde-frameworks/kjsembed/kjsembed-5.42.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework binding JavaScript objects to QObjects"
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE=""
+
+RDEPEND="
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kjs)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+"
+DEPEND="${RDEPEND}
+	$(add_frameworks_dep kdoctools)
+	$(add_qt_dep designer)
+"
diff --git a/kde-frameworks/kmediaplayer/Manifest b/kde-frameworks/kmediaplayer/Manifest
index 447f7972c919..0b8cca072275 100644
--- a/kde-frameworks/kmediaplayer/Manifest
+++ b/kde-frameworks/kmediaplayer/Manifest
@@ -1,5 +1,5 @@
 DIST kmediaplayer-5.40.0.tar.xz 9616 BLAKE2B 21832541f6b4cc8b1b79c6d3db0a197b55631b202fb380c20982b0ba2623742a3de381dec49a9de6de548c248335cd381fd6afbfc1824dbb2d4e402e84c23015 SHA512 69e782b366a957d7849c5d995844d6e4ed52dbb7a1ab835d7dcf04c9a50f9337805b0139db81b5e2a787263dda32a223aeadefc45194c2fab7c2de657039df1f
-DIST kmediaplayer-5.41.0.tar.xz 9612 BLAKE2B 1dd259bd62ec8fc89ada09bb153be19f9c043ea669ba44614b08135b3d1de6bb92226359706705ea1a4a7d59e14e6899314f7c39471c31451d07d1ba4d012436 SHA512 91d0c223c6e8a1418020af90a4f34713a69f9eebe12757890baa1b6eda4eb100a132f4e757a34442d8239b4d1934ec4fae7f34a86feb6b684858d9fc51b5200e
+DIST kmediaplayer-5.42.0.tar.xz 9500 BLAKE2B 3c510040b5e422ff8a28a882fea65e68e105540d1c21652585270c6ffca0f88ba018b1b988f4da40e50edb63acba00c3999dcef194651be5c5989e12fa1abcd0 SHA512 f2821597cadaae7e9686282a0b58f6a9417a3bdc229ca6076003551c2d3fc5c061e55dfb690892756c308c5ebae81ad0370931db433acb00ff5eab73056a3a0a
 EBUILD kmediaplayer-5.40.0.ebuild 453 BLAKE2B ac5f1d170bfdca8b3674e4e59af98893c11a84b84dee560f6610bd1eb596dcdbd280e233a8e9edd03f77b2422b4be377fcad454a967010c6fb7bef417e7c5d90 SHA512 3ad57e3872c18da901fa27104eb04e5a00db786c2c8004fba99daf13532068ab5f9750ee7fe0b4a93862ab3a580388f56fc36b796e40fc5718380dd36f99cf5e
-EBUILD kmediaplayer-5.41.0.ebuild 455 BLAKE2B 00fb210f273f8b5ea4429210d33c1b3d59613fa6ecd68306fea767e8f063134a50fedffe653ba8f628f689aaaf3badf29c504319d8f6fa4c0831c303af4c899b SHA512 6709f80183278d864c22d09691855a4a88f86a99725ab38dc014c4edce7d929fabc39d323b2190c630d773b2bc124d18c0537211828534831a0642a172a017f8
+EBUILD kmediaplayer-5.42.0.ebuild 455 BLAKE2B a3aea55a9edef4b08330c8477e5ca73bc8ad92254455392241ca7e993c7d94da212f4b4e75a0c75dcd69f99e7a78da6e8d6e21ba39f537b49218ef062d5b711e SHA512 502f5e9197896ba494ce444e75311500f5681fedf607115ff7d1f144ac080836db8ee2a1e7c4ba076c997cc909d64ef5a4d575ecb2318e712c10328f2709a1ec
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kmediaplayer/kmediaplayer-5.41.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.41.0.ebuild
deleted file mode 100644
index 20c65967558c..000000000000
--- a/kde-frameworks/kmediaplayer/kmediaplayer-5.41.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=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/kmediaplayer/kmediaplayer-5.42.0.ebuild b/kde-frameworks/kmediaplayer/kmediaplayer-5.42.0.ebuild
new file mode 100644
index 000000000000..9bb5a33e13f1
--- /dev/null
+++ b/kde-frameworks/kmediaplayer/kmediaplayer-5.42.0.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework providing 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 70fed7a7e37c..be196ce33f7c 100644
--- a/kde-frameworks/knewstuff/Manifest
+++ b/kde-frameworks/knewstuff/Manifest
@@ -1,5 +1,5 @@
 DIST knewstuff-5.40.0.tar.xz 909280 BLAKE2B 38966edfa402e92e994081afa93b2f410922fd561953bab650bc71a9ecc79ff5fa70a879fa971247d8c6917a6762378c625d79629c9993679806fcbf002f5796 SHA512 496feafb526ee7ae835e5e590f691c86b22bffb2c446de151a6d582662c856f0df755bbbe91fec06c2e06bc5577181972bb95a3f1afcf9aabca1f055e56c42ff
-DIST knewstuff-5.41.0.tar.xz 912224 BLAKE2B a79bff9f5def2f7007c4667e609e2f90ddda5fefa5ef023588437b4ea9e870800e6e127b203c5e62c3fc761c53d295943931b0d5689832e142c15949755567a5 SHA512 52001c0283c445eb0d2ea0d9f4a8f5d4dbdba518ae99d6e97fd12fcc522e422adc9d897b564a8adf45259ded9c674ab021d574ce084d9ed7f5242478ffa32ed8
+DIST knewstuff-5.42.0.tar.xz 914456 BLAKE2B f384d4ab4108760350e394ea2f452e2984b3b752afb0477dd964e2bb728dd78db13ff27bb4227fe4f101f694647fc018977aed5c372a91e2bb5187f444d3e867 SHA512 6371e70d6cce9f28554b254b6273351ced2305d977af23b35aa82fe965194e7771b0bfc4af1266035ae385904f9c04369b0dcad9202fbb218a17b1e9a808643f
 EBUILD knewstuff-5.40.0.ebuild 897 BLAKE2B 72859cf1fe6fd5d9809dda3bdd21980f4338542f03b16e3db1d79fe06e623003e81c0395e0c83ccd13ae66f5920ef84a283504a4b5092d46b5ddb8b7f19d140c SHA512 40caaca4216abbcb5970930d589e1ad0bc0ec6d6d20f2425f2e2198d1f22a646bf1c15a25f443761c57cfdda2252793656cd6e428b9f6ee739bf58bf8c4905c5
-EBUILD knewstuff-5.41.0.ebuild 899 BLAKE2B 959e367c1d3bf34be37c9b8e76e94200e42c46ccf838ca964ff0e78ac07aefb4157b494b440851cd52ad8de5da83fd81ff65459318f9c63ffd7d2bf34e5af38f SHA512 14146f4bc9998168811e79b12f5e5a9c07681916a0b130daef98c1b2b669f127354bb6351fbf932f968b840d974327a635089d0d55c93769c87c1734265fe448
+EBUILD knewstuff-5.42.0.ebuild 899 BLAKE2B 651db21b676cd76ed69d8fa5f910f9af3827500986043edbcbc12bf2af29a83901cc265ed87cd4eab4aaa079b8a20e65e716db052efee8565768cff90ef1c94e SHA512 5ad2ed5f066f6a23a02925cccb4c07420c16bccb7c7501c637bb0623d0dfc82603c2bd4465c60f48528f18d6a42533a1ab02ae722292a14ec2c9c933803a7dd1
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/knewstuff/knewstuff-5.41.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.41.0.ebuild
deleted file mode 100644
index 5050b624250c..000000000000
--- a/kde-frameworks/knewstuff/knewstuff-5.41.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/knewstuff/knewstuff-5.42.0.ebuild b/kde-frameworks/knewstuff/knewstuff-5.42.0.ebuild
new file mode 100644
index 000000000000..fccd68c14db0
--- /dev/null
+++ b/kde-frameworks/knewstuff/knewstuff-5.42.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 64927988b3c6..71cd750b9eef 100644
--- a/kde-frameworks/knotifications/Manifest
+++ b/kde-frameworks/knotifications/Manifest
@@ -1,5 +1,5 @@
 DIST knotifications-5.40.0.tar.xz 99964 BLAKE2B 7ab0dfcca611b28f2f008fa7984a6b7b832ed718d54fd0cbf1b7b810d02ec89bc6f95fb2ffee1d877397ed68abeefdce113a879ad565e8af9cd892aa1fdddba6 SHA512 7fbeff7ce781904ae9d3d57ef439c1d41880558f219465d5b593ee3099d3ce091124067494f5ce9da590ce68ab8f12ac2eda96c59be8d0a767b3edafeb251675
-DIST knotifications-5.41.0.tar.xz 99952 BLAKE2B 9046b2225adf52d58502a1a1a11c878f9fec3e473c1a38cf9a7366a97bd6e6d435d46c6eb220b4c340d35e531cc3ab985311ebed906794068401b77518225fb5 SHA512 403adbafd6408bfe8c38afd312ec3b2b4f73d6601a6ea076d309ea7e7e599365cd89dbd5aad2358fb931c1414c22069228dd7991f65dc0adbeda54701f70354d
+DIST knotifications-5.42.0.tar.xz 100612 BLAKE2B d79562372d7f6e92bc209e3fb5a646d596da2767358e40fa91e02bd4958bd07085808d983497d56192ad4e3f0e46889d84d0a3d2d1b976e746be8afc75a331ac SHA512 7440bb4b4f025a80d5fc2ffdc10189c7223c0b82ec569f640b88e7fba4f84ccc00a4cbf59c3b31b102db2292ab9cd2ed612ca4c5acc5bf0d65860b891ebb3f14
 EBUILD knotifications-5.40.0.ebuild 979 BLAKE2B 0bb0ce1a34ec9ff786c99316b68440914e2fd588a4ee7b8294f4ad6c5e9287b1abf8a5b1cd9fd9ab2ddbe4efcba3e390915068780c082103c5c83733347e20ab SHA512 00169edd275257fd0437151ebd10397957e76a7d2fb01f8434bd3404e975c133b0bf7aa0496774b95b5c6f85778764bedb2fafd41b5da6b22d5ba4e56b3d2247
-EBUILD knotifications-5.41.0.ebuild 981 BLAKE2B ce46cbaef5396e3a1ee933560fbd1994551bc8e3ce19f159bfb590238ab53aabcdd6718fd8a720c9342a1d6b5446561c15c5d605a5eb03ef8fbebec802a77962 SHA512 f9a7ed59e8ba364035e79b26efed0d4717dd501fee5906e70327fdf012f1e21b31802748505f83d12006074f4daa42e1d7895b4206e4a8c191a8d48f1e5ab012
+EBUILD knotifications-5.42.0.ebuild 981 BLAKE2B 283b73933621e317390bd0c67b16eb184df1f37f46252c9c75e8701cd0b7e30a3dbca158ffc6aa7ebb3cee10f91254658cc6282052b12a321d64bf18ae4b1db1 SHA512 843783f08b257e4fcf4fc90b8b7075cdc228bb694aba842f4f345987c155ab9a9a61267dda67987a620d262c6ece1d5a4597e06c5b7cd7dbadac191584a43ca5
 MISC metadata.xml 336 BLAKE2B 653f2a06935329b39c728a0475b92d1f5a0129e2d4f8cc04a045f4ca5408e3dd78199bea9f02668102d94b6ddf576bac13140b76d621acb03e125363745e2416 SHA512 10046ff92549d9bc3a8487d66095435045700bb85032f00e4f73477b0f7e506006601b7b1a61d341ff8af9a925939fb099b4adc55867f9b1faa5834b717283af
diff --git a/kde-frameworks/knotifications/knotifications-5.41.0.ebuild b/kde-frameworks/knotifications/knotifications-5.41.0.ebuild
deleted file mode 100644
index 46d46ca122ec..000000000000
--- a/kde-frameworks/knotifications/knotifications-5.41.0.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 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)
-	media-libs/phonon[qt5(+)]
-	dbus? ( dev-libs/libdbusmenu-qt[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-proto/xproto )
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
-		$(cmake-utils_use_find_package speech Qt5TextToSpeech)
-		$(cmake-utils_use_find_package X X11)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-frameworks/knotifications/knotifications-5.42.0.ebuild b/kde-frameworks/knotifications/knotifications-5.42.0.ebuild
new file mode 100644
index 000000000000..0ec118ecd131
--- /dev/null
+++ b/kde-frameworks/knotifications/knotifications-5.42.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_TEST="false"
+inherit kde5
+
+DESCRIPTION="Framework for notifying the user of an event"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="dbus nls 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)
+	media-libs/phonon[qt5(+)]
+	dbus? ( dev-libs/libdbusmenu-qt[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-proto/xproto )
+"
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package dbus dbusmenu-qt5)
+		$(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 764b666b3ab2..e03580737c6e 100644
--- a/kde-frameworks/knotifyconfig/Manifest
+++ b/kde-frameworks/knotifyconfig/Manifest
@@ -1,5 +1,5 @@
 DIST knotifyconfig-5.40.0.tar.xz 83672 BLAKE2B c98e95d1d329139e94c707a8f058abd13bf28ea982302394757ef9caffc85eb0a2e16faa3cd85fe5d5b4f6c414c511a09b3a8a40a4e34a0e9f5fe67af4d1b6fa SHA512 0a368e63c5a4af2344293300e2acbf29ee3e07a101e318f883ffa97725b5f05d6bd563ed0f832b59d2052faa3f023be25235a473ad92b0b07456c65f2737536c
-DIST knotifyconfig-5.41.0.tar.xz 83676 BLAKE2B b9021947dfdf2bfd6b06b94044b7b60d4134132d1da3105f00c29974eaef7ee902cec1589140913d12aae2bf2995892a9f3ccbd03507ac3d468504c1f446ff88 SHA512 c5a14f6bd65272c0742df82526d526a352be02c71608b8812fc584a9c1378f40d5abc681a3ecc881c03ef873d00b355fa4ae5dbd7a0cd2204fcc718fd2c79d94
+DIST knotifyconfig-5.42.0.tar.xz 83620 BLAKE2B 8e167821c5e6a5acb07470d3b6702d470c3fe3d8bf9b87d34d1cb1dd70e2bbb45d69b3de544fee9581eefdf27f7f41691cf441526a877462526b46cd99234511 SHA512 05a594da25c43decd6a4974cda507a6ddb534e2bc64ac53508a153d4c42e2578ad528cae5b5109a62f70b7eb05b2a0dde296696f7e7d8c237ca79f7bf8468e5c
 EBUILD knotifyconfig-5.40.0.ebuild 536 BLAKE2B 0b8683056443909fec4e79399dc374bf31f07079baaba9e83fe9fc8e3c8a713622ae8ccb0e19c9d0eeda087f8d6350428163096ff902fdb41de7d0ae822f6290 SHA512 8b2ca475073cca3a27bad58dd0602545a7ed5845a9bb78290d36304c0e0d44ec4f41ed70dae2194a3cc17afbf5584d41f3744cf708772c3358f12c7ba5aa36ad
-EBUILD knotifyconfig-5.41.0.ebuild 538 BLAKE2B 10f67e4ec357b865b4c8fcfa22c80075cacb3294b3b1a0e4ee55a8fe06f7f045316e8a34da2fb9aca1b26e7edfcc91dda23933d2fc93544dba3753475be1c467 SHA512 5c8c12e1830d6fc309d4afe0019d3a6213d010d6b23b7b71c40c2afc7c002ff1bd23cc32655695eacc57029e4b7c5107f64b26588560ebf11daa412cb520b366
+EBUILD knotifyconfig-5.42.0.ebuild 538 BLAKE2B 1adaca74de90d83dd8820547a993c4121d371c1ea91af683ab942a9fc63c1f8a70ad7e451799aeacda86a9d52abcae23d747b543f663c5d613b81139861c4666 SHA512 b55318ffb048a8e72564f950dd7dc662a0a97f64d3683281495495de384159611af17423698ddfb40ddacfbbcb5d794fd5f3f19de3519659cbfb8eb3f6f326a0
 MISC metadata.xml 344 BLAKE2B c11bdb097349febc683046711b82d656d79473ecef4d5d539c71b458f4dc5e9b7f0ced04d5fd59fcdf14377a22591130c85f47a0041d2bf4096675c9c6b802fe SHA512 7ae5c5ed08a8c32a48581dad82010d469c95eb0fdca36547f513942637d42f9018ce3996195486a36f2e722dc1b3557102cf4b9abee4bc30af4d80c5fc2a8221
diff --git a/kde-frameworks/knotifyconfig/knotifyconfig-5.41.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.41.0.ebuild
deleted file mode 100644
index b7895cf39f8c..000000000000
--- a/kde-frameworks/knotifyconfig/knotifyconfig-5.41.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/knotifyconfig/knotifyconfig-5.42.0.ebuild b/kde-frameworks/knotifyconfig/knotifyconfig-5.42.0.ebuild
new file mode 100644
index 000000000000..b8f9b7f9e844
--- /dev/null
+++ b/kde-frameworks/knotifyconfig/knotifyconfig-5.42.0.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 e1e61d5f8ceb..8d59229c5568 100644
--- a/kde-frameworks/kpackage/Manifest
+++ b/kde-frameworks/kpackage/Manifest
@@ -1,5 +1,5 @@
 DIST kpackage-5.40.0.tar.xz 125604 BLAKE2B f5d8f597eab542813810ff4b87a34f79f682b125e546fd524ea158b21e842d1f98c37f7a9a967de2139cdb8ea373f5c8accf3706554e82993caea0674cc04e67 SHA512 969250d2bfeabbb9e69d940156adde87d3819182bd71a36f4b02a7145023e39442b18785dc3ac58f44bd5dd865cc8dad88b731afb7def38f0c6e333553452870
-DIST kpackage-5.41.0.tar.xz 126680 BLAKE2B b0ecbc05a7d9b00ce81369529ff6e4148e0cd6c38c6597f8cbd5a82cbc64a403103342051b26b22d66956dbaa12a9a838d4b3dc13fb1ec36a4761c95a7ad0b75 SHA512 953ed21f0ee5003a826ad2aba39c6155fe33cd7a965f0ac1dab77332cd6cf44ce72613325a8ee7fe407e67fc4d01504d4c67f3e12e818ea5f6adf3e15c970de4
+DIST kpackage-5.42.0.tar.xz 131232 BLAKE2B 4a33b880ccbea556d36228baaeb89343a58d036081f98a0de134f2e49ee450a289d45dad1823a9a72275c06ac070dc48eb8f5a8a03f7d7ca5352812c27314de5 SHA512 e70bd93df21d5d0cfdd4a39d53f71d4295e3b82c2655755fa36a83f5043816c039227d40cc38441fa0ae34d43686b3b167c98a8787745d4b4cda3b1b823171e6
 EBUILD kpackage-5.40.0.ebuild 555 BLAKE2B 38b9d32d14f6116a38a4608b71509a21971cb35f583ce17c0cbaba53bb924d83f9e79694b4933eee40ad13ae93b4faf4473ae897daedc179bfa3f399732fcc18 SHA512 016f191edbee6dca02caf5c59a608916bb5b65561a135598d5ca0ff1808e3ae75559eaab4345aac031006d753cfc7dc18ba4f7f5ef709f6acba962fd5c92e013
-EBUILD kpackage-5.41.0.ebuild 557 BLAKE2B 8f02479e72950718711e5555126d828f9695c48873bfde1eb066a1fd12144445bc9d6a8369eac96380e8c7053698f7e4b7ebda38e39f79f4e5016f0112c972b7 SHA512 a125884c4917563e8589ed85b6fcd477c9229ac0af07fde4d334afe9ddc0ce8c625ee584be3fd7016dfbf44e6ba0527ec1e6889da20d9f6edbb0ccd826e816f3
+EBUILD kpackage-5.42.0.ebuild 557 BLAKE2B f2b1350d6c56ade23effc1a95de0f0d834781eb6d16b0e9093e646076f43f823862408c688bb7164d5fa06515c5f02dd749ebef4cdc2fc504f8aa817caee6f29 SHA512 d532eaa09f76b1d86d953d7828494c3a1fe7c36412fe10fa99754aeea597707e2fcfdcaf39f752b4fe30025f070539d11f9461dc5c0e93ef54d1d039959db7bd
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kpackage/kpackage-5.41.0.ebuild b/kde-frameworks/kpackage/kpackage-5.41.0.ebuild
deleted file mode 100644
index d9ec70903d3b..000000000000
--- a/kde-frameworks/kpackage/kpackage-5.41.0.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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
-}
diff --git a/kde-frameworks/kpackage/kpackage-5.42.0.ebuild b/kde-frameworks/kpackage/kpackage-5.42.0.ebuild
new file mode 100644
index 000000000000..bc804969ffe2
--- /dev/null
+++ b/kde-frameworks/kpackage/kpackage-5.42.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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
+}
diff --git a/kde-frameworks/kparts/Manifest b/kde-frameworks/kparts/Manifest
index c2b4a47ead5c..02fec8ea53ee 100644
--- a/kde-frameworks/kparts/Manifest
+++ b/kde-frameworks/kparts/Manifest
@@ -1,5 +1,5 @@
 DIST kparts-5.40.0.tar.xz 175920 BLAKE2B bdbc34f4a5dcafed935a4bbba89c7d7885d59db85cde1c90c6cc06d6293924365048190477b0a6e36d6be3627b053d1699e8dad42f3bb80029b1b7f1d7ed6d52 SHA512 0ab9883b5583f0d4aae1a27eeadd11b6d3d9902a5672487691275123eec81dcbfbea4f0eebf57eecc01d0a57df828f4b8729165fcc7c74d148acc5fd0a8ed87b
-DIST kparts-5.41.0.tar.xz 175724 BLAKE2B 211d713ef50132514aa25273bca3c7119a9437e99fb24392873a0f3040f7f692049aaa61a5c7de8d76f8f6e1bc1de4886756fa2f1dbc5dd68f8c8edd906de388 SHA512 082971b4d7f017c03440c40ea4579ef3a8c75eac98b95a326255075a71bd98ae12c407c67049bcd46c4f65ba91d754c4f07c4253c7d6bc9269a4b0a80cb915da
+DIST kparts-5.42.0.tar.xz 175808 BLAKE2B 2c279cada3e54a41645f5651bb2813aa3bb44239c8de00cf6575171f9f0a8b9283ff9113451e7ec92c8faa63ea34867b29becdfc9c8882d07b7b487a9e26b84f SHA512 baab67babf06da1503a789db501d2665991f8930f0fee65ff14ad0c658e959b97d20a758c3f9eba756bdc018ec7a20df1a003c5e2570285e7d5b31114a7c8d31
 EBUILD kparts-5.40.0.ebuild 714 BLAKE2B 5f0a87406ecc6c782edf8ffff7a9eac2f67e2014acc19a2923c96ae968447a00da347cafce9b1def0b7d12cdbb486676f7687240c813344ca932bcb9cc35449d SHA512 e993b6be81b7d112540309ed7bcb16fca83518edbe3ae4c1a42ff00914a1942d8c7dd478591359d67d1d7ed6d54b638212b0e38b8f66cd135fff44040fe107d6
-EBUILD kparts-5.41.0.ebuild 716 BLAKE2B 9820648e9b489cb4ce73d1920038a45412418f198fe6f13a07e49a2002c12ba3872b2dd5985cb29bf0d46a9c7b4d747b92532672676c4d045146fcfb19bb135d SHA512 de0e483c199cf623d836831e6ee9c83ad0c53d4d43b74eb1c55d9e7537bf6a415a2305eef362dbe7bf3761f19d73a0e6d0a98a64fe56d3b989a58e3e8da952b9
+EBUILD kparts-5.42.0.ebuild 716 BLAKE2B f323602c59cd3a56d5c30fb6dc031825562d252e92d5ebe4f63979e1bfa714edee2566f393ceac50f48659b10d69253704dadbca4c7e3a1a43122c6fce49ba26 SHA512 8d56ed0dd59509c7108312d5a207df0b2e37138f916eaea7fc8ebea9a4d689cf1ba0a653969c1c4375b2a72cdbd2764da331ca422c609d09d9d9ec906ee69bbe
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kparts/kparts-5.41.0.ebuild b/kde-frameworks/kparts/kparts-5.41.0.ebuild
deleted file mode 100644
index 66bde191b22d..000000000000
--- a/kde-frameworks/kparts/kparts-5.41.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kparts/kparts-5.42.0.ebuild b/kde-frameworks/kparts/kparts-5.42.0.ebuild
new file mode 100644
index 000000000000..ecd80b16ac31
--- /dev/null
+++ b/kde-frameworks/kparts/kparts-5.42.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 2a0a363c847a..33944ef531f0 100644
--- a/kde-frameworks/kpeople/Manifest
+++ b/kde-frameworks/kpeople/Manifest
@@ -1,5 +1,5 @@
 DIST kpeople-5.40.0.tar.xz 59692 BLAKE2B 70d8657c55fac82817d57415841dac99b22c3a58050feee2d061a201e8833c1b2eb247d26ee77ebcb080d401d29cc6e9405b80f43a7d8cd866ad069fd8b599ae SHA512 18b57e846bc614371c65c63662238b806c7dfd999be97695eeff1d1b4e4edb92ec3b7363e5876ec1bb9f9ff9335f6d7e8bd0140cf488f180fa660db20baab665
-DIST kpeople-5.41.0.tar.xz 59660 BLAKE2B d2722fde78172e50d118511454974b83560ade4254216ae931ae38b25fbb4c7e2a3e4761fc93b6e1dc6d1bd319bfe06dc8074c9259e922f988f4a49636d44591 SHA512 11ca56d2ff9e97b7119dc97f75ec32260fdcc32720b54f42e8d3a17d4c17ce6b969bb65b280a5f8773f45ec90c2a75b8f9805f327c64f7fc377e443ad913f897
+DIST kpeople-5.42.0.tar.xz 59572 BLAKE2B 3ec2bbb4d9ca41a5dd6595c388de34d82b40aed98612ed21d35ab03348d5c3337a2774c13a63619eaf394a4548f43e9e1a4b196b529aeb00fa92c0655150f269 SHA512 a2dd648c3618f139c9b3f6df4a6ac01caad23297cd37a8b8fe5c0f65314b8c873c87ffd546dd4adf1c8edc78038e3322f968693a2502a8bc0b8b90f07cba29da
 EBUILD kpeople-5.40.0.ebuild 751 BLAKE2B aec350a4722b024f8ee348d72b6344e4f47e5710f8371c638aaba065e2417ec7f3b3c9c4b5fa0a2703fe297ae2ddf2f12db8aec8e983cb27438d650b28b5dfef SHA512 9b6c79711b65e5fef4c3af2619235abbdbf22b4b3922be303f246828b7f0daf3f1025cbf6865358f265a1a4de8878c56504aa4e7f46d44e051b07da52a9b66bc
-EBUILD kpeople-5.41.0.ebuild 753 BLAKE2B 5ce10255045a8f2991af19dc78ddc9bf1dbc80716287bafa4368945471496afe0f042c9338513c9381318e5841d7498a6ef76d73f51182eaa81d54ca35f9c673 SHA512 750e4bb265600f0e730dcd52d91bef5d7966be816ecf6b9cd2d6a83f3ab730a6c682acb084e878878695353b40de9930ab4216bd9e4c667082b06e8de3b5d414
+EBUILD kpeople-5.42.0.ebuild 753 BLAKE2B d09d215aabee577e17d722b774e0a8cf3bbef30cafa4696ddd9630a24cc447fbb45d5577dd0ebfca3ce40de04eb0a6c0f27d397082e3cf49e37b1d0dd02be157 SHA512 d394b1a87900f3caf570bb60f62b2631db1defc1a595cebc508080443ad35d2f0628b158e9bd424f6f2a826958ab02b9700043009a39a0f9e8f38a768cf6f649
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpeople/kpeople-5.41.0.ebuild b/kde-frameworks/kpeople/kpeople-5.41.0.ebuild
deleted file mode 100644
index 07ff57ec4c4b..000000000000
--- a/kde-frameworks/kpeople/kpeople-5.41.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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() {
-	# bug: 612504
-	local myctestargs=( -j1 )
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/kpeople/kpeople-5.42.0.ebuild b/kde-frameworks/kpeople/kpeople-5.42.0.ebuild
new file mode 100644
index 000000000000..9752db2519a4
--- /dev/null
+++ b/kde-frameworks/kpeople/kpeople-5.42.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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() {
+	# bug: 612504
+	local myctestargs=( -j1 )
+
+	kde5_src_test
+}
diff --git a/kde-frameworks/kplotting/Manifest b/kde-frameworks/kplotting/Manifest
index 34957d905fdd..62b961177458 100644
--- a/kde-frameworks/kplotting/Manifest
+++ b/kde-frameworks/kplotting/Manifest
@@ -1,5 +1,5 @@
 DIST kplotting-5.40.0.tar.xz 29728 BLAKE2B faf2b25dfe0efcfa2b9069e7f856d00f4c9cb4774bca3294d9435edd4786f4f6d731f59d9229cb002dd6c4b2d06e6c0c58fd8a960376aef39e917e3711fd621d SHA512 71a9ec3d041c3cc05f221230cb8727873eb354d8b6c55b12aeaf1f8b41de492d37a66d47baf860b1b222265211351245dc47ff5d08f2c5839cbcf24b5fb53b40
-DIST kplotting-5.41.0.tar.xz 29724 BLAKE2B ddc4cbeeccc4f727ad4eabe25fcfa3d343c68259402a84c42312b868433ec815420b584cc6141f01ab265d588e6a496539ef5ce80aa8ee3761a046783f3fe9a7 SHA512 d3f40de3df24e7d120889524ad9e30d745d34397bac3ffa8fbb132dfe1a8e7bc3b88dc10e9a3e91dd3b852f8bb5c55f4bdea4d8003b9ab41fbb59890dfdb0077
+DIST kplotting-5.42.0.tar.xz 29592 BLAKE2B 6f6bb0e9f777092275d10918394ab6fd1f83f3d6de6b1215f77722c1a74e3225822f1896fd2103b0c365df8b72ead06045f50069934aaa3f5822d63608aa57f9 SHA512 0b79f63b0d399b6db77b9dec2c6b55f763c0b207f8e2296039717a8fe8a0513dbf1d04e4caf8d538340307142f840e7e70daf72ab2944949bfc923346426b20c
 EBUILD kplotting-5.40.0.ebuild 356 BLAKE2B b468cae3c2970b6e8fa0c307428a12ac7e2a8dbc96a937b5823ed2033ccf00646d6a7275798c6845e57384eb7922753ca192d77cc0551634b753735a37e0a2c4 SHA512 06a0895d2d6c8fe6df04385bba56dd7f9741bab3c911d6246c24916663ec3446484c3f55a00b9b9c8535226ad7d5f7555fbf88c7aa26aeb40c6f42b2f9292710
-EBUILD kplotting-5.41.0.ebuild 358 BLAKE2B 7e797d422d1b3746788c90f0c741accc7ae85cb9dfde5f86241bce297659878860b3349a783ac337f8e4cb66f597ec28ee36c66ced2714e103875ffe8d05afa8 SHA512 3bab18404f60acb0a05d799a64cd4cc78195a8aee1a82dc7af66bb621e6e945df2e6feac941d57cb79767095aa0731958abfd15a907036ceb3d3c7da0d854a50
+EBUILD kplotting-5.42.0.ebuild 358 BLAKE2B 62d1f3da0f12de746d9f0f7634c8508836ddbb6bce9c07f56185abd4f31cfaea0b672db28ae490eac9da6c2d37aa27eba5eb399393f06959860b48078b2df7a9 SHA512 35135128bde28c7d7c0ba400a0dc0ec7075baaa56e7930fa80307427c2f6dff38531f4d08837303461c2137012542600c443b1be8f15a77d0600243fd4d114b2
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kplotting/kplotting-5.41.0.ebuild b/kde-frameworks/kplotting/kplotting-5.41.0.ebuild
deleted file mode 100644
index 91c166f32494..000000000000
--- a/kde-frameworks/kplotting/kplotting-5.41.0.ebuild
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kplotting/kplotting-5.42.0.ebuild b/kde-frameworks/kplotting/kplotting-5.42.0.ebuild
new file mode 100644
index 000000000000..af9c36c9cecf
--- /dev/null
+++ b/kde-frameworks/kplotting/kplotting-5.42.0.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 c7f9391e0473..c23eca6a48f1 100644
--- a/kde-frameworks/kpty/Manifest
+++ b/kde-frameworks/kpty/Manifest
@@ -1,5 +1,5 @@
 DIST kpty-5.40.0.tar.xz 58348 BLAKE2B b943ffc92707ad6b1e54dad4f8ab2eb248b78a42bf210c9b41338bb16323d14c0624f7c1d87e5d93814ba6ef524bc6167eb8d44a6b661bf5bae56524a1179575 SHA512 85092a0ef665f7bcb22573c8cb678a4bd0f62a22e02f321caaf3857998396c1fbaeb135a7a40abe519e5421a14932e348223c2a7956befdf7b06cea378f8cea2
-DIST kpty-5.41.0.tar.xz 58360 BLAKE2B 19c3e8ae9ffe9aeb6a38eedaed6f34a29e0d003100d24994ecd29309d1fd56c669dfc4d389231a2663c12c9548d5601120b551b056e1574499ef44827a8728ce SHA512 7a75989459870cde93205731984696fc17964ac8d38d49f8504d7b1f78c645e0918c56133e30de04a72aac2a11d0bafa6c76e94e4dbe59771a09d99662629e6a
+DIST kpty-5.42.0.tar.xz 58236 BLAKE2B 7d748bf0ed4de0aa36e9b75cafd0b3267db1b5841add678809dc2124c020c5341100c38619b171b07dcf1b634823c49d09087dbf2be310492fb1186366ad6644 SHA512 52830cb38c594c0e9841dd708b9ff6341b91bcb863b217810fec13e7b16c3419d285cfc2acb5eccdf3a59aacf3cb48ff484aa1413693eaa897ea24cb3ff7ca4c
 EBUILD kpty-5.40.0.ebuild 508 BLAKE2B 0e8ea8d5d47c15adb205a17bc949b95ae2babfb7de38d5f7b464779832924543fd41865f72ecb9cba372094df39fbcca51ab38b3bc3eb4fc59246ddde5a8efc3 SHA512 c056216f589f45171ecd7dc250e21cdfc6bbde30df7a9254bdd82458d4b53b8c3ed6e0b58c28a115bb9b8fc6de1bcc73ba817e5000b8c48111fd2fb6f081fc8f
-EBUILD kpty-5.41.0.ebuild 510 BLAKE2B 7656f60c35613083fff11fa4d5f9d460db1a18db512cda0e626bab5ed8a944f27d14b41345df3f8f919d38ca94c63c68ab08db7538c6c917cd94b01145f7a2ad SHA512 1287a7327c32e22cbf50a223629ba070806967484b259308e8ec9690bb1f9c7b78720579e44b4713b8ee4f20ca77648a8bd63e1a0872bf755c4e2236ed6211dc
+EBUILD kpty-5.42.0.ebuild 510 BLAKE2B 10d16332edee8fb67f9c2ed59affec1e4e30cff441daaaf196bc47049df311cbe16ca9322c52b694d623c43285d9390f36b5d0dfb5a0049627563184e4ce463c SHA512 84ca0ff36d38e2e71d487370102941591ffbcd23c617c9f4066323837986475fac744f6509e6dfc2b0e6d6e6655e050c4f6aa079371fb3f391f407f890d94c89
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kpty/kpty-5.41.0.ebuild b/kde-frameworks/kpty/kpty-5.41.0.ebuild
deleted file mode 100644
index 87b3dab88b62..000000000000
--- a/kde-frameworks/kpty/kpty-5.41.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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/kpty/kpty-5.42.0.ebuild b/kde-frameworks/kpty/kpty-5.42.0.ebuild
new file mode 100644
index 000000000000..052e41e44cf6
--- /dev/null
+++ b/kde-frameworks/kpty/kpty-5.42.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 bd3e1b4bced3..caec30e6a8a5 100644
--- a/kde-frameworks/kross/Manifest
+++ b/kde-frameworks/kross/Manifest
@@ -1,5 +1,5 @@
 DIST kross-5.40.0.tar.xz 127968 BLAKE2B 0d6bae7a418fb441ca51c131095b9ff4f549395d3169050403f8275ae4b04b40fe04f6db7bfc5879260fb59fe9600039ca8db80030623142cc96d7bf062e9d57 SHA512 03051b30d84b9353e8397e39fec221f5e09899ff2fecadb347511d598099e374202c1c7b5553e323744237c4ed7c632f69ad708c5f6ce18ae9d57ac09fd8d88a
-DIST kross-5.41.0.tar.xz 127956 BLAKE2B 86d87da595b77f0c14e63b5361cf2bc5dcf46207e98925522604f965e389427327c273cf82651c09f4c75b56e5c8d1a74e548bb1a62cc6ed30c26408a490f376 SHA512 36c14c5684636e0e49a56f456a19350bf38fdf8f4d73610d53ccd713ad5501c5f50fd87232e03612e4be29fc1ec9b4671e97b3f7f63a5074e4a0cc583340cd89
+DIST kross-5.42.0.tar.xz 127828 BLAKE2B 8a2eb1e0ff8ccefdc2b62f5c25b5c3b9ca2b3b4946e1776094a5f1af7211a96215af02e9fd9c1b2ce1772aa30173a873d305cea91bcbca32353e9eff70401a18 SHA512 e9f5bbc984e05bd3bfc5749027c4181d511ce67c77ea32eb6b4aedfc5a261f5142e74d9e2e92e48631f9da11731775f1726274d17c3ddfb10a61516c02f1a2ce
 EBUILD kross-5.40.0.ebuild 734 BLAKE2B ba7fcaa11b834737f40640a470f308f5139aa6ca0688ab63176e3fc8e40a91a1cc79b4379dd418e381eb8614399790785feb432149a6f5c7727ee620e23b2221 SHA512 812efa7af65c4cc7ca657231924176b50b6edab6a44386fffb3472499e59fdc3fd0c8a1c8cc4e6a8a3b2bba305360dbb430acea7954ae4329c7f79e1b09c9d68
-EBUILD kross-5.41.0.ebuild 736 BLAKE2B 4179499596f11b9175d9f5ac08138a43dd4202f9175806802b65ae66cf0bf1751fed9e36d37e63bc4394ec4db706f05b5243d8e04b51dd5de9f5ab603d5d8151 SHA512 0338e4fd77a3fa44d5a3920497287aa68c26b82907db6adf500f07bdb1688375de487744f6b7321f07b7466c8222bf8fbbf3632eb224843af34308acfb4a0089
+EBUILD kross-5.42.0.ebuild 736 BLAKE2B b7185f64377781cb9b0a942bb43527f996f6a9aeda6ec7b32e8afe2d6ecf1bcc7a33e75ad2ef36d66955b462a7dac07e4acaec8a96b03db85c7172bf95b39205 SHA512 ceaa8e9a369737462cee4104a241f51a0a4119b63f3c0dc117b8e541e830c9d0c2dc5aa79ec7c96e687bde69def18626f85c9de23ef3f17f11ccc582ec092461
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kross/kross-5.41.0.ebuild b/kde-frameworks/kross/kross-5.41.0.ebuild
deleted file mode 100644
index cb127dc346ea..000000000000
--- a/kde-frameworks/kross/kross-5.41.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_QTHELP="false"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Framework 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_frameworks_dep kdoctools)
-	$(add_qt_dep designer)
-"
diff --git a/kde-frameworks/kross/kross-5.42.0.ebuild b/kde-frameworks/kross/kross-5.42.0.ebuild
new file mode 100644
index 000000000000..7b2f82f7f14e
--- /dev/null
+++ b/kde-frameworks/kross/kross-5.42.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_QTHELP="false"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="Framework 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_frameworks_dep kdoctools)
+	$(add_qt_dep designer)
+"
diff --git a/kde-frameworks/krunner/Manifest b/kde-frameworks/krunner/Manifest
index c4b4a6c509d2..58e34651de76 100644
--- a/kde-frameworks/krunner/Manifest
+++ b/kde-frameworks/krunner/Manifest
@@ -1,5 +1,5 @@
 DIST krunner-5.40.0.tar.xz 60644 BLAKE2B 3e03cc566dd2326487c9626b4098e241905eb84df4a2d1591ae55d32a51a78233c01fbf8ef4b223f2248b9c2f80b9976a91ddfea6d9eb3378a3a869a728fcae9 SHA512 fc634c01935096500614525f33c60497946b43d82f2656ab601ca49147c3d615288fa25645daf83c9fd6e734178b0abcd6c73f238ad8c5866ad1a47e83e60bb8
-DIST krunner-5.41.0.tar.xz 60164 BLAKE2B 4aeb70096d167558bdbd34cb4e3c3aa4a7d57ee51cf55210bc11d422e0a4463bc813cd74e7484cfdf44c3995dc5491570b792096d6512147b57798d9efb0ef99 SHA512 53a24d6e16d70d3682a0311adfce610b78656bc44785f41f621acded778b6885f269e376364ee8ffa1f4d26b2c7d937a41f38367350013871771ede9ab483249
+DIST krunner-5.42.0.tar.xz 59976 BLAKE2B 2dd302d5758d4ff51356ae111ac4d9230ce410f765ff52aa471211fb986ede34ba54aea60a0154fe33e0aba8e291b051548495919488dd6c0402cd9165e75c7a SHA512 23e851abc96f21d7e3d7c1c1a43f4abd41c982a1bfe48901febe70f0c926f9e957f3e4ae15bbab6b0ed7d1dbeca2c89da70064d6fbfdb3b5b44f5843c7f639d0
 EBUILD krunner-5.40.0.ebuild 798 BLAKE2B 50fe4da02b9cf9d5e8508587ac97aa5cac4fb2b91c7a1f889192b8ee06040e88f654c4ff11e5f2dc32af812984d7a76b1a01de13d5abab117ed059323f630c6e SHA512 9aa72f057dc470ac23885dfdb5bc27375af3d677efecfe14af3ade255e1d43ba7f5f921171c89fc2356baad1225dc0ddb8a9e8cb229d9fe147c3e842ee5993b3
-EBUILD krunner-5.41.0.ebuild 761 BLAKE2B 20b7599565c407ee8024bc8dc8a813379cd01e1218dd0aefd7b5a278258d7822a40bc81e6ae71f265ab578ff1bce474448e85bd763f0f858c41db7aa7f8ea298 SHA512 146304595c38630e0e189d78e3cbc9dc0fe3cc2dda71036842b382eab8f0ec5a923145776d65fe0a2fff63f072fff23966bf8273fea91ee624b8f7c7a8706707
+EBUILD krunner-5.42.0.ebuild 783 BLAKE2B c90937a5a69bd1b85a66c013a17e37b7d085e3bab36d4d791b5d007dc647b7ad5a779ddc7ebe3e48622247523edaff951d693f86eb7538e4a55e865ea9ebed39 SHA512 df8ca3067d3862724299ea74986d978101b33fe04423d3d25cabd0621ff30d25fc5b893f9e1f77f0f16c48960b0d0afda2cf642a6aacc33ec7a84ef0f533e087
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/krunner/krunner-5.41.0.ebuild b/kde-frameworks/krunner/krunner-5.41.0.ebuild
deleted file mode 100644
index 002eef1513fc..000000000000
--- a/kde-frameworks/krunner/krunner-5.41.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 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/krunner/krunner-5.42.0.ebuild b/kde-frameworks/krunner/krunner-5.42.0.ebuild
new file mode 100644
index 000000000000..d15b1eb63faf
--- /dev/null
+++ b/kde-frameworks/krunner/krunner-5.42.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 aa12f543a37f..fe872107c945 100644
--- a/kde-frameworks/kservice/Manifest
+++ b/kde-frameworks/kservice/Manifest
@@ -1,5 +1,5 @@
 DIST kservice-5.40.0.tar.xz 250072 BLAKE2B 9f7e55d0a21f13b1b1eb651b10b8d7800fe93521760a23d40326227541a9b1b29b92783bbfa4159e84cf7db8ac3353ef55f963bdc7e43b365efd77e230486f7b SHA512 362a81aedb24f0fb2c598329e8b4fb174435b756f9a13617935d96eed1e5d40be38a8f27c7aedb0bd0cf07e73b5e1d464d53266e34b426958876aff2540fe89c
-DIST kservice-5.41.0.tar.xz 250040 BLAKE2B 0f3126d310f5628f0cb59cace5db22667ac12a1f7e509b31e8fa61eeea49c0d1106b6b4ed6af4954d44dad2e089ae4eb5a7d9c7712b2404c7f0398d587597c52 SHA512 4dee46935a3fd136b84edcdd4590531370e5d9c1b6fee31992811ba5f6c601a2da4d8d3bded9ca080c6263e00be80288ec22e814003f436a2439f8238598bb60
+DIST kservice-5.42.0.tar.xz 249852 BLAKE2B 00a282e8ef5816a36908ed072012e315acc3e9e0a72d74e11fe6d01b259575d9919eefdd3dffc3c835b48ee7672fa2bf0025f9fd3c4d149ca27575480ab5c68f SHA512 dccc59a5638fcce3c73e358baef0632cf089280f85551e712901a281410146b2127d1dde7a8d9ffac44ad8458cad3b2eb89e667ed73d351d27cac9e2e4ca4be7
 EBUILD kservice-5.40.0.ebuild 941 BLAKE2B 97fc609bc8fd107860af30cf6b82cdc81d2917c8a3d2e1aeb73692b496edcd1d67dce7ef163c9d96a7a34ebddaee5dfe1747c2d381349080c3349bb207bda2d0 SHA512 8aa5365b784caa3960dcca985839dc5da7055e3d569e8404be9430502070483bd66d30114f6d835afac3db479bc898897e73cc7c64afbf3a664cba0c36d9ec81
-EBUILD kservice-5.41.0.ebuild 943 BLAKE2B dfcc1d405161522747d81e517fd6bdaf965e40da4a90c7a4dde2af297a19c920d98accba89591ec945e864b83c58d57076be423c2f0bafce066117be3e270ae9 SHA512 8e5d3958682047a9bb85140b584beb16162de649748cd53df5e61269874f36370efb4f3a9bfeab2857e3ede284779f948d3665f526a2b3e7339df1f0efe4e96e
+EBUILD kservice-5.42.0.ebuild 943 BLAKE2B d0108d280d361e446986bf451be95d1006724b7383d3f319f6336dc72a42cfaaec553863eda36fdd48153b33481edfe25240cf399a7a4f9858ed492b564b4732 SHA512 0ded01c1f8728ba4f9c90d3771fa82f76b6dea74a6a2cfacd6e41a77f6eb9def5db3d4ca52e7fec3f1e1c69bd0dd0cc2489fb4eaece2f329ae98868f0b443487
 MISC metadata.xml 318 BLAKE2B 9665006abc95aceca873c478f86e683bdf562983e75d0235b882e0ee38133677ffa2c3fb1d3c486d8bb849bc2bdb10be3b2ba2ab08c145cb782a22e802e65a68 SHA512 4a404127f167e1af4cfd3b76cdf77cae21aede91f089dc058512b3bd8ef3dd2e2929ff28636ce2baaeb5e7754c6f6203a6ef461fd7335ad1654eb7f24c101337
diff --git a/kde-frameworks/kservice/kservice-5.41.0.ebuild b/kde-frameworks/kservice/kservice-5.41.0.ebuild
deleted file mode 100644
index a30964fc8306..000000000000
--- a/kde-frameworks/kservice/kservice-5.41.0.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kservice/kservice-5.42.0.ebuild b/kde-frameworks/kservice/kservice-5.42.0.ebuild
new file mode 100644
index 000000000000..ed1da52d31c6
--- /dev/null
+++ b/kde-frameworks/kservice/kservice-5.42.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 55e5301093ec..6bd5c1773a20 100644
--- a/kde-frameworks/ktexteditor/Manifest
+++ b/kde-frameworks/ktexteditor/Manifest
@@ -1,5 +1,5 @@
 DIST ktexteditor-5.40.0.tar.xz 2296760 BLAKE2B ab4e458144dd0d7ba7460d9a0b9e3fbfa3c554a180c070976fef5372f447ad595e2c1ca9ac1dcabd19567c408efd46693b47894a9fbf8e6dc1ec681eb2f9d9fa SHA512 933b1a65e3d4bcc5347f35b7ed5d67c07a4060dd8fb755275e2aeeb40b3107b09b361faf7d95fb33991a9c36ed49f4c5e08ea9887b98a6096dd8ae0dbf48b208
-DIST ktexteditor-5.41.0.tar.xz 2297680 BLAKE2B ebdb8180bd7308bf020508f9a47e58afc2df7db7d70974692f3640425db886457f549cbda3b5e715dbfbd59ea05681ba1192d0857a002338a94deba7eb053bf8 SHA512 a8cc6ce4a85669d9fe1062e85a1d170498db6de0cd7256143caf60cb454c31dac7920cea6d12ff6dfb109c579a86c3fb4d33add1b104724cba00a4bc00a1fa7b
+DIST ktexteditor-5.42.0.tar.xz 2301012 BLAKE2B 029a793515e2c52b8fdd7f51b73f306c3e3dec8f43a9911626ad7b232b730402017d924e2fc14e72bdf4ce90a62d341acf2c92ce214595ceb72ad4dcc5c97a61 SHA512 a0a301a1409c3f3f792fa63db35b30eceb47da334910576b68a42b2ed3e3a17d7f8b50696b5a27b4278c81706e856b183637d5c104e378ae1020f1d80255291a
 EBUILD ktexteditor-5.40.0.ebuild 1425 BLAKE2B 8ca61b342d2940b881dde30fd7f62e62aae85bef4bbedbc700ff35b1ef5107a2b8484db7ccaecdce0895c26fbc6af6ca56924254daab42ffef9a463e5ce83c07 SHA512 fac45bf208abdd79228f1c2b808cbda325cc7dd1f0190a654c23273ff1c437f1012eff249fa2b5ac2c2f8189d12aff54a4e9fe1814c2bd1a460771fc26febb05
-EBUILD ktexteditor-5.41.0.ebuild 1427 BLAKE2B 4c4eeedee4690765a71e024b7edae5bc9feff936995cdbc8fbee7747093e0df354b35f9a2762d76a49e14f2d1577739d06e06465dfeba7ebb33eaf361b1bdd51 SHA512 083135bc4e4dfaa5b9acc2ea2a854a4400e89fd087191e98bd4379fe613f3d0b24f289bbc9635ca5eaefca0c2ff2ae58ef79fe6d1107fdd58680146fdc624d02
+EBUILD ktexteditor-5.42.0.ebuild 1427 BLAKE2B 06ae9c7111371de93791cac534e9959d6b32ea22affe26193148185b2564332cde237eb7c0c698894c69f52c62a9e10c4ab5508dad736ce9e953a964fda28be1 SHA512 1fc22a7562f17aed007dce8a6d1263944a432e680da55a93355092f413483ae8ab37244b8d189d7d70ace3a9bf16108195e39397eca6d5f6f4d65e39a1cc4100
 MISC metadata.xml 351 BLAKE2B 7e4b1aefcf41fd5e37bd68d4e2fdb057be4ba7f8efb18b3494fe551c1990eb5209e4692e9b9a5618c950875c03a05ba6a39e2ea8c7f63c9894dab23277b0a070 SHA512 e87786bace9486ef7f23fe747b3a880af51a6b0b2e7dd7c0e6c7e597bb9ac11e787c403e15cded386632d13682061f7dbcd47e2b411b12f998de964bbfe57301
diff --git a/kde-frameworks/ktexteditor/ktexteditor-5.41.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.41.0.ebuild
deleted file mode 100644
index ce4cdc432cf4..000000000000
--- a/kde-frameworks/ktexteditor/ktexteditor-5.41.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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}
-	$(add_qt_dep qtxmlpatterns)
-	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/ktexteditor/ktexteditor-5.42.0.ebuild b/kde-frameworks/ktexteditor/ktexteditor-5.42.0.ebuild
new file mode 100644
index 000000000000..7683d63307d2
--- /dev/null
+++ b/kde-frameworks/ktexteditor/ktexteditor-5.42.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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}
+	$(add_qt_dep qtxmlpatterns)
+	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 4413edad633c..f7653be2be6c 100644
--- a/kde-frameworks/ktextwidgets/Manifest
+++ b/kde-frameworks/ktextwidgets/Manifest
@@ -1,5 +1,5 @@
 DIST ktextwidgets-5.40.0.tar.xz 308804 BLAKE2B e50c441fe7765a07b0241d98f2ec31f4a45a8dd1445c7b836b5df6458592374e3ececd6557b4a97b2bebf76e396516e893b7d7931c245b5c7970dda4bee2d3e2 SHA512 b24af586ff3832432d89106ce45d5b549958998a6be230f5ecce06e47a1ac55aa61c30f1d0a1f3ac1e51cb17bf4fea18990a9f33ed8ebb8f988d49bbc55023f3
-DIST ktextwidgets-5.41.0.tar.xz 308888 BLAKE2B 6213c803514245fb9c6b0f3221273e58cf4be811d8cc9eb86e51d184cf2e9299d5c8c437279fdc66d6d8bfc1ad109f7fb47bf66167dd3f00bd99bd243605eb14 SHA512 a0ec6618418bbc1128cb3e12cdbfe85917dafcb265463a69355576f873775b69e6552d1d7db31d5ed3436c8dc72fde1896710b3f47b8ea0ce0612ec15dca4079
+DIST ktextwidgets-5.42.0.tar.xz 308704 BLAKE2B b9bea9837ffc9ddb79ccf9271a5b5f982c7fd145011dbf8aa853b650efd355b683379b4272030b3066cb001eab842b18a0874050bf15ac20b2a8b0b07479401c SHA512 089b7cc2ba0e74908b9a8662e0feb7921c9f18aad2b484144da74e2539c381fc2b00ede2aa8b3b5e3c1d357ec0826cd3b26e0ce21cbc07c623de7d8632e456cf
 EBUILD ktextwidgets-5.40.0.ebuild 899 BLAKE2B a3eebdc052b423e1fb4872c42d009dadfac1d131389634dad3f8fceb7553a115aa0632c6cdc4d3c6ba5718ce1d3a5bced9fadecf92b2fc56c8c281716da633aa SHA512 7ed4f0c66b3b589f6b645f1c0af9aa5cc42d02bad9f3704f5b48c514a0489aaa7ef185759889bb6b693c079bfbe47ebe3483806e1ad23422a346031dba4875e7
-EBUILD ktextwidgets-5.41.0.ebuild 901 BLAKE2B 6d50d2eeba61e81f40cae393f5c33d816013d8b69fb55627ee1fb15d3626df4287bd93753c6528508a57c329db6357f295a9a3c02222e72025d87a917f6c213c SHA512 02ad3cf9e87fba352c7ed0f94d029d46affaa150052f3d371e27908ccc762fe5380e9e95414f476c0bc6b963ea5af85d19d0fc09286c58617d562108653ff760
+EBUILD ktextwidgets-5.42.0.ebuild 901 BLAKE2B 3a0aac93faa3492308066c10f35abc66f42ed56bd3f1dd1c0bf82e9686167b8f0e12651e3bd2c20c46e25ad1e1e1a87adc3bbebb72007572c7d858af2d29d0be SHA512 90fcc78eab913ca66886bbc4294264ccd32be9a76d25b6e383089d04562802857dfd120f85090a9138af2a37f8c93b2350174ea3cd08a46165366a4a619ba556
 MISC metadata.xml 323 BLAKE2B 2ca644434642a951be5bd9043197403222aa71e73e2eaf896b61862bd9f955ba06490f20af1c9e3a4cbc9c83a33fecae0b1c58bc10aec95a93ee518bf3d4099a SHA512 873c648b3985a05f119b13bca927dc15bce53b193d7225e1129b4327629192a1b5c23f6137406b2944b01369f2a6d0cd71442f48a14e67758b54c3fb27f07b17
diff --git a/kde-frameworks/ktextwidgets/ktextwidgets-5.41.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.41.0.ebuild
deleted file mode 100644
index 03ae3da8a20d..000000000000
--- a/kde-frameworks/ktextwidgets/ktextwidgets-5.41.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/ktextwidgets/ktextwidgets-5.42.0.ebuild b/kde-frameworks/ktextwidgets/ktextwidgets-5.42.0.ebuild
new file mode 100644
index 000000000000..2bbfa4f065eb
--- /dev/null
+++ b/kde-frameworks/ktextwidgets/ktextwidgets-5.42.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 bafdf3e7abef..9b4b0c1b7e41 100644
--- a/kde-frameworks/kunitconversion/Manifest
+++ b/kde-frameworks/kunitconversion/Manifest
@@ -1,5 +1,5 @@
 DIST kunitconversion-5.40.0.tar.xz 772184 BLAKE2B 19e677d07aa5550636e8882d22371c06d67d5032b8ad12490aca0b5004b074834253da0525fbb04f1f31dd69a504f291d1ee26c0cbd761802cdf9400182a936a SHA512 a863956bf359b694cf3f2ffe7de2e79abfe379b6ed4c68ed73550da96c5d98f3ec562e7f790e97731abfb5b290dd874a459e91d38edd8918073d10c5b16c896d
-DIST kunitconversion-5.41.0.tar.xz 771916 BLAKE2B 1facbbca2089b94932a1e0e0fe4f6a43cd9e77ed9199c2cba61d20089c46311058a2835f1787fb6f412501a25a1486cc4c179fc1d5aea081ee00399f6c75dd8c SHA512 b21a5ee06a5b9d00a0ef11b3af36a7ab4a8df5adc183cbd5d1e811ad36e9bd5e3f4dd21af3e7d9c281811f617e3e8a863d9bfa1c3e94cb1e23f6ce2ad917f937
+DIST kunitconversion-5.42.0.tar.xz 770968 BLAKE2B 34a5fd6860cedd64b2af709c8762886358b2ba3f2831dde328872410a88a484a513d4bb1cf5d1102db6916c895e34e370a8887830f83cedbb48e84f80cb4f34d SHA512 c99e9bec7a6dfa801333c49137446f27bd072d424472060fb73dd1c68beeb6c50620dd031ea9adf1325d8402e896bc6bd4e4c34ea0de7818851ae24c7bc30817
 EBUILD kunitconversion-5.40.0.ebuild 463 BLAKE2B fe0686ce1f4d7613740590f4a07ab8d6b6403c2c00ff58cabdeff00e1e5372c2d93a6d44ee48192c1d74c1626f701b6c90a27fb7e555965ee799b32372255f5e SHA512 9d638896966588eb5f0b7fd51893cb95a02d16b45c873a64088a4150ff53e0e7c1b8f0b0a6a63521e56bdc6bc8f5485e326622469bf96192a6336d61217e7ab4
-EBUILD kunitconversion-5.41.0.ebuild 444 BLAKE2B 78c5c15fb5a82b65ed22dc221bc80b66e2f2a029c5ef39c0839f4e21ad90fa813b2f653a11f340574ccfd94e7925e65d00f24ea759de7a848cb771aa36f97978 SHA512 fcaaf186a1df8e483e70c4ed82f06dc56e6fea1472f38df597d5f46a622865b044e02cf42d49f231a5103ddcbb4960786e61a04a5dcb85ba3739346d219599aa
+EBUILD kunitconversion-5.42.0.ebuild 444 BLAKE2B 635cbf217f3292c2c80edfd0ad8451ed99cb351b9ec8cf6e49fb7cee0940708c60607a008bd9fea3162f3686f5c162c6cfa3569c3016d844f98e3ed19415bcc3 SHA512 2707cf4e5e2cb6721032c31b640a009c2993bee3b264066f9ff2ff77084feb9a2c2719c758f3596213eef2f5309afadabf883e93cf499df50020024a71f71620
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kunitconversion/kunitconversion-5.41.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.41.0.ebuild
deleted file mode 100644
index bfae63e1f2f7..000000000000
--- a/kde-frameworks/kunitconversion/kunitconversion-5.41.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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/kunitconversion/kunitconversion-5.42.0.ebuild b/kde-frameworks/kunitconversion/kunitconversion-5.42.0.ebuild
new file mode 100644
index 000000000000..8f880d3d8fcd
--- /dev/null
+++ b/kde-frameworks/kunitconversion/kunitconversion-5.42.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ae483ef538f1..ba710bd0c74a 100644
--- a/kde-frameworks/kwallet/Manifest
+++ b/kde-frameworks/kwallet/Manifest
@@ -1,5 +1,5 @@
 DIST kwallet-5.40.0.tar.xz 306244 BLAKE2B 84fbefe01377d3c960274c9750fb7eecf3c0f45143004a35a9b331f197b84a807fb37655ad9793d0f4c8e29781ab30d0c09977ea24acd196a4eeeddd07254e58 SHA512 a162d5ed1901fe3c8675f715ddb9a32640d7b563bf0755a7add885208a8f55465d9082d2abb9553d411018d3a5a4856b17efc94789dbd5993ac6f11a8a0c71c8
-DIST kwallet-5.41.0.tar.xz 306496 BLAKE2B 8436b8441fdbb33172fa46b850a0bee5a1b325d0f238000acf8ccb346c059b2e57478b554eb4b19ad9cb574f88ff09fd89a6dde1ff601384079097e519326193 SHA512 572b1d145f7092ed8ca581a00ced425f6a6fa4d153853ec591bbe6f91c5851c8476356b907ea1808e93f881a9e24797e894e7621f5627eadaf086a7f92e89e74
+DIST kwallet-5.42.0.tar.xz 306540 BLAKE2B 7aabef63f3455c947d84d531f5181ba97364cac8e0e29264599acbac7e94df2f8bad154a097f6bec187f4e35bf98568fbefeac7e002e9d61d667911ecb829997 SHA512 800eca462be0f95d5f0c41aef8cbf5513b5599cea988c49fe94dddc5803ec2834acde0f44a83d4739cef120cbfca5807c523c3b5a7a7f07f1ee3372fe5e63987
 EBUILD kwallet-5.40.0.ebuild 1574 BLAKE2B 9ca7064bfa9cd5bcd6d51138a7c90da5002ea5cc8cbb2f92a2be8102083d50e6f6269aad1c3613540b0835d99b71f1a359a8aabdd9d6818c6c6999078557063f SHA512 21bee1a8001f9df996b093a3a05a8cfe91ed98dc4a97619cc250855ae38675af4c76e6e1e35ee84134eeebd4801d3f605cfc48384a0c9f03021971248b1e4256
-EBUILD kwallet-5.41.0.ebuild 1576 BLAKE2B a4d6c97566b8fceae68357a5d749fbb80fafd3119bc79e2c15e780c226ff065adee7272ef33895ca7390e40921a3ab52fcb8d61c07585ba8bdf71171fae2786c SHA512 576d9bfc9265758d870f15a37d556dff6c53d63c9be0d05ff9d3e849b3574a408f4d79679783d1c96d484f976926bba6c6691be465e51ec29c91ccc1c47ae08d
+EBUILD kwallet-5.42.0.ebuild 1576 BLAKE2B bea0446006a7d6610c1c06fca0b8df0a7431bb7fdd45d2a8d80cd41fdda8ff2f13f19dcd119859bf6f6b8bcea64948806e53229df5c4064362c30c83280319af SHA512 17c1643b34a2501924da0712ba5b1cef4f9a454b54449515342d95ae074fdba4618fbe844367bcbd1f90111f1d5b45b18d6da3584ae3fb250dca8b89026c5516
 MISC metadata.xml 433 BLAKE2B f33e8e33f6e8ddc49a85ec7494416546ddaf4db590b02cb3e4ededc7322cd088b7372291777dd836152df31f0ad890b61638b721fb2fa025d007453850d9e2e3 SHA512 c5285c0beb12f4f5c81f89e856c63737a119f9758e4302e3789603fe8daa3c675674698105e38194eb383097c7f57e8ece1e7b845fff1822cd5ff8b0688ff1c4
diff --git a/kde-frameworks/kwallet/kwallet-5.41.0.ebuild b/kde-frameworks/kwallet/kwallet-5.41.0.ebuild
deleted file mode 100644
index 8037d189d022..000000000000
--- a/kde-frameworks/kwallet/kwallet-5.41.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=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/kwallet/kwallet-5.42.0.ebuild b/kde-frameworks/kwallet/kwallet-5.42.0.ebuild
new file mode 100644
index 000000000000..9ebbc724defc
--- /dev/null
+++ b/kde-frameworks/kwallet/kwallet-5.42.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit 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 8ed575933eac..1a0a08bcc753 100644
--- a/kde-frameworks/kwayland/Manifest
+++ b/kde-frameworks/kwayland/Manifest
@@ -1,5 +1,5 @@
 DIST kwayland-5.40.0.tar.xz 284976 BLAKE2B 756f461e431647fc80144eea85ba24fdbd9eced45c8d1802369c7e42d7e1590ae1481af98d2a3561ed7076299f7832a163ee048c9649d4b45cf2ac778c1fd2cb SHA512 3bbf49ee8a7cbf613d29fec59ac1444be1e89946792fc265a6c889fb32cb2ac93aca16ddd0e636daa8fda556ad01210e4bdd6b6ef4783ca95de5b0834baaa403
-DIST kwayland-5.41.0.tar.xz 289716 BLAKE2B 0fde2e6d486ca62113b95be02f55558bd9917dcf3e3f75d48c1138cd98362b4df43b1a577b457bf73ffe7997543e381b316d9f35862a5a37a06d617e42c7e90a SHA512 b31a769c1b265ae786eec42ab0a9e1aa29820b2dffed08fb9d5b1fbe224c4a4f2deab461823da88f44ffb0a4f35fbb0b77af2d235d45d3c90f9707f728ff1d37
+DIST kwayland-5.42.0.tar.xz 297904 BLAKE2B 2e82bf6eef464f0bfebbd498abacea28b64169d1c09fa5ece40c74905bd59357e60a0bf1064f931c0281a2bd2c35f2719c6244c83086408c0c0733e10a69a847 SHA512 0b841c9b96895de504621c467fea07483543b50b274511708a21b48f12e63dd206d41f7614cea3e34fd9d169b7f7142f96db4dd1b2b14b7da4f5aa89cfaeaabf
 EBUILD kwayland-5.40.0.ebuild 576 BLAKE2B 9de9fdcc57a1e4c040d97c0d74ddf6752dbaca88ba6f82f626668837b0926ea7423d5366146151fb87447eb55191226a550b43f90595af9667bcfdfe65ddbc67 SHA512 2529ab9d1c5f0fe308b868236d538e47866c054a534ac74f03eb2a0e3b366283ebada354648d17ad3c069c95e883a70178ab2bdf3574cd84d925488f192635f8
-EBUILD kwayland-5.41.0.ebuild 579 BLAKE2B 36782ea98a29d40fff006fc6704ab4df68502130fc32eca738b5b14d369c0ffa3b196991c8b599544423dcb87a6bbe78fe7093d8e013ea258c1ade6e73d55f34 SHA512 227c480b599d63a82656e144a1e2ae14f6dd3f1521778944e4d9a0a4453301bbc501614c87976ef80f4776cbcfe5df970b0d2f32bea6d8ad54a74c5d4ca7d3c2
+EBUILD kwayland-5.42.0.ebuild 579 BLAKE2B ad3c16b9cf6424b2ee3d71d51973d78f63229d1c931a2593fd93bafe07322b0cfd92286812b6fc8f18107781171f4a059a7d4a2768205681a43f195e45eef99c SHA512 8c5d7cdf1369f8fe4b66957c30ab5fb976a773cbc3a464a3c728f25d58452a65f0a2f4ad5f898c3d474292f0dd0ac66bf4961169876cd09f149a925179851d1d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwayland/kwayland-5.41.0.ebuild b/kde-frameworks/kwayland/kwayland-5.41.0.ebuild
deleted file mode 100644
index fd8568054ce8..000000000000
--- a/kde-frameworks/kwayland/kwayland-5.41.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kwayland/kwayland-5.42.0.ebuild b/kde-frameworks/kwayland/kwayland-5.42.0.ebuild
new file mode 100644
index 000000000000..4bc9d6baa35e
--- /dev/null
+++ b/kde-frameworks/kwayland/kwayland-5.42.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 af9ed4a21671..14c03dc4df3d 100644
--- a/kde-frameworks/kwidgetsaddons/Manifest
+++ b/kde-frameworks/kwidgetsaddons/Manifest
@@ -1,5 +1,5 @@
 DIST kwidgetsaddons-5.40.0.tar.xz 2179044 BLAKE2B ea6207fc550ef58a15cd2b00512f4ff30487b1acd3b337072de67342c26e4d640187c95995c86ef88c2f7843a3409dffb1811181d639c7fdac9c0fa0f57ebe3d SHA512 885afe981ff9aee90b9ed98e6d2d0a458729133ff9b681597a9836fc68c022906ce0e0dc53f58e60a907e23d5e5914993ce6a4610d931b62613ad15a0ac011b2
-DIST kwidgetsaddons-5.41.0.tar.xz 2181500 BLAKE2B 3a6741c3717abdc4c4221d61f814b74cb132a45ec74442c5223ed75a26dbe5986a2d4cd574039a22cd577cd0bb4499896499cfbce413ac0399adb2531640c700 SHA512 4a78b95d4fc2574f051c314b3313e36090c233cf997be4d7ce7c528006d0196091cc1c6384c0fa2cef83f07df62a7a0101369d702fda0eb7f6fb1773e6747477
+DIST kwidgetsaddons-5.42.1.tar.xz 2178740 BLAKE2B b653efd24968fcf212cb8d35a3825e44533113e68092d04d9306f211cb037919e8063f19876a841531f2e78ffd6cd5d98256816048ca7512f88840035e29f7ec SHA512 4ab5549a6dd8c62ac896c9e589ceb3c6f26834f3a03558b565f3781a46d38f81c0f10edb049ae3dd8a358c9d8ce74d5743fb82007c8af9d2379b6ff7c1b80873
 EBUILD kwidgetsaddons-5.40.0.ebuild 405 BLAKE2B 0bcdf18bf22f9f86b4a6147f918fb58f1d0f47cf13910df05bce33ceb74ccfea741ec600e91b054fdf4fb21dcecccab248cc40d2203b60b9f6d54d03aed8bf90 SHA512 146334cc51cdfce91d148bbdeec8c331c390fa21919436eaf738400cd60f45478a4f0d5f2bb923eece4d48cfff0d4f1c3cc4c5716832c3b654abf68a35b277dc
-EBUILD kwidgetsaddons-5.41.0.ebuild 407 BLAKE2B f9ffc1ab01dfe59ee59e5da59e8f783c7eb7416192a19fc41fe9d86718385ea0b2da998850b55d9e0de7fd823dc2c909ba956ed9f714a52554fa68ebb30b101f SHA512 802c180271fb091420a48d5db94cd4edd3b734b5fedcc6ced792e638d6dea4433d536d50781ec5defa56a78db920a8d728e3202a0228103fd90f28f0c6d515e2
+EBUILD kwidgetsaddons-5.42.1.ebuild 407 BLAKE2B 97de2063f7f6c5aac45a2ea05baf91de163c2a80a67ba225332e4234d9b096541b1ce3654d323e6b4b4c92185528cf112233bf1870bcbf91a0bc35c538ddb757 SHA512 904b449d2787744d2b85d54d3e19b0214b6e7e59ef8d34d50e40803f49603590ef8b7868588977c12f996d13d1db6c35c3b33714c5fd6c4251a13993610726e0
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.41.0.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.41.0.ebuild
deleted file mode 100644
index 9b683c48b86e..000000000000
--- a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.41.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="An assortment of high-level widgets for common tasks"
-LICENSE="LGPL-2.1+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="nls"
-
-RDEPEND="
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtwidgets)
-"
-DEPEND="${RDEPEND}
-	nls? ( $(add_qt_dep linguist-tools) )
-"
diff --git a/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.42.1.ebuild b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.42.1.ebuild
new file mode 100644
index 000000000000..d59d575f3e78
--- /dev/null
+++ b/kde-frameworks/kwidgetsaddons/kwidgetsaddons-5.42.1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="An assortment of high-level widgets for common tasks"
+LICENSE="LGPL-2.1+"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="nls"
+
+RDEPEND="
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtwidgets)
+"
+DEPEND="${RDEPEND}
+	nls? ( $(add_qt_dep linguist-tools) )
+"
diff --git a/kde-frameworks/kwindowsystem/Manifest b/kde-frameworks/kwindowsystem/Manifest
index 7384027f6b7d..cc7e63e1bb42 100644
--- a/kde-frameworks/kwindowsystem/Manifest
+++ b/kde-frameworks/kwindowsystem/Manifest
@@ -1,5 +1,5 @@
 DIST kwindowsystem-5.40.0.tar.xz 169628 BLAKE2B 39a5c58a91781730436ebf911c7a31efc12881584c5bf2dd1695ac4e009612064ba617fa2f2834b9a501b7c9f82928c8fef2dca342371303a05e58b0dd54b417 SHA512 e07531098de25d96168efb2820b209b47cc5fd0ea5a9a38e3c7c86b079619427e1e597e7b07fd92ea1a64ad6f031afe037ccc73c64bc59e3e5143ab54fff530a
-DIST kwindowsystem-5.41.0.tar.xz 169584 BLAKE2B cfdd0dd80c7896d9d544dff20cb3e398d84e2d753f5c33148e59738eb8b334afe2e22d66cd8be3b813957703ac863dda21dc2dea854c1db9646ab9c11f732a72 SHA512 e34d2b597d97d9dd81842d6ca0be9d737d96ec3cfe632b52b72b94a140479b4c3af29376599fa6ea23befd20b88bde679c5ebe47e091aba6efd163968f76318c
+DIST kwindowsystem-5.42.0.tar.xz 169544 BLAKE2B 7d0d3fdd6e8ce187872f5c8c5e5b81dfd9aa21c87205c1f8b1c9eebee08a2af98f651e8a355efb42bc282d5dbe10aaddbd96cb28bdd95d91eb86688f86866e12 SHA512 1b1d8cd74ec6aa318226029aff230af07fc91280d56eba607ff53786191e6492e6b3a22e4eb9c7cca158017095d534048e74c0f13cb9c23a79164a3f21931ff8
 EBUILD kwindowsystem-5.40.0.ebuild 756 BLAKE2B a3c6bf4255939e42831660097446b6b42d53548f09f88559babdecaf70225482fb1b84306269b42a6c98a0b866d85ea6046fc50ff3ccd0526f61ebd905070dc8 SHA512 37f6b666fd723252aca41f90edf4399b4172b3781ce18bdb1950f8202310fe3f6776af09032552819c6710c9116e984de8bcac26f869ea919c4a106a74bd675f
-EBUILD kwindowsystem-5.41.0.ebuild 758 BLAKE2B 1a92e0d2d178fa344bd9410ffc0daba9f87cf920d4e0e6249204f963079495f22876408476b72f92610b066f40ff7959b96978988b61611dd26daa83f5baf1cd SHA512 ca0c4b96b89f18802ba0978e53b2ec462cf257ccfcc7bc90c5b64bc9eb81f471ef3a09cd7213f3c6a984ef889d93069859adc1ce5853870495258fb2307b2782
+EBUILD kwindowsystem-5.42.0.ebuild 758 BLAKE2B 52213d3e2a5ec47bf3e5bb196367fc9a6564d0ff0ccc8cf80d1e6a1cf40fa4600a92f987f99d919581578f77c64b478e6614414918b1da6a988f38da8711f141 SHA512 11e2fce2281e70829bb2e684fc2a9f51a065b97dbc80d833a67ab3432d6cd32b35a59df20459af391d832d4a18ebe2ef3add834f3f13fee42384f9974679b68e
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kwindowsystem/kwindowsystem-5.41.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.41.0.ebuild
deleted file mode 100644
index e487d4f75b73..000000000000
--- a/kde-frameworks/kwindowsystem/kwindowsystem-5.41.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~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-proto/xproto )
-"
-
-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/kwindowsystem/kwindowsystem-5.42.0.ebuild b/kde-frameworks/kwindowsystem/kwindowsystem-5.42.0.ebuild
new file mode 100644
index 000000000000..2615478ef608
--- /dev/null
+++ b/kde-frameworks/kwindowsystem/kwindowsystem-5.42.0.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ~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-proto/xproto )
+"
+
+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 1b0676020cc4..5bfc2c753bd9 100644
--- a/kde-frameworks/kxmlgui/Manifest
+++ b/kde-frameworks/kxmlgui/Manifest
@@ -1,5 +1,5 @@
 DIST kxmlgui-5.40.0.tar.xz 883668 BLAKE2B be1406a557c48ea3779aa16aec94fc76d6838b7523995290deb41d14f5738fe2669ef3309125e32c0536053ce1ec913d294563fe357b8218b5ab3ffbeb5531c0 SHA512 fc29a88395a9fb1979fa56d6e98e789da2831745358b71c2845e8f180b42ad76f1880fc22d13fb3e830dadcd945dd3225c1aa3fd008b14eaf7201d6f05355177
-DIST kxmlgui-5.41.0.tar.xz 884016 BLAKE2B ac954b10b5398c4d160dc721933eb8bbf41a0e659bbbcb0a428267031171697bd9919205a2d06e7f2ac336c31ef2b46570482b961d5bf8a96abb363264946059 SHA512 c8e7d39ebf8e0cb887f7b8bde7fb1a9a5f35e24972df26b1ba9ff5bb444fc905bd9380e6daf3b52a6bfe97d022029f9c00f55b0062d24de51dc0b0ccd255f1a1
+DIST kxmlgui-5.42.0.tar.xz 884252 BLAKE2B 85dd2fcccd936c2a2d476139afe2865df3b254fbb9446626b91949b85a9b5852a375a300f294729c494f6899f8dd4b7e9b153c405174dd2d0c1639059bcb4a4a SHA512 ac1208f464434faecdb122cbcd11ad5ef92f0dfbe2a72c81865b8862e8247d1e593bf975a53ff8dcd4e659e2467656c3eb011038acdb3e7e91e91263a817eb40
 EBUILD kxmlgui-5.40.0.ebuild 992 BLAKE2B 6fba6338bc261707ceff1ea3883948005f5e1ef48c0f623210b1fe2a2bc87632595e728e6055386a22f397b3451e1ff8e3dc713509eed019576190b1e9af9c28 SHA512 7c80deda380933c538d4c78c401c07f2cf909caa5a894d1df6239ded9ea6e0810b3bd6b418e05ff3e5e0e93460d915ec4ef113a627dcbc61772cef55249317eb
-EBUILD kxmlgui-5.41.0.ebuild 994 BLAKE2B 8c5da5a5e825f170c0ba4240766b3cb435b04878384288a713da623551cc9903b856d71fafa57e295eca80ca669a2fe89e7249dddc89f1a40da1419ebb8ea25d SHA512 39301a13e0089012e1e8e90630a540bc74a539120db5288fd43a81ccbafa922de576c83e1c33142c04deafeb5a2824eb42f193ee83631509368d96f2de74b488
+EBUILD kxmlgui-5.42.0.ebuild 994 BLAKE2B d8b6fd1eab40d03112284a5479845a8d7cf805d467167d0573a361ee506601da38b0a804bca499aa17f8ccb9e6e775256c3ca716b573fe1c9821b88abf88b165 SHA512 afce7b8da8f8e651a7804b8b08ce03103703214e56e07bfd3fd6a8ff338837e6faf01e96c8e8131f81105ba95eab01fad72b6cc8d5d79fde57d39ddc6ac06264
 MISC metadata.xml 345 BLAKE2B 96a4b9d8b198daa5ab0dc57b20fc8825cf496d8790b443a573db2e9779ec68b601cd6e0d17e41151820e834b888b25788f9e117539fa283b5036f19f0ee6f4b9 SHA512 8afbcc4b1fb04ab5cfd90dda415afbbd45fd96bb365ed08c4aa2f456bccb020816c45006222f6c53a0fe4bee1c5ee4b427355db8699ad0282526d97f873b70c4
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.41.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.41.0.ebuild
deleted file mode 100644
index 5e1cc3ab58bc..000000000000
--- a/kde-frameworks/kxmlgui/kxmlgui-5.41.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-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 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
-}
diff --git a/kde-frameworks/kxmlgui/kxmlgui-5.42.0.ebuild b/kde-frameworks/kxmlgui/kxmlgui-5.42.0.ebuild
new file mode 100644
index 000000000000..1962dcc0d82d
--- /dev/null
+++ b/kde-frameworks/kxmlgui/kxmlgui-5.42.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+
+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 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
+}
diff --git a/kde-frameworks/kxmlrpcclient/Manifest b/kde-frameworks/kxmlrpcclient/Manifest
index 9ab513d78fab..e1820f940b27 100644
--- a/kde-frameworks/kxmlrpcclient/Manifest
+++ b/kde-frameworks/kxmlrpcclient/Manifest
@@ -1,5 +1,5 @@
 DIST kxmlrpcclient-5.40.0.tar.xz 29296 BLAKE2B 4ca339d8fe3130c53fac366754322fdda2acb155b0a77ce6677756a5fd2f89e895f829b92242bc5c51a6d6885c8f38cb0153c051f11a1b55522485ae333db532 SHA512 e35410b53dc39940b5487bae385167d86f8b2cb82248953aca246cdb8bf21db65749f3179940156e302d43aac03756a2085217cf66716718dfd6765caafc7294
-DIST kxmlrpcclient-5.41.0.tar.xz 29300 BLAKE2B fd7993e576b78522dc74ae1c656af351b27c595744b4998025695310c34ca9e2045abd9f025aa2b0b446b432b8de9470aa8b5c0340b02b4314dd08f9983aacbf SHA512 ffb485f7c6027861d51da96eec33c68551627def1bee467797bf2864207584f74c6847b6ffca4ea130709615d9dae451cd406d391644712ad78f09d175dfc030
+DIST kxmlrpcclient-5.42.0.tar.xz 29204 BLAKE2B 5e954a23a75aeaa37f8b20f9b0c71eedb6b1ff6b3e1c6785b861fd608b10efabef8bfa5f44f22f1e0b6f37dbc8cfbb6a6d9a1e027a5ca9b1b475d9e4d20b1268 SHA512 51ba99d8482a372a8785dc79b877d6fdcd64b55ddc4d528d362b129023a64e3125ad5395bf322c56ae786677afa5d07e0dc51a44e3bebe7996ff462e5273c306
 EBUILD kxmlrpcclient-5.40.0.ebuild 426 BLAKE2B 99f6bd61e7e6a090517680f99de18a158ae7748c945403325259e6dadcd474ce30715807aa02a61cab84639f8f3e8eaf248b310c4d3fea4af14cdbac3e32da25 SHA512 f43eb7a40d230af7c71eef9ddc7c32f11ee234f63561c47e5939875526b8c93774e2702463e88a3966d713123a95886341c4674252d7b2a5c007a0efd7c6ef97
-EBUILD kxmlrpcclient-5.41.0.ebuild 428 BLAKE2B cc2ba5e71a2cbc0dc54c574b8b68c3851760e9c3fbc88a6282548a581e19e55f032fcdfa146d6a7b71f8ff60af0fab178c87ba1f8cb6bbd1ff641c1418709713 SHA512 7170490395f1443bd307bbb007d37c582e8c3fc1173a897c355cef874979e8947faf8979bcd6e126400d3127bd783af767097a4c1c52ac11e65c66dd41f57a02
+EBUILD kxmlrpcclient-5.42.0.ebuild 428 BLAKE2B 5d998bf9d6f8d4c3fbeafe073737a7f8c5aa1be1e7df79c01fcd1925590fe158cfcba17ff489d0ff33290692e3ecac6a7b3c7b810611cb4944f474bf6692a3f6 SHA512 b41cfa153cc3802acbb01341daa104fe9fc01f2dd5a5e3c3dd996b063d31a3642de9640016fd930b54ca9c97c399c10e1e39ee6bc83939253488a92b4564d38a
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.41.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.41.0.ebuild
deleted file mode 100644
index 87998183ce16..000000000000
--- a/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.41.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/kxmlrpcclient/kxmlrpcclient-5.42.0.ebuild b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.42.0.ebuild
new file mode 100644
index 000000000000..d9a11e8ddd03
--- /dev/null
+++ b/kde-frameworks/kxmlrpcclient/kxmlrpcclient-5.42.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 d7a49f31162c..e9b9875ecdb1 100644
--- a/kde-frameworks/modemmanager-qt/Manifest
+++ b/kde-frameworks/modemmanager-qt/Manifest
@@ -1,5 +1,5 @@
 DIST modemmanager-qt-5.40.0.tar.xz 98404 BLAKE2B bfb16ad423c67ae213c97a2c1e463591910e42b49e2c7d3199dfe77e5c5bcae11bae2e680d87cd18b8c73fe05a950ec093fce7d159355779cbdce03dc1e8cf79 SHA512 81d9cc2a851a5846c6aaab561776f7c4a04b8567f2db5e2c235f11b3261aa1164d3a442fc4401225b57acb1e9f75efc61bf4f8a04bec3948e7cb0854653d0758
-DIST modemmanager-qt-5.41.0.tar.xz 98396 BLAKE2B 64654a7c2ed4ccb4e5539c8a1baf57c62af814b366dd7f7279cc756ba43572c100c832c36c7f548cbe4724a8ba75463a5d577b1f6de200c2cdc63a1d71a2afc2 SHA512 c5bcea16e426b8c2ed09014fed97cb527d1137c9a458304ebca96552dbf6b4d2b4c11ddab2fc0a89483557bf709624446f9862313e3a495a556395c0bbd0db46
+DIST modemmanager-qt-5.42.0.tar.xz 98288 BLAKE2B 50bdaedc1917a98f91fb9bc722d9fa062a31e171875caffe8c70e2c8804fe52401941b222beba575be829ed4c94a964fadb6df5909f05da888a7ddb3f2097b40 SHA512 6329e9233613bc536ac4f77f766af2f05d6217246a77862ff467df6f39d72acb1c47c410d51d3b5adbbb6d1e658dadc79aaf4073aa36394fd54b228fe2004426
 EBUILD modemmanager-qt-5.40.0.ebuild 393 BLAKE2B a17a9543e26ac580809ad302020de1ae60f13befe5b4589d49d91e73a0e4d62c4d246707a1b3f9a8c79e0ab5fe1242e0d90b3ced9ef253d4168f826ce7e59595 SHA512 a523fcecfc853a6c6df45b2451dfd08debc9f9dda21ca1c36ed07c37eefdeb8cf9ae865a32080984156dc24922fd36b161b014c0864a7491b1a2452b6fe7291d
-EBUILD modemmanager-qt-5.41.0.ebuild 395 BLAKE2B 7562e5aef48911149602c3de8b4a8820f96b55f3cd3100dec254b6530d62c5257170d7e7efc9f6770cbee57cab08f0f71ca1ddb3e37dcd84c39083baa57cc8e2 SHA512 d117750df940932dbdb7684a3736f0647d7d9256e32f93c640690a073eff929ad10d5468a3dcbe3538d52b96b301f522ec30b5bc8f3d4d2ae6f7bc73e7b7831f
+EBUILD modemmanager-qt-5.42.0.ebuild 395 BLAKE2B de105df8a4e9a3051e5a9f3db826f40a04dad408f76bf7c523b23eef0421af86e2420df9bd0bd78df301697ff67ef9b44b4c041947a025bf32bbea41cb9c8468 SHA512 5a2e685b48462c723284aaafa72894c7dcb5a1cc832bf275e3b158c19c82b736a4e5a614418b0b0f0f9333af349e1855b5e7eb79811576b1ba46867a9b716af4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.41.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.41.0.ebuild
deleted file mode 100644
index 0795a82a5e2d..000000000000
--- a/kde-frameworks/modemmanager-qt/modemmanager-qt-5.41.0.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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/modemmanager-qt/modemmanager-qt-5.42.0.ebuild b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.42.0.ebuild
new file mode 100644
index 000000000000..0c4e09a7567f
--- /dev/null
+++ b/kde-frameworks/modemmanager-qt/modemmanager-qt-5.42.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 43e41b9e7e77..73213c69b18b 100644
--- a/kde-frameworks/networkmanager-qt/Manifest
+++ b/kde-frameworks/networkmanager-qt/Manifest
@@ -1,7 +1,7 @@
 AUX networkmanager-qt-add_EAP-PWD.patch 3077 BLAKE2B 5725f8f6b4a2580e50c236b366513e4adf99f46725742ba4716e73f0218457bc29651f2a7ad6c601a881b0582e90fbd754c766c66afb763f404f1e677d9e23f3 SHA512 fe483c7b53a98965e37e1e424dff2582b386aaaa420e95dddfef9619cf7297127714d079b5f4035936c22d7a0b3a0445fd1aada9706b7351e70760a0631c1303
 DIST networkmanager-qt-5.40.0.tar.xz 163456 BLAKE2B c8d0e85f06219ba5d89817c86cd97c493146b5a184f363b5367c93d138d52cb2c4901536afd9950a0c9cb54b1cd4ee9356f614d4573ddc6158da5cff873f99c7 SHA512 6c04dd10c85573fa33d1651aa17afd1f987cade3ec299b1f73c3f6052aaf65aa393aca97e0a22f6434e325e99a9c72c7c6398946c1573be3df57c08905460bac
-DIST networkmanager-qt-5.41.0.tar.xz 163516 BLAKE2B b07c191e25a70150ed436670bbcb964b1bc59c47deccfe0602e660e58bda3672a94901c82a8339252b10e0231ad0f9f0ff2b4910ff75f2a1148b651d86a7edd6 SHA512 7dcee7ca4025c9104ab9e1c583fcf0f1adc44c714817e730f35b0acca1ccb7ac059c9ce1bf499763e816f5231ef755c92ee5dc60792d1590139082c2aa856382
+DIST networkmanager-qt-5.42.0.tar.xz 163480 BLAKE2B 11d105062007a41824001efdccebd36ed9488c584f476c2f819a17ae668f42e649f371942cf474c294164203ac92fba52ce6f0fc5ff1bd5e5671807b851b7a25 SHA512 bd8f9a4dac1f79c94f210ca7823ec012e0ac82c95103c294dcf0f676842ba4c901edb268fe1a4c6f6c69af034e9dd14a3425801c702edc2587517c00bafa0695
 EBUILD networkmanager-qt-5.40.0-r1.ebuild 740 BLAKE2B 74651e20523a2b6a8c8fe50e17a2bf458d31ac0fa8e21dbc474c02d528c00a8580e63a31aa5120bb2eb7518268c229dd61ea210e2c3fd867d895a44f6d72de76 SHA512 35c46e75f18331bcf63cf03490f81e5e2a4097a8f0cc88ff174997e2931c31c6c331c49d5203484c5991d7d0ae7e361015f117552d682d616ff3afdae5d97614
 EBUILD networkmanager-qt-5.40.0.ebuild 687 BLAKE2B 0a973209ba3928b911a35b1dd17336bf6650bccebd35c6da1d60704625703d6c7507aeb3bbae486601d51293f7b82a0f94cdfa981fa44fb2946d605f04d1f318 SHA512 dfbb706b1ca4dd91ac1fcdc7b6c59775de2e1b85eb3453f5c433106e29729a149c345e36333d5245d860b6078e308b4e234027953837d0b40e73282994673226
-EBUILD networkmanager-qt-5.41.0-r1.ebuild 740 BLAKE2B 74651e20523a2b6a8c8fe50e17a2bf458d31ac0fa8e21dbc474c02d528c00a8580e63a31aa5120bb2eb7518268c229dd61ea210e2c3fd867d895a44f6d72de76 SHA512 35c46e75f18331bcf63cf03490f81e5e2a4097a8f0cc88ff174997e2931c31c6c331c49d5203484c5991d7d0ae7e361015f117552d682d616ff3afdae5d97614
+EBUILD networkmanager-qt-5.42.0.ebuild 689 BLAKE2B 381d4293e75c7f90ab393154bd6222ef1a8c66d1a22be892dd511320ca7a6e87aed918d65cab3890ed06397c0d8a9954e9fb8020bc745b6710d9748d962b8ce7 SHA512 64742eb2066a71672b057ae0fe0a57e1de27c6736ed25cc05395947ac8df69d2c8469df4b343de1219a71309f0bb4a41135d6e0f80ce2bd73553bc39eee53d68
 MISC metadata.xml 321 BLAKE2B 098fe8fddb4726cd267f0eac451b1b8dc63aea1f1b44f0f3582b9c9be12e7bfbf7b9efd98e7c01e1abcf601d9b1e6527bd6338caa4152737b88752aa6ee0a095 SHA512 ced12318dbaa149e54fc1e205d412f322c388483ab91d5706597805c53f1054374c8d525d5eff79df108b48249148877bce9875ac246fdaa43e47c0d139a4eaa
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.41.0-r1.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.41.0-r1.ebuild
deleted file mode 100644
index 8cd9b7ba3ff0..000000000000
--- a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.41.0-r1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit 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[consolekit,teamd=]
-		>=net-misc/networkmanager-1.4.0-r1[elogind,teamd=]
-		>=net-misc/networkmanager-1.4.0-r1[systemd,teamd=]
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-libs/libnm-qt:5
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-add_EAP-PWD.patch )
-
-src_test() {
-	# bug: 625276
-	local myctestargs=( -E "(managertest|settingstest|activeconnectiontest)" )
-
-	kde5_src_test
-}
diff --git a/kde-frameworks/networkmanager-qt/networkmanager-qt-5.42.0.ebuild b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.42.0.ebuild
new file mode 100644
index 000000000000..4bcf5b7443f8
--- /dev/null
+++ b/kde-frameworks/networkmanager-qt/networkmanager-qt-5.42.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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[consolekit,teamd=]
+		>=net-misc/networkmanager-1.4.0-r1[elogind,teamd=]
+		>=net-misc/networkmanager-1.4.0-r1[systemd,teamd=]
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!net-libs/libnm-qt:5
+"
+
+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 c5e3c6d0c8fc..1edf894b0837 100644
--- a/kde-frameworks/oxygen-icons/Manifest
+++ b/kde-frameworks/oxygen-icons/Manifest
@@ -1,5 +1,5 @@
 DIST oxygen-icons5-5.40.0.tar.xz 234407136 BLAKE2B 0f654925131cb958516c54ed577540c4880f0fa45c31741afe15cd717d37d07342f62a5db211d628d095b25d78e45df5a37af469d22d807defe09b04499d61d1 SHA512 c1bdfdbeb01440d56600b9b17b9247207d0cdd5bbd316cf0140788e76efdcb094fee98b4cc00f86951005e5a125407edc0902d0edfd369065d934cd8fb1c37f0
-DIST oxygen-icons5-5.41.0.tar.xz 234412448 BLAKE2B 384b7334b666f377577d8a399f5227a39187ce075afe1d72dee3c0e90efc16790ec7b47bb31235bacd6249ccfbcbd4ad6a3a891209ab62f3e3ce616a700dde5a SHA512 f1d8f88b06f75df91a6c7297cb9ffb681217e14a4643849961fb4751da2e4652c398c006cdf2134887775142a2ee3b62ebd24c0a13ae5c9eece5ad6a0d629d9b
+DIST oxygen-icons5-5.42.0.tar.xz 234410672 BLAKE2B 560be8762c1ea2ac6550141eaa53d66419f967a32543d18eaa140c8363441f1ddd2580a99e618532803b40504e02ccc96624df5b5e40a74e87a7fc3f083e9298 SHA512 b82dde30e254867f1cb7e68d6575f50a7fb52d703af5c8b24e80733732462dc20ed0fce2299549c7665ad6226d89ac3f97cf16700e2a900f7a2f9ccd5eb8fb29
 EBUILD oxygen-icons-5.40.0.ebuild 533 BLAKE2B 19c27ff693a38fa6bb8b830ab30361063cfd17ea6475ebb9103afb49ed0c898859035cdbd2c89ac697600aa06121629d9f135396dfc96e8ee158809b124648cd SHA512 2348d444ba5f98af032ba1c85a571c97bd521124c1fd16396fbe465f294aed516823ccd6d0e431c231fb7f67b6538aab9ef0e14b3e8a792575d6b928656f4ef9
-EBUILD oxygen-icons-5.41.0.ebuild 535 BLAKE2B f00bd5357a06c117cee62ab81e94b9b4a4e4fa6bc9c53edbf0f0ec3cd9e8fdcba820bc70ac75c62786baa467ceecf9c77892af64ccfb8c4524c95fdfabc8480a SHA512 349cd277af16ab5f54e553a99f59f5dd79f09a737b043b7900140346b98612bfab6b715dc0aec7a8ebd2f4605741ad25bdd74b4daa13a9e925f2f2a16742604d
+EBUILD oxygen-icons-5.42.0.ebuild 535 BLAKE2B 14ee28425a622b6bb62626a73b50494c0d7afa5d874e6d4fcdfa8384e5eca7883d913bbfacc1ee457a14445855005d634274dc324d9e5916b31c27c1b0afd4e9 SHA512 68808ff06d72a0d4848d97de358d0d724edc03e0632d883e8cded78507bb343d7cff7da0077b4da1a69ea1c5c57e6d825b7f3a4143369c8976bcb16b9155b607
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/oxygen-icons/oxygen-icons-5.41.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.41.0.ebuild
deleted file mode 100644
index 752fe3d00516..000000000000
--- a/kde-frameworks/oxygen-icons/oxygen-icons-5.41.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
-
-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/oxygen-icons/oxygen-icons-5.42.0.ebuild b/kde-frameworks/oxygen-icons/oxygen-icons-5.42.0.ebuild
new file mode 100644
index 000000000000..30f0353067e6
--- /dev/null
+++ b/kde-frameworks/oxygen-icons/oxygen-icons-5.42.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_AUTODEPS="false"
+KDE_DEBUG="false"
+KDE_QTHELP="false"
+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 3f175e623783..ccdeefe5419a 100644
--- a/kde-frameworks/plasma/Manifest
+++ b/kde-frameworks/plasma/Manifest
@@ -1,5 +1,5 @@
 DIST plasma-framework-5.40.0.tar.xz 4607172 BLAKE2B 84c72797dc00ebae7a2daaecaa4f3bfdfadd53eaca84253f08e54edd3e735c09ab50d2a43f08302e33d504ce77f0d877858e3224c2a1b0ff2d8c046ff5805104 SHA512 0718ff2fa45d6e793aec947ea42c7264ec379014a6286606eb7bc2577a64f236621f67f20b5223794c1d9b65989a2ebaa6f77f2c11f48fafd0f992dc03e01189
-DIST plasma-framework-5.41.0.tar.xz 4607744 BLAKE2B 1f3b510b0828937693e0dfa75ff54e94e991d23eab9dfcd14745e6c3f25bb92e8d5628d4061a94a19ce00131403c07127dbb23a8c43c5fb813bf097c41c44b07 SHA512 fb94919f85393fd09a5a926a093bca80c243260adcb9dcbcee822295bc5773bf176cdbcb4b554473f3413f95ca5be061fe5e5b17d4949947f2bf510894a7a67d
+DIST plasma-framework-5.42.0.tar.xz 4609604 BLAKE2B 9c2f5180d2a06007a540bd75ebbda47a93a7c56d2a83c126db15052193483890d5779201e13379ef52d9d3e9cf861257c00e4c9150cdb3fe8e2d478a2269200a SHA512 90cc77a17beb1240b9d46e83a413fbd931ab0000a4155f732f33384456c48e69777d088c0c8bb87dfa29a481f8ae1c5d876c042ddb4f446ccf0548b0647e4681
 EBUILD plasma-5.40.0.ebuild 1652 BLAKE2B 99d3c0913e17b793ab63ee14449d18606d1c42213fb66679880f3758145dfd6d4d07e0231a359ce2d5021cc885bb9a41f0d66b5109f0f2f9c5de30d85fd7e1d2 SHA512 280974848d1c5650e8bd76fcffc9c9b391b1a3b2427c15907ad44b4da9d3d7ac3fd39e98a29d432f4eb878fadaf92eb3b4d311062bf8db426f33eac021d102c6
-EBUILD plasma-5.41.0.ebuild 1654 BLAKE2B 11994ae3f01bb86b4208f406635c8267391a2583040c0e3a0f1d59869bb42048d8068b458154137a8117e81d564ca7b45e5bd54a22ab788a4b5577032690e55a SHA512 50798d29379057dce2144f20bbb22d640afb3dd7788b96cc4bd53b9a79e343fc4d705d8c1ea317ca4ed23bd1b8e8a4e9c48ad4cef244b6f16aba681da1758bd8
+EBUILD plasma-5.42.0.ebuild 1724 BLAKE2B df0c2e6e8e9b6f207f37d0a78befdb323e07126f7b702c721365b8dad91d5d1c155b9910d9a6cea07bb7263493218c4ec17f7a46243472f708d35d58db00520b SHA512 f28a15d5f67cfccadf72755ae15d89fc4d37aa2a888262e888521c951b0d9d9b7fb79c9cb24585e6f3aa0687d12220b371a0e3325b41a38fdd3122cc82e1a6b1
 MISC metadata.xml 337 BLAKE2B 83b14f1456a141498367a54d2b3b1bd22095d8a2ea5d4b348bcc1b27b6e753900e89d2b2f7f6623a9737c6c6fdf4fdc741fb38fef17b17bc458d182e72be919c SHA512 bd0bffaf1b63f9b0181776335e38b2ad44baef7fd4a1d78752b5e342de444bfcda03b72c795c0b52c87a768e243e9ffdfbd02de745c2dde8f8372fdcfbaf2797
diff --git a/kde-frameworks/plasma/plasma-5.41.0.ebuild b/kde-frameworks/plasma/plasma-5.41.0.ebuild
deleted file mode 100644
index caceebd1fc79..000000000000
--- a/kde-frameworks/plasma/plasma-5.41.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KMNAME="${PN}-framework"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="Plasma framework"
-LICENSE="LGPL-2+"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="gles2 wayland X"
-
-# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.9.0
-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 knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative '' '' '5=')
-	$(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-proto/xproto )
-"
-
-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/plasma/plasma-5.42.0.ebuild b/kde-frameworks/plasma/plasma-5.42.0.ebuild
new file mode 100644
index 000000000000..f8fa9d11bd33
--- /dev/null
+++ b/kde-frameworks/plasma/plasma-5.42.0.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+
+# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.9.0
+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 '' '' '5=')
+	$(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-proto/xproto )
+"
+
+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 89e4c9307562..79b5e23e33b4 100644
--- a/kde-frameworks/prison/Manifest
+++ b/kde-frameworks/prison/Manifest
@@ -1,5 +1,5 @@
 DIST prison-5.40.0.tar.xz 13904 BLAKE2B d2fec20bcba0fec9f0426ecb8b42cb559b0869c158016f02864cfa774351f339705f96830f7f30f2d0f37c2628320ad490dc8cc0ecaa565da4fcc904da3123ca SHA512 a4cbc5c8200b280c802f1fe2314d464b68ada11a1e3ad45d4a851a324e691c6b24bace569118405c10cbc97e01cd7f233b19da31887e86b54d1b260d73fc0e48
-DIST prison-5.41.0.tar.xz 37532 BLAKE2B 07f7d1837871c79a4b0b44663e59690445357971a029d4d9506c7f6d91fda7e5c59bd80221ce774211439027f9d189d89bc96e1d7f94f27e3fb2ce11d8e88b73 SHA512 14f952aa1c8fc289efd6ae34c3476ba44b68c3aca9169754d0b79b11114d9aef4a101a071b0da1dc46c517165626073dff6a36bd6f4b6b86a0945ae03130e960
+DIST prison-5.42.0.tar.xz 37484 BLAKE2B 7e7fe72bb56d1117794ed064e69607abdb0033668f92ff5e595f3144b74fbc319d7d1859f93d8a71b314fd0c97b89f18d9ccd447ab01bbdbc76553c983eb4efc SHA512 88fd2bbc1fb39d3d0ee55bb49377b34019f248140474c09824fdb29dd665084ba24b5ef3d341f40304f0877ee70d34fa47258ec4f3fdfa8cfe15c6298df12e5a
 EBUILD prison-5.40.0.ebuild 379 BLAKE2B 856e73e1c9a13a1192f43219b7ec7459366f07a90a235546e42ea60bd1f018026a9af868c750cf23aef49d9cd6c18ddebd2c74e900b4c91bfc9c54af2076a2ee SHA512 403f2140d377045ffeebb7cc1c41d146e2d1fb177e4d16ae61fdc044987c6256f3991691ccf436fe3f690cc08de5549ccae93a561a9c2d4ae1b8b9791c531e0e
-EBUILD prison-5.41.0.ebuild 381 BLAKE2B 892edc715119ea5d58efb54cf2d7a5b2d4901549bc95626f749b1cc9a2eabaecac4f121bea0c3db4c151cc2fc97151d7e4bcad91bb661dc8f1568c835af05fec SHA512 a01fc5f9b131c6664d16ddc0a9d50df8db4df1ee9eb747ee77f48c10ae418c1bf076bbb84a99ec3457a970551847aab82f11a264c25ba9a3cda88ee1ae3e317f
+EBUILD prison-5.42.0.ebuild 381 BLAKE2B dc8407485dd2960ad71df37a262e801256f89cf5797796732613864d8e78e6783da3e733f21b14ae70a4041f08894ed9bb5256484a0a531c99b6cbe6cb8a6f13 SHA512 37b1b33e3bca21185872d88113e84881992d995a0aa1f142997e035f8da4f959e67671a09f695daf610b53c219562e7e3a362bb76b337b566bccc31df7afbfcb
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/prison/prison-5.41.0.ebuild b/kde-frameworks/prison/prison-5.41.0.ebuild
deleted file mode 100644
index c58970ce3531..000000000000
--- a/kde-frameworks/prison/prison-5.41.0.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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=""
-
-DEPEND="
-	$(add_qt_dep qtgui)
-	media-gfx/qrencode:=
-	media-libs/libdmtx
-"
-RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/prison/prison-5.42.0.ebuild b/kde-frameworks/prison/prison-5.42.0.ebuild
new file mode 100644
index 000000000000..58d93e06213a
--- /dev/null
+++ b/kde-frameworks/prison/prison-5.42.0.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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=""
+
+DEPEND="
+	$(add_qt_dep qtgui)
+	media-gfx/qrencode:=
+	media-libs/libdmtx
+"
+RDEPEND="${DEPEND}"
diff --git a/kde-frameworks/qqc2-desktop-style/Manifest b/kde-frameworks/qqc2-desktop-style/Manifest
index c253287ca5a9..5f11882f67b3 100644
--- a/kde-frameworks/qqc2-desktop-style/Manifest
+++ b/kde-frameworks/qqc2-desktop-style/Manifest
@@ -1,5 +1,5 @@
 DIST qqc2-desktop-style-5.40.0.tar.xz 35292 BLAKE2B 367c633eb67ac76dfa0a58bbe2cd021a9eacc4155913c35eef855417234424beb1cf674f5f3ae749518a113316f3f68e8636d7495b94a3f1bedef13637dae20c SHA512 ef6c94583bbd264b1057439cde0428a6f2d95e1001832215aafe14549d521e0647b99f5cd61b56becdfba14ffbc140a3cc3b88a6f98e0aef7f409f7f203b2b3c
-DIST qqc2-desktop-style-5.41.0.tar.xz 36120 BLAKE2B a0034a83163b0042e2796d63092927c469f7ff70cb99dc89755ffa53ab32e02abff9f181b06a3fa308446c290061f6387415748b3757656f75da05b85e21592a SHA512 63904a8c5083555852a296a9a21af0a33ae5855f3aac17ac14087b5dec3e5c8f6a8e131cdd55079bd100cb43d4660cb02059813658dc7449d0f76026c3b00367
+DIST qqc2-desktop-style-5.42.0.tar.xz 36216 BLAKE2B 4d3479505caf55ba1be2946165cdd41cfc521131ba6f273a71e5e77daaa80b46e456e4c9c8fcaf6bfbb1e18d2da56d7ad5c93758685d5952d93c5d5e5e08dd66 SHA512 47188597586a58f5de38e459d9bd6a6d6b277cde9dfc15a9369322f216bcb7dc2f6e2fce002e8d4ff5ac3d5c571e636f536e01aaf8f258ae3b0fe5d0704f0484
 EBUILD qqc2-desktop-style-5.40.0.ebuild 650 BLAKE2B 7eeda81585d43654214d74ddad2f173a01db9fe6bee0cb421cae9b59d69e6deb2930bd9ce044f2aa326cde2ccee6e33a08b072ef7ea73d01c5c9afedb41a2daa SHA512 83d0aaeeaec5a2cd4e9f4318aab49ce2760159d75cd67697169f0a888ad7619dd579db5d305814023f4c0ee0e62a8f15f9e6cc14330dae739767fd02bf506ee3
-EBUILD qqc2-desktop-style-5.41.0.ebuild 652 BLAKE2B 5d0ffd33385641ba3358d511f66080e4cdec45ffb7cd495f765bb3a6cf00401e091ae42dfe83d286de9f931c67044ddae6fce8813e5dc341afd637e9501289a7 SHA512 1581cbff0fefaa479fe781fb4471693e03a689b742f5aeb25967cfba3f21f55a1cd8d889f8d187070896de7a61adbee6d1f150764c4911d9d760379f73590c35
+EBUILD qqc2-desktop-style-5.42.0.ebuild 652 BLAKE2B 9d233d950432f891b0cb36d133298dd26a6cfff3c7396da6ea0101846663e75c8ceeed3208163b9f2ca3334a9e57669187119ddfa1148659d43ef7ce401b4acd SHA512 e78c8c1f64c6e3d8bfc6d9600e2d649be155249eee0c62b475a3776f2bcf4c6e214dff19ef9b457008bf14eb323410900071979513406e4637b451b4674e68ab
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.41.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.41.0.ebuild
deleted file mode 100644
index 82b727e09170..000000000000
--- a/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.41.0.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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=""
-
-# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.8.0
-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/qqc2-desktop-style/qqc2-desktop-style-5.42.0.ebuild b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.42.0.ebuild
new file mode 100644
index 000000000000..e4c5e5dc30eb
--- /dev/null
+++ b/kde-frameworks/qqc2-desktop-style/qqc2-desktop-style-5.42.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_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=""
+
+# drop qtdeclarative subslot operator when QT_MINIMAL >= 5.8.0
+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 27e255abbad4..60970846177f 100644
--- a/kde-frameworks/solid/Manifest
+++ b/kde-frameworks/solid/Manifest
@@ -1,5 +1,5 @@
 DIST solid-5.40.0.tar.xz 247840 BLAKE2B 0aaf2e81d152c3e616123e0959e356170aaa974d6431e33ec6fd935e3750311f444c57adb1f45772d1454db50b82a601df5929e2201c09960ecc4977b636f0db SHA512 83a63f08569b385ef21e3401aabe61c04cc7a727e0788b126a9c23f659fb24186f8810223b8b64da605033f46775b5b3ce6e8b2f1b2886b2b533afbcf2691bb9
-DIST solid-5.41.0.tar.xz 247840 BLAKE2B d6fbaa6d34ce740a32859cab27691c09cc4c1b8b91775ddd2c43f8eeeb2baa9c435cc94f1d780ab1343bd36f2fe73f51b597911a9768ebd8c8e619c5c1fc71ad SHA512 a2ebe5352863b27c4ff83d3d6f6961de00ba3ada81e697a1519c9f86849561dc3da8d3cc8df5a79c2cd2288c08f7c033b6bbefff02ba938cb450b38cc0db81c3
+DIST solid-5.42.0.tar.xz 247816 BLAKE2B bb5adbe270aa9d8b699805699a73e483521ac978609b78e41d60dbe6190fe9e3a0c2146f89e2e0ee24986ee3c6113827c9c133f4a242af6accb31005c01eabb0 SHA512 2f7adfea5127821cec068151ecc8225ac09359494a890d3012b6d05eddc735f596982fb0742be95e2d8e4cbbf717dd7cc8119284ca39cfb4536f8c9ac433b66d
 EBUILD solid-5.40.0.ebuild 721 BLAKE2B 0ab80f5c90ab4dd480199ab5cce8161053434892ec23a3601599692861a5deecb5a645f001826b2e38dd51bc74dd6191b53cf4ed68c718628eb2109e31e205c0 SHA512 a2d4c1e4a65dacff05253cda3559ec04ec70ea83a7789f95dbe7d75c313e8f53cceb504b4985177d9976ad85696140e6a9ff4ba51763c96ce84d98d33fa89e44
-EBUILD solid-5.41.0.ebuild 723 BLAKE2B dd3ed875802486757247b1ab4ef3b4beea02fb910a12841620c7971b7bc6d7a686a2c18c30d1fee55f65d0709a47ac5dc9c4d05849edda9dc56a112ddc0e62de SHA512 132d1d5d65e153344ad00f22395035ed7f33fce21c893fa700759fffe1e85cd435e1d9dacc2eeae195a866b89dc9a11e4dce2d51866c6a078f9f79e55e4d5f4d
+EBUILD solid-5.42.0.ebuild 723 BLAKE2B 911ac9dfbdb3d07f1813c2ab918afc61db02f32503170a7d602fe3c3e8c3dc9edb40359132c80f4d11c913c50fdef1928898e7b7a91dcdea1a041090cc91368c SHA512 34fc5f901ea145470607edb4a636fcc0aaeb86b475140ccb6b595315cf09e20d3e146b763ff76af8d7dc89aa010eb884de53caac53e646b88d7aaa81dae54204
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/solid/solid-5.41.0.ebuild b/kde-frameworks/solid/solid-5.41.0.ebuild
deleted file mode 100644
index 66e0b008185b..000000000000
--- a/kde-frameworks/solid/solid-5.41.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# 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 ! has_version "app-misc/media-player-info" ; then
-		einfo "For media player support, install app-misc/media-player-info"
-	fi
-}
diff --git a/kde-frameworks/solid/solid-5.42.0.ebuild b/kde-frameworks/solid/solid-5.42.0.ebuild
new file mode 100644
index 000000000000..5ba7d7e87013
--- /dev/null
+++ b/kde-frameworks/solid/solid-5.42.0.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 ! has_version "app-misc/media-player-info" ; then
+		einfo "For media player support, install app-misc/media-player-info"
+	fi
+}
diff --git a/kde-frameworks/sonnet/Manifest b/kde-frameworks/sonnet/Manifest
index 05508bcfc4b5..c5f79d46e6e1 100644
--- a/kde-frameworks/sonnet/Manifest
+++ b/kde-frameworks/sonnet/Manifest
@@ -1,5 +1,5 @@
 DIST sonnet-5.40.0.tar.xz 284824 BLAKE2B fdecd27ab93d346884cfb0ec6c21cc15451a8f5f8060b8037cdc7197ddbdfe31ce74774dd1875e17496cc1f24dff7e74f11095d098db7b18ada420b6da2f2023 SHA512 bf304b06607a1c98467621018445638e6e7fe96198c296452b853d5f593da406b247bc812616b354d114d83a5156df7794fa041e0a41ebd6f3d9e322a7a47d0e
-DIST sonnet-5.41.0.tar.xz 284748 BLAKE2B c5c4872d9dc1e692093eb16e352b333f2c7eeff5f1af3485d993dbc8d898c4a95d144dd136cf5e2ae4082b9fcfed9aba3f2223653d1a3a9fafc2dd3961ae4ec8 SHA512 608b0c476f6a1bb9e598c9c3dbb58882ec80f2e3d436cf4e4657cccc2ca5abd24bf7af5f7982ff79d80eb602c92a26be498a9bd02fcb8b6ac44298b42af6648b
+DIST sonnet-5.42.0.tar.xz 285832 BLAKE2B c473fd2e159d8c34622f75dc4c473bec76144ed192e5627b663fcfddd5eaeae0eed5dbec02bc886f733331c02b3923e057c0ea4a1f488146930a424bd840a486 SHA512 f066d54107895970fb4502a3b6987373300a2c753e54ed31b25c952eb2c9e4d40cb2ea98a14bffd6e05147eee8ac7d59c210b04809bf99c826cd0c93e4edec01
 EBUILD sonnet-5.40.0.ebuild 673 BLAKE2B d84f8fa5feaa112645cd5422042b5850b57c5daf85b780e745abed423fe58408545b70f74c25de6a1872d4ef1c66a3d8cf4facf1382d5fc14d706ba035b2e7e0 SHA512 6620b7de5b633f2a7139bf04fe6a988dbbbb7f1722fdb496c8347e07067b4d97bae6ccdcefdc78c0f96850b2aebe56004c5e41b51d805a03d6e9f0638ad7463e
-EBUILD sonnet-5.41.0.ebuild 675 BLAKE2B f022ad08ebcc9c0fcaeb8c6609a667fa122da0c9347055a649998745a8b6e9b6119cac035e8f8e7099f36abbd88b7350f60dd6d0ed4ed9526aa1a066c6fca700 SHA512 01fae6737de17f90b06f9d1e0dda5e9acab7458504914e418abfe75fc7ab99646c213687c99029447fcc7c0ae3fe235c5fac1f863d34ba21f525b45c8ebe1b9d
+EBUILD sonnet-5.42.0.ebuild 700 BLAKE2B becb8bcb31a4271814083734910d63af328cb31dd8302d8d58090b7bffc8fd56a2be2196c63a1f2a1f9dbfc74b82ee1d6f37cd69733fb9dcab6103b215518dc7 SHA512 be5b5906da4ee91f946910577ab7c573e1d57a1c641890d9ecb4f5a733f875e55ffb80d156521549ea87aa3ae49d0b2e4539db6ae367256927d8852be4b49318
 MISC metadata.xml 426 BLAKE2B ae2511b818ef6c330062e792c4f0bf503fd73d0c42d93965f6b3535d6610a75229c6de627e1be5046e95ffbb055b5c1c07c5cb4eb8e824354d9d3e7ddc6ff8a4 SHA512 d429dde1039230ff5cc0611f0373c22511fe7b9b6b5ece823591b8972a876f3d10b4bf658bffc061f8433b8cf8cacc224db97791f2008c47d9d5e41e0deef8a5
diff --git a/kde-frameworks/sonnet/sonnet-5.41.0.ebuild b/kde-frameworks/sonnet/sonnet-5.41.0.ebuild
deleted file mode 100644
index 7d13e6f89d8c..000000000000
--- a/kde-frameworks/sonnet/sonnet-5.41.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/sonnet/sonnet-5.42.0.ebuild b/kde-frameworks/sonnet/sonnet-5.42.0.ebuild
new file mode 100644
index 000000000000..c71996ffd9f6
--- /dev/null
+++ b/kde-frameworks/sonnet/sonnet-5.42.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/syntax-highlighting/Manifest b/kde-frameworks/syntax-highlighting/Manifest
index 35bfba17b909..5435cf7514fb 100644
--- a/kde-frameworks/syntax-highlighting/Manifest
+++ b/kde-frameworks/syntax-highlighting/Manifest
@@ -1,5 +1,5 @@
 DIST syntax-highlighting-5.40.0.tar.xz 1108400 BLAKE2B 44fd2a5374dd2a28db211fa1d258fe612cd6fe6c72422cd1fbe942d56684a9c4286a947038e105e8e90d1a701bb5df376a3f18aa73e836773690f695a6325152 SHA512 4e7868ae64e18b7734d7d5b778187951ae01fdd2d2dfaa1a78f8d9c0b9d5c435e30f4bc333dac3ed18f864f3458991144e870bd6a2c5b17c8ee49b61a82c0ccb
-DIST syntax-highlighting-5.41.0.tar.xz 1108580 BLAKE2B 1b5a61b45ba6a4900059e5813a92a3a47cf87aacb75094fd0f7b5c13acc6bc6f104ddac00b56cf4694bdaa9a82cc20c2afd16f764b7eb43e16a6a3cd5e68698c SHA512 86ed50766c9c0a3ef9e71421f5e7b9248ab1f28d0ecd424af57d643e613f488e572d001c55c58ab0ef501d6160b2db75dec0b325447132a5f49ff6dc6c52afea
+DIST syntax-highlighting-5.42.0.tar.xz 1106488 BLAKE2B 713d2ea27097129d64b8454c75e419a39ff5d8b5046d442dbed64575605b60d625350e6cb1abe62369349a9ba5cf92b28886bcc137cc9f4d8055fb0e05f20974 SHA512 9475cc613f9de1f675d95e06d59fd4bc688a5255f8471bab7a01de2b35cc6fc7c4b4fc58b1f7d5b187922c841cfdab7f261987007b936c2a63d569ce241f8f88
 EBUILD syntax-highlighting-5.40.0.ebuild 525 BLAKE2B 3247f7ee3cb47dac62c1b57f89d4e48f0ffb2b79e40e697d19212740f3b9c3451db1160cfeafde966c549a12db97df940ae9b43b9d0c548439e5c1d050d96976 SHA512 7c54f6c74e1d172d91ec9d9678f8679ea74a135a6050b110c18a31609da75ea42d90fcb336dfca5abce7f2a09a2825a0c9d7e4767b1e368b6c93e0fb3e1d9c7b
-EBUILD syntax-highlighting-5.41.0.ebuild 527 BLAKE2B 70ff39c4e3b13901ccbb68f6b8d93eab92a84607aed27491fcbca8930a752b79ddd8b3f7aaa39fd02ec894e0c5fbc6dcc5f17183f292bede9abc538706b6c133 SHA512 4d70f7d6d9bf1e07e87775dcb20500c54a145765e18a54e357440acf27edaffe371bc4ea062aa60ce9421b2b58cf471aeb545bd4973c2d146afdc98dc23b75ef
+EBUILD syntax-highlighting-5.42.0.ebuild 527 BLAKE2B 1bb1dca51da1a7f0586a19309ff66fabb3a9c70e85d8f465872725fca1e26924999dcb0c3d7ce97f14351c26c6cd56b075072b93616850c33eda9507ef56d805 SHA512 c073e449ae41fe7d0347bedb0405b71bbb5e80f9834d52a535b4740ea3fb02323869e3ce4b2a49f2fd6f0dfe04eea4321470d666b499b9ae52ed280fde195c8d
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.41.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.41.0.ebuild
deleted file mode 100644
index a4de123cab8b..000000000000
--- a/kde-frameworks/syntax-highlighting/syntax-highlighting-5.41.0.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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/syntax-highlighting/syntax-highlighting-5.42.0.ebuild b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.42.0.ebuild
new file mode 100644
index 000000000000..dcea91c13a70
--- /dev/null
+++ b/kde-frameworks/syntax-highlighting/syntax-highlighting-5.42.0.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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 dba97cb9ee1d..d59b9f4f6c9a 100644
--- a/kde-frameworks/threadweaver/Manifest
+++ b/kde-frameworks/threadweaver/Manifest
@@ -1,5 +1,5 @@
 DIST threadweaver-5.40.0.tar.xz 1409332 BLAKE2B cf48a1086df5ea8ca6dac821e01d74e842639381aee3431231dc0b7a2f8ef536b20d0c22493aca2022840138326ffa7b52a73c8ba212cbe6285320c8d84e2b21 SHA512 7ea45517957a0970370a57f3f2e50fb39b8e4723546d5f0784db14df310ef5ad1820e682da36e109c13a1215992235a9bb878ac2b592f03e31a516976404765b
-DIST threadweaver-5.41.0.tar.xz 1409460 BLAKE2B 351387fd7e41301d64481d684a56c71cafa8e4bc3f0dc7f29904d0547371b687496d71ecb1f0ecdfeb81bbda73f782cd996c1f53a116045162b06efad6f523a1 SHA512 9d8e0e6fe9a6b1310d936f646a888d00ec6abafe073665a6ad5115bf4dfe11908db5714f321590c553c00edd5663fd609dd5f3af36d78263cd6ee93d5e27d805
+DIST threadweaver-5.42.0.tar.xz 1409344 BLAKE2B dfc730996406721378e3ca217caa2b9515be993b5b7f21c52b286b699f061085b6b0bd697d7f9061ee8dd673daebad9aed736ade134a5d7b16ef4bb2031251ca SHA512 6b8f3499c6888521f165f9c4b114589595da1663da623359e2482899a7b901607e7d34780d4269a77e8a7ffdded94988a7cf53ea60ac1bdfff98dac78340674b
 EBUILD threadweaver-5.40.0.ebuild 351 BLAKE2B 7d4a67fde3d976972bcb7e79d5648a681e2d97de2f34a302a4a7bd81c0cc222c113755f9d05aa732e7b2ba61a04dcb064326a21e6ff141e82cc0b9b5c656e2ae SHA512 744662547235cec4a872fff5fbb96a7c3c82fc55acae7e033569e82acba4211fd6c88c7605cd9fce0a5240c0f64caef990656d8b6b04840b967345bc4f4d8d62
-EBUILD threadweaver-5.41.0.ebuild 353 BLAKE2B d6bba4fe42edcbfa73ec1021a9c129efa163ecf8be817440d02649740247ba1bdfca0b07db1fa074a3f7feb16909c646169709319e695341bce6cb2bc5521546 SHA512 712d04ee29bfa1b4eda6da8a260384dde36710b65987b0af1b6e93949486ba117d56443a63db2838e09bd5164fd8ad0699cf7679b5a6d25848702efaf6266424
+EBUILD threadweaver-5.42.0.ebuild 353 BLAKE2B 27eab9442775246b176656f368b7de7103fcd7fb809b80521242cdc24cf339e982c46afbc7e64b7e67573be68eb72d0e3e3adfbd1c1c49556f11aaf7d691bae5 SHA512 7e46eb34fd33c32a9bc728b7afe171a2a76c21df0d8f7a0f9ac0ecc466b6c17b98145620f0787f609042acfc0125dfa7d24807592653ab0d5d4f3bc9abc2a403
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-frameworks/threadweaver/threadweaver-5.41.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.41.0.ebuild
deleted file mode 100644
index d8403c75b940..000000000000
--- a/kde-frameworks/threadweaver/threadweaver-5.41.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
-
-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-frameworks/threadweaver/threadweaver-5.42.0.ebuild b/kde-frameworks/threadweaver/threadweaver-5.42.0.ebuild
new file mode 100644
index 000000000000..44bbeff6f8d1
--- /dev/null
+++ b/kde-frameworks/threadweaver/threadweaver-5.42.0.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index 9e3944fc6903..abc5d6a4df9b 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/kwin/Manifest b/kde-plasma/kwin/Manifest
index 7572c8bf1148..e5ed48c264d9 100644
--- a/kde-plasma/kwin/Manifest
+++ b/kde-plasma/kwin/Manifest
@@ -1,8 +1,9 @@
 AUX kwin-5.10.95-test-optional.patch 1023 BLAKE2B 9e3f9e831a7164ad4041732785f771c4557c65f68dfe8cd5e6dcb55f6f65d5e1d0b220cde0901f56baeb8ffd194c604115f64c6d6496b19be6e9254cf37f567d SHA512 e564dc6c0e28762917713d37aec099d1ff522f64e26aabc906ffbb7dd4056316bbab43b1b3c71e1f55659471e270f17afe8673a76dcd75efa1a5c8e399bdd7f5
+AUX kwin-5.11.5-cmake-3.10.patch 1547 BLAKE2B 581f27ce23adfa92353b61bf0a58e1c945e56e27f3cf5dddc0ab558f8bddc3d81045711c24077f9da2821bfba17d1ca841f3aad9989d55f4211344f28e158983 SHA512 adf58db9d06ebefd66e0af20eee67c11ecb9e6ff8dabd848021bf8587d1e7fa7924561fbed39308c0ab214d5a4c4e130166ad008e8d30590b697cd4fb33454d7
 AUX kwin-5.8.7-glibc-sysmacros.patch 1016 BLAKE2B db65f2af7eb305398649e3f73445a3e658725fca426fa4d3785e3a1aae669005b776499c21237ecfb834e1b4b95664dce754e367452ac33a346084453f7eae1b SHA512 9b8d8754a4e0c8a9421bc7bf04932b5dabfd9c0c7f56fc1ebe6562afcdbb2d3495c009f4cbfa0a8a665e363ffeb9ac9bf3c7a5fbba7f7d1da7571f7cab6908a7
 AUX kwin-gstreamer-optional.patch 523 BLAKE2B 471af1885be73ef7ea48054ff9451faba750008117903cedb073e2ba217cb48f386b48824af95813e81646afebddcc99e01646d507b26a94e8c55fb5b90f9c40 SHA512 e8a4106f8754e5e1b426f1ae3141d17ba4469c1dac44f34f0ec7292d3242d7848b5f7748c56f08db576e1f826c171a1020d5fe73e2aa4dfdea813e37c565a4e3
 DIST kwin-5.10.5.tar.xz 4674932 BLAKE2B 5e10f20220f750e49394395e3070ae4259aae3fc6109dbbb5540a92b6ecafbacc8c1ab2187be17413abd60a0d9b01071b2216bc44a80cbe3754ee13311dfb980 SHA512 b679dac07b7cc71c9ac7f4755282f8e30d5c2757c7cf9f29ed4f7653c70832140171e1227299a726af8aef1919db83b115dc4091ff80851b0afc53a4cf06840a
 DIST kwin-5.11.5.tar.xz 4965516 BLAKE2B 1e9fcc3c97f1a714925b9f33c5741cffd91ffd080698def2693b94c2b8a07d7526566637aeffdbc54b19136144d29327e5a9dad3165f099e95e79e4bd41262ff SHA512 fb1355a33998c5b5ddb0bac59d65862fecfa8bab8bda234bf60c75800f04fb7b96b8069d3fcdd5f2647c06ca7673ed6ef6b7fa49b160b57dcbcb65dc1a853cd2
 EBUILD kwin-5.10.5.ebuild 2344 BLAKE2B 0bd5e7f96a3acb77f99944a96cf26748cac7ec7ac48288bbb29d1f10584d31a88bbea908821c9a3764d2848bc1fbc78ac72d41cd70936e1e1947f598cb46e889 SHA512 d8194a55406f9299772e80cde1afa6363b689efb7bc7a289c72925f92351adbb18c688e7908ccab476eca40a35561a0ef9eb0a2f435b70ee08459268ea20c5a5
-EBUILD kwin-5.11.5.ebuild 2369 BLAKE2B d949027948431953041ee953f3f20f7ff2822c1be686ff54d72212d1f5665bf34c1a1aede9febf26bf5403a770228badd6e9730b45c7f42a18ad678364488ce6 SHA512 479f0aa42fcf82db72ef9e3a71f645186108ec4b1716f0d11d011f6182208892732c44cb029376d81bd9b8b65044b0994b8e49fdeecd6deb1a81d904ddc7bced
+EBUILD kwin-5.11.5.ebuild 2415 BLAKE2B 7c8fc3fe3b2602e78c43f2499df414e45dc0231722bfd6589930d16c16fa1e25bea5016984f3d20589119526cde0dc40ef742fa26d89d9d967f5e28ba80b32c3 SHA512 8c974a79b1559f4cb4a60fc0a62f98d19d9ad0c0f97e7c86d83a17910350678167a00ca7d29d8a56e687ca586262d044c9afc41f21e9485718f33dafe32f99d0
 MISC metadata.xml 410 BLAKE2B 2e56cbd363ebaea00a040efa12ae0049cee90c9be17b7acdbc96b61ec3452a9b6ad837779259ae7fc506331088fca9a2822afebc035e94bae73bc545ded034c0 SHA512 0aef8e1ddd94f46d2f90a90c5a0408e1068c11684593dc86d1b7681f2be71fbd8f43f33566e15548f17be51da539b8fdd37d173bb5dc65bf74719bc38275d12f
diff --git a/kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch b/kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch
new file mode 100644
index 000000000000..1b7c61455783
--- /dev/null
+++ b/kde-plasma/kwin/files/kwin-5.11.5-cmake-3.10.patch
@@ -0,0 +1,49 @@
+From cd544890ced4192d07467c89e23adbb62d8cea5c Mon Sep 17 00:00:00 2001
+From: Milian Wolff <mail@milianw.de>
+Date: Mon, 18 Dec 2017 11:40:35 +0100
+Subject: Fix build with CMake 3.10
+
+Looks like a classic false-positive, but this makes the compile
+pass for me without making the code harder to read:
+
+AutoMoc error
+-------------
+  "/ssd/milian/projects/kf5/src/kde/workspace/kwin/kcmkwin/kwinscripts/main.cpp"
+The file contains a K_PLUGIN_FACTORY macro, but does not include "main.moc"!
+Consider to
+ - add #include "main.moc"
+ - enable SKIP_AUTOMOC for this file
+
+So we just add the include and then get rid of the duplicate
+definition of the plugin factory and the problem is resolved.
+---
+ kcmkwin/kwinscripts/main.cpp   | 2 ++
+ kcmkwin/kwinscripts/module.cpp | 2 --
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/kcmkwin/kwinscripts/main.cpp b/kcmkwin/kwinscripts/main.cpp
+index f5ee04b..baa5175 100644
+--- a/kcmkwin/kwinscripts/main.cpp
++++ b/kcmkwin/kwinscripts/main.cpp
+@@ -22,3 +22,5 @@
+ 
+ K_PLUGIN_FACTORY(KcmKWinScriptsFactory,
+                  registerPlugin<Module>("kwin-scripts");)
++
++#include "main.moc"
+diff --git a/kcmkwin/kwinscripts/module.cpp b/kcmkwin/kwinscripts/module.cpp
+index a0d698e..ccf7d41 100644
+--- a/kcmkwin/kwinscripts/module.cpp
++++ b/kcmkwin/kwinscripts/module.cpp
+@@ -40,8 +40,6 @@
+ 
+ #include "version.h"
+ 
+-K_PLUGIN_FACTORY_DECLARATION(KcmKWinScriptsFactory)
+-
+ Module::Module(QWidget *parent, const QVariantList &args) :
+     KCModule(parent, args),
+     ui(new Ui::Module),
+-- 
+cgit v0.11.2
+
diff --git a/kde-plasma/kwin/kwin-5.11.5.ebuild b/kde-plasma/kwin/kwin-5.11.5.ebuild
index 1a2386680586..3cffda51d8d3 100644
--- a/kde-plasma/kwin/kwin-5.11.5.ebuild
+++ b/kde-plasma/kwin/kwin-5.11.5.ebuild
@@ -84,7 +84,10 @@ DEPEND="${COMMON_DEPEND}
 
 RESTRICT+=" test"
 
-PATCHES=( "${FILESDIR}/${PN}-5.10.95-test-optional.patch" )
+PATCHES=(
+	"${FILESDIR}/${PN}-5.10.95-test-optional.patch"
+	"${FILESDIR}/${PN}-5.11.5-cmake-3.10.patch"
+)
 
 src_prepare() {
 	kde5_src_prepare
diff --git a/mail-filter/Manifest.gz b/mail-filter/Manifest.gz
index 2824bfe2ea66..67a416ba4e6e 100644
--- a/mail-filter/Manifest.gz
+++ b/mail-filter/Manifest.gz
diff --git a/mail-filter/rblcheck/Manifest b/mail-filter/rblcheck/Manifest
index e87084fbd2be..92d7dcdd4a61 100644
--- a/mail-filter/rblcheck/Manifest
+++ b/mail-filter/rblcheck/Manifest
@@ -1,5 +1,5 @@
 AUX rblcheck-1.5-configure.patch 719 BLAKE2B 81c4bfbe0a85f58965755c32eeadd9796a97b48c7626f285fc462cd260a1ef8e46de716b5be1816d1928a1a4157e8ac2d4e43f54f17bdfe6f318c07f0100b48b SHA512 302eb1d56793d07cda5000ce480c8bc705c0fcd20d41fc514b47fbdfbf6d8ec48318c85a7ed8008376e2c09b6ff0891c5484e930589cbb078fcf4832f547cc36
 DIST rblcheck-1.5.tar.gz 150395 BLAKE2B 2d4232fea8e5b43d0b29c44d3413eb3a5b5222bac0a6f737c9e7a273c3810b7c729f8fc6222fae18801cf6e172d4ef165213b70d38f510621791e4f8a0f25a0e SHA512 f0122701b5f7b293cf97cfb6f04963fdf657774f97342ecd57bc4a049b08f3d5b94e5148a4cc1f24de62c852b003c7339c35e4ddc199ea6be6a13583ca58f311
 EBUILD rblcheck-1.5-r1.ebuild 575 BLAKE2B 049637b8ba0295cc6e725b28a52d4ea7c4c662a2b60693b7f08a031c07d2275bedb2d45532546d190ade50e60f7adec22f6365243f33ffa69b893634c95b192b SHA512 ca907cdcfc0ea7778647d92c4c67e264d213d3eb6147bf1dcbdc0adc7e3b2fdabd8805958e6f088db17193abcdb4a1ee88095b55e505a8f99c832a17dd16bfa2
-EBUILD rblcheck-1.5-r2.ebuild 580 BLAKE2B 51f165818a2b8030bb3422ff057ba63e0fa5ff3597970d6b63ac7f5148723cd561c64538657c73211153923f6c6134e3e1cfa2f0635572ce1a9681a1e45bc5fc SHA512 3966cf3c8aeb760df66fb0666e904919e3ef38c514750c0ae576f2d923cd5f9dd2364407077bc7cebfcc2d3a9a7418ec2c53ce2fa14c7e8c6d6319a61e82d3f4
+EBUILD rblcheck-1.5-r2.ebuild 578 BLAKE2B 04776b26a4bcdaeebfc187acdd4713cd5022c5db441336ca8f10a2f44bf2a1ae6f9916ed9577211b4feda55832ddc273e7ad03cb91040cdf7158cfa9daccddb2 SHA512 8ae3572e4f0ff3b19d302e75357a9d3c20f11a8acdb876e92f420b1045e9c5e7251259d4ec3cb8e5edfa42a669b349266fa96f7d88b13669684d536b3b42c100
 MISC metadata.xml 322 BLAKE2B 32d25e7fe4f44c4a9c3d688eccb366276ff526ecd46bcd697af4fabf346c2d4739d18ee0c5f48fcf670b6c0c0fff3617d1b00adbf252160b46d5d56e8dfd9a7c SHA512 6c3ea033bc43fdef607e51ae34396012b6a15a27c7ae2c97af4ad5b297b75d4b3cfb231b63bdbcac01d30c99bd8093726acfedf54f137ff8bfd990e32b651a0a
diff --git a/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild b/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild
index 34502fff939c..380fbc3317c6 100644
--- a/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild
+++ b/mail-filter/rblcheck/rblcheck-1.5-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/rblcheck/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~hppa ~mips ppc ~sparc ~x86"
 IUSE=""
 
 src_prepare() {
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 36bf1f8548fe..bbf3d6430a8c 100644
--- a/mail-mta/Manifest.gz
+++ b/mail-mta/Manifest.gz
diff --git a/mail-mta/netqmail/Manifest b/mail-mta/netqmail/Manifest
index 5ccf33cb50ae..f94acc79155b 100644
--- a/mail-mta/netqmail/Manifest
+++ b/mail-mta/netqmail/Manifest
@@ -15,7 +15,7 @@ DIST vu555316.patch 617 BLAKE2B fa98c360cb199fc4367c668d605399cc53ab2d26668f5ed6
 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 4177 BLAKE2B 540a01ddaeabc486f372efe7caae7e20b3c37f3b09a3de4c0e20780f87dbc7d74e7b5fe9b30811d2bea2827ba7ef4cf4935963b9a69db7dadccdd1327f46a40a SHA512 1da89f1812b71573a3c2149886f5be2d4d3a3e0b1bcf6308dc2ddb0cf9a70e95cb6148df9b5facd05bafbf2b60ad5bdcfb55fab3f5b5a9c0487d47ab905280fa
+EBUILD netqmail-1.06-r4.ebuild 4176 BLAKE2B ad326da6465e7ebb6bb070ca1bdc4bf131c953c671d188057864605514a21625383612377f25dd21518eef778fefcd69de639d0caa15fa4c4887068a46082554 SHA512 8cc84199ffac2694770c2dba155a0d6d4275553cd6cf320da1fbfeb27e712866eed7e5f18620ecfbd7c6b4e0df3dd43ade4d9679a31eccae5bce8f272f4d5ab7
 EBUILD netqmail-1.06-r5.ebuild 4308 BLAKE2B 38decdce0607cc9c4402b744d04b4969e1cc983d7b600bfbf3364ebbc4fb774de82a0719708246803ec8218771e0d3921e5b7e81560f2a092b241fee37408181 SHA512 83b4ada94ccd29c97ceb81c97b5f2e932fba156b6b534866853d8cc0cd15853c8e82faaf0ebc32dc535459ff0d3b6391c4660cb108b9165bfefccc8b67577375
 EBUILD netqmail-1.06.ebuild 3289 BLAKE2B 9d121491b56d59695be2601961901e41ad4060ebbecf809adad9b4f671ad4aa06137f542a5f7c466805017c3481c0ccbd82ace0d7042b323fc6d7ca9fadc9e2b SHA512 7bee6b14ef4d02650d7e502fcd1d4efbb61a40073ea0b4ded730f6fde4d8a309f24d489b5388b86854237b3d990a5a57d5792d57f2d88ada42492034d6d23d4a
 MISC metadata.xml 555 BLAKE2B 5f151e2b07d6c26b0d4445bb0577af01374934d94cdccc099e18730736f8d05829e287ad63b5cbd249e9e29d2fa99b50dd5c2100001e3369a5ef0b8963ba130e SHA512 dec725506e819558500bc86ce215370a6576bfe47baae06da3e12315fbd0395d2d8237d85e41996d6e5b11878bfe7ed2e1bbeb81061351b3bb9729749f702eba
diff --git a/mail-mta/netqmail/netqmail-1.06-r4.ebuild b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
index f75334b2d3dd..ebb18f0d4b0d 100644
--- a/mail-mta/netqmail/netqmail-1.06-r4.ebuild
+++ b/mail-mta/netqmail/netqmail-1.06-r4.ebuild
@@ -36,7 +36,7 @@ SRC_URI="mirror://qmail/${P}.tar.gz
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
 IUSE="authcram gencertdaily highvolume libressl qmail-spp ssl vanilla"
 REQUIRED_USE='vanilla? ( !ssl !qmail-spp !highvolume )'
 RESTRICT="test"
diff --git a/mate-base/Manifest.gz b/mate-base/Manifest.gz
index 8a4c98669017..741104f6616c 100644
--- a/mate-base/Manifest.gz
+++ b/mate-base/Manifest.gz
diff --git a/mate-base/caja/Manifest b/mate-base/caja/Manifest
index 3721b0d6e13e..68d30c49e753 100644
--- a/mate-base/caja/Manifest
+++ b/mate-base/caja/Manifest
@@ -1,9 +1,9 @@
 DIST caja-1.12.7.tar.xz 3645820 BLAKE2B 75f76841b6a14aff27521d9a8db40f5ebfa536a10c727a272439c1ea8d54c9cba191eedcbdf2b8af42c92cd30f4f4b300bc159e3813239e6addd5a11a557945b SHA512 32761370cc419ab8d8f815a291782d1ce380d04bf2450dbcea9d0f17d91a1c0b9a487a67a51a0c769a5fcb11091638a7b60e27b28f3148899ba44fb6feb313da
 DIST caja-1.14.2.tar.xz 3560252 BLAKE2B 6fc45445c279085276a55f718f809db9813fc6602b45018487529a85176915fef5713492448b55703355e422da47d23b60365de1a675403d21b0a3290cd2fc00 SHA512 ef0c42e26fbeb2a2296c67fd0a1f59d18b104ba818761600dec2ab571fbd5a1d659471105b97a9fcd7b0e16afa1dfdf860decad1f65b299964017932f7dfdfbc
-DIST caja-1.16.1.tar.xz 3508944 BLAKE2B ced9a4b0d42efd8bf12ad7157e338d6f32a214dbccebc4856239ec0b0fe2d5652c73c482ef1258fb5ac3a319d9f5b685ecc0ec60685ffd0cb5b27dd5a415da7c SHA512 c0b8f4aeec8c649c54d0ff7a51db4973547f3cac17b3b28a36b3656eeb8234cf25d185c547c0f1bcc015beeac25b5931a2db678227b183e3921f4b4feb2a6e0f
+DIST caja-1.16.6.tar.xz 3511140 BLAKE2B 88f965d89ecd027d76c64143d99dd0820f338aa2e6260702eca0f3ec0893fddddd0fffc26e2e678973ed12e27e0e3b9126490d845178d779341c0ddcd18f008b SHA512 21553b44e97f3d294996de59af151471928d0153234f986c0a3cd639ce0661eba5182975d3f03915f7e5ade72266837c9ba5747d02527b65f74f8e0ea6471fb0
 DIST caja-1.18.3.tar.xz 3526224 BLAKE2B c92370cf3d77ae6faad3ff122008eeed2a091e9a378435d6d944e33813d3114bcd8c9b2ded5b1be5b649508082cd4bcd8907e987b938401356e5398ee6439129 SHA512 845f7532fbf701fecc5b0e29036ee4b4d6c65f520d6d7fdbddd05d7e7bcd0f7bbd52c54cb45dbb0bd7a5bbf2ece11e584e5074e4c86954b2730baa469168a566
 EBUILD caja-1.12.7-r2.ebuild 2170 BLAKE2B 42053624182ca2de4c91f5a7ca0a4d2196c0508705b93aab7665ba3fe13f0cd40f6c9ad219f1b97be001446544b4a89507905f5679070cecef54ec8e1a525bd9 SHA512 88a39a9219ecdf4d56f2f03ec0108499f210a8bd85437b698905341df8ef48713a9b796d682f7da7edcda2d2c7f55a6940a32e45b6d75760d78824d9cc4ebbf7
 EBUILD caja-1.14.2.ebuild 2204 BLAKE2B c9cd0c103c2340a8a3ea2a7065017b3625b79f603f7d41fe7d24ea39f7cb03e8f7bdaf3130e0e0a62cffb742cc9a2be232891b2e7a4772a4bfc1d30c22e81919 SHA512 79245d5d02007280262641d001cb545de2bcd5427b02c9179005feb8629031003f4c3f76ba2ec5390a01eaac3d6778ca1466f3567d7fb39664d5fbf121f83500
-EBUILD caja-1.16.1.ebuild 2207 BLAKE2B 58d563c8e922e8cbb48fcc001ae493872cc86959ba84cf26474082a9ae11e4054985c676272151b24b24d220dba6f1e7db3b9841fdf9c8e2814f28f15e8a2c74 SHA512 829635e5b133d2a62a459397baa82744ab2744d763a84766d2b88e6bff2437a3f0fe37e53a37b3e651ac68f71dc81e33ff109aaad829ce45ea9c02f7c32104e3
+EBUILD caja-1.16.6.ebuild 2207 BLAKE2B 8506a9bd9dab659f05ad9e3d7230f5a4eb436203a3b6d3b6fc3d43ae04af7c6eff602d5d929fea0f5b601f2e3bc67c87cc46f59e2b0f46623e4c261db2952683 SHA512 a5aa456c6fb6b89ff7618baa7844c2bbba0feea51c830dd7d27b5438f5a8f737910ff8a8852eef220ec7d699810d03ee61671541b5b114ca6b637a77865d39c6
 EBUILD caja-1.18.3.ebuild 2072 BLAKE2B 5f6dade807085df21b0f347a2a70c5c75bab36fb6d3d6c67f8080a3e1c538edbff8880469ec17a454e1ff82cbda9f6b4ce8f2560d33465cc93826ab7d0a3049e SHA512 c9b4205811fdd3d66a7691fa99a2429d2a41b6908df0841678b128a8525d0a2f59cb6afdda7cecd9f65292178b669cffc209469a4e2444cefc70404e6c69c60e
 MISC metadata.xml 682 BLAKE2B e64e762f92934cacb28463f366ba5e79514fa609445f0524097de46f4983e40b129dfeccc05d37e9be2ff1cd30e4c900579d8cc1a40e6fa35b3b9b4793676e99 SHA512 731fdad4d4e0dd3c862df5dfbbc48817cd434c9c7fca9a5b71d6ccc844caaea871128774f4bc69acd0a0197746870b3a6353dfa1ba06f55e0841b616db7860e1
diff --git a/mate-base/caja/caja-1.16.1.ebuild b/mate-base/caja/caja-1.16.1.ebuild
deleted file mode 100644
index ac3b4ee07a0d..000000000000
--- a/mate-base/caja/caja-1.16.1.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate virtualx
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Caja file manager for the MATE desktop"
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="gtk3 +introspection +mate packagekit xmp"
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2.4.7:2
-	gnome-base/dconf:0
-	>=gnome-base/gvfs-1.10.1:0[udisks]
-	>=mate-base/mate-desktop-1.15.1:0[gtk3(-)=]
-	>=media-libs/libexif-0.6.14:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXft:0
-	x11-libs/libXrender:0
-	>=x11-libs/pango-1.1.2:0
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=x11-libs/gtk+-2.24:2[introspection?]
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		>=x11-libs/gtk+-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
-	packagekit? ( app-admin/packagekit-base )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!mate-base/mate-file-manager"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-lang/perl-5:0=
-	dev-util/gdbus-codegen:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
-
-# TODO: Test fails because Caja is not merged yet:
-# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
-RESTRICT="test"
-
-src_prepare() {
-	# Remove unnecessary CFLAGS.
-	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
-		configure.ac eel/Makefile.am || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable introspection) \
-		$(use_enable packagekit) \
-		$(use_enable xmp)
-}
-
-src_test() {
-	unset SESSION_MANAGER
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	Xemake check || die "Test phase failed"
-}
-
-pkg_postinst() {
-	mate_pkg_postinst
-
-	elog "Caja can use gstreamer to preview audio files. Just make sure"
-	elog "to have the necessary plugins available to play the media type you"
-	elog "want to preview."
-}
diff --git a/mate-base/caja/caja-1.16.6.ebuild b/mate-base/caja/caja-1.16.6.ebuild
new file mode 100644
index 000000000000..d0c09026f371
--- /dev/null
+++ b/mate-base/caja/caja-1.16.6.ebuild
@@ -0,0 +1,97 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate virtualx
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Caja file manager for the MATE desktop"
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE="gtk3 +introspection +mate packagekit xmp"
+
+COMMON_DEPEND="dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2.4.7:2
+	gnome-base/dconf:0
+	>=gnome-base/gvfs-1.10.1:0[udisks]
+	>=mate-base/mate-desktop-1.16.2:0[gtk3(-)=]
+	>=media-libs/libexif-0.6.14:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/libXft:0
+	x11-libs/libXrender:0
+	>=x11-libs/pango-1.1.2:0
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		>=x11-libs/gtk+-2.24:2[introspection?]
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		>=x11-libs/gtk+-3.0:3[introspection?]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
+	packagekit? ( app-admin/packagekit-base )
+	xmp? ( >=media-libs/exempi-1.99.5:2 )
+	!!mate-base/mate-file-manager"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-lang/perl-5:0=
+	dev-util/gdbus-codegen:0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PDEPEND="mate? ( >=x11-themes/mate-icon-theme-${MATE_BRANCH} )"
+
+# TODO: Test fails because Caja is not merged yet:
+# GLib-GIO-ERROR **: Settings schema 'org.mate.caja.preferences' is not installed
+RESTRICT="test"
+
+src_prepare() {
+	# Remove unnecessary CFLAGS.
+	sed -i -e 's:-DG.*DISABLE_DEPRECATED::g' \
+		configure.ac eel/Makefile.am || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--disable-update-mimedb \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable introspection) \
+		$(use_enable packagekit) \
+		$(use_enable xmp)
+}
+
+src_test() {
+	unset SESSION_MANAGER
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	Xemake check || die "Test phase failed"
+}
+
+pkg_postinst() {
+	mate_pkg_postinst
+
+	elog "Caja can use gstreamer to preview audio files. Just make sure"
+	elog "to have the necessary plugins available to play the media type you"
+	elog "want to preview."
+}
diff --git a/mate-base/mate-control-center/Manifest b/mate-base/mate-control-center/Manifest
index 951839d4fac9..2098e196bb56 100644
--- a/mate-base/mate-control-center/Manifest
+++ b/mate-base/mate-control-center/Manifest
@@ -1,10 +1,10 @@
 AUX mate-control-center-1.12.1-backport-appindicator-configure.patch 2662 BLAKE2B 8c5bc2cfb66aa4a0b97bda5f95faaaed9d9f347ef17549e46d2a5fdd298a1cab6351574c4505cbf106bdd4f3ab393b5910c1b6bff72e237ebc7f8de48cd8c387 SHA512 ffa139b6966935b22fa0ab59349b944318ba483670187de9b65135d64fdf8e18cafd0c67667b45e4e0450fdb77616c84b9e91eaa933e5ee30c2b6a6900be55d5
 DIST mate-control-center-1.12.1.tar.xz 1304732 BLAKE2B 7556f8b87f6c8e78475d77e7e6e1fde88a81f8c3c795cee2aa8bf0167dec9ed336e632e17b4d2d098fb7fb6fe3d48b01b374934ee2e2898f548e5ccde2eeface SHA512 4023511113c993b2420666803a273923b161cd3fff74b07e02f3dd9a80baea47278ca5c10a5baec673818390174a9f0b5c2d8db81c653f48c411cf5f53cc2dce
 DIST mate-control-center-1.14.1.tar.xz 1371360 BLAKE2B d896ba7733d42d440ef1c8f1518a0e0f71e3ca12f59599c47a6ee65a15ae20ee6884d90c067077ecbb15db18472181b4dbb0369ce7186c75e49a75084a8dac69 SHA512 c871486e69174801e6b509848ae416e1b9aa55ca21ea796f7bc9e408ad59d0dfe5feafde59258c8d0019448b620af2fbd73b75cc644c5dc7b031237e3170a30b
-DIST mate-control-center-1.16.0.tar.xz 1341724 BLAKE2B bf37c702c136b10d26449945eb3f1c3ceaac1174e64f83b919e35aea9b5aab542822944523e026fe2d8d3d4a0304d8590176b995d0bac83081dbf5643d2e6b98 SHA512 891cddc3a908bd0a6aeeb05241290f4c0bbc247bc8923c34a1aa1a7ee55d62881c3958a9e65e338d2e79ecae91cdd5641e2186cea44a5fdb762a9a765a065496
+DIST mate-control-center-1.16.1.tar.xz 1330348 BLAKE2B 3062a3a7dc1ad572ef967e5310a318c010036d9377724e007a9ac20b482e6f34246196f013f4f4e5d18ea608a774ee0d7de87fe9573e0758b900ed05e834c291 SHA512 6bba690455cd4097a6a10ea068627768a242dd68da2375e7ab898cae80fc07f5d3286265422edb13359adf3f2e451e41b1693da836d03f99410beda4951e1610
 DIST mate-control-center-1.18.1.tar.xz 1343276 BLAKE2B 1ee135992814f5438061516d75235e2f7fd07e898fa068cdd9a9c1bb7e1c05a5c85cc7fb998e479a19c5119cbcb446c7703f2ab7a606caf6f36b384f1d665549 SHA512 0d4828f7175394a970c30ce7777cf175aaf0e79e9f379661d4efc6973c22516b6a93548f7166d793bb4dd1ad8e757bff4c7aee744f142d3320c3f9a49b5dd76d
 EBUILD mate-control-center-1.12.1-r1.ebuild 1970 BLAKE2B 6c6c5873465962bc36ab87c9bb7f429bdbc35fe21ae0126b15eb5a09d97a49bcb84e3a0648e77ec49623ab776a275c10421475679e167eec3603088d4c6b6dce SHA512 5b102497f3cc90d248cea6b892c7ccd3c89503e04964d75655caacc6ff2cebee7137fbfba83ffc441d89417c077dc5caa70e2f25826873daeca8b6053efb2a11
 EBUILD mate-control-center-1.14.1-r1.ebuild 2016 BLAKE2B 1566f3512362d8b69f88b715e15d23ee8e825f998afa89da062c325b234496ed1d128387fb47e3a03c2286fb23338e716185d577832332b907e24c9809e07268 SHA512 7f72998610c1ef755092a9fe1f31fbfa0cfcd5b13232baf9cd6cf2560cb095df0631d08caf98544a564c3a8604411dc54ef9f891e55bb38f8775285b2c5f18e5
-EBUILD mate-control-center-1.16.0.ebuild 1941 BLAKE2B 2871008dd8ff177fa176fee1a1faf16e747599d33b2184fdcf3a7ca96866ab54b194703212096a4074b251873ffc7b9197d4e0072346ef67325a79c81ec95187 SHA512 ce1f3f057026c5dee9e43900d034c439b4bf0410749da9155e67fd8b43f38d3a8c9fc46c73b32c5fc7c852b6b17d69bfb607f111d7b1becd865d04cbfe590941
+EBUILD mate-control-center-1.16.1.ebuild 1941 BLAKE2B 52869ebed1b3d9e5f04f0b455d1833bfacee9eece8565325c766e38ab64dd1550867c49c43d59532f2eebffe90fb8d7525a81ba04ef0e96f5685a2769e1e0eb6 SHA512 dbf676b67167318b3ceaea187aed52a0a725625804b08cb53bb1f17c8dd00fa82544a4ab3450de5bee059f69cce25ad45c09728d6da68f8fdd796a26ffce723d
 EBUILD mate-control-center-1.18.1.ebuild 1680 BLAKE2B 2d49e1b331042929d602780c97b0ca0678e3e1edb0bac2c758b378c40744aba0ea92614c24c61d774e5b6bfc87be0f4f2b4aeaf958c7d9d654ec1e66b677df2b SHA512 a27359f5dc9c629e74a05062691362e8bb1c4793ebed5971072608777ecd2cd94c18fad166b5eaf835f09c73ea1ad0547b7389a2c2289092267c4cf8643c9011
 MISC metadata.xml 488 BLAKE2B 6def839521080b9734f402356249b2c318fce40541ff2f5063e829b1022dea8b74c24b8369d35a5fb1137262363b9b230755265a148f968656962beff32249ba SHA512 52b8617cf3bb2e4750d20e3c869f0624b290dc0a2b4dcaf56851fdbc3b978088bca2c616c76a8b161f5bc7c91f22b28bfb1043e415d615ce3ece59f435dbb137
diff --git a/mate-base/mate-control-center/mate-control-center-1.16.0.ebuild b/mate-base/mate-control-center/mate-control-center-1.16.0.ebuild
deleted file mode 100644
index 336b30d617c1..000000000000
--- a/mate-base/mate-control-center/mate-control-center-1.16.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE Desktop configuration tool"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="appindicator debug gtk3"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.73:0
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.13.4:0
-	>=gnome-base/librsvg-2.0:2
-	>=mate-base/libmatekbd-1.6[gtk3(-)=]
-	>=mate-base/mate-desktop-1.15.1[gtk3(-)=]
-	>=mate-base/caja-1.8[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=]
-	>=media-libs/fontconfig-1:1.0
-	media-libs/freetype:2
-	>=sys-apps/dbus-1:0
-	x11-apps/xmodmap:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11:0
-	x11-libs/libXScrnSaver:0
-	x11-libs/libXcursor:0
-	x11-libs/libXext:0
-	>=x11-libs/libXi-1.2:0
-	x11-libs/libXrandr:0
-	x11-libs/libXrender:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-4:0
-	x11-libs/pango:0
-	>=x11-wm/marco-1.13.1[gtk3(-)=]
-	virtual/libintl:0
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-		appindicator? ( dev-libs/libappindicator:2 )
-	)
-	gtk3? (
-		>=dev-libs/libunique-3:3
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-		appindicator? ( dev-libs/libappindicator:3 )
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/desktop-file-utils:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	x11-proto/kbproto:0
-	x11-proto/randrproto:0
-	x11-proto/renderproto:0
-	x11-proto/scrnsaverproto:0
-	x11-proto/xextproto:0
-	x11-proto/xf86miscproto:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--disable-update-mimedb \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable appindicator) \
-		$(use_enable debug)
-}
diff --git a/mate-base/mate-control-center/mate-control-center-1.16.1.ebuild b/mate-base/mate-control-center/mate-control-center-1.16.1.ebuild
new file mode 100644
index 000000000000..80aec283c926
--- /dev/null
+++ b/mate-base/mate-control-center/mate-control-center-1.16.1.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="The MATE Desktop configuration tool"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="appindicator debug gtk3"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.73:0
+	>=dev-libs/glib-2.36:2
+	dev-libs/libxml2:2
+	>=gnome-base/dconf-0.13.4:0
+	>=gnome-base/librsvg-2.0:2
+	>=mate-base/libmatekbd-1.6[gtk3(-)=]
+	>=mate-base/mate-desktop-1.15.1[gtk3(-)=]
+	>=mate-base/caja-1.8[gtk3(-)=]
+	>=mate-base/mate-menus-1.6
+	>=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=]
+	>=media-libs/fontconfig-1:1.0
+	media-libs/freetype:2
+	>=sys-apps/dbus-1:0
+	x11-apps/xmodmap:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libX11:0
+	x11-libs/libXScrnSaver:0
+	x11-libs/libXcursor:0
+	x11-libs/libXext:0
+	>=x11-libs/libXi-1.2:0
+	x11-libs/libXrandr:0
+	x11-libs/libXrender:0
+	x11-libs/libXxf86misc:0
+	>=x11-libs/libxklavier-4:0
+	x11-libs/pango:0
+	>=x11-wm/marco-1.13.1[gtk3(-)=]
+	virtual/libintl:0
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		media-libs/libcanberra:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+		appindicator? ( dev-libs/libappindicator:2 )
+	)
+	gtk3? (
+		>=dev-libs/libunique-3:3
+		media-libs/libcanberra:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+		appindicator? ( dev-libs/libappindicator:3 )
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	dev-util/desktop-file-utils:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	x11-proto/kbproto:0
+	x11-proto/randrproto:0
+	x11-proto/renderproto:0
+	x11-proto/scrnsaverproto:0
+	x11-proto/xextproto:0
+	x11-proto/xf86miscproto:0
+	x11-proto/xproto:0
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--disable-update-mimedb \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable appindicator) \
+		$(use_enable debug)
+}
diff --git a/mate-base/mate-desktop/Manifest b/mate-base/mate-desktop/Manifest
index 0509043bf721..7a84e1eb6569 100644
--- a/mate-base/mate-desktop/Manifest
+++ b/mate-base/mate-desktop/Manifest
@@ -1,9 +1,9 @@
 DIST mate-desktop-1.12.1.tar.xz 773332 BLAKE2B 90e70929dcf1b3136a17ae658065d823dd052c53677db0b57e6843c4c86da4bd4de1f036c54b0fe0cc29b7c4e3bd83e9583a14ed148f30d67f8631a756891f50 SHA512 bcd3731bded736cdb4e0531d9c35253c025fa654d51f3ffb72ad7768ef62a1407b6ef62c2ff6beb45b0a30c2fe85e8d72c3e13068c92716e85f99f103b562c9e
 DIST mate-desktop-1.14.1.tar.xz 829244 BLAKE2B baecc3f130d095b2f1c679591ac48c28cf5fcb2b785ecd55ff03fde7b7b44b72cdf52dc38d931a2a312ce2999e5d3fc4a48cede4fc19d1ee2aa85f7e6003861e SHA512 b8d9688bfbea83d1264bce32be72fcb629b007e073553af24a9a79895baa29db3137cf6eed6a1bdf1a0b16ba3e02de892e85cbcfa62b84773d02fce71311496d
-DIST mate-desktop-1.16.1.tar.xz 810184 BLAKE2B ea30ff353dd5e20cdcd1854f5744c17bf80829ac7a965c9ad8f5a5ce9d61a4770a5a711b37a63fb63c1e3b7f6c15f9faa5dfad18465aaf046ea9ff1473c8b886 SHA512 4daec6ef5e9fd523962d34d59ecda91acb3831825100b2a96836d402dc187e1a4123642149bfa600a22a9ff1ed2a83632176a5864e2df027b29c5d42ef9d598d
+DIST mate-desktop-1.16.2.tar.xz 822124 BLAKE2B 5c5ad8048dabfd460662e5c9b0f9ddc08119fc1eda31a6496ba3f344f4625e3243e9c88c1ea9fd2cdb54ffba7957ab0f6907beb5ec82dc81ab854d4e77567cd2 SHA512 da557edae0f5e2ed197b3d4601fa49e791274f7c5e6ba47846ee47d886ac660849786b7b143028826a5c29520465c06f100df7d9999717aace05d78d0da1f6d7
 DIST mate-desktop-1.18.0.tar.xz 827332 BLAKE2B e5a0439c768a388a76f1bd2a7ba819d92fd020565d63d4b412c5edac54c28493e83d9fa9c5b9f7c82dd5d76338f257e7cb8db7318d7743f6101098f20d47db5c SHA512 0490e9810009923fa315e7f191103bc797c37f4417cf41bf317c55d26f7b52a848a65c28dde6903a861694c131ca52f3ed0be05cbbf6b2dd1cb216539f513220
 EBUILD mate-desktop-1.12.1-r2.ebuild 1358 BLAKE2B 92667e31ae57f81d7dc967db1476ac96fb6c9b3ba2a8f35ca904a0da659a68088319af38fc655a66f24b330fed7b7eb0f5ae609ebb99a1c4222925bc2f819021 SHA512 e8ae99d0cad3306375a46fce6860cc949b03065e4d36577ebc4ec2225d2c7acb28a7a50f4f52113111c7fce5384441f871e7a37cb4a869036642a4a38a2d6362
 EBUILD mate-desktop-1.14.1.ebuild 1246 BLAKE2B baaea895d603c6912dc33c34a4f6a65c89377f8f4d6131d58a996c286be7e89d310b87cb6a5835d8b7213250e4b1461ef74fdc1836db6f5bc9066b7ce3322500 SHA512 6ab4261ed1bbc06724a7e81f9942cb23881be02065760a735074da3647f87bfd574213317dd83c81f96e609a6bb0a1033faf72535e88274f4ce5bb1e8d6c164e
-EBUILD mate-desktop-1.16.1.ebuild 1246 BLAKE2B baaea895d603c6912dc33c34a4f6a65c89377f8f4d6131d58a996c286be7e89d310b87cb6a5835d8b7213250e4b1461ef74fdc1836db6f5bc9066b7ce3322500 SHA512 6ab4261ed1bbc06724a7e81f9942cb23881be02065760a735074da3647f87bfd574213317dd83c81f96e609a6bb0a1033faf72535e88274f4ce5bb1e8d6c164e
+EBUILD mate-desktop-1.16.2.ebuild 1246 BLAKE2B b9635a5ce182e3f9f5d4add05d8043b0ad9d5169055eb4bb583eafc17ad9977cb2d6a08ba8290ffc11553595c95f4c9b9da68e04a7bfc0d8c4f50a80c2508ab8 SHA512 cb65f62dd5cf0253c0abd2ec9f9f79378bee4f789b1a9c1cb60fff8ce34ac2d2b3129f907bb68f10a2fe42100aefec83f12b9ad929e64ee66dd57ec33b1cb84a
 EBUILD mate-desktop-1.18.0.ebuild 1130 BLAKE2B 8b46291e71fbfe5ff3c2fb8013f283332116c2a259df5f4a9410e34fe3096027bacac63c7195872712b9fd78e7a7d37845c7550ac1705b624ce5ed961abce04c SHA512 0099c88bf486ddd0631a0dcb7dd3e51530e77e19789bd7eaf49e03f56f07911c8d1a48c55e2d4fc4d18b778230e591ff447185d03d1d41c3564d6363ae18dfb2
 MISC metadata.xml 417 BLAKE2B 947a1abeccf86daa74d6dd42b4b63b32599287585397131e1a51b349bd4fdcd64d934467608cd6cfd682474201ff7b08b9c64553a4b08c09a867cf2d45d5efb6 SHA512 e3bc89370c680206ae9cab86e17bfcb36f4d2efa93b6d5a8b5964e445e95fd3873861a6c10f1069a8c9caae61268973aab97ff9ef72b3fdfe9334ad11ead0a51
diff --git a/mate-base/mate-desktop/mate-desktop-1.16.1.ebuild b/mate-base/mate-desktop/mate-desktop-1.16.1.ebuild
deleted file mode 100644
index 16df086e4c73..000000000000
--- a/mate-base/mate-desktop/mate-desktop-1.16.1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X debug gtk3 +introspection startup-notification"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/cairo:0
-	x11-libs/libX11:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
-	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.40:*
-	sys-devel/gettext:*
-	>=x11-proto/randrproto-1.3:0
-	x11-proto/xproto:0
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--disable-mpaste \
-		--enable-mate-about \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable startup-notification)
-}
diff --git a/mate-base/mate-desktop/mate-desktop-1.16.2.ebuild b/mate-base/mate-desktop/mate-desktop-1.16.2.ebuild
new file mode 100644
index 000000000000..49fc7f1eeae9
--- /dev/null
+++ b/mate-base/mate-desktop/mate-desktop-1.16.2.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Libraries for the MATE desktop that are not part of the UI"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X debug gtk3 +introspection startup-notification"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2
+	>=gnome-base/dconf-0.13.4:0
+	x11-libs/cairo:0
+	x11-libs/libX11:0
+	>=x11-libs/libXrandr-1.3:0
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] )
+	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
+	startup-notification? ( >=x11-libs/startup-notification-0.5:0 )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.40:*
+	sys-devel/gettext:*
+	>=x11-proto/randrproto-1.3:0
+	x11-proto/xproto:0
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--disable-mpaste \
+		--enable-mate-about \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_enable startup-notification)
+}
diff --git a/mate-base/mate-panel/Manifest b/mate-base/mate-panel/Manifest
index 916d8480b142..6f4d00ba28fe 100644
--- a/mate-base/mate-panel/Manifest
+++ b/mate-base/mate-panel/Manifest
@@ -1,9 +1,9 @@
 DIST mate-panel-1.12.2.tar.xz 1930792 BLAKE2B 8694e39fb16a5565749cfbf62a23ce068f1656c0c64ee39384d3b184acb02212c9ab758d0c547b557d4710116c9335b3b4f5bb8917f811b54c7cb45a6f5aab9b SHA512 7810c3b3585e9def59c192914a91e2e64173b5b44cf43496808f6be46df798fc97358bb7bc300e52985fc401feb5201daad60bb0181e72e5e2512e7712aba6a4
 DIST mate-panel-1.14.2.tar.xz 1981716 BLAKE2B 1963d0035e8a5abf8940a88123408b089b4c19c9ca7a2d696635c653883d2023aa95de42e30bf40948c48c60ca6f410fa2c76f39879c51e44d734ddc9aecbffa SHA512 296a74fcbdd3a58337987c0e8bcc804a203fbf5f134183c2fe09016c609bbd67bfab4dc6e46e333c7714e9c264965f1c3897c9645a5003405866fbdaf0a04944
-DIST mate-panel-1.16.0.tar.xz 1945868 BLAKE2B 57eee8a5cd7c1276c121cb14251a3024e50105db915db292178760184193a71088ed104241908453dc98dfe87ec3225a61fabc59c192658698bfb9dcbefd7015 SHA512 96ea6e71dc602b2ff81294984f22854079e0daeb41d00a52646a6f2eb211f26b51eba43f97a3548707f3948b1f226480e3a8242c84de7eb4cd7f69e9b143fa36
+DIST mate-panel-1.16.2.tar.xz 1953812 BLAKE2B 20dec8edb56a13774419f8d43ca4d9df1a12f9188001762edd5cb3ff3d1e93365a2fc825d1094538b0f93ad6d8d224d8d2d0afe302d998e453daff726f86f327 SHA512 4d5ad1a657a2a2f04b4a667b1fc4b13b158a2ee8cf379636ac196b16093589e5bb5d97ed06c0c621f72586e01bff791a364aa17ff16554c844f9d870e3b709bb
 DIST mate-panel-1.18.2.tar.xz 1946680 BLAKE2B 1165e30a177e521713a747161d153b809a39acddb95ede19035bd67f2871f445fb86f4a46371061a8e9013723acf6e1eeba7b5f9f0cf3670e7975769646f94fc SHA512 c0b7b25a2f2aee928324badeb577707e856f1c6669190e0967592dc86b0991006d6cabdbabf8aa8e24807a974e120b096312916ff2acb4601e73aaad2208f869
 EBUILD mate-panel-1.12.2-r3.ebuild 1688 BLAKE2B cbbdfa3e872b54ac8fa68d24ada32ba2fd9929a122b828ac8e92aed46ff6cb3868f55c0224b31103b445db518e8d08b527585f155d50b416414c708c350ea1f2 SHA512 a04aba1c58bab130082dedb17c2ac7d70fbf8b3cfae00fdb690b0cff0c9ae6acdf3c45bfef761b53d6a9ffe12423558610e0c1052c8b717859c2c1e9576bcd18
 EBUILD mate-panel-1.14.2.ebuild 1598 BLAKE2B 095c13daeeaf196f5eb268c00bb423b1d8883d9f633cbe4e491d8fd7f43ecf2368cd19f2942d15b7482c424477e4aec7c93919c1eb81fadda60cd4f769ad79f1 SHA512 148fd91c7f9db1bd062b26a9fa2a7fb5bb108e2d3b698bcdf7107d5693939db2a67ff9d36b1e3ec981c76297666cecd7230f78f6c58c016309f3e242f07fa6df
-EBUILD mate-panel-1.16.0.ebuild 1598 BLAKE2B 095c13daeeaf196f5eb268c00bb423b1d8883d9f633cbe4e491d8fd7f43ecf2368cd19f2942d15b7482c424477e4aec7c93919c1eb81fadda60cd4f769ad79f1 SHA512 148fd91c7f9db1bd062b26a9fa2a7fb5bb108e2d3b698bcdf7107d5693939db2a67ff9d36b1e3ec981c76297666cecd7230f78f6c58c016309f3e242f07fa6df
+EBUILD mate-panel-1.16.2.ebuild 1598 BLAKE2B bca60dfcdde93e589f7b737c2138956d97eabea5a3e1578748360b8cfda6495f531828da77d1851eb5a3beceb4dcce3f7aab8c63071e7b6ced45d8a433691861 SHA512 08b4afb3d62b322fbe2cadb83687214960476a9a7f531b40870dc7fed3844a98b1a114c27656df9867bf54cb9dfaca6859354a38445ab3c1179f3aa3f0f6ee09
 EBUILD mate-panel-1.18.2.ebuild 1401 BLAKE2B ebdd7536ed55bbd995d423db803daf37049781e290cb6233609b3def98de82952e0f2baec21591f81bde277f4b20971de6e7bcf6e7cd333f8316be3a7c5ef4ab SHA512 85df4e6e47656bdd566c65a913f0ad407411d76231b15107f078c0884edf7bbfb5d4a06b35bb2c779e0bfb043d87423de920d7fb91101277e88f70b5c261887c
 MISC metadata.xml 415 BLAKE2B b4ccf02438c98ac33146a6710c89166d57bcb48bc681e5089832e97bdd1373e63ab27e2983f5c15cbb384901acf7b72a5b17fa819d9ccf774ec4409d3b558358 SHA512 bb1d49b6f17d4dbb7115979faed200a7e5cf3953c87dd9326f2b96d48ff6daa1edaff6a50b7ba9c5d0706c2e3a9bcca414218cf9f1fcd1f02a0cbed4c64cc847
diff --git a/mate-base/mate-panel/mate-panel-1.16.0.ebuild b/mate-base/mate-panel/mate-panel-1.16.0.ebuild
deleted file mode 100644
index 8fca1161980f..000000000000
--- a/mate-base/mate-panel/mate-panel-1.16.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE panel"
-LICENSE="GPL-2 FDL-1.1 LGPL-2"
-SLOT="0"
-
-IUSE="X gtk3 +introspection"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/dbus-glib-0.80:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libmateweather-1.7[gtk3(-)=]
-	dev-libs/libxml2:2
-	>=gnome-base/dconf-0.10:0
-	>=gnome-base/librsvg-2.36.2:2
-	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
-	>=mate-base/mate-menus-1.6
-	>=sys-apps/dbus-1.1.2:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.7.1:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	>=x11-libs/pango-1.15.4:0[introspection?]
-	x11-libs/libXau:0
-	>=x11-libs/libXrandr-1.3:0
-	virtual/libintl:0
-	!gtk3? (
-		media-libs/libcanberra:0[gtk]
-		>=x11-libs/gtk+-2.19.7:2[introspection?]
-		>=x11-libs/libwnck-2.30:1[introspection?]
-	)
-	gtk3? (
-		media-libs/libcanberra:0[gtk3]
-		>=x11-libs/gtk+-3.0:3[introspection?]
-		>=x11-libs/libwnck-3.0:3[introspection?]
-	)
-	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.1.2
-	app-text/yelp-tools:0
-	>=dev-lang/perl-5:0=
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--libexecdir=/usr/libexec/mate-applets \
-		--disable-deprecation-flags \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable introspection)
-}
diff --git a/mate-base/mate-panel/mate-panel-1.16.2.ebuild b/mate-base/mate-panel/mate-panel-1.16.2.ebuild
new file mode 100644
index 000000000000..9f90e878faa4
--- /dev/null
+++ b/mate-base/mate-panel/mate-panel-1.16.2.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="The MATE panel"
+LICENSE="GPL-2 FDL-1.1 LGPL-2"
+SLOT="0"
+
+IUSE="X gtk3 +introspection"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/dbus-glib-0.80:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libmateweather-1.7[gtk3(-)=]
+	dev-libs/libxml2:2
+	>=gnome-base/dconf-0.10:0
+	>=gnome-base/librsvg-2.36.2:2
+	>=mate-base/mate-desktop-1.9.3[gtk3(-)=]
+	>=mate-base/mate-menus-1.6
+	>=sys-apps/dbus-1.1.2:0
+	>=x11-libs/cairo-1:0
+	>=x11-libs/gdk-pixbuf-2.7.1:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	>=x11-libs/pango-1.15.4:0[introspection?]
+	x11-libs/libXau:0
+	>=x11-libs/libXrandr-1.3:0
+	virtual/libintl:0
+	!gtk3? (
+		media-libs/libcanberra:0[gtk]
+		>=x11-libs/gtk+-2.19.7:2[introspection?]
+		>=x11-libs/libwnck-2.30:1[introspection?]
+	)
+	gtk3? (
+		media-libs/libcanberra:0[gtk3]
+		>=x11-libs/gtk+-3.0:3[introspection?]
+		>=x11-libs/libwnck-3.0:3[introspection?]
+	)
+	introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/yelp-tools:0
+	>=dev-lang/perl-5:0=
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--libexecdir=/usr/libexec/mate-applets \
+		--disable-deprecation-flags \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable introspection)
+}
diff --git a/mate-base/mate-session-manager/Manifest b/mate-base/mate-session-manager/Manifest
index 4ba2c74ab832..bc58ed42c7e8 100644
--- a/mate-base/mate-session-manager/Manifest
+++ b/mate-base/mate-session-manager/Manifest
@@ -5,11 +5,11 @@ AUX defaults.list 14293 BLAKE2B b8de50636f845e5ed197968a0f917a3d2c1f59b082ae7d76
 AUX mate-session-manager-1.12.2-save-session-ui.patch 20029 BLAKE2B 11ac604f47ec4b4892666d117d1ad514026fa6d15cdcb973c8d4d0b9051f6505d219ea7bc884ca8b20cf51fcc77913840b7f1adc6b7ea26b993134b7abfa027f SHA512 43501ff0911a3c9e6e007b7b8da771a6bfaac46b33b7b7a7be1570e77cad8222e1b3c0f4db0e23c92e5f3bde593bf52770cb56cad37d78ead028ecce8e5c619d
 DIST mate-session-manager-1.12.2.tar.xz 538832 BLAKE2B 6442fae3076e2ac54b4705326469f1ccc4c4daca8cc06bcfb720a89e347a725e46c18e7b6d987043cb1a9371f73c9cc82324c0d1d6fdf97bbed8c894ae2d398d SHA512 4b4a3ecb0f7cbb25e17db8c5833f789858c94fb236ed60b9e98f59cffa320ec32c2b1960fdcbb9c2c9f476ed76cb1f37c3e07746c7c90e08a0dbcc62aac9793e
 DIST mate-session-manager-1.14.1.tar.xz 574804 BLAKE2B af3ed0abec15a7bf2002d965252b07eb5327c2fc351b1f475c0afc64011a7b18d21d0b4f3d40f56282ea11b8055e21e52ac0a2df9e509442b2e43eeeb549c9af SHA512 993f314c887bca8d8e0b9450f0e62686e133ea16ee2b6675ff69766564d47a4e7d48581867e8d5e8395ee2e3b1735b121f16cb1be22c7da29015a58f98edd638
-DIST mate-session-manager-1.16.0.tar.xz 574464 BLAKE2B af1a2992e88324b186d65dde62582d3736abdd5f781db2f4f07fe6b451231ceba5f48f3ed337a50312325f587c6bdbcbb0c53b121c29a17d5d4aa22b80f794f1 SHA512 55eeef35c388a1f2ed1ad21002863b09d462f5549fb14edcde530715d52e012ee4ecb09c7757775011159b261db7e02be13dccad710fdcd66455383b84a26b86
+DIST mate-session-manager-1.16.1.tar.xz 574540 BLAKE2B 40abb2655acf84c90a8805e967817d1ef4739a1278369f5b632071302d22a9c6cf15d83d69e8ccf7503dc19f8c39844f14afa976a96f905dfd355a7071a609a1 SHA512 fdce8351b5541e7e8455659c1107be2976a24602e61010261fd8d1931d07298033d15fda43163fabc2bfcd6b42120c68e377278b820100686a8ef8e36852ff0e
 DIST mate-session-manager-1.18.0.tar.xz 578256 BLAKE2B ef58007798ac15934b6e8c071ce97ad3bd52d47fdbf639ac7a2e6c1120d67492e77a2d1159700a17a6a6321645b4a63e6de2c493fdc26d65aba4e98f7262c6c5 SHA512 0b1299eed5a745112a9976a85965847fc7a579e161236f4d661cf08a1292037aa8246bd3e3efcf3d0c6ea8b005e9dfc33cec797c8dc48615f7bc88ce5d351ba8
 EBUILD mate-session-manager-1.12.2-r1.ebuild 2230 BLAKE2B de6a5a28b0ec3ee14d09eb0e85ed7ee5058d806e03ed3d905ee893064e9c4bd44630bf6496564a14807e85a622ef39d7421640e34230d69f07ab6a8a423aa81a SHA512 55063c103ad5851136df465c4a7dc7cbc0032805da4acf4df22e0c3276dfc21b1ae41dc91d6f27cfae76983c5f36d9703e83a114023a2da67ac4b3422f4dec54
 EBUILD mate-session-manager-1.14.1.ebuild 2118 BLAKE2B 206db9ba0cc46441a7861a58359eceeb9def7ec306093691371479f7df15de399c66c77abac6083812888a9e93aae1efbdb16d4da573fd1169b71294db60386d SHA512 9249fb51db47698f455dc127ad136166ab4500fd00419da86af3e6013fee9b1969376bb24675985095f74ee31f14683efb6f37508d8c4e996948d1a75ba60a14
-EBUILD mate-session-manager-1.16.0.ebuild 2033 BLAKE2B 5fb5684a7ac8d357b5d84b395fe18e20cd7388d636be0b5bac6cf43daa0d392f848bb856cb1ed0c9bf98fa0551883fd29836ecd2d78832c16b6aec9f09be40a1 SHA512 935987758e365e1719ef0d7e29ea7a03e40e7f3a6b0b311c464663f89a7259e0e6cda994dc5705181deb43e4beb027364b0b614e03b48aa5272d9fadbd759733
+EBUILD mate-session-manager-1.16.1.ebuild 2076 BLAKE2B 50a36a0f7cacf0535d945962f1a99ad270b5723892c13578af25acb42469a394d1259428dafba05703e17a731c539506d60c668651190cc72d9f2f9994e3f9e0 SHA512 3e4b58de6e7eb24b69917030311d34ef72cb284d1cf344528bb6202e39bd7fe296d7cf3f3d16d8df20af552c6ede0535d9da85cfa4c908661ba3f4c8532181ef
 EBUILD mate-session-manager-1.18.0-r1.ebuild 2014 BLAKE2B 1930d25922bedf4e44132cd243a8079571d8ae28edcc3ce5f26e98c6928857141bb53a71cc05448fabc48029c30143d43c864e7e3e34aefe5c04d8b8a3a3f667 SHA512 65b1cc52f9c5a33207662fef05698371a12d72460bacc8beb074d4e20d6eaaf11d370c239c4e659deb9a98f686d3e7aae84afd595d6b8f165872217811fbabc9
 EBUILD mate-session-manager-1.18.0.ebuild 2006 BLAKE2B f4ee751c8a1c65cb40260cf5bc62aae54720fd5230499688c986aa61f857b7a8ee7df2116dc872683aba05ced1bfb977fe53beada8914fdc730028a708f15658 SHA512 fb1e2010ae2bec4a6e931cdbc9ac2169baaa027f3254b7ca1c9fb3a77fba19fc661ea12b76d5ad62725e4b0688aebd1cd2ace107e0ed177aa3892ae6b393be6d
 MISC metadata.xml 558 BLAKE2B 6c7b3116a26b07af4afe5be2f4635ffeba7a67bddddb5bee3009f20ad215c2fdd4bdd89d3d8f58c02e8edf6ac665da54b35a708936bb6edd12f4c1703360b497 SHA512 3ec5ae6695bb7477bf8384dc31143be21ff5d2f5ac0715309657b14e3b43b8013cfccf701307b2ee1a0f8e2cf0e7956d5db37739578c18006a299e428137ed14
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.16.0.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.16.0.ebuild
deleted file mode 100644
index 3991dbb0bf5e..000000000000
--- a/mate-base/mate-session-manager/mate-session-manager-1.16.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE session manager"
-HOMEPAGE="http://mate-desktop.org/"
-
-LICENSE="GPL-2 LGPL-2 FDL-1.1"
-SLOT="0"
-
-IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd upower"
-
-# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
-# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
-# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
-	>=dev-libs/glib-2.36:2
-	dev-libs/libxslt
-	sys-apps/dbus
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libXext
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/pango
-	x11-libs/xtrans
-	virtual/libintl
-	elibc_FreeBSD? ( dev-libs/libexecinfo )
-	>=x11-libs/gtk+-3.14:3
-	systemd? ( sys-apps/systemd )
-	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )"
-
-RDEPEND="${COMMON_DEPEND}
-	x11-apps/xdpyinfo
-	x11-misc/xdg-user-dirs
-	x11-misc/xdg-user-dirs-gtk
-	gnome-keyring? ( gnome-base/gnome-keyring )"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	>=dev-lang/perl-5
-	>=sys-devel/gettext-0.10.40:*
-	virtual/pkgconfig:*
-	!<gnome-base/gdm-2.20.4"
-
-MATE_FORCE_AUTORECONF=true
-
-src_configure() {
-	mate_src_configure \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(use_with systemd) \
-		$(use_enable debug) \
-		$(use_enable ipv6) \
-		$(use_enable upower)
-}
-
-src_install() {
-	mate_src_install
-
-	dodir /etc/X11/Sessions/
-	exeinto /etc/X11/Sessions/
-	doexe "${FILESDIR}"/MATE
-
-	dodir /usr/share/mate/applications/
-	insinto /usr/share/mate/applications/
-	doins "${FILESDIR}"/defaults.list
-
-	dodir /etc/X11/xinit/xinitrc.d/
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/15-xdg-data-mate
-
-	# This should be done in MATE too, see Gentoo bug #270852
-	doexe "${FILESDIR}"/10-user-dirs-update-mate
-}
diff --git a/mate-base/mate-session-manager/mate-session-manager-1.16.1.ebuild b/mate-base/mate-session-manager/mate-session-manager-1.16.1.ebuild
new file mode 100644
index 000000000000..0e302b18648e
--- /dev/null
+++ b/mate-base/mate-session-manager/mate-session-manager-1.16.1.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE session manager"
+HOMEPAGE="http://mate-desktop.org/"
+
+LICENSE="GPL-2 LGPL-2 FDL-1.1"
+SLOT="0"
+
+IUSE="debug elibc_FreeBSD gnome-keyring ipv6 systemd upower +xtrans"
+
+# x11-misc/xdg-user-dirs{,-gtk} are needed to create the various XDG_*_DIRs, and
+# create .config/user-dirs.dirs which is read by glib to get G_USER_DIRECTORY_*
+# xdg-user-dirs-update is run during login (see 10-user-dirs-update-gnome below).
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.76
+	>=dev-libs/glib-2.36:2
+	dev-libs/libxslt
+	sys-apps/dbus
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE
+	x11-libs/libSM
+	x11-libs/libX11
+	x11-libs/libXau
+	x11-libs/libXext
+	x11-libs/libXrender
+	x11-libs/libXtst
+	x11-libs/pango
+	virtual/libintl
+	elibc_FreeBSD? ( dev-libs/libexecinfo )
+	>=x11-libs/gtk+-3.14:3
+	systemd? ( sys-apps/systemd )
+	upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) )
+	xtrans? ( x11-libs/xtrans )"
+
+RDEPEND="${COMMON_DEPEND}
+	x11-apps/xdpyinfo
+	x11-misc/xdg-user-dirs
+	x11-misc/xdg-user-dirs-gtk
+	gnome-keyring? ( gnome-base/gnome-keyring )"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	>=dev-lang/perl-5
+	>=sys-devel/gettext-0.10.40:*
+	virtual/pkgconfig:*
+	!<gnome-base/gdm-2.20.4"
+
+MATE_FORCE_AUTORECONF=true
+
+src_configure() {
+	mate_src_configure \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_with systemd) \
+		$(use_with xtrans) \
+		$(use_enable debug) \
+		$(use_enable ipv6) \
+		$(use_enable upower)
+}
+
+src_install() {
+	mate_src_install
+
+	dodir /etc/X11/Sessions/
+	exeinto /etc/X11/Sessions/
+	doexe "${FILESDIR}"/MATE
+
+	dodir /usr/share/mate/applications/
+	insinto /usr/share/mate/applications/
+	doins "${FILESDIR}"/defaults.list
+
+	dodir /etc/X11/xinit/xinitrc.d/
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe "${FILESDIR}"/15-xdg-data-mate
+
+	# This should be done in MATE too, see Gentoo bug #270852
+	doexe "${FILESDIR}"/10-user-dirs-update-mate
+}
diff --git a/mate-base/mate-settings-daemon/Manifest b/mate-base/mate-settings-daemon/Manifest
index aae0e6b1b0e2..1d70c8e2356c 100644
--- a/mate-base/mate-settings-daemon/Manifest
+++ b/mate-base/mate-settings-daemon/Manifest
@@ -1,9 +1,9 @@
 DIST mate-settings-daemon-1.12.1.tar.xz 781388 BLAKE2B dad221eb742f7748b4c3b70123ce3689509752a73d3f090e027f56d9f64a5d4d11e0c49a5c293c6e8569e250cec7d027dd7dc93a76e8541b8e70828f33ec94de SHA512 36c0d2cacef22db1d27e694602ee390fd0a24e3478837fd7fbfe069f55278c7a7ff3f7d280e0bf9cd4e827beeb9b3d40f505e5772686036e47e3d0b7d1e4b47e
 DIST mate-settings-daemon-1.14.1.tar.xz 760936 BLAKE2B dd3365faa55c743cfad7ee5dded7fd4d88c5b5080afd0e806600879e57a7dcbffb4f77217faefa766b1faa85f622ccfdf9e0774604d4e67d68fc8ab0758647da SHA512 e237c1c7df4a42183e3c3079c88dfc94422b604ed9b197363a5ea9bfdf7a16782681f6d82ee3b5b7c5edac6b90b0f2875072a108f5fe9b954bbbf1c8cc27e6d5
-DIST mate-settings-daemon-1.16.0.tar.xz 767136 BLAKE2B 8a90fe88477caf5d8069730966fe5ecc610822512bc0b935090919fd6dd46d6678432ff5d147291ff76529b2ba599642beb707b53537fec90bf244549125ac0e SHA512 39ab6cd52008bfb92949f225b003186ed27f9ad215a59015a3ccaa1f02e618b786fe9db94d993bc89660b03c50700b364de1ac4a9b7cf23a83ca545fc93bbee3
+DIST mate-settings-daemon-1.16.2.tar.xz 767820 BLAKE2B 1057d21f88799978a58fb0db8b15e72f4905995f7673c1baa92100b823232ae1ed4886d88b5a37e30cd05e1d1ca72b8fa3c58ee9f3211581bda4845f745e52b7 SHA512 e4b527791f65c500ac0b432744c3b128a6a438077261ee182993c82c175d165c2f67fa60620ac03c6f6f532ef6cb4a2a6df52164022a30015e7a071a03df043e
 DIST mate-settings-daemon-1.18.1.tar.xz 778776 BLAKE2B 3e7c76af27dbd4150ff75038e92f76669e0530e13852e37bf658e8ad2233340f66d04aa0bb72bcbc73edd3cbbf60df9cfc6719d2ab92cad478ac2eb90011467e SHA512 35ea953a508c1a8a2359a13f36789f2b171873e2b153f3c7e5e779a900672cf19a4f36892136d4886e61349f536706f0ab0e781cbde3e246c490c66af3e621d6
 EBUILD mate-settings-daemon-1.12.1.ebuild 1707 BLAKE2B cb6153f0a4341fcbaa7c3c35a348d8257a4710debe75790290ccc287393f657a78f13a4e27b9ab032f9f287d12454a6e429dea4cdc5ad0ffc7c0eee60b77ab5f SHA512 24bfac7cb9c14c148d6a848db9385c520beb7439dca96805a3726c2f3ce65137bc0afa90ddcd692ffab972ee19bb55fcc56355b6f1a1702dc2c444a9948c0240
 EBUILD mate-settings-daemon-1.14.1.ebuild 1749 BLAKE2B 17c39c75418b429db9b5883801514c5f9ec8ca2e3d9097d8efc5d1d45cd11331bb547b3b8e95c7987d840986618966c49503103def0e49bf26ad0aa06da4cdb6 SHA512 441ee4c9c62956e6b2d9419510e1747d1847423aabb4cd2128f6e7668c8960d32ee6387ee0963989a277f49b6870ea7f3f9c02244e5a6fd6b2ed9cbdcb4f84bc
-EBUILD mate-settings-daemon-1.16.0.ebuild 1749 BLAKE2B 17c39c75418b429db9b5883801514c5f9ec8ca2e3d9097d8efc5d1d45cd11331bb547b3b8e95c7987d840986618966c49503103def0e49bf26ad0aa06da4cdb6 SHA512 441ee4c9c62956e6b2d9419510e1747d1847423aabb4cd2128f6e7668c8960d32ee6387ee0963989a277f49b6870ea7f3f9c02244e5a6fd6b2ed9cbdcb4f84bc
+EBUILD mate-settings-daemon-1.16.2.ebuild 1749 BLAKE2B d4dae781639bf72059e659db45c6d7fd8c104685a4c1e8032c7bf85740d04b422efb6d49149f833b6984c5929c7ddeadd608859edf29fb81dc47819208cf0884 SHA512 7bc9e7d8d331a2bc80186f96d0e9bf79d59b035666245ffb085a7107b105778f1b4782b54eb018fe73de7a708b89ab5c1d2c0fccf4023d4650314c62538526c7
 EBUILD mate-settings-daemon-1.18.1.ebuild 1609 BLAKE2B 50fb94f963bf26b825d864717c5ce770b3ef9fd3fc91e1687f4cfc775d3db1df3e470042aba8b9b0499e8a2a60160c3ef58ddf2739cc167062e7d8924c3b13ee SHA512 7c4db1a50f4e20ae038c98cf91f39347768504c0155a0dec65b191795858abd0670d4e10405062f341a53201492da84ff7ef9ed6e976bfb31bbeb9f40ea95461
 MISC metadata.xml 425 BLAKE2B f4dd8aa58084e192d3f20df7f926845f1aabe03c4a03c20177e42c9daeb5f7db7f1ca535ac7131c58a3731e1d250c1de144a00bbd6f2434539fd52b749be55ac SHA512 3849ef93c7ebd9b753a15bab1c1fb3142d4c3270fe1ac29585862c27265a78f389478962475038680e194d976812ecfab398ecb89d26c2372e1fdb060432d932
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.0.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.0.ebuild
deleted file mode 100644
index 262630d7c4a6..000000000000
--- a/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE Settings Daemon"
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-
-IUSE="X debug gtk3 libnotify policykit pulseaudio smartcard +sound"
-
-REQUIRED_USE="pulseaudio? ( sound )"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.74:0
-	>=dev-libs/glib-2.17.3:2
-	>=gnome-base/dconf-0.13.4:0
-	>=mate-base/libmatekbd-1.7[gtk3(-)=]
-	>=mate-base/mate-desktop-1.9[gtk3(-)=]
-	media-libs/fontconfig:1.0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libX11:0
-	x11-libs/libXi:0
-	x11-libs/libXext:0
-	x11-libs/libXxf86misc:0
-	>=x11-libs/libxklavier-5:0
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	policykit? (
-		>=dev-libs/dbus-glib-0.71:0
-		>=sys-apps/dbus-1.1.2:0
-		>=sys-auth/polkit-0.97:0
-	)
-	pulseaudio? (
-		>=media-libs/libmatemixer-1.10:0[pulseaudio]
-		>=media-sound/pulseaudio-0.9.15:0
-	)
-	smartcard? ( >=dev-libs/nss-3.11.2:0 )
-	sound? (
-		>=media-libs/libmatemixer-1.9
-		!gtk3? ( media-libs/libcanberra:0[gtk] )
-		gtk3? ( media-libs/libcanberra:0[gtk3] )
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.50.1:0
-	sys-devel/gettext:0
-	virtual/pkgconfig:0
-	x11-proto/inputproto:0
-	x11-proto/xproto:0"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_with libnotify) \
-		$(use_with sound libcanberra) \
-		$(use_with sound libmatemixer) \
-		$(use_enable debug) \
-		$(use_enable policykit polkit) \
-		$(use_enable pulseaudio pulse) \
-		$(use_enable smartcard smartcard-support)
-}
diff --git a/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.2.ebuild b/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.2.ebuild
new file mode 100644
index 000000000000..193d67a874e1
--- /dev/null
+++ b/mate-base/mate-settings-daemon/mate-settings-daemon-1.16.2.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE Settings Daemon"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+
+IUSE="X debug gtk3 libnotify policykit pulseaudio smartcard +sound"
+
+REQUIRED_USE="pulseaudio? ( sound )"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.74:0
+	>=dev-libs/glib-2.17.3:2
+	>=gnome-base/dconf-0.13.4:0
+	>=mate-base/libmatekbd-1.7[gtk3(-)=]
+	>=mate-base/mate-desktop-1.9[gtk3(-)=]
+	media-libs/fontconfig:1.0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libX11:0
+	x11-libs/libXi:0
+	x11-libs/libXext:0
+	x11-libs/libXxf86misc:0
+	>=x11-libs/libxklavier-5:0
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	libnotify? ( >=x11-libs/libnotify-0.7:0 )
+	policykit? (
+		>=dev-libs/dbus-glib-0.71:0
+		>=sys-apps/dbus-1.1.2:0
+		>=sys-auth/polkit-0.97:0
+	)
+	pulseaudio? (
+		>=media-libs/libmatemixer-1.10:0[pulseaudio]
+		>=media-sound/pulseaudio-0.9.15:0
+	)
+	smartcard? ( >=dev-libs/nss-3.11.2:0 )
+	sound? (
+		>=media-libs/libmatemixer-1.9
+		!gtk3? ( media-libs/libcanberra:0[gtk] )
+		gtk3? ( media-libs/libcanberra:0[gtk3] )
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.50.1:0
+	sys-devel/gettext:0
+	virtual/pkgconfig:0
+	x11-proto/inputproto:0
+	x11-proto/xproto:0"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_with libnotify) \
+		$(use_with sound libcanberra) \
+		$(use_with sound libmatemixer) \
+		$(use_enable debug) \
+		$(use_enable policykit polkit) \
+		$(use_enable pulseaudio pulse) \
+		$(use_enable smartcard smartcard-support)
+}
diff --git a/mate-extra/Manifest.gz b/mate-extra/Manifest.gz
index 3fcc14cb075a..ba9d6ef7894f 100644
--- a/mate-extra/Manifest.gz
+++ b/mate-extra/Manifest.gz
diff --git a/mate-extra/mate-netbook/Manifest b/mate-extra/mate-netbook/Manifest
index 4f0d4ca93896..531fdd1ec2d5 100644
--- a/mate-extra/mate-netbook/Manifest
+++ b/mate-extra/mate-netbook/Manifest
@@ -1,9 +1,9 @@
 DIST mate-netbook-1.12.0.tar.xz 268632 BLAKE2B 8d5ec5ec4eac31f7aa7e93849b7a8d35ec5537cdf75e4c4358f919418b0ffa7addfcbbe7e23f55b9359ac45f9f77899c90e309bfd601d33576f3b22e3c1a0156 SHA512 3f46e537b48833fe3bd599dcaa6af89a265dacac4fc077d46ca87b5a35c2368810824747411d263541e2685e2700311996f8741aa9321122d6d306c1ad8fc15b
 DIST mate-netbook-1.14.0.tar.xz 284248 BLAKE2B 405d278573feaf875edb2e7c02d5e47004be2f137e1ede9ae84850b685b68ff9f315dadda9095eaf340923c1390bc6f04ea3f3f40a5d0a050def9452f41d3bf9 SHA512 aa5d5ed1a8c31df4b7e84cad8efaaf326f7bf2a9a392b34b053c30287404949ddd5f27d438d028bc569cbedc177dc1236af32e869b0418677021e7a6ef17dfe1
-DIST mate-netbook-1.16.1.tar.xz 287092 BLAKE2B 20013280086551c1fb3744defac7cc135296356c194267d3b34a2f876fd8b7428e297a25258130ac57b39094d2e2c6e5d3e7c7aaaa479e24bbc1424c78015c54 SHA512 9f79ed82210254b11be0ccbabed3089e82070056d3d096c16dd0c092a3cc4621fd8449d38b2db5781a460ed9f6b6974d9ee59b8c40b554bbb13eae282cb8a74d
+DIST mate-netbook-1.16.2.tar.xz 299112 BLAKE2B 134c92225e4234944d28870bee994bce25967df5f35cb40603bfe2677bc71b71f331433b571543de739bedd4f0ae944f57266f547926ee654e19cb361316af92 SHA512 2a633164b1a4d57b659f6710969bf8d14b99d77351464b171cbb049635fc6bcfcb1925a0b36762c6593c45a7695fe20e981ada5a24816879b4c0b392da2803b4
 DIST mate-netbook-1.18.0.tar.xz 300904 BLAKE2B b67ad3ac2445cda9b67f7ffddda86f788f1b14426101678283f480c16554178e84a2fb0ec391e2df8ecd88aa59f5c7f94f558c5f24c57e7699aad5c0eddc343f SHA512 4004b62ed0b2e0c578bb01ff39483e69e80e294ffb131e433c4ba41cd4462da122362dd98c37a6bd734a38fabc526429c0b8694c7f1edf440ff7a4d841aad419
 EBUILD mate-netbook-1.12.0.ebuild 822 BLAKE2B 403e6fb0347b2cbddb1506587b1b6b21aa83756e9a224dd2993c49a5df01a4e188e85a0aecdf6db6c9f00a0eb2296709f82c412662c11cf6179ef8ba9a0eb826 SHA512 3dcdb0cea9f2f01786b25f9e1975a8c1aeaadc35d38eddb746eff2066c97d060f66501135650dd29444836739229af741e6133ee508d0df8954f4011f3fd4d9d
 EBUILD mate-netbook-1.14.0.ebuild 864 BLAKE2B d36fce29e71c45a02f98fd06925aef9f66b5d474c21d2bf8bde9c713f7ee24001e36976701ca29dd3b41cd0a3d04fdb018a3edeba06b95e0e3640e054ccbfec2 SHA512 eea09b5b9845e7a4570ab8be2488be1151e226e0c83435aaa26bae07a076b75b5140ea8f6cbfb3c95d0d0049b1c82e4ccbefec51fa68a14e48ae3baf9ad5385b
-EBUILD mate-netbook-1.16.1.ebuild 778 BLAKE2B e1ffd297b21c8d9b75679d070bdca089a5ab56d6b17a01361941974dc0f183d1ff6e82dfc6706d10df011c7e0e541ff0cb5c2eb132b1bfb6b2082d45437f5562 SHA512 2dc07c6dc9f1ce0db205a7bdd29c7e3bffb13ce1d1a99eb1d2eacd7996f521e5c3df57fc9d1410c262e7f94aca38b41cbef68dac30b17c0f3e346cf071fe7146
+EBUILD mate-netbook-1.16.2.ebuild 778 BLAKE2B dab47176e721ffeeace93f3c95aa8d87e1646e8c8c3d7a6df2d5b0454423789952ea5cdafc725509c32b8b5fad39b1c4afb9764ef84f24cb5e0888b76415bc64 SHA512 1d1bbd5206e1ae9537bf8d20e877eba0fce4c13d57af658d57c56b37be0e9d662cad84b02ecc656cd3aaf1f6054832bc4f6c6c706ca286bc7dddc027063cb537
 EBUILD mate-netbook-1.18.0.ebuild 638 BLAKE2B a5c1ad11ebcf0fb04d6bb9a484cbd478ed035b97ec38905e9c8490978e7ba9c442f06054240842518cb472257997c133fb743f654ae2cf33363d0fdd934d34ce SHA512 a90011c93fdd58a52a3302ab085246900ee6862a917e208ada600dcc6f5c2c69d1d717a9195c8e64597f48eeba1e8e05cd0547383a44df2d6d73339b9026abcb
 MISC metadata.xml 571 BLAKE2B f402acb0954e2b199d94e0281c4f76795a91f3d5d028a07a546d0ddb54aa134112f39b51dd00b2aa5132f58c21c121864d04c4c7ef4d768258ece8850b965033 SHA512 c615ac4dcce2738757c792d96a5af9db7d745b6587c1c8e36f70ece45128ec1b05141fc787320031559b8819969f1ac661a11876f8185fef2623d039f6832d76
diff --git a/mate-extra/mate-netbook/mate-netbook-1.16.1.ebuild b/mate-extra/mate-netbook/mate-netbook-1.16.1.ebuild
deleted file mode 100644
index e8c29d5e123d..000000000000
--- a/mate-extra/mate-netbook/mate-netbook-1.16.1.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 mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE utilities for netbooks"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE="gtk3"
-
-COMMON_DEPEND="
-	>=dev-libs/glib-2.36:2
-	>=mate-base/mate-panel-1.8[gtk3(-)=]
-	x11-libs/libfakekey:0
-	x11-libs/libXtst:0
-	x11-libs/libX11:0
-	x11-libs/cairo:0
-	virtual/libintl:0
-	!gtk3? (
-		x11-libs/gtk+:2
-		x11-libs/libwnck:1
-	)
-	gtk3? (
-		x11-libs/gtk+:3
-		x11-libs/libwnck:3
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	x11-proto/xproto:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0)
-}
diff --git a/mate-extra/mate-netbook/mate-netbook-1.16.2.ebuild b/mate-extra/mate-netbook/mate-netbook-1.16.2.ebuild
new file mode 100644
index 000000000000..e984a66a9d39
--- /dev/null
+++ b/mate-extra/mate-netbook/mate-netbook-1.16.2.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE utilities for netbooks"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE="gtk3"
+
+COMMON_DEPEND="
+	>=dev-libs/glib-2.36:2
+	>=mate-base/mate-panel-1.8[gtk3(-)=]
+	x11-libs/libfakekey:0
+	x11-libs/libXtst:0
+	x11-libs/libX11:0
+	x11-libs/cairo:0
+	virtual/libintl:0
+	!gtk3? (
+		x11-libs/gtk+:2
+		x11-libs/libwnck:1
+	)
+	gtk3? (
+		x11-libs/gtk+:3
+		x11-libs/libwnck:3
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0)
+}
diff --git a/mate-extra/mate-power-manager/Manifest b/mate-extra/mate-power-manager/Manifest
index bb8a3bcfdfa3..2f0020a49c2d 100644
--- a/mate-extra/mate-power-manager/Manifest
+++ b/mate-extra/mate-power-manager/Manifest
@@ -1,9 +1,9 @@
 DIST mate-power-manager-1.12.1.tar.xz 3197824 BLAKE2B 17f2f7939bfd0cfce433253ca8d4af6c7b98d850aed2c705650ef33e09d01f0f33107612ffbeca0a07a333e31ce736786e1638e32681fef49c95691a67e33290 SHA512 60da8ab6988a4bbef363fcf4571260bc7f70ed90badf85e4233e6ed80cfc13446319bd8686ed6d4bf9752971a6f98021a5d0354e3aa7f9274b6fdbc8f9f920b4
 DIST mate-power-manager-1.14.0.tar.xz 3221144 BLAKE2B c8bf7f263f3c7388cf937bb40d81d016e5e8e227d503c7828029f1d52c48edfeb6d5a9c666c45d752edf26798f69e27199ac6221a0a8a6b84c0a1cf12e216a45 SHA512 b1e6c5c0fe18b8e5d70ad66af450e86e7cf9fd5429973907618a742093fa9dec0c137e598f766824cb092d7c8c90a6d7116bc6b0417c81320dc21f8426d1eae2
-DIST mate-power-manager-1.16.0.tar.xz 3178780 BLAKE2B 6ea247e560fbf4ba98423b9680af9c74b03f3cf601d7eb99ba56f00e660af9d1fe787c87255024d43c3aa0eeae4834c93099a76fd30468103c1c2977bd547add SHA512 c05edf0a28e9ba5aa84f8d8f2280a08c0214e03eede4701e3292747a242dd7a120078955348121faa9b68a5cc8d7601ff3d94f52ed13b918421c7b18fe028970
+DIST mate-power-manager-1.16.2.tar.xz 3197208 BLAKE2B 80b84f596f3dad097508a2bc155f77ce7858699a8e7f5ed9460934b4f949bed9708b073722a6f680ec2e81f88c44c5db8c252b2b83f8706bccc8c9bad10503ea SHA512 8b5c3141d5e9dde771188ef7fed27073efbe7bfa7c244e3fb97fd2e0cf2e964ed6fcf587f003b3c090267ab0bf77e908eba44038e1b98cbb8d275bde0c08df09
 DIST mate-power-manager-1.18.0.tar.xz 3180036 BLAKE2B 45689fa3613824c88c8c3966e0c41b9e0326140145814d45075facd0b5d96e38feff6453e906111ed8b892fd4466975df248b54102fbccb368f0575c38e5b5a3 SHA512 dabd0d6757171ce0556d65c8d2c4234a8fd7ab4e191caf45447d0797d779a83f23538c96b36d1f959f5fcb63e2305cd3ede6cb13d504e59a2daaf1e75e5a7bd1
 EBUILD mate-power-manager-1.12.1-r2.ebuild 2186 BLAKE2B b302bd0b96c33540d406ae4f91cc18b6efc2b990878fbcdc8674e0f5e7f2059071c293c2bfeecb1187bfc09de2b93c9372c64f573bd7906ce0b4704695c5604a SHA512 42f53a627a9eb59922cdfb2ed61fa211c14c62da24a4ee7ab9d85570cb6d49c5c2348cd376480078945b9edff1ab9058968c513dfc45cc57283f6befee832178
 EBUILD mate-power-manager-1.14.0.ebuild 2188 BLAKE2B e18c0afa235a5efcc43b0efc246b3e381cb217ac07cf443c9d97f2cbf4a18c05d90783b3279ee0b9ca06a0cf84e0f1c173b898cf93486132649b120148720714 SHA512 8c83126c850a967e3a86db7094081adb097c5605011249ef46b2fdb801814900dfe741eebdb536bdd9de3e089a769b72d4bed484b8b8bbeb39fafd70266eb5af
-EBUILD mate-power-manager-1.16.0.ebuild 2121 BLAKE2B 9f3de7bba75741c391c1ca288de84a7012d8497b0fa1974bfb031bb1095f2ae9a8ca441a271d10a26ef3a8b072948aef35ed63d86de4e6c63661f05db31b7e4c SHA512 9d2e1cdd6b60ec9b03b557982ee44c265d78f193dfa724afb2815b7a04f8b5d1a03f186b4ad960506d5b1ebf7a71b2f5b8c2106e45f4d1c934af40d623e687f2
+EBUILD mate-power-manager-1.16.2.ebuild 2121 BLAKE2B e41ad9fad1605b8830f04cbd400f64477a74e4959e165f9efdb48a2fc59aa0ae3f6945778a897edd09258120eb31a1fc6d045b9a9460c1335067f8ced0dfd2e8 SHA512 9ac67b7d61588ef576caf29aef94e2f1151bf083426195a0be74ea97d7e5754a21e02d7f9c556896c329be4b738458b407b5d3b532eb06137f78360016df9303
 EBUILD mate-power-manager-1.18.0.ebuild 1635 BLAKE2B 0efa2d332a8d9a486cdefc4cca2e96bf134b52e2f5fec88da9a14bc26e08d88de3a379a1165b4432580c8c1ec70def515da5cd6b56375be8aa60cc6e6d6ddeaa SHA512 723ad407148031dd00f6f76138ae6916ee6acc0f423e777ff54049b70b66d77a4de7b5ebe938dd7d3e124373ec0ae58712fffd7ab0249d8832a2742fbd189bfb
 MISC metadata.xml 697 BLAKE2B 37cf4e4380833f76e09a7da9f8c6d3d4ddc73aa0d481e9211a2f81ac16ed3978f49fda5511fc5b2c40618c6f06f5a324710ef9e8e9ca0c986d0e4e8905b037ca SHA512 bb4229159bc69879bf967fc082846e75e905ad7fcc772e70de1f3f2cd58117089d7d339903ea44adee01966b1aa04db8192c67b0021196a5fd56f78610a51399
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.16.0.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.16.0.ebuild
deleted file mode 100644
index 5a16f8e82080..000000000000
--- a/mate-extra/mate-power-manager/mate-power-manager-1.16.0.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+applet gnome-keyring gtk3 man pm-utils policykit test"
-
-# Interactive testsuite.
-RESTRICT="test"
-
-COMMON_DEPEND=">=dev-libs/dbus-glib-0.70:0
-	>=dev-libs/glib-2.36:2
-	>=sys-apps/dbus-1:0
-	>=x11-apps/xrandr-1.3:0
-	>=x11-libs/cairo-1:0
-	>=x11-libs/gdk-pixbuf-2.11:2
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/libXrandr:0
-	>=x11-libs/libnotify-0.7:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
-	!gtk3? (
-		>=dev-libs/libunique-1:1
-		>=media-libs/libcanberra-0.10:0[gtk]
-		>=x11-libs/gtk+-2.24:2
-	)
-	gtk3? (
-		>=media-libs/libcanberra-0.10:0[gtk3]
-		>=x11-libs/gtk+-3.0:3
-	)
-	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
-	!pm-utils? ( >=sys-power/upower-0.9.23:= )"
-
-RDEPEND="${COMMON_DEPEND}
-	policykit? ( >=mate-extra/mate-polkit-1.6 )"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/docbook-xml-dtd:4.3
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	x11-proto/randrproto:0
-	>=x11-proto/xproto-7.0.15:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*
-	man? ( app-text/docbook-sgml-utils:0
-		>=app-text/docbook-sgml-dtd-4.3 )"
-
-src_prepare() {
-	mate_src_prepare
-
-	# This needs to be after eautoreconf to prevent problems like bug #356277
-	# Remove the docbook2man rules here since it's not handled by a proper
-	# parameter in configure.in.
-	if ! use man; then
-		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
-			|| die "docbook sed failed"
-	fi
-}
-
-src_configure() {
-	mate_src_configure \
-		--enable-compile-warnings=minimum \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with gnome-keyring keyring) \
-		$(use_enable applet applets) \
-		$(use_enable test tests)
-}
-
-src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS
-
-	dbus-launch Xemake check || die "Test phase failed"
-}
diff --git a/mate-extra/mate-power-manager/mate-power-manager-1.16.2.ebuild b/mate-extra/mate-power-manager/mate-power-manager-1.16.2.ebuild
new file mode 100644
index 000000000000..fa4762e71ada
--- /dev/null
+++ b/mate-extra/mate-power-manager/mate-power-manager-1.16.2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="A session daemon for MATE that makes it easy to manage your laptop or desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+applet gnome-keyring gtk3 man pm-utils policykit test"
+
+# Interactive testsuite.
+RESTRICT="test"
+
+COMMON_DEPEND=">=dev-libs/dbus-glib-0.70:0
+	>=dev-libs/glib-2.36:2
+	>=sys-apps/dbus-1:0
+	>=x11-apps/xrandr-1.3:0
+	>=x11-libs/cairo-1:0
+	>=x11-libs/gdk-pixbuf-2.11:2
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/libXrandr:0
+	>=x11-libs/libnotify-0.7:0
+	x11-libs/pango:0
+	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 )
+	!gtk3? (
+		>=dev-libs/libunique-1:1
+		>=media-libs/libcanberra-0.10:0[gtk]
+		>=x11-libs/gtk+-2.24:2
+	)
+	gtk3? (
+		>=media-libs/libcanberra-0.10:0[gtk3]
+		>=x11-libs/gtk+-3.0:3
+	)
+	pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 )
+	!pm-utils? ( >=sys-power/upower-0.9.23:= )"
+
+RDEPEND="${COMMON_DEPEND}
+	policykit? ( >=mate-extra/mate-polkit-1.6 )"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.3
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	x11-proto/randrproto:0
+	>=x11-proto/xproto-7.0.15:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*
+	man? ( app-text/docbook-sgml-utils:0
+		>=app-text/docbook-sgml-dtd-4.3 )"
+
+src_prepare() {
+	mate_src_prepare
+
+	# This needs to be after eautoreconf to prevent problems like bug #356277
+	# Remove the docbook2man rules here since it's not handled by a proper
+	# parameter in configure.in.
+	if ! use man; then
+		sed -e 's:@HAVE_DOCBOOK2MAN_TRUE@.*::' -i man/Makefile.in \
+			|| die "docbook sed failed"
+	fi
+}
+
+src_configure() {
+	mate_src_configure \
+		--enable-compile-warnings=minimum \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with gnome-keyring keyring) \
+		$(use_enable applet applets) \
+		$(use_enable test tests)
+}
+
+src_test() {
+	unset DBUS_SESSION_BUS_ADDRESS
+
+	dbus-launch Xemake check || die "Test phase failed"
+}
diff --git a/mate-extra/mate-screensaver/Manifest b/mate-extra/mate-screensaver/Manifest
index 5c1b3aef9173..2bb6024aaf38 100644
--- a/mate-extra/mate-screensaver/Manifest
+++ b/mate-extra/mate-screensaver/Manifest
@@ -1,10 +1,10 @@
 AUX xss-conversion.txt 1026 BLAKE2B 4675ecb7d7ce45b28183ff503739b5d3853e8a68adfb8e4bf92274944c034d4f043c8854cc54a801ad72160bf452c645dfc5a0d35a71b967c9094f2a8464e59a SHA512 149d28bf7ff9dffe75f0a59408d91eff6537ec27a9457bf2419efe78e9b39a11796b341176e6ba4b1a183cc3ead080abe0ba85f51a3d57b0ff54dae8a3ec312a
 DIST mate-screensaver-1.12.0.tar.xz 4868924 BLAKE2B b523e18eed64c7f4521e6ac5fb656479fc9ac15652ca6bb5a832b66944a52ac429bb9dcc73a6ac50fda49fc2ba22beda0ad3e58a7b5e44d96282066ab7d1a151 SHA512 01bdef496560eb8e9118b0ff66863568aaa6df872e7947d0a92fe9fcb1d305618b28928ea95c65a3367e3e4e79e9bdab7a8266287c8e3db2a5210b955d412c8d
 DIST mate-screensaver-1.14.1.tar.xz 4912772 BLAKE2B b317bd9e40d423fc16ec53966a5ca813dd07f250bee171dbbd351bfa14d33f4b28a2c98e71311903eea607c7059c75c12d38b09d91c55a13052bbe5026b46eec SHA512 28b5834450da9d7d2fd3a77504f244e69212e751435bd41a957f30a5231db312dba37ee39442c63a40098bb3d1e1fade81ea423f9d59b29fc5d1201522d1d8f8
-DIST mate-screensaver-1.16.0.tar.xz 4918240 BLAKE2B 2624428e91051527dd568509dce64bfbcaa3499756dfbe4f517fe2524b30e24b73af2840f16c4ca7b24cf682a39ca4eeadf4b6be7501cba1d0c056f4a82137d4 SHA512 e25d654ce4090108a0d1c38c3a7d7315c3c3b6226f694ad1833c6d2d26c6682bf52450809b33c75b1276c3ad6cbfe709df44556cdc9a0c2e7faa66373efcdc9d
+DIST mate-screensaver-1.16.1.tar.xz 4916316 BLAKE2B 0918082568752c52f8e03f52c8423f6d053327868eebca77615e22fcb5bab1225f0cbccdad2f66ec01325ba3b67fa67db617509855a27618be71e8cd9f76d60c SHA512 ac481226ccec9a2785321ecc18ef3ed7ec188ba3fcb6e31515bca97b86b68955b1b1e08d4f72dbb683552877240e2f294b48af6bdea36f23d39a0853e1620085
 DIST mate-screensaver-1.18.1.tar.xz 4923504 BLAKE2B 67b5abc8a42938897e60d9b5efafaa23a14c14cbb002d8693295582f2f7884f203b53019683ae47bb0c7ad8d83d05277ff619fdb3229b359e91cdf6de58f9eca SHA512 6e41a44e0d12af6080e69461a86b66b8ac4696dcf2b140d8e31b07945f4ac8848c872e9b1c07a6cf706042d3254567848c177a726038a862514471104242e807
 EBUILD mate-screensaver-1.12.0-r1.ebuild 3161 BLAKE2B d674b38d726062f2e0fa405d2c6a0a18a54b771bcb76c6cb8c0800f651014386837d8f9bec38e8c57b9bc6a8d8cd59e9144b859e546aef347ef3d458a8eaf203 SHA512 98d6bbb3cb567947fb72c9f6f4c701efde4ca0221b2d67b1e07f6ff1bb33cda88d2499605314210d7e44ecef3684a4efcd330cd1fe773524aca2509a36479e50
 EBUILD mate-screensaver-1.14.1.ebuild 3203 BLAKE2B f9996e9aad5ca709f98f17e26d405fa5892c56ca6d07340fc5197d45c7b4ae4526635b5c890efe494c7d756b0455eb045b37d9bd974a77e0ff36e2af4ef14dcb SHA512 3a5e247804609e8b670680188789909c324182416dc7902db724ab265d86784d3f5ec89dc5b323a08e46b73bc976684f1f81e258c10ce974a678764ef9c7c1e6
-EBUILD mate-screensaver-1.16.0.ebuild 3203 BLAKE2B f9996e9aad5ca709f98f17e26d405fa5892c56ca6d07340fc5197d45c7b4ae4526635b5c890efe494c7d756b0455eb045b37d9bd974a77e0ff36e2af4ef14dcb SHA512 3a5e247804609e8b670680188789909c324182416dc7902db724ab265d86784d3f5ec89dc5b323a08e46b73bc976684f1f81e258c10ce974a678764ef9c7c1e6
+EBUILD mate-screensaver-1.16.1.ebuild 3203 BLAKE2B f9996e9aad5ca709f98f17e26d405fa5892c56ca6d07340fc5197d45c7b4ae4526635b5c890efe494c7d756b0455eb045b37d9bd974a77e0ff36e2af4ef14dcb SHA512 3a5e247804609e8b670680188789909c324182416dc7902db724ab265d86784d3f5ec89dc5b323a08e46b73bc976684f1f81e258c10ce974a678764ef9c7c1e6
 EBUILD mate-screensaver-1.18.1.ebuild 3110 BLAKE2B 1e4ffa41e1213aa14a1df4a692d9ab7801adc7e99be691b93eb24806bbdfb3ac3cacd5537200ef3e973978816b865a194544e56c4f57cb95362ed693ba134d90 SHA512 2c6597c0b5737a256d5dbe7295c6537ac65ac87ef6a7192d2c0d89526fa4e256bbc6843e5b17760172d6000ab0b160f4f2fa604cba913302a7050a054f560ae6
 MISC metadata.xml 508 BLAKE2B 0e4b0470e1a7c5259930d95e36a39314b708d0f9ae46e761fbbc03b6d4594e792f8f894f92787474097bdf012f561ae4952116189b2cf6d1ac982b72eb7d5527 SHA512 03f079381cf35a7c0d33ec93f9aba9e8924dd010e1d67ea64508d1fca59fe56685ccc06b2a721006c1144e16a217b32156b67205c9ee8e8d39410406612cc3e2
diff --git a/mate-extra/mate-screensaver/mate-screensaver-1.16.0.ebuild b/mate-extra/mate-screensaver/mate-screensaver-1.16.1.ebuild
index 4bedd8f149c9..4bedd8f149c9 100644
--- a/mate-extra/mate-screensaver/mate-screensaver-1.16.0.ebuild
+++ b/mate-extra/mate-screensaver/mate-screensaver-1.16.1.ebuild
diff --git a/mate-extra/mate-sensors-applet/Manifest b/mate-extra/mate-sensors-applet/Manifest
index 65f8221f9bdd..98881fa89904 100644
--- a/mate-extra/mate-sensors-applet/Manifest
+++ b/mate-extra/mate-sensors-applet/Manifest
@@ -1,9 +1,9 @@
 DIST mate-sensors-applet-1.12.1.tar.xz 369492 BLAKE2B cdc0bc46639e5234c9ed37cbd62b9439e1dbf1da9d2b377c57502d370e1f6e19a87e307c00a9bfbcde32812fde2804d3c248805f55dcb29b70d10cd38ca08210 SHA512 2e96708e4e27d545b0ad010dbd04139c5d340be1138236ba1197c2cf16486005905264e381f8dde75ea6c23c29bd1a0dd03afb5726340cad718d06914d4dd994
 DIST mate-sensors-applet-1.14.0.tar.xz 389960 BLAKE2B e220374ac5e56fb0e5fc86c036dd49f509def048421903597d82df8a14ed8877586282880419d168d1319fc05d890f6ffd61cdc49622d53f9dc5d4d51e82332a SHA512 8d1afdb491e3a4a72dbee098ff3383a9562ab47da81d68807cb1fe72ee9f2ccad31cbe355268d7641fc213dcabf8a4527f03e04c4d8a166584730e934f006f5f
-DIST mate-sensors-applet-1.16.0.tar.xz 393436 BLAKE2B 970cc13e9d08ff76db0e333df17e8f95b798c3538b90b30c43f89c4364b834c8409be7a2c77913c692440ea543dc2e619a715c3d29ac85279f7201515aaab32d SHA512 7fef6e9ef7ef9d4596e0e58217c600a1a800cc483cede875ed60316dda5a51bc98746b4e2a6d650ada8bb3438ab8fc4f7cc451c552df54191152d66e7a7da34a
+DIST mate-sensors-applet-1.16.1.tar.xz 393360 BLAKE2B 01afa10059a94bcedb0af497203f481dba2fcbf9b9633b3c69ecd1d28ac8894159abc8e26ef61de7ffcfa62d51d7d651adf73f53850b4fe7446aa8b56dadfbd2 SHA512 35ea60f7f63b636dc8d8f6fa6f9a8fac516cea6e3005eaaf715f3f5bc3d03f1d04f24fe9f5bbba3edea41498efaa78fdec085f63d1940bc1265e0b1d70da62cc
 DIST mate-sensors-applet-1.18.2.tar.xz 397340 BLAKE2B 1885592426eb1e66a4fd1959088629918ce9a6813081283164e5e53d3a5ec84d84c41453404d865412ba9b3c362f464bb4e7dccd09b2c58258ff9c19adacd71b SHA512 67a998b20924d81490fe7f63f64ceace8298e58a7cf8b8f565f9604b1c063e3cfdf331c6bb6436f5631465bcbf2095c2b9877edeeebb5edb24f93109c50d0245
 EBUILD mate-sensors-applet-1.12.1.ebuild 1508 BLAKE2B e68ffc6abfd064d9e7a9ead780b581a07085344b317eb0e7c1bdd42218f876392a3ad28e37b56155c9eb30aab83b9a7396912dac7557564cf97780fe551bb05b SHA512 4e5ad947d984975d3915a46150ab450fb932dbb69a92a26170c73f876d6f8d55b3e257f1adfef4c9c53e7699ada8d3e4d8336cc220d7ed970554550991c31287
 EBUILD mate-sensors-applet-1.14.0.ebuild 1550 BLAKE2B 273d425daeffebc84c5780c5c829eb2b429849f6e7eb33ecdd7a2bad3a4a312923df2b1383d0d961bdd12d9084acc091fa91b2932fba16018e62e10deb0f0a72 SHA512 2f216c9e421e42899eb6f7b8646fb56352d9b6589decdcaf8453277b76ad074877871112888d60f97c4fb589a5d5568924207693d235fa07e3253fec66686dc7
-EBUILD mate-sensors-applet-1.16.0.ebuild 1550 BLAKE2B 273d425daeffebc84c5780c5c829eb2b429849f6e7eb33ecdd7a2bad3a4a312923df2b1383d0d961bdd12d9084acc091fa91b2932fba16018e62e10deb0f0a72 SHA512 2f216c9e421e42899eb6f7b8646fb56352d9b6589decdcaf8453277b76ad074877871112888d60f97c4fb589a5d5568924207693d235fa07e3253fec66686dc7
+EBUILD mate-sensors-applet-1.16.1.ebuild 1550 BLAKE2B d4d58b9c33f4a609150fb9badaacd8a78e0b1da5b8f6f45f0057137bc4435fa8a49f8c8ec1d505f85b63b6fedfa18bbcd0b0c80f353183acf64e9979a2c0dac7 SHA512 dd0e5257ba32bff392dee3b50c00ba3c49c756d378eeefc7bc1959bddb319013510e47a04d2cf749e0d22c95b661dd3c9744def4ab9df4d579fb67b61e2fb82e
 EBUILD mate-sensors-applet-1.18.2.ebuild 1458 BLAKE2B 860d5b94c6d59361a51b5d3b05594a3e94a05ff04caabfd9ef5acd609013a9f1a7e897d78afc4313df613a3d683a0ebd3de5016221b0be3e25ca00412cc37d0e SHA512 bf10cdef40fdd6c8f855099d4b049747e0c2a1bef99b3d65df8e99808b4f4ae626999aee70ae8d521a62ca08e78fa8ac486f39289bf62128b23e16949ec63fed
 MISC metadata.xml 424 BLAKE2B 4f531e8f367a68662eb43f995f304b74661ccd2dc00870128252e8cda1a21b5c9b659b2ab32e6a0cc4066243dd724c7ce2b853dbf07234b27aa0a776a4d539ef SHA512 1bcb907fe8786f507b01dcc94309761ed2dba978ee0176d482c461c610b8b2e9876e29be1d0a3b36962ab9a7edd7e505c50851aafdb22e2bdc3588afb4aeaccb
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.16.0.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.16.0.ebuild
deleted file mode 100644
index 4e3e5391b775..000000000000
--- a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.16.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE panel applet to display readings from hardware sensors"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="+dbus gtk3 hddtemp libnotify lm_sensors video_cards_nvidia"
-
-COMMON_DEPEND=">=dev-libs/glib-2.36:2
-	>=mate-base/mate-panel-1.6[gtk3(-)=]
-	>=x11-libs/cairo-1.0.4:0
-	x11-libs/gdk-pixbuf:2
-	virtual/libintl:0
-	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
-	gtk3? ( >=x11-libs/gtk+-3.0:3 )
-	hddtemp? (
-		dbus? (
-			>=dev-libs/dbus-glib-0.80:0
-			>=dev-libs/libatasmart-0.16:0 )
-		!dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) )
-	libnotify? ( >=x11-libs/libnotify-0.7:0 )
-	lm_sensors? ( sys-apps/lm_sensors:0 )
-	video_cards_nvidia? ( || (
-		>=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
-		media-video/nvidia-settings:0
-	) )"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )"
-
-src_configure() {
-	local udisks
-
-	if use hddtemp && use dbus; then
-		udisks="--enable-udisks"
-	else
-		udisks="--disable-udisks"
-	fi
-
-	mate_src_configure \
-		--disable-static \
-		--without-aticonfig \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable libnotify) \
-		$(use_with lm_sensors libsensors) \
-		$(use_with video_cards_nvidia nvidia) \
-		${udisks}
-}
diff --git a/mate-extra/mate-sensors-applet/mate-sensors-applet-1.16.1.ebuild b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.16.1.ebuild
new file mode 100644
index 000000000000..caab01e9f30e
--- /dev/null
+++ b/mate-extra/mate-sensors-applet/mate-sensors-applet-1.16.1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE panel applet to display readings from hardware sensors"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="+dbus gtk3 hddtemp libnotify lm_sensors video_cards_nvidia"
+
+COMMON_DEPEND=">=dev-libs/glib-2.36:2
+	>=mate-base/mate-panel-1.6[gtk3(-)=]
+	>=x11-libs/cairo-1.0.4:0
+	x11-libs/gdk-pixbuf:2
+	virtual/libintl:0
+	!gtk3? ( >=x11-libs/gtk+-2.24:2 )
+	gtk3? ( >=x11-libs/gtk+-3.0:3 )
+	hddtemp? (
+		dbus? (
+			>=dev-libs/dbus-glib-0.80:0
+			>=dev-libs/libatasmart-0.16:0 )
+		!dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) )
+	libnotify? ( >=x11-libs/libnotify-0.7:0 )
+	lm_sensors? ( sys-apps/lm_sensors:0 )
+	video_cards_nvidia? ( || (
+		>=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools]
+		media-video/nvidia-settings:0
+	) )"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+PDEPEND="hddtemp? ( dbus? ( sys-fs/udisks:0 ) )"
+
+src_configure() {
+	local udisks
+
+	if use hddtemp && use dbus; then
+		udisks="--enable-udisks"
+	else
+		udisks="--disable-udisks"
+	fi
+
+	mate_src_configure \
+		--disable-static \
+		--without-aticonfig \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable libnotify) \
+		$(use_with lm_sensors libsensors) \
+		$(use_with video_cards_nvidia nvidia) \
+		${udisks}
+}
diff --git a/mate-extra/mate-utils/Manifest b/mate-extra/mate-utils/Manifest
index 344c69578095..e94d2c3e0c7e 100644
--- a/mate-extra/mate-utils/Manifest
+++ b/mate-extra/mate-utils/Manifest
@@ -1,10 +1,10 @@
 AUX mate-utils-1.12.0-dict-gtk3.patch 1780 BLAKE2B 9f852c4531437a1868d69f7b62b7dbe0b21283fd7446262cb329f882e71297b46e62b2da3f825b61c10ad1fb116084ceb9da399b2d608b9b8f7e5e20ede84153 SHA512 758eb7b3734852553df9a7c064370241ab3c3b1ba6eaf56a28021ebd7c61b92f1b4c354d4ef05d6647d3549ca518e9c576bd478c6dbcd96bed818dc63522ad7a
 DIST mate-utils-1.12.0.tar.xz 6482900 BLAKE2B a9922a2cd4cb15f5d561c4e07528c265ef759f65fc306490a8f1aebbfd077ece481c6d69485c7df639611b61cbe9ab2789cccd32edc2800be36429718526acca SHA512 fe1db5c04b3adc616fdd0f76ddfb1291bbbfb6fb7d2f9ab11c5ffc33e19e0487ba3581babdfe74dd64553fd07f7d986fbac08fe2b14bcb79fca315e365069e47
 DIST mate-utils-1.14.1.tar.xz 6498448 BLAKE2B 21809b5bfe4e624c9aaafeda2f161acbd5648b237d013ba4098c8a421dcb22e474caeac5148e3b902e9f869655928a619d5282957d508856f909592944881125 SHA512 7c95fe390f83ee90405929025039ccef186ebf268f85e45a0dda0483b5de9bb67a6d3bbbe1a55315787996118c6bdf6a4fb29ad7236428eef89750c058b886e4
-DIST mate-utils-1.16.0.tar.xz 6502040 BLAKE2B a87a1fde570a0c37c1a563914d271702c2ae8507d45641981418d48e71ce9c1aee214132586454c3f7ddbd201431ba6b1e388c88e3d55e0a1b895fde58a3fd6a SHA512 a12883b732b0ac597c28c45609bde6fdf86369a3a00a16619617ec3834465fe85e83c4872a84a20d9d9a734c8180eae7e730f7cdfb4a6a41fdd14c59f607cacb
+DIST mate-utils-1.16.1.tar.xz 6517092 BLAKE2B 3a9fa4b12d29038872a90841eff36310aeac2834797ad8b4a1cde41c97b4c1f815546a379028ba4559c3dbaf4f6aa91102fd0b80418a0f60d9501da2b7915dbb SHA512 d902362b23b8b26377fa6741e8b96230ee224ef6dc9c4b02dc50e6bd43d87a28c266d2a1bb9c4c7be48cc43162988240257be40a4fb8b7f2569a2520f35b7aa0
 DIST mate-utils-1.18.2.tar.xz 6442576 BLAKE2B bb146bdae4a9579fe700751679ef10efe149df9b4e6c27df67e88137c664a674e052cebb6c8af137bb2fd1da8f8b15b3e754c884c74aa81a6ab35f7d7e54e447 SHA512 4db4dd0ad986c52978a9fe7f893a0e1d8086b1685d8b162df9b7e7b33c9d8e47a85efc45f2db4cf45058cc91df3f909ece1b44e46c16a1a389070d8cd022348d
 EBUILD mate-utils-1.12.0-r2.ebuild 1442 BLAKE2B 393d0e6174ed7e22e1258d1e82e17ed108d4d803a34b460c278eff2640c8bd91cf3c3560649df3ceeba6bb7265b951e6dc56fc9ea370a26af686a69b9c394981 SHA512 6c043d0124bb98c69c073aa7d8f67ef0f1c131971f0b0c82c26083b01b6517ff7c21a5a2155c8f3c8f2f10bddc6f6ef3c5d9011e9425aab0c8b8cfd3a9458b6c
 EBUILD mate-utils-1.14.1.ebuild 1438 BLAKE2B 2b61060624fe937d566036f776d475af7cbbfa5f4dd9cfe1d8cc154a2ab49dd9639509cc60186fa71bba6d34e9c70c6707f75696bbae7c3bfa231c6e49de8cd9 SHA512 bc81e418c63e0c136dcbfc7efd381b9654f565e6a8ee7f8c8d84b97c740d57570a889208cad948409ba13751e77e5432a4cc832a6a1b6c8f5b90d64d713561b9
-EBUILD mate-utils-1.16.0.ebuild 1438 BLAKE2B 2b61060624fe937d566036f776d475af7cbbfa5f4dd9cfe1d8cc154a2ab49dd9639509cc60186fa71bba6d34e9c70c6707f75696bbae7c3bfa231c6e49de8cd9 SHA512 bc81e418c63e0c136dcbfc7efd381b9654f565e6a8ee7f8c8d84b97c740d57570a889208cad948409ba13751e77e5432a4cc832a6a1b6c8f5b90d64d713561b9
+EBUILD mate-utils-1.16.1.ebuild 1438 BLAKE2B a1fc00e2774468ec36b051608372eca86c663de38b87d52cd122653812d275bffdc12d887abcd8ca31d8faa3795fd23448edafa722d0f87819fa142d6f0ffc30 SHA512 ff1a9de5cde45d092b94c89fda2a6afb08d4542a5f29048d3a5a2b2767aae8496a345cbf9792e037b3c7a3d338c8cc18ec747d0ae886b9c71752204556ceb2e9
 EBUILD mate-utils-1.18.2.ebuild 1308 BLAKE2B 2de5cfc62d664880b73dafec60acd95095a445947c0aa4cb3a6f87c53db212c3962e73404c5f40241ae432b8c38e36881db622aaedd1e911a450226d57ed3480 SHA512 1e190f69043b31326d3fe41aa9316a61b7ee002d3ed4288f0a095466df8cbb1f11a583b9a557b88b84ae0267890d38394ffc03abb5a27b7bca0e63c1baa9b49d
 MISC metadata.xml 478 BLAKE2B 2ed326f51a418eb5a2b3bed542f07e97107c3e1f8e1d438b4b757bf81ef34e5762b0ededcbd7474990ac6a6b07dfa58970b05bb1da5ebe2c629a2726534afc98 SHA512 129a8bac28360c9260eca2a8db8e23aa5cef92464905b730952f0508fc8057c12929f590b1f6c2d0dfa72687a2dd63e7300fa01a2b25fb9346add99544e10db9
diff --git a/mate-extra/mate-utils/mate-utils-1.16.0.ebuild b/mate-extra/mate-utils/mate-utils-1.16.0.ebuild
deleted file mode 100644
index 58b285e69de6..000000000000
--- a/mate-extra/mate-utils/mate-utils-1.16.0.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MATE_LA_PUNT="yes"
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="Utilities for the MATE desktop"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X applet debug gtk3 ipv6 test"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/libgtop-2.12:2=
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/libXext:0
-	x11-libs/pango:0
-	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
-	!gtk3? (
-		>=x11-libs/gtk+-2.24:2
-		>=media-libs/libcanberra-0.4:0[gtk]
-	)
-	gtk3? (
-		>=x11-libs/gtk+-3.0:3
-		>=media-libs/libcanberra-0.4:0[gtk3]
-	)"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	x11-proto/xextproto:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-src_prepare() {
-	# Make apps visible in all DEs.
-	LC_ALL=C find . -iname '*.desktop.in*' -exec \
-		sed -e '/OnlyShowIn/d' -i {} + || die
-
-	mate_src_prepare
-}
-
-src_configure() {
-	mate_src_configure \
-		--disable-maintainer-flags \
-		--enable-zlib \
-		--enable-debug=$(usex debug yes minimum) \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_with X x) \
-		$(use_enable applet gdict-applet) \
-		$(use_enable ipv6)
-}
diff --git a/mate-extra/mate-utils/mate-utils-1.16.1.ebuild b/mate-extra/mate-utils/mate-utils-1.16.1.ebuild
new file mode 100644
index 000000000000..0798d88b327c
--- /dev/null
+++ b/mate-extra/mate-utils/mate-utils-1.16.1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MATE_LA_PUNT="yes"
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="Utilities for the MATE desktop"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="X applet debug gtk3 ipv6 test"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=gnome-base/libgtop-2.12:2=
+	sys-libs/zlib:0
+	x11-libs/cairo:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/libXext:0
+	x11-libs/pango:0
+	applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] )
+	!gtk3? (
+		>=x11-libs/gtk+-2.24:2
+		>=media-libs/libcanberra-0.4:0[gtk]
+	)
+	gtk3? (
+		>=x11-libs/gtk+-3.0:3
+		>=media-libs/libcanberra-0.4:0[gtk3]
+	)"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	x11-proto/xextproto:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+src_prepare() {
+	# Make apps visible in all DEs.
+	LC_ALL=C find . -iname '*.desktop.in*' -exec \
+		sed -e '/OnlyShowIn/d' -i {} + || die
+
+	mate_src_prepare
+}
+
+src_configure() {
+	mate_src_configure \
+		--disable-maintainer-flags \
+		--enable-zlib \
+		--enable-debug=$(usex debug yes minimum) \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_with X x) \
+		$(use_enable applet gdict-applet) \
+		$(use_enable ipv6)
+}
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 929bfeebf67a..5ec4d6203f9c 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ditaa/Manifest b/media-gfx/ditaa/Manifest
index 92a89bed7029..7a979ef2fd81 100644
--- a/media-gfx/ditaa/Manifest
+++ b/media-gfx/ditaa/Manifest
@@ -1,3 +1,69 @@
+DIST apache-18.pom 15667 BLAKE2B ebe956b864cf02ad67caa9626a5644b6acdffec62a65930490754ba96d50807e9e8bedd502b15736263af515dfa6e3f685feeab653b08612971ecf63cefb75bd SHA512 9ef6f99b30fe2603ad8f2c88116072de36bd2dc99590fd9e7eecf153dbf50cbd766694d861e666138d2a26137be69fe98cc38a491f6a2a68e8d421d656731ed1
+DIST apache-3.pom 3430 BLAKE2B 58c252c7cc69cc1ea86c671586cbf4f5a406f4bcab5447e4faa6a415d1021efa652c377e240f46242593e1df187dafea0f1d6bd0e813d1da3d12796a6149a575 SHA512 2e07dc80988c9cc3ddef4d31dba266aa71f01f25e1e8bf541d3c538c8d7c9c19c7d3c8bcd2a7e19693da311d32911dd677fb4a44e48ceaae25d5ff91cc77bcf7
+DIST apache-4.pom 4495 BLAKE2B e5208233aa81d207235fc1667b607016b3da338f1ebff83867551b4b719606ae6a3cce0a3ca44edefeb79b2192656cadd584374a1f7161a0d128abca93e3d16b SHA512 866f80b02dcfa294fbc77dee0c14e019f5b9fd0d7cdf893c2269e93b17b9b6ac49af76ad30952e87b55c8ea5896d812842ff2f05c69a1553b6eebe0a11a5b4fc
+DIST apache-7.pom 14430 BLAKE2B 6a76bb9ad4723d026e51b826a9dc886b3491a6b42d175389c1178a0148a8275250aef924044cdc024986d7b4dc6c60861726f7fdca5b8e4286416329f2186b52 SHA512 99a60915e419d1c05d2bcc98dcf61b53d0216e99c7306fb40279993a48664352c59600d6947fe06dce4f524a72c4502b45a146be0742f7fddd7a3d76b177bebd
+DIST batik-anim-1.9.jar 478686 BLAKE2B 56aa12f8f7f9a0361a6d1ee394d003f74636d1eb3c228bf416a12504ba677c6d17b8cd668a0ec8a9a9e1e7d19168083506477c3b48300bae8ea5ff79067f375e SHA512 50702bd37c1877ba5e106e31baddecbbbe7fd961b9cee60fc1c7eb803f39f4fc117e37c2253623a573beb908405306a0adf341e5b40780e40168dd42681f602e
+DIST batik-anim-1.9.pom 4404 BLAKE2B ee9cc583a604b7c0af408c9ce3878887cd560f7d33e3f5c9920b014de9e38013b31164b9c7895c1140a6aad4b22abb5603fca55d60294942e4121751033e8894 SHA512 beddfe9568d845bb949cd3e6270dfc366e61d5c47ebfebcda0c01d39a0c1047967e27202a317cce43d8b1534179cc450c4a8e6c6d82d0261f4104aaa3c9fd34b
+DIST batik-awt-util-1.9.jar 421002 BLAKE2B 3321d019530567865ec7f791a09014d2e62e354dbb7ceabd31dc2fd3236756bb499fb892f13ac6b8e84844b99ac8bd7e8c258e63bf268b610012fec375f3749c SHA512 c1bbd632a8db688d1cf34eeb55e3785aa86c7ce6726ef84de217818ebd1dd3236b57025bf47046ba5d2fd9efd70b5aeca2b47d20fde977548ecc30e9e6dcd74d
+DIST batik-awt-util-1.9.pom 3189 BLAKE2B 83d96583d56234997726ed31581a245f08284f32fe042d973edc847a07fc2f8aa24672d5af4d63e7fc494a75b63ff38f70e87f1a541786015b558f61c41aba03 SHA512 a457cf97e2762c4a9d4ce11708991b0d4d7606d94bb978e5afd2e323667f98150b3a85e8bfa8d9bf974007962e8dad3a9642bc31d1ae1027f3b96b50a5be9f06
+DIST batik-bridge-1.9.jar 695031 BLAKE2B ff4258969486249c7c61a76bdfe7f9c6d80e2b4cb99d1e00c9787ddb27235d49e2eb006c26f9532e3a8cb9551fc199524a47a718cd7b46f78955e67d32b2625a SHA512 e3b0eda20a7df0560015d54f8ca0682e54e8337b74d2da256bc36ad7ef444af2428b13b87ef1c02b2648965457b082e124c3de387d7a224efa4ad901dea2655c
+DIST batik-bridge-1.9.pom 5154 BLAKE2B 336667be4ed0cc0fbe7b7d83f14c393d232eb446b7cfe6787e2b2f4790b16a89d20077652d6fe4bb7ec6a613bcd24b7ec565a8b657826441116c73feb2f5b91b SHA512 4521876016d25c6fe75f8f204328ab53bca97e87e9639224926d0681b4b20dd4b076dfd9cd48358e93c1109c4607743783c0edc258a222e353c462d9f96e330e
+DIST batik-codec-1.9.jar 111695 BLAKE2B ed4e2e623f536ba4a99cdcc08cfb943034cbeef96e805d961e5ec23fd0ec05c4c7a6943f7880c47033ddfbb64e97052b5663b422eb5f2762672b61e2ca06a087 SHA512 62b40070367e168e9fb608506e1149ea147c9ab8529679437f0e75a9a42aa3b4fc9355e2a3bb66f8fd0a0b5dd6c4ad56bcd8872f8d1846e3c59b508b9791e9aa
+DIST batik-codec-1.9.pom 3800 BLAKE2B d4f57dde7bae8159a14608226877cfd59a204d7bb86fdbeaf41058ce99a77d9829611e19d5147f12327357824eeff4385be049eb166a0a9cbeff66d603a47d05 SHA512 4749463adcbd1ba7f0d718920a7df34bfb4c03d1336d62ca52f0908aceca8e1a9abb7943a2823255880f29801260e5d77e30ef309380a524fdb49e2475c2519a
+DIST batik-constants-1.9.jar 8243 BLAKE2B 321d29c19e521d535cd14d428e88986063b0b5c0829409c2ab8657b760d9a0bf21cfaf613a1f91f5e0d08367784294e1e3dbc28b77423af8bf37c8017e2af313 SHA512 22661d26d5b3f71292e54d8d8a35063cc3e918cd2bc41cacfe25197ea0d50283d0cd704a142476857fd3c42f4df98e7530d767c3f8738c6cd8e34255fbd1b83d
+DIST batik-constants-1.9.pom 3004 BLAKE2B 01fedfe6ef7c580bf922fd365ade4b63013f19ca1a41ab3ad79a9903e6236104b4e27acde89aa70120874930798be38a7955e684c86d4c8d55be8041df118f8a SHA512 b3d0092c9de92fc9001464169e6295fb7a4d72510a961bf270cb1e5d447ac7d7d6500c6c3dfcbdb06386b8bdd18c3f10100e18eabaa80457df4abf1b33f08b78
+DIST batik-css-1.9.jar 324858 BLAKE2B e4dade4bf013b1a70ec1b9f2a21e8f681d9da8ee66bd39a792e2ccd9bb00d1f06effe8e3f2cb8332b61bb6f07ffe570963269790a09228cd611e2619a2d2382d SHA512 3a66f108eb4a86e8b6cb08b3f97a236285509022c6e7fc3f957541b70cbbbb75d718a4fea338c03a3a277a6ef82401a2b719f4067a3346eab1a5ae3d0df5a665
+DIST batik-css-1.9.pom 3630 BLAKE2B 1e9035b788769d95f3ddbb1e2c8ff7e967d9bbddf109ec670d87f3690bd26d513e7a2163cc54d9c28032d29e4ef94033a60a645c97670853598d87d72460a68a SHA512 a7e8736ccc71d5dd8bc6d1ff669a658f520c016f3e442ce9a7b975e051135c14f0a62c9e2c60e4e90257ce9e5628e848314405f6295dcfd93146ffa471432d97
+DIST batik-dom-1.9.jar 184081 BLAKE2B ef1b5dc6188192897e4202a5775ab9b5c83de7d98bb0ee4bfd723bfe2299fe79b74cf59a7aecd018fbf528a8b2422fa0b05993205adb29cbfa3d4b391c865618 SHA512 25c5a384ad15f8ac4dbfd791fe9e2c23029d2df8f4198ddcb3bb4594738c6cca5e0b4dc41c7883433cf25553f6cfce86e92000b70dd58c33dbaae779c7468132
+DIST batik-dom-1.9.pom 4068 BLAKE2B 84973793d1af933d8d58514c1d89f90a6783a41d4c7dd3b289d68b35226d5847aba1d799ecf83db47cb7458895197d8c0c07086c2a43af7729a3f9ed6d5f424b SHA512 4c651f06b8847e827b321297c6f6214243b4d48b7e4175b2eadc88a969e4eb93c9a8e8dc8dcc37d21c2b00f02b3b3a196be081cf808b3d0da6d40ffdaccdcaa0
+DIST batik-ext-1.9.jar 13018 BLAKE2B 141e559043c41d167216b75a1e6f0a94d8865f94e41b3c631e79dbcf5ae8c0025c92856c4e86cfe45f0376c30fcaa5b8da5566573876cefae3104d1dfb0effdd SHA512 471db357d2893e7e0669f18eed152855292dcb286292d251eefa52f22cd6330b3c24ca2713c95496d2e8e9e3b5108b8793ea6af7c37dd7937e585974945e6663
+DIST batik-ext-1.9.pom 3030 BLAKE2B 03381d4c07012dcc7c573de966f81aee871f1af6684ab9ab45aa72dbc896487d98426cde51ee71661146290415197467047550d6a40569e6e0754d2bed37d905 SHA512 0253b02c34ab22f6b03fd03c710e9f3cbfa65370bc5d304d734f1771d441e4548968c8dc9188f0c6f454bde88e9347fb852d5ae0cf0224e30a3d9013275315bc
+DIST batik-gvt-1.9.jar 190589 BLAKE2B eaaf9b58b8af3140986bcf67b15e1528c4b675e0c4c6548eabbbf0b779aae8e1b17b82e321798f1142c269e5619e62ae5ad65a9264e8885d0848cebe59a2625f SHA512 734a87015effce44fdb1c0593fbd9076618a2cee9289a2b32603e6b34f64c3d287971ba722d6fe0c1bd93dbcf39574e2a99dd108e73dc3edec424afe45627073
+DIST batik-gvt-1.9.pom 3355 BLAKE2B 8f422eff0bacdf9f702a695bc0782543a2b7162a7ab88e85de1f936f1e5c56773aac044dc9d8fa22b5cc0c3264e79357bf256732421e03318898a5a8ea4a063e SHA512 e837112a1fb5f4108df1c567cb51a8c43f0c93587da5db0b323633cd0bf036bc8a92a8122b186869d639ff4c1b27d3602ba2adbcf373ec0453d84c376f0a1b7e
+DIST batik-i18n-1.9.jar 11285 BLAKE2B 453e56509b2dde28e4332adcf33a0222767c27c7435b4c0dde62a4aa4b25ec56c91bb8aac8cc0cd8725bf9bf879594b3b69dd1aecc26587b6c7222a5a7b7d4e3 SHA512 a17d621efe9746d3b6ae57c93ce72d131c7c03c6e0229ac4e0deeec09124f38a0f5281674deff868cd242755aee8365a366b6e1aef36d4c9ba41e0264b7abcdf
+DIST batik-i18n-1.9.pom 2994 BLAKE2B adea4794a946b99ad0ef3f732cb64c69983ef6c29150f153413a51b4eba16f2024e55c1e0dc4551f1039b2cf87a50660b1570c0f7d6d0f87dece77ed98e76563 SHA512 6bea0363d4c307f35941536e80b6b0abc810f52ee5c8f3020d0224cb044903409d1a1e93a4f712d64b5948d79c842a8f722503a8adbaa42c965c3e0399675c95
+DIST batik-parser-1.9.jar 76381 BLAKE2B d86318822c1ea56199039e3039b8c217aa8bfae21d101506b5ef51101f2d992d4e73a000e8f1d285d5967cbcb88c418c1ed64cf33261c8188a7b9f179625c803 SHA512 9d481d4704912d6dfda6bba026cbeb323f78402f4e46e48806f74d9115258021afa50013a3055b333ebcfb90db979be58d8d695de3d33a99bea7676590c9af57
+DIST batik-parser-1.9.pom 3801 BLAKE2B 67417881ce8c73facdb7f799c6653650f92e865e01c1b63f85fe660411ac4e71800747836a7d1fedfd116b93160033d05a394e77202bf6b098222f220bb06545 SHA512 ceddfc00595f0c685a93f537a7c502a2d8bc8218b1014157089e4089f913dbe2bc88b1dfd1c673d0fad0a31cb82700014a44dad6840cadc3f0c7c0bad69b8321
+DIST batik-script-1.9.jar 25675 BLAKE2B 98e08ef3b28f658aec08a959f6a306a7c0fa4cfbe1710e165c0153d5614489c58043ecd9c934b9df53576a3605679e41824b679f01cfdf20d27877d7bb86c1c4 SHA512 5200f7f6de7a6beefb3542b8c011ddb2365c7a888af09459e53017cc4b27e2d1a27e1bee7654fd7c7157ba3602eaa511974ef798bcd1b847a5376c8ecabddc62
+DIST batik-script-1.9.pom 3495 BLAKE2B d9383d1910d5a732be915dbc60dcf6933c239bf101723ca1df333aecb1f33fea4c6eea3851b468075b72c53e54c32a59f5ef548c75ed8cc26d31193feb514eb5 SHA512 cda9ef5b35526748597003dff5ed4744a97e2f1b0e20cc40c5c7a3b44fad51fa0214dbd07b321640baa21630caff4278bdd842dcb91b66c567f12a70890f5566
+DIST batik-svg-dom-1.9.jar 232616 BLAKE2B 0a6b9aa93b727d4e2c78dd48882cc2755552bde6503d00abb10e7fd2ad05f7461e6853cbba291761fd9677ed7370e380973d9fb121982a1d4d749110841a25a1 SHA512 34154755f0c9012040c312ba4cac759195383343227796d40234a46c8c52e37bb99082201be96f9a24d300c2f6a1628e27cc3f9be3b337274c00b5250669a48d
+DIST batik-svg-dom-1.9.pom 4256 BLAKE2B 404f52a801b0989ea7379e9ad6dd974722a7affef742bf1db33f5c967f4005187f58a1deb1758dd86ac82bd49fba7ea304b75a07fe9a4cb8928430205b077f39 SHA512 e87146f8952f7c96a733c47889db9a2fb98647ed69732744e46a587ee71f3165e7b8167dca056444ccd635b8934b07dc273ae29206ca68a71dc75c4e95fa81b9
+DIST batik-svggen-1.9.jar 224365 BLAKE2B 451c46272114adf32f9827332b17e6d2302d5ca8e4a31bda72ee997b0c09abf21f5d5d4d9f429ddffbb074645149f9a53f86632db6298d1cc5ca5eee77d7347c SHA512 bc62f5aa887eb952fe040bff3beece433119f36f2d00a8b50ac345a7a6720e71050ad6bd3a75294bcff320fee93e5b5eb9004e9b0bca65ad4079376c2a66c933
+DIST batik-svggen-1.9.pom 3493 BLAKE2B ea177a10f11c8930dbd8e846880d892634428b3022460086d0a8d43ad5ce788ed4da2a45b750fa8ae4152d9dcbcad07e9a453a3b33ed248cab222c05ec3bc8e1 SHA512 9aa897d2b1dd2377969b210b78045fe1fdbdffaafe7e4df577324e8e76a74e99a245ae87a72b54a01954625408e993ca33b42ff8812f033b7511d676e7955710
+DIST batik-transcoder-1.9.jar 127932 BLAKE2B c28702487cf3af4449d8856ca6eb370d7bc6b5b5b635381c4b05d9b7fa3bdeb6dde06243421d10fb3df0f85bd9ce1e4406164f5a86b3ec94e07706680d4c2fc4 SHA512 8c1d9eb730c918655718a825b73f8fdc649848f73eda43c53370411cd0a295f9f42c0d4292d463e3fe93afb451b5b0b91fd8aa27001aa09148fb32c58353af11
+DIST batik-transcoder-1.9.pom 4569 BLAKE2B 87efe8e542dc1868b53d0e4ec3030c34fef6bd148f3cafc63e3db53becae163e84637ba963e09d801046746d40973d7ee671a06f01f885d9917d8c99e13e5cf3 SHA512 b4dfed7a535e4201d07fa25de261362236ef67164b717d2ed4ec72531a4f6e5134e42248932e9998d4721ef93356bbb95b00b6036a3b7c6290b42ed568c798d9
+DIST batik-util-1.9.jar 126821 BLAKE2B 1df3f66224299b8ebc43cba9e699ed55cf9e22df1b5ad56a6cdc8fd46b33780e1b064f99f40590aa09cb961a4b6f92f6a08b1b525db98cc29394a1726304cb8d SHA512 42ca50f24f9c50bf22066a15eb8c84bcd907596a0eb0eff7057b5845b62cee6efb8e4353d4f53a4805df2872ecbbc9df0259d8e25119dde757bb6264ae578d36
+DIST batik-util-1.9.pom 3346 BLAKE2B f34c4f5e414129a82b91556df9b3b8fef13f51e917419123d7a96656998a43b949c82704875cdeebd1b6ebdd63ffc1079382ec8c625626fc91dda1d8f263a440 SHA512 88a888a545c07484c5ca4e593e9a5f36291f116e811e46ad7faeea2a09b37d543674f5e2041f089f34b03db95eb35b373089485df446a8718a08a08aecc43d63
+DIST batik-xml-1.9.jar 33463 BLAKE2B dce3ce848545541fd59e334913dffb92330dba547c4aa1025ffcb1bf8288492dcf835a4112a8bc9575b71be64c8decefa4540477b6f4aff9de65d1296efcbb2a SHA512 1f867ad7b0c3e21a99221bd810d008de05241bfc4e9609a8477e0b3c482225ba1c6ac2cb35af667ac9aa9fcb50b65ad6b832176e3775738354c78766fdc754af
+DIST batik-xml-1.9.pom 3190 BLAKE2B 362d0f62c87aa1aba68fcea8df55c3edc3dc9453390c103d68c51301c0d0b471c5654bc31a8cdf3ac081c12a7f1328ea0d9336bc72ea9ce79319534b86e16160 SHA512 bef4f5700809854e4ab5e2e102b80f5f44c7445a29f933e7650475051c35625f42d3b1240628099eefff432b69a176ff0653609b75c3972ed78baecb2453c578
+DIST clojure-1.9.0.jar 3688794 BLAKE2B c73a947ed90b40d517d827d2045a9fb283370f1935e95dd78cdd054d7260770a9a0df77f0832b573733c0176493749a77409de5e74d3678cd4e752da7977a217 SHA512 7fdcc6fe280c44966cbe38b2758cacb3eadfade07eca9ce0a50bbf71129a6ce0e7b1959067f6b7f47500b30bdf7a68891e18600d5b1c2afc7288f0bbb330ec2f
+DIST clojure-1.9.0.pom 10055 BLAKE2B a6cafc7b7bb587f1661941f0c670c58f597941ac7d6f22b6a58366670436e25d89b1018f6770d0e51a7f894748860608965f24c29d0fcd11c7d12b68d1291e17 SHA512 29d6210fd67c5552b1d4d3afa628c40cbfb321b2663ca8d204ef1a488599054b0611f03c6ef184cf15c94fdafd4b971e4a1e9cf2f7f0d1341f801d98a008e7cb
+DIST commons-cli-1.4.jar 53820 BLAKE2B dcb5aa30dba82596277d165de51532a9e0027eb9c1d53946851068f7acaef68fae5c6431a1ef5a465f34ed51011ded904ec50325b29d2e4123b7ae02e5b6e36c SHA512 fa769a08a118141831cd4eaf2ce4f3f65855b8aeee86fbf3e07b4c619facf801f8b55c14c5e56a154cd14f438a8f120bb59a20c1b6be04979501e362f252ca48
+DIST commons-cli-1.4.pom 10703 BLAKE2B 7db04541681440803c6c005d6c387f56306bd856dbabb63198b9b5f4725b76728e8157a8f7403c8047dbeed43610b3b2da8b2ccfb63adacaf36057be29a5fddd SHA512 e741efb69fde4927207c0e7dd04d3a8a205977d0cd8f689f0c6b8cd9ced2efac9c8fa624147be6293afc12cb3d6de7c8e71d89cd5c0e3a44297d8f2d3f99eb16
+DIST commons-io-1.3.1.jar 83613 BLAKE2B 79b66de1e5b31d569cab66babc4f39da839a9e3db2325fe8cc3f28cb82e4af21c325fe85cdae417d478da81ea55550dfa21da194fcfa1a5e6b3411744948e6fc SHA512 fbefc32530253cc3fe5638da036a85567cdce9c9f748522725f58b349b07a37b474e16cec329b333b7f720e3c385a2ff7024d51d0a93bc26d201726f559e42f1
+DIST commons-io-1.3.1.pom 6780 BLAKE2B 32364b5890d451c4675f0e11eb6044dec71f61bb2f3e1091b7db1141dff48072ff54dc2a7d801af615bd933ce7cdbfcfcd71c640cc1e8e4a00c3449b54b1ecaa SHA512 6e188d384acb1107bac2ef674ae68b1c7eecd4c68336b4a636bf0b26ed41c6db635e9798b48ffce43cba946f89b215ac29333d88e661272f6507e8aaf8183a7b
+DIST commons-logging-1.0.4.jar 38015 BLAKE2B 6d3bab13b76ef2f9685928e15e09e430ace32a56b6a89f537119dea39f50f5f6a61df516469a22a4179a9c9decaaff7ba168155aa507443fb31e7d7b046d8146 SHA512 c8d2d39a60adcc49091d393daf30473d1776e4b6b09bb86639171f660833a17afbdc9f3e85843093535da16fa664cd7cd4ca38f54e141018dd1b78de681ad668
+DIST commons-logging-1.0.4.pom 5264 BLAKE2B 9043130bebbc9df98500cfdcde7dd38956525ebf1a42eacf40529ef0615ced6e04935ccb19a43b0d71bbd615487654a9fd2f3024da306a0ef27ef843be597598 SHA512 2c3ffa01e5640c24e7ffc9aae55dbfd3fb18c8fe43fe684e2568d4c96186beedb1a2278a03ed12440e9f6abd24e02d62ac7e6959829271395cf24c12ffaddfd8
+DIST commons-parent-42.pom 67956 BLAKE2B 9d00c017420c825a85584c18e15a080ba98eb166a7a62fd685b7e483d943436464c998d8469c699323718f9ef60305278da7bc5c2008009234ded1c2eca9813e SHA512 a35d1f7919551adbeada88d9f47a4d6de200380aa43266f91d4b65255120cbf4b11f73bb3f9b98eeb960fd9f1b0793dd48095b46270ed2376ce3b122861a94d6
+DIST core.specs.alpha-0.1.24.jar 4236 BLAKE2B c70795b7c1ae1959bca231b3294e26ef8c8dcd17bf8ee3b215165275ab47a983ac20492f7e74e78a715bdd4b1743a0c3bd0009c8cc111dfeb316de9330537616 SHA512 b4f5eee01da39914e6024dd529d1f72952d5a9dae65e1e41bf386b1e86a004a0d197b5be95aa70e7e8d6438c92b7fa8fc0c5039f2013e97c0b91c22d86fb7968
+DIST core.specs.alpha-0.1.24.pom 2845 BLAKE2B dcd50ffba6f33e8685cfadb748ea53a9faf31cf34498ce18be6e95512539e2ceed180e400fd1e3ac2adcf680656a23369f381033f777a41ed573c099e3f7aba1 SHA512 14965a5e65c000ba8fa4753be3246514f29c43eb1eaf120e967d6b85a59dd44611a91273f47663aba244fcf87dc53f34cfdd82d6e5d81b018f807ac665d6806d
 DIST ditaa-0.10.tar.gz 4514464 BLAKE2B e5d21ec0ae1e2410fc77f21cdda45924be61824354ad3e3264f95ac7a40a473e7c96d4b101d2938ed564066650ae7a66b3f4c7b89ddb0462eb817063d9bee2c0 SHA512 0abd70657d53ddf222d6a86b0c68064d1da093e421b060f59f73b91dccfdf7764beaad96bb1553c0d4b1c8a57b4922de63b20196a1ce3929b4a2e68b6f2a793c
+DIST ditaa-0.11.0.tar.gz 534679 BLAKE2B 3613b74d9d339688ad35c13c9e2f2bd7ead927ce860e7387bbb9fbb5b011ba9503dae58dba9ec523a3ec49886bdc9885c6c156dfe574335873c5edbe0b072611 SHA512 fde75a33300000c68eca499d54400beb108220022cd1982ab9c1a1ce6f48eb57bca8bffecb52b69cab75c646d9eb951434067cec6ff98044adb177e8ec7ed560
+DIST jericho-html-3.4.jar 238398 BLAKE2B 3d22115a5608ab1bb2dccb8412a672e97b8132dd7aa3f0cfdc827b465b48b3b6412a71cc660adce2722c0446d96ebfb12f3b0ba8d009493aad11ab4899c7eb24 SHA512 7dab0cc8fe3d48afb948f8f35e787d5843e8e7e0982426278342a4855998fbe974e7e5b1448043813edfe8c08dc757174bcf882d6a19941e337d79ea5ecde9a9
+DIST jericho-html-3.4.pom 2634 BLAKE2B 5c0a069238ca9e6e7662b37f9d8c087f5b449179f39694f65a2661d29b780b5d2d447c3781742e5c2143e14e67574418ff1ccb8f0b6627d52d909c8f37c966de SHA512 0e35349315527d80f69f6d8a65cb51ef460250ac11ac97c823ddac5b70fb3f016263b5489318ba47ad28f0f40114121e49350b025a694cccd94e86a03b2a1e85
+DIST pom.contrib-0.2.2.pom 6960 BLAKE2B daf33b0c815edeae5e9b2a6055fb1d1e349b93bb1b5393b57f22080f24cc414831431292f628fbef937d5edfd5fd73da889818157b7841a77f9ea9bae7e39c2a SHA512 bf231158effdb0009166ce1e274d2f836b17c3e3c646aa26b35a7bfb642f7ba4ef6e90074855878e715037d01a652ffc0aa44e499617f99c58f302c5fa1961bb
+DIST serializer-2.7.2.jar 276420 BLAKE2B 232d48ceaefe0cc6a33be7972b93bcb96897dd8b224686f283323e4856deacf3ebc2b577f893d929d3f6b9f952939666ab62827e1a18ff771e3e75ee8191b9d7 SHA512 884d865865858a46306a3680df69f3f0efa0df1313706b54e6900d36af21e17cb6828f5a6bac551c59f7f80bdd1cb64c3fdbde44e213519c4af87969e9e70774
+DIST serializer-2.7.2.pom 1089 BLAKE2B 74e3ae09fe3c35636b17d95f8eb16c43b0655b822393ea5910df76bcd617dd3043898c54b0e422e945ee8c9e3828b3cc3b785235b9995fc3c5302f827b676207 SHA512 1a20cd7008ab876f9605a67515d558b26b9be009c4f49cb27ddf5aa715b5d164c476c236b6d6edf39e81538dfb1516271c3859af8e73f8cdbeee24efb45e9a44
+DIST spec.alpha-0.1.143.jar 591287 BLAKE2B bd6bf420b4e648daec555eabea298a9f66156a54142f6e47f585e3908a46fbec3a14d85cd539a5685bb0a41086d5ce13e16d9aa31281e23c0b9b68d938656795 SHA512 b8fc40ed9bc52b545e699ed188dd61bfd144ee67f0c70364b8f2715e9f1fea608d3721db7f618f6ef4bc3056e3c2984c626080486ca710f3595dda8ba23730ac
+DIST spec.alpha-0.1.143.pom 3532 BLAKE2B 28e7e5d69983e17a7e17f149ada808208212db75adeb16101d837b44a38d4f14bc53a55ca125a4477952b9f95dad1d95ecb7bcd0e8fd65e210ba01bc47949351 SHA512 f0e2a521cfb9eb2b1f61189a12c81cd5046fa4a26501bf040e67e8bdfb66e74df2d9021631c1407b7d6c876f33d8913aefb871aa7c4b46cb87837ba336e37584
+DIST xalan-2.7.2.jar 3154938 BLAKE2B 8448f397c7c4503a536ea195f751230aa17a95c454ab28f7608e9aa38a009c1a8265d850559a6c76daadd262e2abcbb69ef59987670b75b9d1bf8e543e0acc02 SHA512 00f859c5bd65f6dc91e396ce91fe2f6d30b2354d6b419cd9ea96984c5403e5cd1342bb9362b0ae1f2792612f0df731c4f7ac92f16a825bb7e22089c27a129c6c
+DIST xalan-2.7.2.pom 1277 BLAKE2B d6168dc0d946431df8b94a674a802252bb6c6a97d0dd8c1e8373a8c4e1937f1edd8dbe1dec7fec37a2974271925eea9aef977b73bc81c2bf6d8b6bdfdfedc2ec SHA512 4b95e3eb3a2ab262c9a27040a5214cfb8c49c36ece8e71a933074eb063205ef96deff351f017b034c9c97d43d77b020482aade7bc01e1245d8ee10a51269c5ce
+DIST xml-apis-1.3.04.jar 194354 BLAKE2B 31db62e2922cfcec1872d53abfb4ca642fa9816eb46fdf325261bcb59b8849188128aa5ed48210123aa7d660a1c030c36e7ff2d711295523fb3f4e90caeff9d3 SHA512 1086a52924add2406e0b4ec7219a8783ac20e02a32a7a2461efbf092f0070501f7cade9c0588907c403352f1a48f80b950e6d40b2e4e3e9eb886e7db4e97bdec
+DIST xml-apis-1.3.04.pom 1822 BLAKE2B 409040fecc5d1837f84d176fe4a32bfbe21cebd585eea2b3b81eaac2a1d23c7e94cef562414c9ec4f5d21d0ca4337ec291202bcd79f8d87120d538ce53b81c5b SHA512 98efaaedfd6f663dcb7353c1f47dd4f6157c00eabd7f96beb37aad711ba2f380c087f45584757543ac6d566cd0b1f2d955b076dcdf48ffa22a770e3fc5d8e3c0
+DIST xml-apis-ext-1.3.04.jar 85686 BLAKE2B 8ab0f8e8ff2c944765261155fe26aae84807ac9a3ac7c123cb7b36836b36c224fe4bd2ae74c4d853a126f712fa495d868a80758de0dc992ea92b4a995392ca68 SHA512 ac0896b9a3fea71644330daef4eccb33005b5b7ac1e1d1d73eed2b2a1f4b2282057f3c0f3698b899e1c76b19c09c69bf4cd0ee548427b9bcc676b791db5c36bc
+DIST xml-apis-ext-1.3.04.pom 1837 BLAKE2B a1db75a095c5a007fe95088428aa84efc6d94ced3702470e24e324e7cee89aceb4508cbfad79486e2b2eecbf0453266c652c825e2e048919fc938ff92fc97721 SHA512 f5c4cc21a9b8f359e610c5661f866c2bbbe4f6e887dd678bee9036dd5ec0e6f771a7e0f302f00d10f7f454d1c7376f3813e880a3ad733449fc81927cd2384e17
+DIST xmlgraphics-commons-2.2.jar 646509 BLAKE2B d129509003efc96a737d90c8e0bf52cf0a7b8e75ecd6eac44f918022a88290d498430c6e0eb903c100a026e2b863e391b8b6f20e78bdb1c22c589557616e9e49 SHA512 77f07e7ccce8f55dfbddbc4a9777aaacebd13a55edb67124017683c0e0bbdcf5bfa54d91a86de700e3116fbabc066b1810d189c4832bf1464db9c52a3c9f554a
+DIST xmlgraphics-commons-2.2.pom 3480 BLAKE2B c4694909338261307bc5bffe3e0de003bcbffa7dbeac3f568022bd9a42f9ba6a3138858d2354de0a9ab21ab9219c8d8577cc4b440921b3727053dfd1df7bb95e SHA512 3fa756d43ffd9e2b50f804f63a412329e74c96e3487b97676882c574daa08a1167b41f438cc07b575816c6f6ddbac5d017d0a34a74218834aac4fa90baf98b95
 EBUILD ditaa-0.10.ebuild 877 BLAKE2B bfef9480532218b20fb76898966ccfe733ed35a66921657aaa2029f369d7bcd5a8960b762e05b2e7e07b099f6926581e2694f82ffa2d4db2727d504a17edebe8 SHA512 16a191d7bd8eb04a12f5099aab7103ced74004baafa67edd4567e410c33e538ce32a086f6ffb961ad210136dfd60ccee2919e7341709c41669945ad11378d6c2
+EBUILD ditaa-0.11.0.ebuild 7442 BLAKE2B 4d1bc5beb70b3af38bc5e91a2f28cdad850314c8008e40527ff75a07614a4823301354ac59fa5deca76ce2d0c882c481c0dac30c0136fbd0039446c3038853b7 SHA512 79a04e02ecfc7c05b3e0c551d8c5eddb21c955ec0d301ea8c0ed55eafcd452d508bd2c6bff27953ff59820798f0422260542b14f5a00d056185338fbec5f464e
 MISC metadata.xml 353 BLAKE2B c1399a1104a9fee9cf1ae3a55f85b1ea9865a3e2b6f5c19836918a3cfc551ccc179ce5571f94df4910e5a0bca955322485b6359257e3a6643ed19cf9c37216ad SHA512 6112ea1ba12f0d98ae7fa47f05e85bd2394dc84fb5ac3cce4979f4bf45ec8796b77482b74c7e58086243bc3d5d57128a59cee7bd085308a2a5f373e27ce043de
diff --git a/media-gfx/ditaa/ditaa-0.11.0.ebuild b/media-gfx/ditaa/ditaa-0.11.0.ebuild
new file mode 100644
index 000000000000..15a698349069
--- /dev/null
+++ b/media-gfx/ditaa/ditaa-0.11.0.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit java-pkg-2
+
+DESCRIPTION="A utility that converts ascii-art diagrams to bitmap diagrams"
+HOMEPAGE="https://github.com/stathissideris/ditaa"
+SRC_URI="https://github.com/stathissideris/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-java/leiningen-bin
+	>=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jdk-1.8:*"
+
+EMAVEN_VENDOR=(
+	"https://repo.maven.apache.org/maven2 commons-cli/commons-cli/1.4/commons-cli-1.4.jar"
+	"https://repo.maven.apache.org/maven2 commons-cli/commons-cli/1.4/commons-cli-1.4.pom"
+	"https://repo.maven.apache.org/maven2 commons-io/commons-io/1.3.1/commons-io-1.3.1.jar"
+	"https://repo.maven.apache.org/maven2 commons-io/commons-io/1.3.1/commons-io-1.3.1.pom"
+	"https://repo.maven.apache.org/maven2 commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar"
+	"https://repo.maven.apache.org/maven2 commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom"
+	"https://repo.maven.apache.org/maven2 net/htmlparser/jericho/jericho-html/3.4/jericho-html-3.4.jar"
+	"https://repo.maven.apache.org/maven2 net/htmlparser/jericho/jericho-html/3.4/jericho-html-3.4.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/apache/18/apache-18.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/apache/3/apache-3.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/apache/4/apache-4.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/apache/7/apache-7.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/commons/commons-parent/42/commons-parent-42.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-anim/1.9/batik-anim-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-anim/1.9/batik-anim-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-awt-util/1.9/batik-awt-util-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-awt-util/1.9/batik-awt-util-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-bridge/1.9/batik-bridge-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-bridge/1.9/batik-bridge-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-codec/1.9/batik-codec-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-codec/1.9/batik-codec-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-constants/1.9/batik-constants-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-constants/1.9/batik-constants-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-css/1.9/batik-css-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-css/1.9/batik-css-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-dom/1.9/batik-dom-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-dom/1.9/batik-dom-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-ext/1.9/batik-ext-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-ext/1.9/batik-ext-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-gvt/1.9/batik-gvt-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-gvt/1.9/batik-gvt-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-i18n/1.9/batik-i18n-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-i18n/1.9/batik-i18n-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-parser/1.9/batik-parser-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-parser/1.9/batik-parser-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-script/1.9/batik-script-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-script/1.9/batik-script-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-svg-dom/1.9/batik-svg-dom-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-svg-dom/1.9/batik-svg-dom-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-svggen/1.9/batik-svggen-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-svggen/1.9/batik-svggen-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-transcoder/1.9/batik-transcoder-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-transcoder/1.9/batik-transcoder-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-util/1.9/batik-util-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-util/1.9/batik-util-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-xml/1.9/batik-xml-1.9.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/batik-xml/1.9/batik-xml-1.9.pom"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/xmlgraphics-commons/2.2/xmlgraphics-commons-2.2.jar"
+	"https://repo.maven.apache.org/maven2 org/apache/xmlgraphics/xmlgraphics-commons/2.2/xmlgraphics-commons-2.2.pom"
+	"https://repo.maven.apache.org/maven2 org/clojure/clojure/1.9.0/clojure-1.9.0.jar"
+	"https://repo.maven.apache.org/maven2 org/clojure/clojure/1.9.0/clojure-1.9.0.pom"
+	"https://repo.maven.apache.org/maven2 org/clojure/core.specs.alpha/0.1.24/core.specs.alpha-0.1.24.jar"
+	"https://repo.maven.apache.org/maven2 org/clojure/core.specs.alpha/0.1.24/core.specs.alpha-0.1.24.pom"
+	"https://repo.maven.apache.org/maven2 org/clojure/pom.contrib/0.2.2/pom.contrib-0.2.2.pom"
+	"https://repo.maven.apache.org/maven2 org/clojure/spec.alpha/0.1.143/spec.alpha-0.1.143.jar"
+	"https://repo.maven.apache.org/maven2 org/clojure/spec.alpha/0.1.143/spec.alpha-0.1.143.pom"
+	"https://repo.maven.apache.org/maven2 xalan/serializer/2.7.2/serializer-2.7.2.jar"
+	"https://repo.maven.apache.org/maven2 xalan/serializer/2.7.2/serializer-2.7.2.pom"
+	"https://repo.maven.apache.org/maven2 xalan/xalan/2.7.2/xalan-2.7.2.jar"
+	"https://repo.maven.apache.org/maven2 xalan/xalan/2.7.2/xalan-2.7.2.pom"
+	"https://repo.maven.apache.org/maven2 xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.jar"
+	"https://repo.maven.apache.org/maven2 xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.pom"
+	"https://repo.maven.apache.org/maven2 xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar"
+	"https://repo.maven.apache.org/maven2 xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom"
+)
+
+__set_vendor_uri() {
+	local lib
+	for lib in "${EMAVEN_VENDOR[@]}"; do
+		SRC_URI+=" ${lib%% *}/${lib##* }"
+	done
+}
+
+__set_vendor_uri
+unset -f __set_vendor_uri
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	local d f maven_basedir="${T}/m2"
+	mkdir -p "${maven_basedir}" || die
+	for f in "${EMAVEN_VENDOR[@]}"; do
+		f=${f##* }
+		d=${f%/*}
+		f=${f##*/}
+		mkdir -p "${maven_basedir}"/"${d}" || die
+		cp "${DISTDIR}/${f}" "${maven_basedir}/${d}/" || die
+	done
+}
+
+src_compile() {
+	export HOME=${T}
+	mkdir ~/.lein || die
+	printf -- '{
+	:user  {
+		:local-repo "%s"
+		:repositories  {
+			"local" {
+				:url "file://%s"
+				:releases {:checksum :ignore}
+			}
+		}
+	}
+}\n' "${T}/m2" "${T}/m2" > ~/.lein/profiles.clj || die
+	lein -o uberjar || die
+}
+
+src_install() {
+	java-pkg_newjar target/${P}-standalone.jar ${PN}.jar
+	java-pkg_dolauncher ${PN}
+}
diff --git a/media-gfx/eom/Manifest b/media-gfx/eom/Manifest
index cd6c318d3646..94cec24a4348 100644
--- a/media-gfx/eom/Manifest
+++ b/media-gfx/eom/Manifest
@@ -1,10 +1,10 @@
 AUX eom-1.12.2-gtk3-svg.patch 1329 BLAKE2B 4f4660aae9a5376beedd68f7f18738e25fcc4b61704d1efee18680563ee60074dd940db579d7ab3a18e8d66a81f858337265f9db8c57906cc2fcf4971eba181e SHA512 9b9d437a9867ff131c3fbfcff03fa2a85cf1d4d5004f178cc7081ee0dc721e558e98dcb6b977c05cc577985e51623cf9b3d6f2e9d886944645d26ed087448984
 DIST eom-1.12.2.tar.xz 2213260 BLAKE2B f05264c5b0a5185d1bda8a27e140910e8a1bcf23104a20ff9af78052b9b0a513da50e797ac90da7973dab7d868d10f72098c3ac13f22d369b4c2561a981def69 SHA512 03283cb1cae817c7c21219913fe2f3ab64e0fa6662a63193d4fa012bd0b5c286cbd25131a5bd5e52c1d9304b4b10ae8c37d38a88ea985215c5b277303d7b8cc4
 DIST eom-1.14.2.tar.xz 2254180 BLAKE2B 4ee974fa38fb10ae6984bf32bdbe428e6eefd6b9871fb7bc93df809659d3faaff76ef8afe9c0581bb8f34da64a2b58fdbf4a12d520524fde6c94e6387d3e4e06 SHA512 87d7c5e62249d598474324f24bac1f5f3388bb11517fc54531792fc0291ef42199f3339e492dfc1a1caafed575cf3b21e36ea91f15d0a03b8e912a3d16e5f3b7
-DIST eom-1.16.0.tar.xz 2214612 BLAKE2B d95b478262b16e67e6d4a431a68bee782c2f11bb3ae18c935aef249a72e1078a7daf960938f82a2bf4da21db7a4eea9e4486c74bb67e48926f062876d72cce0c SHA512 ed1dfb8bfd8af6e74def133c38bcbaef81adbbc98df428479cf8a4037379f1cea0df2033eeb4ea28e5cba2c5996b0c248012be34e5450b2cfda575f2f79a5f36
+DIST eom-1.16.1.tar.xz 2215676 BLAKE2B 78ac0049c36008ae56fe4d59b908728b49925a1e678ad6b61dcc4dcf450633bc56279bc04d9f64c2631f9a78c957a0f51ab385cdb770b48d3c5dad6ab38f2e01 SHA512 6154f8423eb825fea3cba975e15ac46bd9c46c139966c02365c1fe5d0a0144c4a4bffc80801eddd41506ae0ef86909ca8acb1591f39260aedb6cbb0db9335b4f
 DIST eom-1.18.2.tar.xz 2196228 BLAKE2B 6689a3b3b0954b7f29f12bd951adfe2d2a89de8c964e3c8b9a7b2754ccea6dc6e8bbadaa332a8c6014e529a3e31c22463052a1db79cc63345080cee4e994e387 SHA512 d0d8aaa7837564fafd949da26e477e675a6cbecf6efd799ea0f29ba23800d4df36147f83bf059dcf38f9c4a9601e8501ec78065e02125fb18261011e1c3ac12c
 EBUILD eom-1.12.2-r3.ebuild 1897 BLAKE2B acdf2fa81bae0814e7f9891810b146b58f77a959ae5fab53349868499d58c971c3af040fae0e49500a47253f65638d10beecd11fc84885eec1059f6da357356b SHA512 41e360632bd653ef941714e45bca87f8ff940729070ab1a31046f87726e92ba2c73b71eb092ffc258f7674a3cf420c0bad5726442d35fbd49fbaf354f067e795
 EBUILD eom-1.14.2.ebuild 1892 BLAKE2B 0298f92977d6368dfe624a78cbde84291db5a7f06774f2935b60ed33432dd06ab996661d8fdcc88525b2027d21627c4c7e9f46e30e8d857b1725a8147de4c4d6 SHA512 4d7e22033498bff1cad886de6d850977e913dce452f46d71c580c263103bb66cca9f4ee6ff3331d9b68e294fd52978bbda39df583be7472072957c0db4f56955
-EBUILD eom-1.16.0.ebuild 1892 BLAKE2B 0298f92977d6368dfe624a78cbde84291db5a7f06774f2935b60ed33432dd06ab996661d8fdcc88525b2027d21627c4c7e9f46e30e8d857b1725a8147de4c4d6 SHA512 4d7e22033498bff1cad886de6d850977e913dce452f46d71c580c263103bb66cca9f4ee6ff3331d9b68e294fd52978bbda39df583be7472072957c0db4f56955
+EBUILD eom-1.16.1.ebuild 1892 BLAKE2B ce4075caa97a575077a77657abc68539a5e6076f04dda697cec172dd168bc564698f9853aa88a09175ea238a9ee40107074136d4b56e38dc26d505996ca59759 SHA512 88eb94a745dc8bf09867dbd0671dfb89a931d274a2eb9c95d900b6a7c25d3a79a4afef4c066e18bed09609969d6e1b1f72b2dbd86d6d83fcda1542f57129d713
 EBUILD eom-1.18.2.ebuild 1480 BLAKE2B 1b7cbb148fb9ffb72d91219a880f13461353715d48c81614b416dbe32d16c109e57b4ec4a6e99df909a3868cc79d1ee773b482af6395259cd8154df9c948c430 SHA512 1120a5126289d462ce1b8737ac8ec51abfe297f5cb686cc29c73cf1698b94ebd152159f5f68f7c8c5813ca9bd18c3abb55835c74aead4f47ee0eed7e5dda689a
 MISC metadata.xml 408 BLAKE2B 3aa045b7f75c60605aead480120e080ce799255190b0ffddb3a204b9fdaad92451bd42717fa70232056dc073a29fca96c96b01cdce2125f9e357c06aaf874880 SHA512 948981426d592856f20cfcf6cfc8d0505acc76144ca32211ed1a5c9d6106aa71e2d7987c1a0ab6373903b5a413da6e22f5fd9d10894bc89eefbac12d48cd7b30
diff --git a/media-gfx/eom/eom-1.16.0.ebuild b/media-gfx/eom/eom-1.16.0.ebuild
deleted file mode 100644
index 293481bdcc77..000000000000
--- a/media-gfx/eom/eom-1.16.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit mate python-single-r1
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE image viewer"
-LICENSE="GPL-2"
-SLOT="0"
-
-IUSE="X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp"
-
-REQUIRED_USE="
-	gtk3? ( !python )
-	python? ( ${PYTHON_REQUIRED_USE} )
-	"
-
-COMMON_DEPEND="
-	dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=dev-libs/libxml2-2:2
-	gnome-base/dconf:0
-	>=mate-base/mate-desktop-1.9.1[gtk3(-)=]
-	sys-libs/zlib:0
-	x11-libs/cairo:0
-	>=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
-	x11-libs/libX11:0
-	>=x11-misc/shared-mime-info-0.20:0
-	virtual/libintl:0
-	dbus? ( >=dev-libs/dbus-glib-0.71:0 )
-	exif? (
-		>=media-libs/libexif-0.6.14:0
-		virtual/jpeg:0
-	)
-	!gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] )
-	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
-	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
-	jpeg? ( virtual/jpeg:0 )
-	lcms? ( media-libs/lcms:2 )
-	python? (
-		${PYTHON_DEPS}
-		>=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
-		>=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
-	)
-	svg? ( >=gnome-base/librsvg-2.36.2:2 )
-	xmp? ( >=media-libs/exempi-1.99.5:2 )
-	!!media-gfx/mate-image-viewer"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/yelp-tools:0
-	dev-util/gtk-doc
-	dev-util/gtk-doc-am
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	mate_src_configure \
-		--with-gtk=$(usex gtk3 3.0 2.0) \
-		$(use_enable debug) \
-		$(use_enable introspection) \
-		$(use_enable python) \
-		$(use_with X x) \
-		$(use_with dbus) \
-		$(use_with exif libexif) \
-		$(use_with jpeg libjpeg) \
-		$(use_with lcms cms) \
-		$(use_with svg librsvg) \
-		$(use_with xmp)
-}
diff --git a/media-gfx/eom/eom-1.16.1.ebuild b/media-gfx/eom/eom-1.16.1.ebuild
new file mode 100644
index 000000000000..1bf8859a0972
--- /dev/null
+++ b/media-gfx/eom/eom-1.16.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit mate python-single-r1
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="The MATE image viewer"
+LICENSE="GPL-2"
+SLOT="0"
+
+IUSE="X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp"
+
+REQUIRED_USE="
+	gtk3? ( !python )
+	python? ( ${PYTHON_REQUIRED_USE} )
+	"
+
+COMMON_DEPEND="
+	dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=dev-libs/libxml2-2:2
+	gnome-base/dconf:0
+	>=mate-base/mate-desktop-1.9.1[gtk3(-)=]
+	sys-libs/zlib:0
+	x11-libs/cairo:0
+	>=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?]
+	x11-libs/libX11:0
+	>=x11-misc/shared-mime-info-0.20:0
+	virtual/libintl:0
+	dbus? ( >=dev-libs/dbus-glib-0.71:0 )
+	exif? (
+		>=media-libs/libexif-0.6.14:0
+		virtual/jpeg:0
+	)
+	!gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] )
+	gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] )
+	introspection? ( >=dev-libs/gobject-introspection-0.9.3:= )
+	jpeg? ( virtual/jpeg:0 )
+	lcms? ( media-libs/lcms:2 )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-2.15.1:2[${PYTHON_USEDEP}]
+		>=dev-python/pygtk-2.13:2[${PYTHON_USEDEP}]
+	)
+	svg? ( >=gnome-base/librsvg-2.36.2:2 )
+	xmp? ( >=media-libs/exempi-1.99.5:2 )
+	!!media-gfx/mate-image-viewer"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/yelp-tools:0
+	dev-util/gtk-doc
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	mate_src_configure \
+		--with-gtk=$(usex gtk3 3.0 2.0) \
+		$(use_enable debug) \
+		$(use_enable introspection) \
+		$(use_enable python) \
+		$(use_with X x) \
+		$(use_with dbus) \
+		$(use_with exif libexif) \
+		$(use_with jpeg libjpeg) \
+		$(use_with lcms cms) \
+		$(use_with svg librsvg) \
+		$(use_with xmp)
+}
diff --git a/media-gfx/gimp/Manifest b/media-gfx/gimp/Manifest
index 59d526ecb04f..2e5371030b8a 100644
--- a/media-gfx/gimp/Manifest
+++ b/media-gfx/gimp/Manifest
@@ -11,7 +11,7 @@ AUX gimp-2.8.22-cve-2017-17789.patch 1245 BLAKE2B 14d519b8b024e51b452806b4acb6f0
 AUX gimp-2.9.8-cve-2017-17784.patch 1087 BLAKE2B 2398e735ccd7b0a5cc393f297b60d4a51038aeb146779268f78fb2f0a24ef912468510de2a0f640c5f905fe9959581686f55bccc022633b6f2a3a93ab3f12848 SHA512 5bc928860b2f2b53cc72c9c3caf6a532cf7e61b02e0716ee99a5166a07b01bdd46edfeae7bf6e333ce14ca11b5fcb963cbd42005e02f914d909431bf201dc6d5
 DIST gimp-2.8.22.tar.bz2 20873278 BLAKE2B 673246fd2354f1cecc74bf389df698f594b7553cc88a1d2679ae410ad39923abae843dfe9623ec195b4f967b5eccd199769a6300bf028ae04b8df4932df11505 SHA512 84a78d428282538b606b3cd1ff571e52c3d828fceade171b2012bc1cdcb85919fc7734e7e6c45ed3a8683657fa580412b32c1b511b8a512172a8c1df930493e6
 DIST gimp-2.9.8.tar.bz2 26161474 BLAKE2B f00a58d33848a818a2cb3b74920b33156330a26423a2b567cd8372258f87b44ae1ad812f2b3ee9a093b919d022e8b71ef518d40b76ab94c616f9916b3d1effec SHA512 897092aa823961e6ed5dac47eaadd3a25c419364d6ca791987d99e495d0d4eba1d75e08c809dfa305e8feec9da606193b608e3470e0ef18fcfaa98ee8aedfe02
-EBUILD gimp-2.8.22-r1.ebuild 5184 BLAKE2B abc10e4f056b0587a193eb6991157cd194a8fd8a574147008add477234b83ee6e22af3270444d85abac9fd521012ff3a6bf757c4f3873ca2ece4ec285d3ace5e SHA512 2e1bc04eaf0f2fa86e71d861b040ab86f3f29d01fd5da0fb7e3d29e18db93be3be9a9f0fe5ecd2d8fbedf4c56c352ba7e1555a9e2a81a9f2e6d64097f09ccb8d
+EBUILD gimp-2.8.22-r1.ebuild 5183 BLAKE2B ab9688c1c3b980779ef73cb0bae0b1e847efdae9ee98d7583bc77191b5f831a5034d02dd89d5046f98322d6ae359c18adc12402182ef7e889c0b5cfd5c7bd389 SHA512 7b09898602934a24314a83329db7cc8c94bf966566dfab1733723b038e557ceb38c168dde6b53592302331a4abb5bee678d31abf1b61997999a7538c0b57040e
 EBUILD gimp-2.8.22.ebuild 4739 BLAKE2B 1f9f5b643fa9c061a1b8bb982df80261c481b362ea7140f4f6921419fa6fa23487df7547976dfbdae9a61eed461199ed0059ab68ce6748f1169b637750638dd4 SHA512 6c6e4c124eb106a22d6a3149e190cb0e3acaad34948e46c3de6be581641667e5841e844f3f79ecd05d67706de5a96d33b098baf8ca9066040200288e3d627e9d
 EBUILD gimp-2.9.8-r1.ebuild 5766 BLAKE2B f526bca4ce58c5ee9e1e5f4015a0a7894c36357005294058163715f9b9ffc1d6eb0db0afcb2c2ff20c8ca488f99a80d8cc82cc31f744580df2e55b7e02820f65 SHA512 4c51668d0dcb82af5e4ef2811504fc744e5be32901c6a40abe706833a4cd5a1623019a8c1eac7fee682fd62c90f7eb879abed5558f6011769b698fb1bbdf8305
 EBUILD gimp-9999.ebuild 5375 BLAKE2B 1a33e0b4106e98872afaf1c664b72a8b88c813575121d1538fd63fa3b52b6915868f1b432d85e51cf0800bc12aff6adaa8ad84015015e25616ef325703faeace SHA512 b9c0c738acebae699385af18cfdfd9f200a616cb48e565b40768f96d5bbce80914a81a1066de5116ba750d46a2ad3c3b51dc04604dd8e3eaf77aab3084dfd2e5
diff --git a/media-gfx/gimp/gimp-2.8.22-r1.ebuild b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
index 63e5dfba2ce8..30f2f9dbb2a4 100644
--- a/media-gfx/gimp/gimp-2.8.22-r1.ebuild
+++ b/media-gfx/gimp/gimp-2.8.22-r1.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.gimp.org/"
 SRC_URI="mirror://gimp/v$(get_version_component_range 1-2)/${P}.tar.bz2"
 LICENSE="GPL-3 LGPL-3"
 SLOT="2"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 
 LANGS="am ar ast az be bg br ca ca@valencia cs csb da de dz el en_CA en_GB eo es et eu fa fi fr ga gl gu he hi hr hu id is it ja ka kk km kn ko lt lv mk ml ms my nb nds ne nl nn oc pa pl pt pt_BR ro ru rw si sk sl sr sr@latin sv ta te th tr tt uk vi xh yi zh_CN zh_HK zh_TW"
 IUSE="alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm"
diff --git a/media-gfx/graphviz/Manifest b/media-gfx/graphviz/Manifest
index 41130462057d..fe6a341a7d29 100644
--- a/media-gfx/graphviz/Manifest
+++ b/media-gfx/graphviz/Manifest
@@ -5,6 +5,6 @@ AUX graphviz-2.40.1-qt5.patch 4140 BLAKE2B d0d92dddd6ae1efb7e24e22ac0f32025b16ad
 DIST graphviz-2.38.0.tar.gz 25848858 BLAKE2B 2c35e7bde3824d7b99008d7879c08ee15bbf4c31272bfccc2be18e6ebf81622030fd856a6d48f7c62a03c8807c181593918f2841d8c0fd393e3b1c868dce81bd SHA512 0e51a97dae595f4e80bc9e4a12ba3c48485fab19941a28d522f5a0624b6a767e0ba720e9e55bff8efe8308dd1cd3793e2c99cb5fdfceb2d5cafb0cbee907e531
 DIST graphviz-2.40.1.tar.gz 25633455 BLAKE2B 96ba5a8cb94d93cf4ecd424bf29c1bf67099e39e582be97fca088de0aad6bbbb46b00af55c197894e0b63f1a96177894b6cd23498295bb524fe19a75661cbc59 SHA512 a3f358a7050523a39b91a259563a95925b37853ffec799e571211af5b686d3af42457c937882954482785745d90416b1abd945caf05f8abb52b3876e07aa70f5
 EBUILD graphviz-2.38.0-r1.ebuild 7875 BLAKE2B c6db8f9f8fe5ad4f824e5d4a7f2fe97bed36a955ef63988969ba04e1ffa062845610a8a38c1d841ca5218750f3cd2c4f553e809fa18a6d27b6491b9d0180f19f SHA512 2f149be71d6b6713b554ed345c4b792e5af143413efe5d66893545cbbc62b83e427ae458a81ee2567f1001e8c3a4ad2efff644d4174a873411daf4cf7cce34fc
-EBUILD graphviz-2.40.1-r1.ebuild 7942 BLAKE2B 239e6bbb0f60b7f57e425fba8277e0105fa7ef436e504af8970ec89194aa29577446b75b2819d3e8fb5e70813a89dd563386cf0471abd94b79c692195b5aa02e SHA512 be6bc43f1df559f484492647f4e268f08a2e71dcb2c7e161a7393b55b982adaa6f62cb0da7c5edecd132cbc201eeb59acfe91a3bf3d7f27ab4b06d19c177d9c4
+EBUILD graphviz-2.40.1-r1.ebuild 7939 BLAKE2B ee07f5de29111ab5a00634da81c63a409de991219887f5769adf8c5e18ecfb7bf58ce3765a9005491b70495f873f2c869c07638a576a31ffbd64f06949e1039e SHA512 9f8eeabf2c62e81b41735e2793f4b32d3344b0c49c5819b7593de6ab71f3e886941682cdb245413eb093340fb74cfd8417736b833776f6c7a1b35f69f4fc9f6d
 EBUILD graphviz-2.40.1.ebuild 7792 BLAKE2B aa1a463791808a989f06a044d88c0f68f4bab6a6072d50114d59c35e39b083445898b6b8b086661ff32c84acf549014a06796ef279aa9090b23a132ca2a28c8d SHA512 25c9d1358f48f8ef0fea4040ca36d450b4ff7e29083407aa7b117a6792a330d7d0b2f2da1271eafcbeb16b2b1cd1d651a6d96898b2ae7c2e9abf3f712aa7ecfc
 MISC metadata.xml 2204 BLAKE2B cc6012ca977a477d6a557df8343e980e926f1e67f737064f3fea406db213e53c416db5fc50692b1132ebcd5b5ce52d4bb2f5a2cec91b0af846b905d36748e48c SHA512 cd26813c5d7d6341ae9a21be50ca4451657c9813e25b2d0d69cd972fbdecdacf63e763ecd1f1a56fee10f07a25e1063822f7b2e9a96df48e3bcf8c7d1d05de3a
diff --git a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
index edc5a11b4af8..1f4bd01a6b18 100644
--- a/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
+++ b/media-gfx/graphviz/graphviz-2.40.1-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="http://www.graphviz.org/pub/graphviz/stable/SOURCES/${P}.tar.gz"
 
 LICENSE="CPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris"
 IUSE="+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD"
 
 REQUIRED_USE="
diff --git a/media-gfx/inkscape/Manifest b/media-gfx/inkscape/Manifest
index 33cb9db7d29d..b40bdf2c839f 100644
--- a/media-gfx/inkscape/Manifest
+++ b/media-gfx/inkscape/Manifest
@@ -11,8 +11,8 @@ DIST inkscape-0.91.tar.bz2 25858909 BLAKE2B 9ca69a10a043efa64d7327ca6ba28d04a650
 DIST inkscape-0.92.1-poppler.patch 44142 BLAKE2B 4431a4185cfeb6c41f08da656db4335017fc08a62e154f75ef4ef1a2ae92dd510f22a4f9cd1cf8bb1fae09770f47a398b7b789c8bad4e47bc4941b9e8f79c1f0 SHA512 4a0504c236c816f413b3bf055754513bb53b52eb5f0323faa28ab445ce3fb83b6f41de5bc6e3865909e50fc9be937e3f99282e8414f4cdc954e04b974d7f15ab
 DIST inkscape-0.92.1.tar.bz2 31222684 BLAKE2B 26364e3ccf447d22d15291b132b44b1abd5ca4efc1df8e5eb4ca494ac9340ed8aa5e2d57d2e14c1859fc202532cf722b4c9c89defa92c630e462b07ce29ec774 SHA512 f8f3bfb812a214216c3ffac7064a4619f847cf9810417c782481dba12e6c6a44123c8b8a9289fbf5287f2e6b6df39a641d94a000d842faee5ff808eec86187a0
 DIST inkscape-0.92.2.tar.bz2 31224100 BLAKE2B c0a7b01220d1b0b0863f71f3e1c8ba7bdb58bd86e79c2d3f214831a344c992a1084d64813de00e6f88d77b1b1f1b8562c7a0ee98824149cb867eba586314d27d SHA512 e790cafb7cc2be2eb75f04ac4c18ae8558ae997f4261c38dac9c2a3383c7a12a0f4a090956770d1341b212fc9698d31d212f2c1609421907255f8af650569b30
-EBUILD inkscape-0.91-r3.ebuild 3974 BLAKE2B 8e146e8913b76879fc247cbbf004acb0205956ca364b19480226e5cac931cc86cb64d8fc766f5efde23076f4553aaea1127dcfdc10dc533096463e2bf2f72def SHA512 24c5607b5e6d7a0867680672bfd4a9577837b1ab6a25b4bb74e4c9ef457aa74556d4dc75bf358b9a38de87213ef8b36fffe540e99117637161c3b30a971a43b1
-EBUILD inkscape-0.91-r4.ebuild 4049 BLAKE2B d9d0c010bd57f3cbc34dea97b807147a488ac0c6b4afc554a492978a050b9ba0ac1b480b6efefbbdd5c998f966e934236e4c2158a1cfe72d66a91da0dbb11ad2 SHA512 c61b6ee024e1b046e0bdc1e5cfbd9e14e3de02d68e5b699b96884953c00492339ff633e68d4bedcbaa996b989289d38fa8ccd14aa56aa5196382c70610800839
-EBUILD inkscape-0.92.1-r1.ebuild 3753 BLAKE2B 9c6256ddf4426e740e2d122a4735a1ae143a9e4cf859901833d887bf2d8f23636f70554207d9fde96dfcb7fefd9ce6cd869b0a2d1eab1848b608206f0f8fa9ed SHA512 c06351cd4c9f700c387ce115de36410b69f0e1edcf4d7e31cf9c7d6cf26eb79317cec03c801500d372a106f514a0aac091d256ec21b8d429aa1d408bfb2e6eb3
-EBUILD inkscape-0.92.2.ebuild 3877 BLAKE2B 7b24be371cae8563c61c7e76d5cc87471abba8fc0e0c06c5d85942893bfc8b18e560823f18062529af502aacdb866fbcfbe9c3c42a987e368fc3627aaca69701 SHA512 3195572277b3df808e698eda791eca420ff4ea9d43fadb616cb0ab2344271785b7a40d22afb56497632cea578f4d534b2873b6757caee638df2e8765a691a44e
+EBUILD inkscape-0.91-r3.ebuild 3976 BLAKE2B 6109a0638f125b59ce3a01681290a44371016d72ce9fa8147792f106180437b823969981f1fe8cda95c8bc26c9f70c09025aa32f60117ff594c7168491145e3c SHA512 4b9fc5881cd58b4a5e32adc416564e7943c520f8add50673013f6c953080cbccddcd0690742d938df81d93252d5ad3ce4e41f6bf6191c9d018ebc2667c93dca0
+EBUILD inkscape-0.91-r4.ebuild 4051 BLAKE2B 5ccbbd94230ebb9aa4b6ebbd455b260a2b680247091a760d1556d9e4ad8c897441dda1a1edf90eb3846f42cb3885684863389ca067c11a4d7dde51bd6a74a2ee SHA512 93d3af17489e4a2230931cd53690cdf5bc8ffe9d0f5225b9539ba896cd14976c9c5345925e3974a1b57ac0ce0517333eae3b6a641017c94c37334dc35f9a8188
+EBUILD inkscape-0.92.1-r1.ebuild 3755 BLAKE2B 9c16cd19ad761248ffcaf7f4b4c28ee8a7acac0e33ed7c0b58077904cf5c9dbab2069102363fdb1068b29a1a02c4f903324195ecbd6238f88b447225143501da SHA512 7dc891b411af3f5af45df67707db758deb0265b76e3d6d14fc55d20b0de73f9e4188cdf38f30667d7ecaeea69b799976b64551c33aabd242b4503e658cddc26e
+EBUILD inkscape-0.92.2.ebuild 3879 BLAKE2B 086718507185ac24023279ece38978a33bb7a4bf3c153cec7b5f51f87deb579c892d8b21c3bb32403b925e40cd7652cec39e9ac4a7e578dc17f53a01e9d64158 SHA512 e711d9c2c7f43973ba4be09c4368610986c3dfb6efbd200053b99431edf32c5adadfa507a7ed35aa954cf4745f1e3ff17efe6662001766d3b9bb34d632ebc130
 MISC metadata.xml 812 BLAKE2B 9b06a44ec7ded4b7b4618813bb4b2b5deed3bbc45fd43cffcf435594f3141943a45e592bf2947b00895f0f40d40b0fbe51109daa63f73f3276f50afec620d9fa SHA512 dbe4bb2e918a4c8a20c9a273cef29976d8cfe74e6c2ae1ba8cb77f592c885e8353b7bc3ca8f529e00629f6a0ac7627877cdef68fe07472fc1f417abba5d0268b
diff --git a/media-gfx/inkscape/inkscape-0.91-r3.ebuild b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
index ad850ff0c14a..e66661ffc32f 100644
--- a/media-gfx/inkscape/inkscape-0.91-r3.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=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/boehm-gc-7.1:=
 	>=dev-libs/glib-2.28
 	>=dev-libs/libsigc++-2.0.12
 	>=dev-libs/libxml2-2.6.20
diff --git a/media-gfx/inkscape/inkscape-0.91-r4.ebuild b/media-gfx/inkscape/inkscape-0.91-r4.ebuild
index fa43b4e54d92..26296f1bf535 100644
--- a/media-gfx/inkscape/inkscape-0.91-r4.ebuild
+++ b/media-gfx/inkscape/inkscape-0.91-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -27,7 +27,7 @@ COMMON_DEPEND="
 	>=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/boehm-gc-7.1:=
 	>=dev-libs/glib-2.28
 	>=dev-libs/libsigc++-2.0.12
 	>=dev-libs/libxml2-2.6.20
diff --git a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
index 24b21bd2bb48..3a632ccb1ac2 100644
--- a/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,7 +33,7 @@ COMMON_DEPEND="
 	>=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/boehm-gc-7.1:=
 	>=dev-libs/glib-2.28
 	>=dev-libs/libsigc++-2.0.12
 	>=dev-libs/libxml2-2.6.20
diff --git a/media-gfx/inkscape/inkscape-0.92.2.ebuild b/media-gfx/inkscape/inkscape-0.92.2.ebuild
index 6f8363666e05..b64b94f2b343 100644
--- a/media-gfx/inkscape/inkscape-0.92.2.ebuild
+++ b/media-gfx/inkscape/inkscape-0.92.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -28,7 +28,7 @@ COMMON_DEPEND="
 	>=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/boehm-gc-7.1:=
 	>=dev-libs/glib-2.28
 	>=dev-libs/libsigc++-2.0.12
 	>=dev-libs/libxml2-2.6.20
diff --git a/media-gfx/kuickshow/Manifest b/media-gfx/kuickshow/Manifest
index 0da9481db7db..5baf5cec3967 100644
--- a/media-gfx/kuickshow/Manifest
+++ b/media-gfx/kuickshow/Manifest
@@ -1,4 +1,4 @@
-AUX kuickshow-0.9.1-gcc6-compile-fix.patch 408 BLAKE2B ef6450d7f9b0feebed096c04bcf409a1a93c5fc1189c917fee14dd691d9ca421e547f7197f676bb23a1bb21b8e0abba3db474ddaa033de9408ab65deed35502b SHA512 0b64ebefab7aed4b9a42457f3782a7f36ab61fee96d281ee1d42c6315e25a1afd97a92d9d847862eaa2a5cee5fe3190ddd74c3cfcaa92ca5e1718390c48104f1
-DIST kuickshow-0.9.1-kde4.4.0.tar.bz2 915108 BLAKE2B d6ba91bd737ced19c4dbd8320da553b0212a60b6f98aa2188d1d8068856182b2b61a186ed02d29bf88649fc6bd7a6db16fb825c3711b26ac4ac37b7eee0e1071 SHA512 394b95c6b7c3b655a96729559271cd837ff5995aefc7e229f3bc7905f7e64f3fb05d34a67c9a9ba584c1cdbc459b7349d0e134a16afe9e0505b5a494e85ab87e
-EBUILD kuickshow-0.9.1-r3.ebuild 599 BLAKE2B 5dbd0e2403140574560650c0ea844a3eba21aae1e5a62947225d2e1670b6ebfea19a92131b83846c73391b164840a9a1ebc1879e96e4c4a7dd2aa710bb1f1744 SHA512 6fcf79f99ff3ba88be85cafacb363973860b70623bff265d9256fd0f84c4a505d32c373d3ae10b4b9d7033ebaf931a2942c42925fae93a1f9f07f5d722f3322f
+AUX kuickshow-0.10.0-desktop-fix.patch 397 BLAKE2B 60260af0d7b9b060a0b52cbe9371419faac84c807757eb70c55b5f824c9ef6bee1a2e949b82dace5fcd32e5ad07e3bb4baaa88724045bbad5a2248a6a8d7ed7f SHA512 09747c0457225ab2d885b7c7af00d2844323edb8dcba37424316b88abad039b698c68d1304a78a9ecbba5edfa3cb68c1bc305ba5e0a8e7e0083740569835af1e
+DIST kuickshow-0.10.0.tar.xz 1038552 BLAKE2B 435a2ea3e944514c3ea9cd42428281517dd91bdcb0d288cfd95d7b4e59f4b063ca4cfdf1aed19d3ccdd96ce492edad60fe76ece26ae7be7fec67d3a51d70ff99 SHA512 3c12bcca649b4b7d75709432e77b0b8d7ba9bd98ddd75592421f2035bfd43724d25dd066ff1aeffb1f2200df618ba153a0d855e037a48517f3aea177aa3fdec0
+EBUILD kuickshow-0.10.0.ebuild 1135 BLAKE2B a6a05b53c2a4d551f94f7a7fe0891414cf41f2ca24b045f648238facbe341d57262b437ee435dfe05c9a19124551de38bf202543c0b4022add5a3a54e515257e SHA512 84a596199d3b83f387a7a5c2105f1fa7a62cceefd8a3eab403e7d8eefda737ad71bd724d0b31c99b6c830a403e1397a53a602571533ac6e124cfc6f5d8218092
 MISC metadata.xml 368 BLAKE2B 2e35a817f35b6cd1371efcbc8c9f178d378d9951a7f72068020fb27e5aeb7de5e903e20c65355780ab66ba08c0655b16fdbf48aa8f02cba8a66cf706c813b730 SHA512 9396698295f746c83f4fe1cc56396093feedb617a0a8cd1fa750b9f3099d9db014329d021af1021b0a22e73a3a8190b10ba5b80c0e753ea526094382e7495d20
diff --git a/media-gfx/kuickshow/files/kuickshow-0.10.0-desktop-fix.patch b/media-gfx/kuickshow/files/kuickshow-0.10.0-desktop-fix.patch
new file mode 100644
index 000000000000..3b914e6e36a3
--- /dev/null
+++ b/media-gfx/kuickshow/files/kuickshow-0.10.0-desktop-fix.patch
@@ -0,0 +1,11 @@
+--- a/src/kuickshow.desktop	2018-01-11 23:33:22.000000000 +0100
++++ b/src/kuickshow.desktop	2018-01-13 18:26:36.622067345 +0100
+@@ -54,7 +54,7 @@
+ Name[x-test]=xxKuickshowxx
+ Name[zh_CN]=Kuickshow
+ Name[zh_TW]=Kuickshow
+-Exec=kuickshow -caption %c %U
++Exec=kuickshow -qwindowtitle %c %U
+ Icon=kuickshow
+ Type=Application
+ # TODO: What is image/x-eim? Register it to freedesktop.org if you need it
diff --git a/media-gfx/kuickshow/files/kuickshow-0.9.1-gcc6-compile-fix.patch b/media-gfx/kuickshow/files/kuickshow-0.9.1-gcc6-compile-fix.patch
deleted file mode 100644
index 82bf2eafd270..000000000000
--- a/media-gfx/kuickshow/files/kuickshow-0.9.1-gcc6-compile-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fixed wrong type of 2nd parameter which wouldn't compile with GCC 6.
-
-https://bugs.gentoo.org/614304
-
---- a/src/kuickshow.cpp
-+++ b/src/kuickshow.cpp
-@@ -661,7 +661,7 @@ void KuickShow::performDeleteCurrentImage(QWidget *parent)
-     }
- 
-     tryShowNextImage();
--    fileWidget->del(list, false, false);
-+    fileWidget->del(list, 0L, false);
- }
- 
- void KuickShow::performTrashCurrentImage(QWidget *parent)
diff --git a/media-gfx/kuickshow/kuickshow-0.10.0.ebuild b/media-gfx/kuickshow/kuickshow-0.10.0.ebuild
new file mode 100644
index 000000000000..ee42d53b1071
--- /dev/null
+++ b/media-gfx/kuickshow/kuickshow-0.10.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_PO_DIRS="po doc-translations"
+inherit kde5
+
+DESCRIPTION="Image viewer based on KDE Frameworks"
+HOMEPAGE="https://userbase.kde.org/KuickShow"
+SRC_URI="https://dev.gentoo.org/~asturm/distfiles/${P}.tar.xz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DOCS=( AUTHORS BUGS ChangeLog README TODO )
+
+DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kinit)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	media-libs/imlib
+	x11-libs/libX11
+"
+RDEPEND="${DEPEND}
+	!media-gfx/kuickshow:4
+"
+
+PATCHES=( "${FILESDIR}/${P}-desktop-fix.patch" )
diff --git a/media-gfx/kuickshow/kuickshow-0.9.1-r3.ebuild b/media-gfx/kuickshow/kuickshow-0.9.1-r3.ebuild
deleted file mode 100644
index 16158579a72e..000000000000
--- a/media-gfx/kuickshow/kuickshow-0.9.1-r3.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
-
-KDE_DOC_DIRS="doc doc-translations/%lingua_${PN}"
-inherit kde4-base
-
-MY_P=${P}-kde4.4.0
-
-DESCRIPTION="KDE program to view images"
-HOMEPAGE="https://userbase.kde.org/KuickShow"
-SRC_URI="mirror://kde/Attic/4.4.0/src/extragear/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="4"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug +handbook"
-
-DEPEND="media-libs/imlib"
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS BUGS ChangeLog README TODO )
-
-PATCHES=(
-	"${FILESDIR}/${P}-gcc6-compile-fix.patch"
-)
-
-S=${WORKDIR}/${MY_P}
diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest
index c00ebd3dfbcf..ee378fdcb792 100644
--- a/media-gfx/kxstitch/Manifest
+++ b/media-gfx/kxstitch/Manifest
@@ -1,4 +1,6 @@
 AUX kxstitch-2.0.0-imagemagick-7.patch 3642 BLAKE2B ba3de142cb1dae23a31b9125cbd1da736d30ffd804cd8f68b1f9179a35ebf167e898eeafd73943f062aeac12bae3aa2ec8531a423f22a8d959d8bd65e1cc6ea6 SHA512 f47a5872e2d5da00db3f3f0dd37ce567f7001073b9f273973d4b2ce615e18d8f306dcc4dd38185d65b1b065a569f376bfb3e49e977cc9d72da253268405ec2b8
 DIST kxstitch-2.0.0.tar.xz 1681648 BLAKE2B 669eda3060244636b4ad8bb6e7e7899eb183d7a0f3b264bc40c3bda7146be2a6e10b165165889b7d0043dc5921ff8153775dfa5436546e3cd7be99a4cc144434 SHA512 0ce9ec517659fd9a3163671cdb32d451487aa812355c9abb38cf143192ed49e3e32afc003a0064e9a63303b5de40d8859f92066d886dc06c6d1fe03c8790122f
+DIST kxstitch-2.1.0.tar.xz 1727616 BLAKE2B 34e362b37ef94ed9657254fc4887eb77b0937c4ebdc2b76b09ae9ebbbe6dc490fdafa4c189a87177c26bc1d24fa0b150436a547c3b82dbf74b269fd87f674928 SHA512 c31b8f4c33a86967b02ad2d6c9be84931e607644c8683c41b3160c86fee8714d77a10f770d94ae3905c81261dfdaf13957783a83d2235594656bf2884f944608
 EBUILD kxstitch-2.0.0.ebuild 966 BLAKE2B cecfadc5596ba0b2f89fb501e8d7826b650ecb63790f43ad9809577ff52d04001d7658ebffb34ce5251297c50860536ac62e83cc3391037d075625449c3fe18f SHA512 cc2c291f040c49c5a15e4cc8c5b057121539940a68f6649fad0d6bc895c3dcef774a16fefa2d806985ea6b723ea39c72471d975e9b09ec02aa58885e4f2fe24e
+EBUILD kxstitch-2.1.0.ebuild 950 BLAKE2B b736baf0b1c971d9ad3e65334442a0fd7aa4a32937d544a52005031e682ac34a4e115c310cb68c38640769b3df07872893a0e872345335a28c2cc3f2b9d093b8 SHA512 8ed768f44f342c9d45875fe6045c51d4ab934d6d3c6bb3eef8d73e8d585eac80804d13f751972834319b097fc7046d7fb5df2fad7d928749bf6920d2d3522cd7
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-gfx/kxstitch/kxstitch-2.1.0.ebuild b/media-gfx/kxstitch/kxstitch-2.1.0.ebuild
new file mode 100644
index 000000000000..3e24a1c98c3e
--- /dev/null
+++ b/media-gfx/kxstitch/kxstitch-2.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+inherit kde5
+
+DESCRIPTION="Program to create cross stitch patterns"
+HOMEPAGE="https://userbase.kde.org/KXStitch"
+SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="5"
+KEYWORDS="~amd64"
+IUSE=""
+
+COMMON_DEPEND="
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kxmlgui)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtprintsupport)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	media-gfx/imagemagick[cxx]
+	x11-libs/libX11
+"
+DEPEND="${COMMON_DEPEND}
+	sys-devel/gettext
+"
+RDEPEND="${COMMON_DEPEND}
+	!media-gfx/kxstitch:4
+"
diff --git a/media-gfx/librecad/Manifest b/media-gfx/librecad/Manifest
index 9336e39e6adc..520ed904515e 100644
--- a/media-gfx/librecad/Manifest
+++ b/media-gfx/librecad/Manifest
@@ -1,5 +1,4 @@
 DIST librecad-2.1.3.zip 26086377 BLAKE2B 7f137c1f6c80f10b803ffbe8a739c230664d81003e47dc0f7b82509fdf0534e5fe046cbc6efaa75149daeaf6f0fa217c1fd08e4de83c74361c99108b6b8fd53a SHA512 9a41c17b512ccbc1a0ebb0e6da8e7297663490479f042fadaffda819e371afc7fa49b789449df9fd4e36a2e2b6f95b9b5be19df47cf3c4252111db2a7ed7f009
-EBUILD librecad-2.1.3-r1.ebuild 1418 BLAKE2B db2d3476c190f0e45b9ed1786de2369b887db0c3cdba7abfb259733123a2b96b4dd423236e05b4b8f4eba3a5254a1381ba4f9323fe171359e9cda7ff3205a2d1 SHA512 6489a761f0bad291fc536047653edfb527240fd8582428cb4811b3c5197a9e6a51b143dd650541f543ab4b312c71fc8a626248c8569ac1fbb6b5fe302e660761
-EBUILD librecad-2.1.3-r2.ebuild 1285 BLAKE2B 0dec0e60b81639a3c4850958d228c41df434ff508b83602c55ae493b7672544cb3fecf56e7a86762eb631414e83daf717f316a62d1fd2dc6d9e09cc9479f330a SHA512 639783a6be5bfb84267e6abb1c36db443f99edde1e2098705307d0888fe48d0310bcb10026a6e81ac5f1a749649863bbec789ceb7df59956bcaa973a614624bb
-EBUILD librecad-9999.ebuild 1344 BLAKE2B 7e2d33864340058bf32c0d6f541bfe7b7a16daf386d35015f39535f5ddbee51b2a46d99c7a5a7437d9763e4f953e0bbc9f4fab1d99bf42d1240247c1052e3993 SHA512 722322ffaab726f066da0497261ba9d9f4eedab1f885e1d19b587bfbae5745cfde7399c24767f303a9c76a7d456d7564b3cc9d872b875be2a4cab8c499e6589d
+EBUILD librecad-2.1.3-r2.ebuild 1238 BLAKE2B 4d8663d5bd9897969121283c5d272dfea333dd23e58dac53ee284721a50fc19ebf3ddb915bafa08bf07fb9e649e562256d476cd799c9ab9b2a6f33b30e25daf6 SHA512 ac694a6f1d02179250898479ee0cd0d819793ec4c9747d3f062ee72e2b13438174008cf507aa55f741371de42d1f18c06cb11f0f5edf5e237f88612071cac0a8
+EBUILD librecad-9999.ebuild 1183 BLAKE2B 0cb201b0865a6698ad8cc905c23487caabc22255a4bf2167080f4a7e06ca356f6a350e279c9b115a2a48c329402d4cc81e222a162ad8d86815b7e0f28afc85d3 SHA512 0eacdcb74fbef5864e20db36d7006d1e080a1dd9fc9197ba874e4724add193b8a6b95c31ad9a0ffaf4c71738a6ad5f406bd4ad08ae001e8623d2fdce2a1d8083
 MISC metadata.xml 459 BLAKE2B 8b648b5abdd62d9df306c90d182164694c753231b16ad37319863ee37feac91b2e0fcc89212b5259a899287a638a68cb2e48fcc55af8a076d23b201e6b38ebb3 SHA512 108977904dfb070a16279d3306f40982a73b1cdddfa90e8ab22f83c4a75cd620a829fea9a56a0290d2d160b1d30fd0fb67e320f526726dd57a613e781c700b6c
diff --git a/media-gfx/librecad/librecad-2.1.3-r1.ebuild b/media-gfx/librecad/librecad-2.1.3-r1.ebuild
deleted file mode 100644
index 0c5f0aeb2564..000000000000
--- a/media-gfx/librecad/librecad-2.1.3-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils qmake-utils
-
-DESCRIPTION="Generic 2D CAD program"
-HOMEPAGE="http://www.librecad.org/"
-SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="3d debug doc tools qt4 +qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
-
-DEPEND="
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-		dev-qt/qthelp:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	dev-libs/boost:=
-	dev-cpp/muParser
-	media-libs/freetype:2"
-
-RDEPEND="${DEPEND}"
-S="${WORKDIR}/LibreCAD-${PV}"
-
-src_prepare() {
-# 	epatch "${FILESDIR}/iota-fix-2.1.1.patch"
-
-	# currently RS_VECTOR3D causes an internal compiler error on GCC-4.8
-	if ! use 3d; then
-		sed -i -e '/RS_VECTOR2D/ s/^#//' librecad/src/src.pro || die
-	fi
-}
-
-src_configure() {
-	if use qt4; then
-		eqmake4 -r
-	else
-		eqmake5 -r
-	fi
-}
-
-src_install() {
-	dobin unix/librecad
-	use tools && dobin unix/ttf2lff
-	insinto /usr/share/${PN}
-	doins -r unix/resources/*
-	use doc && docinto html && dodoc -r librecad/support/doc/*
-	insinto /usr/share/appdata
-	doins unix/appdata/librecad.appdata.xml
-	doicon librecad/res/main/${PN}.png
-	make_desktop_entry ${PN} LibreCAD ${PN} Graphics
-}
diff --git a/media-gfx/librecad/librecad-2.1.3-r2.ebuild b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
index dfd56d2aaf24..f7735d744d31 100644
--- a/media-gfx/librecad/librecad-2.1.3-r2.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r2.ebuild
@@ -11,23 +11,20 @@ SRC_URI="https://github.com/LibreCAD/LibreCAD/archive/${PV/_/}.zip -> ${P}.zip"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
-IUSE="3d debug doc tools qt4 +qt5"
-REQUIRED_USE="qt5"
+IUSE="3d debug doc tools"
 
 DEPEND="
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
-	dev-libs/boost:=
 	dev-cpp/muParser
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
 	media-libs/freetype:2"
 
 RDEPEND="${DEPEND}"
diff --git a/media-gfx/librecad/librecad-9999.ebuild b/media-gfx/librecad/librecad-9999.ebuild
index 4a1f2d51dc47..de157dedc9ef 100644
--- a/media-gfx/librecad/librecad-9999.ebuild
+++ b/media-gfx/librecad/librecad-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,29 +13,20 @@ EGIT_REPO_URI="https://github.com/LibreCAD/LibreCAD.git"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE="3d debug doc tools qt4 +qt5"
-REQUIRED_USE="|| ( qt4 qt5 )"
 
-DEPEND="
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		dev-qt/qtsvg:4
-		dev-qt/qthelp:4
-	)
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qthelp:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtsvg:5
-		dev-qt/qtwidgets:5
-		dev-qt/qtxml:5
-	)
+IUSE="3d debug doc tools"
 
-	dev-libs/boost
+DEPEND="
 	dev-cpp/muParser
-	media-libs/freetype"
+	dev-libs/boost:=
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/freetype:2"
 
 RDEPEND="${DEPEND}"
 S="${WORKDIR}/librecad-${PV}"
@@ -46,12 +37,7 @@ src_prepare() {
 }
 
 src_configure() {
-	if use qt4
-	then
-		eqmake4 -r
-	else
-		eqmake5 -r
-	fi
+	eqmake5 -r
 }
 
 src_install() {
@@ -61,7 +47,7 @@ src_install() {
 	doins -r unix/appdata
 	insinto /usr/share/${PN}
 	doins -r unix/resources/*
-	use doc && dohtml -r librecad/support/doc/*
+	use doc && insinto html && dodoc -r librecad/support/doc/*
 	insinto /usr/share/appdata
 	doins unix/appdata/librecad.appdata.xml
 	doicon librecad/res/main/${PN}.png
diff --git a/media-gfx/meshlab/Manifest b/media-gfx/meshlab/Manifest
index dba6a019973e..809de8dadaf2 100644
--- a/media-gfx/meshlab/Manifest
+++ b/media-gfx/meshlab/Manifest
@@ -15,10 +15,12 @@ AUX 2016.12/0001-use-external-openctm.patch 1841 BLAKE2B 8cd4c14c846df052a44d543
 AUX 2016.12/meshlab-2016.12-align1.patch 766 BLAKE2B 4a226e853d8c236ff07d408093bd1e197df202a732e8c6cf429f479c2d9101260d33834e877896ea4570d690fc03c0d60d883b88e9591c9c7781fd0117fc3543 SHA512 4f8684a4fe8fdec286672c330e9c489028518bf121ec561221d3108af44ed4afd3cb3d21113b1b5b110afc127c25d9bc5fb6999be4fd815eddfe3aa406b0f7a7
 AUX 2016.12/meshlab-2016.12-align2.patch 624 BLAKE2B 342231146ef2efc52ae4295d9094e07818d0ce6265a02426d43648d070e0f7b939e4323a820721450ef7c240dc6f0a8459e3608fb74519eeb7e1efea510e2e76 SHA512 cfa90271bd671244ecc4ad92318f2aad31223990843fb3e185e66b51c8b975c5ed3fec73834e379c1498ce35de1a9e217aa28ff2fdea6233abcbdba09896cc19
 AUX 2016.12/meshlab-2016.12-fix-plugins-path.patch 509 BLAKE2B 3a4327b41743704255039f2c06713975c2d842a3af5077385d982107289d33a5a04473f68e21769ca97e45514ca1119244c2b66b5709b99a0b772324e1b0884f SHA512 613b3cec1c50c3d4d6fd3006b80fd4cb3b66a97c1493872d76f95c5ed16ee9c2a9aba5c1a5d021a302114e8e0e172619c4d344306004f109a1f211ee6a14e102
+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
 DIST meshlab-2016.12.tar.gz 94194402 BLAKE2B 53dda75b51198d529d35ae64e1b9d8ec240ec6031835e6cde2ff1ad21403086112a6f4b9acf5c6f53328787078b3e1a90cc177f5e009834b310cdf6b168c59b0 SHA512 68bf863fc390725a949578b545bc749bbe2c07ca75d1461772c7777fd6a4b095f11b64b5b0e8b729f83fea1bb9e3ca4b41123cdea3799a8eee0de587eb7bf1d8
 DIST vcglib-1.0.1.tar.gz 9063634 BLAKE2B 91fba7ebf1ac18d0dfb33d3e26656e546b7c35ae753777730c44ebdf327413dfe94dd5e84907eb7e1644d70bfdf7d00ae8ecd0a81587d790a31354f7db09d626 SHA512 55d1854054744abae2d41e7b5041df89253bae108df5fc1cfe777013de7192dce04bc474475cb11a1d0343ebcab1ea61b381d9d9c36c452528043e85e75bc211
 EBUILD meshlab-2016.12-r1.ebuild 3404 BLAKE2B 629d63d555dfe2ecd9e2930b2ed0906470b41214c549876a6986133c9a78930d174b0fbbdbd7554c64a38918468aadea7646296a666e8389dcb063f00d33960a SHA512 b45ec190c310ef42c312dc313ec448121ff3570e6034061854f2e160139ea5d4c205386c3045109be15b6285f35f7c50b877cf39c198f91b6bbf24d7ee849835
+EBUILD meshlab-2016.12-r2.ebuild 3499 BLAKE2B 091b524a914ae4e97ddeb36d280e00cfcfe73562528f701dc979bbe8b48d993ee542c3e62f02e21093c678d7c99918f18705f011db51fc376c64a384d4534123 SHA512 ca7e94c0b96acaedcbce13456e4cba2e58d8f98bbd1b0fe860703776c9c31d30658b05ad81c172a79fb1dadd06f5eb51156ff4bc44f4ac97e8f4159e162e11f0
 EBUILD meshlab-2016.12.ebuild 3340 BLAKE2B 1f2bd515c6058494c9e1da16c3056f60f46f82582a0aea8d02ddc9713b5a7ac1fadb363c593aab0e52eb8a94cf5f874e130726e65a1d8e09ee2ab2817285b02f SHA512 df0abd4786cbe6d54e6de9984940413edff73ba20166a90a14e1fa1d7db82a49fb6bc7486ce25323c89abae06ffe96686f08d7f7ea8823e9d726c1385c50ee7d
 MISC metadata.xml 729 BLAKE2B 5c89ef346791f1aaecf313a580c18e32d37a116e87aa5955d21445816fd7a9fae30af5763dafe32f019fcda1333b3bfe48280abb1845fe096f223642badb9629 SHA512 f1d3b39a1c612b895463f0cb674411fce2614ff55855b964dee1b9c999aa1ad4bb6ec0a000cab9a1767f54474597836a92fda48722a3d8a90d21f412316e2b71
diff --git a/media-gfx/meshlab/files/2016.12/meshlab-2016.12-remove-header.patch b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-remove-header.patch
new file mode 100644
index 000000000000..8aeace8546a1
--- /dev/null
+++ b/media-gfx/meshlab/files/2016.12/meshlab-2016.12-remove-header.patch
@@ -0,0 +1,38 @@
+diff -ru vcglib/wrap/io_trimesh/import_nvm.h vcglib/wrap/io_trimesh/import_nvm.h
+--- a/vcglib/wrap/io_trimesh/import_nvm.h	2016-12-29 12:54:58.000000000 +0300
++++ b/vcglib/wrap/io_trimesh/import_nvm.h	2017-12-28 12:20:14.591670159 +0300
+@@ -85,15 +85,6 @@
+     return true;

+ }

+ 

+-static bool ReadHeader(const char * filename,unsigned int &/*num_cams*/, unsigned int &/*num_points*/){

+-    FILE *fp = fopen(filename, "r");

+-    if(!fp) return false;

+-    ReadHeader(fp);

+-    fclose(fp);

+-    return true;

+-}

+-

+-

+ static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> >  & shots,

+                  std::vector<std::string > & image_filenames,

+                  const char * filename, CallBackPos *cb=0)

+diff -ru vcglib/wrap/io_trimesh/import_out.h vcglib/wrap/io_trimesh/import_out.h
+--- a/vcglib/wrap/io_trimesh/import_out.h	2016-12-29 12:54:58.000000000 +0300
++++ b/vcglib/wrap/io_trimesh/import_out.h	2017-12-28 12:20:48.434017234 +0300
+@@ -85,15 +85,6 @@
+     return true;

+ }

+ 

+-static bool ReadHeader(const char * filename,unsigned int &/*num_cams*/, unsigned int &/*num_points*/){

+-    FILE *fp = fopen(filename, "r");

+-    if(!fp) return false;

+-    ReadHeader(fp);

+-    fclose(fp);

+-    return true;

+-}

+-

+-

+ static int Open( OpenMeshType &m, std::vector<Shot<ScalarType> >  & shots,

+                  std::vector<std::string > & image_filenames,

+                  const char * filename,const char * filename_images, CallBackPos *cb=0)

diff --git a/media-gfx/meshlab/meshlab-2016.12-r2.ebuild b/media-gfx/meshlab/meshlab-2016.12-r2.ebuild
new file mode 100644
index 000000000000..adc2830aa0fc
--- /dev/null
+++ b/media-gfx/meshlab/meshlab-2016.12-r2.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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"
+	)
+
+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/raw-thumbnailer/Manifest b/media-gfx/raw-thumbnailer/Manifest
index e8f0304ff483..80475d929b41 100644
--- a/media-gfx/raw-thumbnailer/Manifest
+++ b/media-gfx/raw-thumbnailer/Manifest
@@ -1,3 +1,5 @@
+AUX raw-thumbnailer-0.2.1-libopenraw.patch 897 BLAKE2B 26065ada735e744b0bac662110f8f6a8d70f808721452adab0c7b4cf6927152ab255e424b2978147895e36833cf525893d3f601a09871e712a2dcd348d05e1f0 SHA512 c9b582a6f7d8ccd5958da96d4773105e17b9047b1081d5a4e2a48384831f83e79ef32b9fafd3cd2436472ac86554ffa2232b1d039f06d9890425c5b2d6da185d
 DIST raw-thumbnailer-0.2.1.tar.gz 89468 BLAKE2B 8041cfee56f9be900c6f7bfa6dfb9b21b482ee8eb7dacb83ed37603c32edf6e1dee122de3e98b06d158b6725a1900c73c7e1aee1b8e6a53545428ff7aca47b53 SHA512 cc3c107b060add00b4af811bb548b597493ff0d54d863c530d183970ac8bdd4f6b9f4c25cf978e1d2bf80b11424dbbfb20e73c6dd1abeff3a15a08843bcd41e1
-EBUILD raw-thumbnailer-0.2.1.ebuild 541 BLAKE2B 8a7fe22577d94316932c734a504fb21cd8afa2d3ae41f4cedbf154466d94cde69908665fb25c1b0bf1c3e824bdcc457efd0927d7117140d49bd474a5ec792843 SHA512 e538902d9a994a1e36969b9b592a2ae974372dc67ce1eae3e0def9f462b7322b59e8f4571624ad620b16573e48c1887ffb5a3b73de53da79b1a3215bf7c1844d
+EBUILD raw-thumbnailer-0.2.1-r1.ebuild 673 BLAKE2B 31b8d6cf186846ff436aad1438cb0928b29da1ac3b33c9dd63bc598579d0f6ab3f0f263eaa44b584397d0aecdfc815f1712962d5061a7a1f6cd35d00c723d210 SHA512 bf5287011b888be6c12e13a1be5de9d8b76a30d16f3bc19e0ac129f5b0b9c9f8107ad370349adb803463d306d46828dad2ca5ab4276368587b5131236606d6dc
+EBUILD raw-thumbnailer-0.2.1.ebuild 540 BLAKE2B e414123881d1b4f1d3aa8b2b8a37e7a9cc7b14ed05337f9f5091f2281f30661541d5bcfbae9b5b96815a88a5fc4cd523ef9adba9b7599dce7c942341002ad292 SHA512 c2c23998a3af64a083872e64654539e02ece59ca37375c81f2c4bdf96e84d57f51129b78cd73bffb67c66edabe9e81dcc2b94c0284b07b7d7a6a4b8d660cae7a
 MISC metadata.xml 407 BLAKE2B 713244da2a69bfc59fb7a82373bba128e0d08fe7c12645245fb01df403e3affc792fc26ca28967dcc6c499145e90f9a34eb7c984164ccf4396a8924c4c153312 SHA512 7383547238ca395a6cffde72366521dd7e3e04218f8840f19f093cfa61d0788d10138d39250702085a5669f715aaf3d0da5e357829a0e0fd44a70d20c14ed46a
diff --git a/media-gfx/raw-thumbnailer/files/raw-thumbnailer-0.2.1-libopenraw.patch b/media-gfx/raw-thumbnailer/files/raw-thumbnailer-0.2.1-libopenraw.patch
new file mode 100644
index 000000000000..1106493622a2
--- /dev/null
+++ b/media-gfx/raw-thumbnailer/files/raw-thumbnailer-0.2.1-libopenraw.patch
@@ -0,0 +1,28 @@
+From 8711d72122e2e67641cc9a0166c1c35ce64719b2 Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping <sebastian@pipping.org>
+Date: Sun, 14 Jan 2018 18:50:17 +0100
+Subject: [PATCH] Use pkgconfig name "libopenraw-0.1" to support recent
+ libopenraw
+
+---
+ configure.ac | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7562e2b..ef14d87 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -12,8 +12,8 @@ AC_PROG_CXX
+ AC_PROG_INSTALL
+ 
+ # Checks for libraries.
+-PKG_CHECK_MODULES(OPENRAW, libopenraw-1.0 >= 0.0.4, HAVE_OPENRAW=yes)
+-PKG_CHECK_MODULES(OPENRAWGNOME, libopenraw-gnome-1.0, HAVE_OPENRAWGNOME=yes)
++PKG_CHECK_MODULES(OPENRAW, libopenraw-0.1 >= 0.1.0, HAVE_OPENRAW=yes)
++PKG_CHECK_MODULES(OPENRAWGNOME, libopenraw-gnome-0.1, HAVE_OPENRAWGNOME=yes)
+ PKG_CHECK_MODULES(GDK, gdk-pixbuf-2.0, HAVE_GDK=yes)
+ 
+ AC_SUBST(OPENRAW_CFLAGS)
+-- 
+2.16.0.rc1
+
diff --git a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
new file mode 100644
index 000000000000..8d3bedb4b406
--- /dev/null
+++ b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="A lightweight and fast raw image thumbnailer"
+HOMEPAGE="https://github.com/erlendd/raw-thumbnailer"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libopenraw-0.1:=[gtk]
+	x11-libs/gtk+:2
+	!media-gfx/gnome-raw-thumbnailer"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog )
+PATCHES=(
+	"${FILESDIR}"/${P}-libopenraw.patch  # bug 609972
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
diff --git a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild
index cf2c9096972e..baf2934ea32d 100644
--- a/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild
+++ b/media-gfx/raw-thumbnailer/raw-thumbnailer-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
@@ -12,7 +12,7 @@ SLOT="0"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE=""
 
-RDEPEND=">=media-libs/libopenraw-0.0.9[gtk]
+RDEPEND="~media-libs/libopenraw-0.0.9[gtk]
 	x11-libs/gtk+:2
 	!media-gfx/gnome-raw-thumbnailer"
 DEPEND="${RDEPEND}
diff --git a/media-gfx/xfig/Manifest b/media-gfx/xfig/Manifest
index 86b4c7ea2bd8..cd3689f9764f 100644
--- a/media-gfx/xfig/Manifest
+++ b/media-gfx/xfig/Manifest
@@ -17,5 +17,5 @@ DIST xfig-full-3.2.6a.tar.xz 5502944 BLAKE2B 3a83feeb5647ffa9586b9ce40116e9854a4
 DIST xfig.3.2.5c.full.tar.gz 6078933 BLAKE2B 44ccad26fa3d7a57b0e8798d6ebfe6682baf15046d9e360d7a7569cac54c403c0068671e27a5289dbb4f70dafd12c1653a61709749a8298874bc49528783973b SHA512 763bd6fd43bff9b44f934dd6e16b0aa5142041f895e74564d28e7252e012f1c7728bbee40e3970357c7d3fd15aa109dbfcbc1d0a2203fa1a2ed770aabacd9525
 EBUILD xfig-3.2.5c-r1.ebuild 3203 BLAKE2B 7525f53b1b9a9d05fee6c04c53486e5b6954122b0898c0658869432a36730a91e47c4cfe694755e27baf4fe7328f7b4380adc6b4ed08248b9c7adba884e685c7 SHA512 45971e1e43c8f54d0c1a4a57596edae08e52239dd06dd066ff6186c6da759a823b78becd86d3249e17b98f1ef0aafe8aec552669120ebae634391a8d5d3d7b35
 EBUILD xfig-3.2.5c.ebuild 3303 BLAKE2B ca99f5134de4c15df3ae3f656684b3f6bea7f6e7a20e2bae0899e684025475f46bfa2c41792b507db3982637c985e67522261abaa78fda4f399e4ae134cd9139 SHA512 538cee1a1626c417a967f4c4810a0b8924169f61c153b67e8479243dab39041d05cda40e98e5bbc8c2fe5e571fb85acbe0425072c56906d08c53e4bce8be8c1b
-EBUILD xfig-3.2.6a.ebuild 1209 BLAKE2B 750839e5e0333f234533c784791b1b3f4917ccc219d5d0ee61ee5468fe18213498ef4615536624a417a90d7f8c45931f9ad0293e64ba99bd2280a6492f9b334a SHA512 fba531cc5a57174e7f8f69b9a5325775db1b67a442ba04ef8f17a1f3039ae2296667be53aa3ac5de4f47a237608da3bedd5ecc99735b1ceb4a041b3d0634ff4a
+EBUILD xfig-3.2.6a.ebuild 1208 BLAKE2B 9e027ffd88df9abb674fe431e999918913970685c759c1a0f25bac735de849cbcd6da7f0db63e9dfe15a538bbb2524db7f195a188fb215e6c0c06c19a3ae8752 SHA512 88ed355f7b227fd8475e5efbc1c4301a8e7202bd522a3449dfe4c456f685225852920ac34b2c5251285516a219ce46ef27be24038959c75afaa5b0da6b6cd57c
 MISC metadata.xml 212 BLAKE2B 71dabc83d0433b968a559d72c4d8a18ff9477e154e5b7e72ca22b859a0fec0ae23b0fdad7233686c6c1e20178142f5c60bf93f58db30c5109106e4d86b9f1cef SHA512 05c3af7b4c872998a64d3d6dce356ad1bfeb67f4ec845e82e022a89c96945ba5fe8848df48b8736feb39bd4d9a7d6714f0895a9c824e3c67d903ea3da1ca0f22
diff --git a/media-gfx/xfig/xfig-3.2.6a.ebuild b/media-gfx/xfig/xfig-3.2.6a.ebuild
index 9f61211e8523..6c83b8de6c69 100644
--- a/media-gfx/xfig/xfig-3.2.6a.ebuild
+++ b/media-gfx/xfig/xfig-3.2.6a.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://sourceforge/mcj/${PN}-full-${PV}.tar.xz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 IUSE="jpeg nls postscript"
 
 RDEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 3b12d86be482..f02907fe8fc0 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 90704941441f..2bd8eb9e4cbc 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -13,6 +13,6 @@ EBUILD babl-0.1.22.ebuild 1470 BLAKE2B ed22d82d070011f4ea7b74287354d7a24fa3d678c
 EBUILD babl-0.1.24.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
 EBUILD babl-0.1.26.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
 EBUILD babl-0.1.30.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
-EBUILD babl-0.1.38.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
+EBUILD babl-0.1.38.ebuild 1469 BLAKE2B e3a02df1c8226f53efa3e9e799868150892178d10713cf4b1fe204425063e83edaee61693fe02938c69e1821b5219b1cf1862659388cfd7d5bb9fad2fa0e5e8b SHA512 e0f24471cb2196d70991f0a9f50cb9e47659d20b65ab0ed83bb65e0076791ded6f2eb291a9a339ecc7bc703633f5e92e6f1b94b1ef34fb5c99f80b9cb37d79ab
 EBUILD babl-9999.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
 MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e
diff --git a/media-libs/babl/babl-0.1.38.ebuild b/media-libs/babl/babl-0.1.38.ebuild
index 2fbd15d67afb..7a87189aa52b 100644
--- a/media-libs/babl/babl-0.1.38.ebuild
+++ b/media-libs/babl/babl-0.1.38.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A dynamic, any to any, pixel format conversion library"
diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest
index 56d885f3323b..6b3aff3f18e0 100644
--- a/media-libs/ctl/Manifest
+++ b/media-libs/ctl/Manifest
@@ -1,8 +1,8 @@
 AUX ctl-1.4.1-gcc43.patch 2696 BLAKE2B 628ad07e0a8fdf1677cdf01dc47400ed8e9437b90ec382511686fd5edabf155478a4e23e3b2ef62dd302eaac47cc0b63f16fd528b7a977dc5555c55af0193cf6 SHA512 dfceeb1ab50299c1f8b09e118d28c81307bca5a28691994e4a7e413f8e1e508b4efd06084857dcfcfa7605fa304f312495d354a8d33748858cb77c02ac4933ba
 AUX ctl-1.4.1-gcc47.patch 302 BLAKE2B 8cbf57d3e0068e8527f82f426f7128d66ff096c24ec602ab7630e1c119cc83e8972161f4a0679b75b8ab887e4ffec253dd888125e28209aa50fa15bd282ba488 SHA512 40f2afde912a9d35703b755f569c9d42f8c90f957e1acecea4eed6b55d514fee1252acbf1f229b23e69ea9d5e47c73311e0a293af801af2e61e3981566258c93
-AUX ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch 16825 BLAKE2B 3faabaff992059e8193c9b74c2c78a6a4fb56d7bc3c1ce6cfb1f83f34cdcb3aff0404be3ff85b4106726a8fb64a72ecc8d4c45219949fa844b6a9dd262757388 SHA512 0d568a75131a2412881cfc64c66c0ea1d5119dea1b46fa65f63fa34d7b30685575e1eb6969c82e28c5c5f8bbaf7501bf9efefc928f6526a05bd1b223df9c83ca
+AUX ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch 16825 BLAKE2B 4a732a2b461e81016d0d3e165d998b19904fbd9a77af4cc041b29a6c785beaedec109fe33ddcc6cb05c08f3001231b1e832a687dfccf96fbef70c4e517737fb0 SHA512 53df4449eb0acca2f20a42cf9945870e580de3be6be416c52428e300aca1833eda081d6fc17024aa61f1ecd0886098958d187249a9189fb6d1e62c82d0964afb
 DIST ctl-1.4.1.tar.gz 996923 BLAKE2B 20dba7a3cb93e89ecb656a6ee34b35e1a35c3c4cda63bafe2162de15afca4b8e32f2156a0b1b2268d59bc5923c1687817433c41031be07b810762f9feea36fc8 SHA512 671efbdef287c69b416462d479be58c6cfba331b5b6faa1a694ece162aa2ee966482423babb49c61de3d5046499a81110e4cd30824d9d36a3d6b69068b075063
 DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6
 EBUILD ctl-1.4.1.ebuild 746 BLAKE2B 95436778c6f9687dacc3969eda2530510b401e4c498e41c80b035d7a261caa2daee22f8f5ed5b0941c5b5c36a05d03f49cd6fe0105f811347b347703da753998 SHA512 f4e82d25b87b3704d60cc3701a4dbb91c0eb47716d33444a1fb2cdf5961d2b4e6e4d7b7666c51456bc2b2019f13afbfd3b239e4671085bce5d5723f2fa845802
-EBUILD ctl-1.5.2.ebuild 686 BLAKE2B 82e8289849bc9c22d14a251e97ebad528d6cdc6a2e4b477dd5c4cb978f6ecdbd1408eab2989c7801cdfe4a750d658e4d158ebfb0b2c1b99cfcbe7289f57cf56c SHA512 369f0ff3b956b723df5d239d7d382d6d664d51bdbd3d1f095734407b172bae021f0bc144acfa7c052cdc66d7b14accdbbdfe21b3de1e72b7b532ed64318034e4
+EBUILD ctl-1.5.2-r1.ebuild 688 BLAKE2B 5391c6bf83c3a7f1ecf5717020fffbdc0583b9a43fff3051c23efea6f6b0b60ea28822907bc2095df347895327a3068f2acc8e6b99e11182d6374a0df3b69cb9 SHA512 8b0f01a45f4a61de31e03aff05a641292e67f7309664c574838af1c5a5c9a515fbfefb27aaf8504558a77cef7f9df4c07ff350810f587569c6787881aa962b5c
 MISC metadata.xml 297 BLAKE2B 773f2836e68b0405f210dc51fac01e9c40845d34e4d7ed036916af8f8d63bebcd91bbd672bf84e4dac6ab84135915db85914c07a8bdecdb1ce3c3ff1b5f6408b SHA512 e437384a215b9cd38ecc3e4721bb47c6acf9b8c17d6bc348ddb1272b899428cf7835371a3fca39e6b66f49f1760996fccc336bf15f6d4e36783bd12db84afe49
diff --git a/media-libs/ctl/ctl-1.5.2-r1.ebuild b/media-libs/ctl/ctl-1.5.2-r1.ebuild
new file mode 100644
index 000000000000..55acc2744c99
--- /dev/null
+++ b/media-libs/ctl/ctl-1.5.2-r1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="AMPAS' Color Transformation Language"
+HOMEPAGE="https://github.com/ampas/CTL"
+SRC_URI="${HOMEPAGE}/archive/ctl-${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="AMPAS"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+
+RDEPEND="media-libs/ilmbase:=
+	media-libs/openexr:=
+	media-libs/tiff:=
+	!media-libs/openexr_ctl"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+S="${WORKDIR}/CTL-ctl-${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch" )
+
+mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
diff --git a/media-libs/ctl/ctl-1.5.2.ebuild b/media-libs/ctl/ctl-1.5.2.ebuild
deleted file mode 100644
index ada618aa9569..000000000000
--- a/media-libs/ctl/ctl-1.5.2.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-DESCRIPTION="AMPAS' Color Transformation Language"
-HOMEPAGE="https://github.com/ampas/CTL"
-SRC_URI="${HOMEPAGE}/archive/ctl-${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="AMPAS"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-
-RDEPEND="media-libs/ilmbase:=
-	media-libs/openexr:=
-	media-libs/tiff:=
-	!media-libs/openexr_ctl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-S="${WORKDIR}/CTL-ctl-${PV}"
-
-PATCHES=( "${FILESDIR}/${P}-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch" )
-
-mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
diff --git a/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch b/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch
new file mode 100644
index 000000000000..e4fadf1aa05c
--- /dev/null
+++ b/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files-1.patch
@@ -0,0 +1,399 @@
+From db1cccd9cee830f8822521f2c401ea74ad161360 Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Mon, 25 Sep 2017 17:41:26 +0100
+Subject: [PATCH] CTL: Use GNUInstallDirs and fix PkgConfig files
+
+* GNUInstallDirs are variables set by each distro and OS, so we
+  don't need to define them manually. They can also be set manually
+  during the configure phase. The code to define custom directories can
+  be removed and replaced with the equivalent GNUInstallDirs variable.
+* Pkg-Config is used to find IlmBase and OpenEXR, but isn't fully
+  utilized everywhere. This makes Pkg-Config a hard dependency so that
+  the libraries and directories can be found easily. This will use the
+  correct libraries no matter how they are named, so this is compatible
+  with both pre-2.0 and post 2.0 naming schemes.
+* The Pkg-Config files had several errors that are now fixed.
+
+Upstream PR: https://github.com/ampas/CTL/pull/67
+---
+ CMakeLists.txt                         | 36 ++++++++---------------------
+ OpenEXR_CTL/CMakeLists.txt             |  2 +-
+ OpenEXR_CTL/CtlModules/CMakeLists.txt  |  2 +-
+ OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt |  4 ++--
+ OpenEXR_CTL/exrdpx/CMakeLists.txt      |  4 ++--
+ config/CTL.pc.in                       |  8 +++----
+ config/OpenEXR_CTL.pc.in               | 15 ++++++-------
+ configure.cmake                        | 41 ++++++++++++++++------------------
+ ctlrender/CMakeLists.txt               | 20 ++++++++---------
+ doc/CMakeLists.txt                     |  2 +-
+ lib/IlmCtl/CMakeLists.txt              |  4 ++--
+ lib/IlmCtlMath/CMakeLists.txt          |  4 ++--
+ lib/IlmCtlSimd/CMakeLists.txt          |  6 ++---
+ lib/IlmImfCtl/CMakeLists.txt           |  6 ++---
+ lib/dpx/CMakeLists.txt                 |  1 +
+ 15 files changed, 66 insertions(+), 89 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 01f622c..35e9a48 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,22 +1,14 @@
+ cmake_minimum_required(VERSION 2.8)
+ project( CTL )
+ 
++INCLUDE ( GNUInstallDirs )
++
+ set( CTL_MAJOR_VERSION 1 )
+ set( CTL_MINOR_VERSION 5 )
+-set( CTL_PATCH_VERSION 0 )
++set( CTL_PATCH_VERSION 2 )
+ set( CTL_VERSION ${CTL_MAJOR_VERSION}.${CTL_MINOR_VERSION}.${CTL_PATCH_VERSION} )
+ 
+-## Make install directories overrideable
+-set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" )
+-set( INSTALL_BIN_DIR bin CACHE PATH "Install directory for executable binaries" )
+-set( INSTALL_INCLUDE_DIR include CACHE PATH "Install directory for public header files" )
+-set( INSTALL_DOC_DIR doc CACHE PATH "Install directory for documentation" )
+-if( WIN32 AND NOT CYGWIN )
+-  set(DEF_INSTALL_CMAKE_DIR CMake)
+-else()
+-  set(DEF_INSTALL_CMAKE_DIR lib/CMake/CTL)
+-endif()
+-set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" )
++set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/CTL CACHE PATH "Install directory for project CMake files" )
+ 
+ # use, i.e. don't skip the full RPATH for the build tree
+ SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
+@@ -28,20 +20,11 @@ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ # which point to directories outside the build tree to the install RPATH
+ SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+ # the RPATH to be used when installing, but only if it's not a system directory
+-LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
++LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" isSystemDir)
+ IF("${isSystemDir}" STREQUAL "-1")
+-  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
++  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
+ ENDIF("${isSystemDir}" STREQUAL "-1")
+ 
+-
+-## convert install paths to absolute
+-foreach( p LIB BIN INCLUDE CMAKE DOC)
+-  set( var INSTALL_${p}_DIR )
+-  if( NOT IS_ABSOLUTE "${${var}}" )
+-    set( ${var} "${CMAKE_INSTALL_PREFIX}/${${var}}" )
+-  endif()
+-endforeach()
+-
+ option(ENABLE_SHARED "Enable Shared Libraries" ON)
+ 
+ if ( ENABLE_SHARED )
+@@ -70,20 +53,19 @@ export( TARGETS IlmCtl IlmCtlMath IlmCtlSimd FILE "${PROJECT_BINARY_DIR}/CTLLibr
+ export(PACKAGE CTL)
+  
+ # Create a CTLBuildTreeSettings.cmake file for the use from the build tree
+-file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}")
++file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
+ configure_file(config/CTLBuildTreeSettings.cmake.in "${PROJECT_BINARY_DIR}/CTLBuildTreeSettings.cmake" @ONLY)
+ configure_file(config/CTLConfig.cmake.in "${PROJECT_BINARY_DIR}/CTLConfig.cmake" @ONLY)
+ configure_file(config/CTLConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" @ONLY)
+ 
+ if ( PKG_CONFIG_FOUND )
+ configure_file(config/CTL.pc.in "${PROJECT_BINARY_DIR}/CTL.pc" @ONLY)
+-install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev )
++install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev )
+ endif()
+ 
+ install( FILES
+   "${PROJECT_BINARY_DIR}/CTLConfig.cmake"
+   "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake"
++  "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake"
+   DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
+-install(FILES "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" DESTINATION
+-  "${INSTALL_CMAKE_DIR}" COMPONENT dev)
+ 
+diff --git a/OpenEXR_CTL/CMakeLists.txt b/OpenEXR_CTL/CMakeLists.txt
+index c1ca53e..3f19dd4 100644
+--- a/OpenEXR_CTL/CMakeLists.txt
++++ b/OpenEXR_CTL/CMakeLists.txt
+@@ -13,7 +13,7 @@ add_custom_target( OpenEXR_CTL DEPENDS CtlModules exrdpx exr_ctl_exr )
+ 
+ if ( PKG_CONFIG_FOUND )
+ configure_file(../config/OpenEXR_CTL.pc.in "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" @ONLY)
+-install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev )
++install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev )
+ endif()
+ 
+ # TODO CMake config
+diff --git a/OpenEXR_CTL/CtlModules/CMakeLists.txt b/OpenEXR_CTL/CtlModules/CMakeLists.txt
+index c63c22e..9c9e5b8 100644
+--- a/OpenEXR_CTL/CtlModules/CMakeLists.txt
++++ b/OpenEXR_CTL/CtlModules/CMakeLists.txt
+@@ -2,6 +2,6 @@ install(
+     FILES
+         utilities.ctl
+     DESTINATION 
+-        ${INSTALL_LIB_DIR}/CTL
++        ${CMAKE_INSTALL_LIBDIR}/CTL
+ )
+ 
+diff --git a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt
+index e396ec5..1f0eea0 100644
+--- a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt
++++ b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt
+@@ -20,6 +20,6 @@ target_link_libraries( exr_ctl_exr IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl )
+ target_link_libraries( exr_ctl_exr ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} )
+ target_link_libraries( exr_ctl_exr ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} )
+ 
+-install( TARGETS exr_ctl_exr DESTINATION ${INSTALL_BIN_DIR} )
++install( TARGETS exr_ctl_exr DESTINATION ${CMAKE_INSTALL_BINDIR} )
+ 
+-install( FILES change_saturation.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL )
++install( FILES change_saturation.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL )
+diff --git a/OpenEXR_CTL/exrdpx/CMakeLists.txt b/OpenEXR_CTL/exrdpx/CMakeLists.txt
+index 50bd116..d9eadd8 100644
+--- a/OpenEXR_CTL/exrdpx/CMakeLists.txt
++++ b/OpenEXR_CTL/exrdpx/CMakeLists.txt
+@@ -20,8 +20,8 @@ target_link_libraries( exrdpx IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl )
+ target_link_libraries( exrdpx ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} )
+ target_link_libraries( exrdpx ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} )
+ 
+-install( TARGETS exrdpx DESTINATION ${INSTALL_BIN_DIR} )
++install( TARGETS exrdpx DESTINATION ${CMAKE_INSTALL_BINDIR} )
+ 
+-install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL )
++install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL )
+ 
+ 
+diff --git a/config/CTL.pc.in b/config/CTL.pc.in
+index 6d6e732..9b212a4 100644
+--- a/config/CTL.pc.in
++++ b/config/CTL.pc.in
+@@ -1,8 +1,6 @@
+-prefix=@CMAKE_INSTALL_PREFIX@
+-exec_prefix=@INSTALL_BIN_DIR@
+-libdir=@INSTALL_LIB_DIR@
+-includedir=@INSTALL_INCLUDE_DIR@
+-CTL_includedir=@INSTALL_INCLUDE_DIR@/CTL
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
++CTL_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/CTL
+ 
+ Name: CTL
+ Description: CTL interpreter library
+diff --git a/config/OpenEXR_CTL.pc.in b/config/OpenEXR_CTL.pc.in
+index 4cef5c6..39a1a3f 100644
+--- a/config/OpenEXR_CTL.pc.in
++++ b/config/OpenEXR_CTL.pc.in
+@@ -1,11 +1,10 @@
+-prefix=@prefix@
+-exec_prefix=@exec_prefix@
+-libdir=@libdir@
+-includedir=@includedir@
+-OpenEXR_includedir=@includedir@/OpenEXR
++libdir=@CMAKE_INSTALL_FULL_LIBDIR@
++includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
++OpenEXR_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/OpenEXR
+ 
+ Name: OpenEXR_CTL
+ Description: Simplified OpenEXR interface to CTL
+-Version: @OPENEXR_CTL_VERSION@
+-Libs: -L${libdir} -lIlmImfCtl @OPENEXR_LDFLAGS@ @CTL_LDFLAGS@
+-Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir}
++Version: @CTL_VERSION@
++Libs: -L${libdir} -lIlmImfCtl
++Cflags: -I${OpenEXR_includedir}
++Requires: CTL,OpenEXR
+diff --git a/configure.cmake b/configure.cmake
+index 1817071..eb7e14e 100644
+--- a/configure.cmake
++++ b/configure.cmake
+@@ -1,10 +1,7 @@
+-# Until we get some of these modules into the upstream packages, put them here
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
+-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake")
++# Make Pkg-Config required.
++find_package( PkgConfig )
+ 
+-find_package( PkgConfig QUIET )
+-
+-find_package( IlmBase QUIET )
++PKG_CHECK_MODULES ( IlmBase REQUIRED IlmBase )
+ if(IlmBase_FOUND)
+   message( STATUS "found IlmBase, version ${IlmBase_VERSION}" )
+   ###
+@@ -13,11 +10,11 @@ if(IlmBase_FOUND)
+   ###
+   include_directories( ${IlmBase_INCLUDE_DIRS} )
+   link_directories( ${IlmBase_LIBRARY_DIRS} )
+-  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS}" )
+-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS}" )
+-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" )
+-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS}" )
+-  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" )
++  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS_OTHER}" )
++  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS_OTHER}" )
++  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" )
++  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" )
++  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" )
+ else()
+   message( SEND_ERROR "IlmBase not found, please set the include and library paths manually" )
+ endif()
+@@ -39,20 +36,20 @@ else()
+   endif()
+ endif()
+ 
+-find_package( OpenEXR QUIET )
++PKG_CHECK_MODULES ( OpenEXR REQUIRED OpenEXR )
+ if (OpenEXR_FOUND)
+   message( STATUS "Found OpenEXR, version ${OpenEXR_VERSION}" )
+ else()
+   message( WARNING "Unable to find OpenEXR libraries, disabling" )
+ endif()
+ 
+-find_package( AcesContainer )
+-if (AcesContainer_FOUND)
+-  message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" )
+-else()
+-  if ( PKG_CONFIG_FOUND )
+-    pkg_check_modules( AcesContainer AcesContainer )
+-  else()
+-    message( WARNING "Unable to find AcesContainer libraries, disabling" )
+-  endif()
+-endif()
++find_package( AcesContainer )		
++ if (AcesContainer_FOUND)		
++   message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" )		
++ else()		
++   if ( PKG_CONFIG_FOUND )		
++     pkg_check_modules( AcesContainer AcesContainer )		
++   else()		
++     message( WARNING "Unable to find AcesContainer libraries, disabling" )		
++   endif()		
++ endif()
+diff --git a/ctlrender/CMakeLists.txt b/ctlrender/CMakeLists.txt
+index 9fced14..d97093d 100644
+--- a/ctlrender/CMakeLists.txt
++++ b/ctlrender/CMakeLists.txt
+@@ -11,12 +11,12 @@ include_directories( ${OpenEXR_INCLUDE_DIRS} )
+ link_directories( ${OpenEXR_LIBRARY_DIRS} )
+ endif()
+ 
+-if ( AcesContainer_FOUND )
+-add_definitions( -DHAVE_ACESFILE=1 )
+-include_directories( ${AcesContainer_INCLUDE_DIRS} )
+-link_directories( ${AcesContainer_LIBRARY_DIRS} )
+-endif()
+-
++if ( AcesContainer_FOUND )		
++add_definitions( -DHAVE_ACESFILE=1 )		
++include_directories( ${AcesContainer_INCLUDE_DIRS} )		
++link_directories( ${AcesContainer_LIBRARY_DIRS} )		
++endif()		
++ 
+ include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" "${PROJECT_SOURCE_DIR}/lib/IlmCtlSimd" "${PROJECT_SOURCE_DIR}/lib/dpx" )
+ 
+ add_executable( ctlrender
+@@ -41,9 +41,9 @@ if (OpenEXR_FOUND)
+ target_link_libraries( ctlrender ${OpenEXR_LIBRARIES} )
+ target_link_libraries( ctlrender ${OpenEXR_LDFLAGS_OTHER} )
+ endif()
+-if (AcesContainer_FOUND)
+-target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} )
+-target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} )
++if (AcesContainer_FOUND)		
++target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} )		
++target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} )		
+ endif()
+ 
+-install( TARGETS ctlrender DESTINATION bin )
++install( TARGETS ctlrender DESTINATION ${CMAKE_INSTALL_BINDIR} )
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 0b123d0..9776205 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -1 +1 @@
+-install( FILES CtlManual.pdf CtlManual.doc DESTINATION doc/CTL )
++install( FILES CtlManual.pdf CtlManual.doc DESTINATION ${CMAKE_INSTALL_DOCDIR} )
+diff --git a/lib/IlmCtl/CMakeLists.txt b/lib/IlmCtl/CMakeLists.txt
+index 3672a43..ef301bd 100644
+--- a/lib/IlmCtl/CMakeLists.txt
++++ b/lib/IlmCtl/CMakeLists.txt
+@@ -22,7 +22,7 @@ add_library( IlmCtl ${DO_SHARED}
+ )
+ 
+ target_link_libraries( IlmCtl ${IlmBase_LDFLAGS_OTHER} )
+-target_link_libraries( IlmCtl Iex IlmThread Half )
++target_link_libraries( IlmCtl ${IlmBase_LIBRARIES} )
+ 
+ set_target_properties( IlmCtl PROPERTIES
+   VERSION ${CTL_VERSION}
+@@ -50,4 +50,4 @@ install( FILES
+ 	CtlVersion.h
+  DESTINATION include/CTL )
+ 
+-install( TARGETS IlmCtl DESTINATION lib )
++install( TARGETS IlmCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+diff --git a/lib/IlmCtlMath/CMakeLists.txt b/lib/IlmCtlMath/CMakeLists.txt
+index 96738cf..6997c74 100644
+--- a/lib/IlmCtlMath/CMakeLists.txt
++++ b/lib/IlmCtlMath/CMakeLists.txt
+@@ -18,8 +18,8 @@ install( FILES
+   CtlLookupTable.h
+   CtlRbfInterpolator.h
+   CtlSparseMatrix.h
+- DESTINATION include/CTL )
++ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL )
+ 
+-install( TARGETS IlmCtlMath DESTINATION lib )
++install( TARGETS IlmCtlMath DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+ 
+ # TODO Add Imath and Iex libadd dependency and version info
+diff --git a/lib/IlmCtlSimd/CMakeLists.txt b/lib/IlmCtlSimd/CMakeLists.txt
+index 2ba792a..5eaf87d 100644
+--- a/lib/IlmCtlSimd/CMakeLists.txt
++++ b/lib/IlmCtlSimd/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" )
+ 
+ add_executable( halfExpLogTable halfExpLogTable.cpp )
+-target_link_libraries( halfExpLogTable Half )
++target_link_libraries( halfExpLogTable ${IlmBase_LIBRARIES} )
+ 
+ add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h"
+                     COMMAND halfExpLogTable "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" "${CMAKE_CURRENT_BINARY_DIR}/halfExpLog.h"
+@@ -40,6 +40,6 @@ set_target_properties( IlmCtlSimd PROPERTIES
+   SOVERSION ${CTL_VERSION}
+ )
+ 
+-install( FILES CtlSimdInterpreter.h DESTINATION include/CTL )
++install( FILES CtlSimdInterpreter.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL )
+ 
+-install( TARGETS IlmCtlSimd DESTINATION lib )
++install( TARGETS IlmCtlSimd DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+diff --git a/lib/IlmImfCtl/CMakeLists.txt b/lib/IlmImfCtl/CMakeLists.txt
+index 47563df..784e27f 100644
+--- a/lib/IlmImfCtl/CMakeLists.txt
++++ b/lib/IlmImfCtl/CMakeLists.txt
+@@ -7,10 +7,10 @@ add_library( IlmImfCtl ${DO_SHARED}
+   ImfCtlCopyFunctionArg.cpp
+ )
+ 
+-target_link_libraries( IlmImfCtl IlmCtl IlmImf Iex IlmThread Half )
++target_link_libraries( IlmImfCtl IlmCtl ${OpenEXR_LIBRARIES} ${IlmBase_LIBRARIES} )
+ 
+-install( FILES ImfCtlApplyTransforms.h DESTINATION include/OpenEXR )
++install( FILES ImfCtlApplyTransforms.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenEXR )
+ 
+ export( TARGETS IlmImfCtl IlmCtl FILE "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" )
+ 
+-install( TARGETS IlmImfCtl DESTINATION lib )
++install( TARGETS IlmImfCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} )
+diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt
+index c8be26e..918890e 100644
+--- a/lib/dpx/CMakeLists.txt
++++ b/lib/dpx/CMakeLists.txt
+@@ -11,3 +11,4 @@ add_library( ctldpx
+  dpx_rw.cc
+ )
+ 
++target_link_libraries( ctldpx ${IlmBase_LIBRARIES} )
diff --git a/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch b/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch
deleted file mode 100644
index 98ea2fd6da56..000000000000
--- a/media-libs/ctl/files/ctl-1.5.2-Use-GNUInstallDirs-and-fix-PkgConfig-files.patch
+++ /dev/null
@@ -1,399 +0,0 @@
-From db1cccd9cee830f8822521f2c401ea74ad161360 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs <j.scruggs@gmail.com>
-Date: Mon, 25 Sep 2017 17:41:26 +0100
-Subject: [PATCH] CTL: Use GNUInstallDirs and fix PkgConfig files
-
-* GNUInstallDirs are variables set by each distro and OS, so we
-  don't need to define them manually. They can also be set manually
-  during the configure phase. The code to define custom directories can
-  be removed and replaced with the equivalent GNUInstallDirs variable.
-* Pkg-Config is used to find IlmBase and OpenEXR, but isn't fully
-  utilized everywhere. This makes Pkg-Config a hard dependency so that
-  the libraries and directories can be found easily. This will use the
-  correct libraries no matter how they are named, so this is compatible
-  with both pre-2.0 and post 2.0 naming schemes.
-* The Pkg-Config files had several errors that are now fixed.
-
-Upstream PR: https://github.com/ampas/CTL/pull/67
----
- CMakeLists.txt                         | 36 ++++++++---------------------
- OpenEXR_CTL/CMakeLists.txt             |  2 +-
- OpenEXR_CTL/CtlModules/CMakeLists.txt  |  2 +-
- OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt |  4 ++--
- OpenEXR_CTL/exrdpx/CMakeLists.txt      |  4 ++--
- config/CTL.pc.in                       |  8 +++----
- config/OpenEXR_CTL.pc.in               | 15 ++++++-------
- configure.cmake                        | 41 ++++++++++++++++------------------
- ctlrender/CMakeLists.txt               | 20 ++++++++---------
- doc/CMakeLists.txt                     |  2 +-
- lib/IlmCtl/CMakeLists.txt              |  4 ++--
- lib/IlmCtlMath/CMakeLists.txt          |  4 ++--
- lib/IlmCtlSimd/CMakeLists.txt          |  6 ++---
- lib/IlmImfCtl/CMakeLists.txt           |  6 ++---
- lib/dpx/CMakeLists.txt                 |  1 +
- 15 files changed, 66 insertions(+), 89 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 01f622c..35e9a48 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -1,22 +1,14 @@
- cmake_minimum_required(VERSION 2.8)
- project( CTL )
- 
-+INCLUDE ( GNUInstallDirs )
-+
- set( CTL_MAJOR_VERSION 1 )
- set( CTL_MINOR_VERSION 5 )
--set( CTL_PATCH_VERSION 0 )
-+set( CTL_PATCH_VERSION 2 )
- set( CTL_VERSION ${CTL_MAJOR_VERSION}.${CTL_MINOR_VERSION}.${CTL_PATCH_VERSION} )
- 
--## Make install directories overrideable
--set( INSTALL_LIB_DIR lib CACHE PATH "Install directory for libraries" )
--set( INSTALL_BIN_DIR bin CACHE PATH "Install directory for executable binaries" )
--set( INSTALL_INCLUDE_DIR include CACHE PATH "Install directory for public header files" )
--set( INSTALL_DOC_DIR doc CACHE PATH "Install directory for documentation" )
--if( WIN32 AND NOT CYGWIN )
--  set(DEF_INSTALL_CMAKE_DIR CMake)
--else()
--  set(DEF_INSTALL_CMAKE_DIR lib/CMake/CTL)
--endif()
--set(INSTALL_CMAKE_DIR ${DEF_INSTALL_CMAKE_DIR} CACHE PATH "Install directory for project CMake files" )
-+set(INSTALL_CMAKE_DIR ${CMAKE_INSTALL_FULL_LIBDIR}/CMake/CTL CACHE PATH "Install directory for project CMake files" )
- 
- # use, i.e. don't skip the full RPATH for the build tree
- SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
-@@ -28,20 +20,11 @@ SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- # which point to directories outside the build tree to the install RPATH
- SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
- # the RPATH to be used when installing, but only if it's not a system directory
--LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib" isSystemDir)
-+LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_FULL_LIBDIR}" isSystemDir)
- IF("${isSystemDir}" STREQUAL "-1")
--  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
-+  SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
- ENDIF("${isSystemDir}" STREQUAL "-1")
- 
--
--## convert install paths to absolute
--foreach( p LIB BIN INCLUDE CMAKE DOC)
--  set( var INSTALL_${p}_DIR )
--  if( NOT IS_ABSOLUTE "${${var}}" )
--    set( ${var} "${CMAKE_INSTALL_PREFIX}/${${var}}" )
--  endif()
--endforeach()
--
- option(ENABLE_SHARED "Enable Shared Libraries" ON)
- 
- if ( ENABLE_SHARED )
-@@ -70,20 +53,19 @@ export( TARGETS IlmCtl IlmCtlMath IlmCtlSimd FILE "${PROJECT_BINARY_DIR}/CTLLibr
- export(PACKAGE CTL)
-  
- # Create a CTLBuildTreeSettings.cmake file for the use from the build tree
--file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${INSTALL_INCLUDE_DIR}")
-+file(RELATIVE_PATH CONF_REL_INCLUDE_DIR "${INSTALL_CMAKE_DIR}" "${CMAKE_INSTALL_FULL_INCLUDEDIR}")
- configure_file(config/CTLBuildTreeSettings.cmake.in "${PROJECT_BINARY_DIR}/CTLBuildTreeSettings.cmake" @ONLY)
- configure_file(config/CTLConfig.cmake.in "${PROJECT_BINARY_DIR}/CTLConfig.cmake" @ONLY)
- configure_file(config/CTLConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake" @ONLY)
- 
- if ( PKG_CONFIG_FOUND )
- configure_file(config/CTL.pc.in "${PROJECT_BINARY_DIR}/CTL.pc" @ONLY)
--install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev )
-+install( FILES "${PROJECT_BINARY_DIR}/CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev )
- endif()
- 
- install( FILES
-   "${PROJECT_BINARY_DIR}/CTLConfig.cmake"
-   "${PROJECT_BINARY_DIR}/CTLConfigVersion.cmake"
-+  "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake"
-   DESTINATION "${INSTALL_CMAKE_DIR}" COMPONENT dev)
--install(FILES "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" DESTINATION
--  "${INSTALL_CMAKE_DIR}" COMPONENT dev)
- 
-diff --git a/OpenEXR_CTL/CMakeLists.txt b/OpenEXR_CTL/CMakeLists.txt
-index c1ca53e..3f19dd4 100644
---- a/OpenEXR_CTL/CMakeLists.txt
-+++ b/OpenEXR_CTL/CMakeLists.txt
-@@ -13,7 +13,7 @@ add_custom_target( OpenEXR_CTL DEPENDS CtlModules exrdpx exr_ctl_exr )
- 
- if ( PKG_CONFIG_FOUND )
- configure_file(../config/OpenEXR_CTL.pc.in "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" @ONLY)
--install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION lib/pkgconfig COMPONENT dev )
-+install( FILES "${PROJECT_BINARY_DIR}/OpenEXR_CTL.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev )
- endif()
- 
- # TODO CMake config
-diff --git a/OpenEXR_CTL/CtlModules/CMakeLists.txt b/OpenEXR_CTL/CtlModules/CMakeLists.txt
-index c63c22e..9c9e5b8 100644
---- a/OpenEXR_CTL/CtlModules/CMakeLists.txt
-+++ b/OpenEXR_CTL/CtlModules/CMakeLists.txt
-@@ -2,6 +2,6 @@ install(
-     FILES
-         utilities.ctl
-     DESTINATION 
--        ${INSTALL_LIB_DIR}/CTL
-+        ${CMAKE_INSTALL_LIBDIR}/CTL
- )
- 
-diff --git a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt
-index e396ec5..1f0eea0 100644
---- a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt
-+++ b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt
-@@ -20,6 +20,6 @@ target_link_libraries( exr_ctl_exr IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl )
- target_link_libraries( exr_ctl_exr ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} )
- target_link_libraries( exr_ctl_exr ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} )
- 
--install( TARGETS exr_ctl_exr DESTINATION ${INSTALL_BIN_DIR} )
-+install( TARGETS exr_ctl_exr DESTINATION ${CMAKE_INSTALL_BINDIR} )
- 
--install( FILES change_saturation.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL )
-+install( FILES change_saturation.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL )
-diff --git a/OpenEXR_CTL/exrdpx/CMakeLists.txt b/OpenEXR_CTL/exrdpx/CMakeLists.txt
-index 50bd116..d9eadd8 100644
---- a/OpenEXR_CTL/exrdpx/CMakeLists.txt
-+++ b/OpenEXR_CTL/exrdpx/CMakeLists.txt
-@@ -20,8 +20,8 @@ target_link_libraries( exrdpx IlmCtlSimd IlmCtlMath IlmCtl IlmImfCtl )
- target_link_libraries( exrdpx ${IlmBase_LIBRARIES} ${IlmBase_LDFLAGS_OTHER} )
- target_link_libraries( exrdpx ${OpenEXR_LIBRARIES} ${OpenEXR_LDFLAGS_OTHER} )
- 
--install( TARGETS exrdpx DESTINATION ${INSTALL_BIN_DIR} )
-+install( TARGETS exrdpx DESTINATION ${CMAKE_INSTALL_BINDIR} )
- 
--install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL )
-+install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${CMAKE_INSTALL_LIBDIR}/CTL )
- 
- 
-diff --git a/config/CTL.pc.in b/config/CTL.pc.in
-index 6d6e732..9b212a4 100644
---- a/config/CTL.pc.in
-+++ b/config/CTL.pc.in
-@@ -1,8 +1,6 @@
--prefix=@CMAKE_INSTALL_PREFIX@
--exec_prefix=@INSTALL_BIN_DIR@
--libdir=@INSTALL_LIB_DIR@
--includedir=@INSTALL_INCLUDE_DIR@
--CTL_includedir=@INSTALL_INCLUDE_DIR@/CTL
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-+CTL_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/CTL
- 
- Name: CTL
- Description: CTL interpreter library
-diff --git a/config/OpenEXR_CTL.pc.in b/config/OpenEXR_CTL.pc.in
-index 4cef5c6..39a1a3f 100644
---- a/config/OpenEXR_CTL.pc.in
-+++ b/config/OpenEXR_CTL.pc.in
-@@ -1,11 +1,10 @@
--prefix=@prefix@
--exec_prefix=@exec_prefix@
--libdir=@libdir@
--includedir=@includedir@
--OpenEXR_includedir=@includedir@/OpenEXR
-+libdir=@CMAKE_INSTALL_FULL_LIBDIR@
-+includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@
-+OpenEXR_includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@/OpenEXR
- 
- Name: OpenEXR_CTL
- Description: Simplified OpenEXR interface to CTL
--Version: @OPENEXR_CTL_VERSION@
--Libs: -L${libdir} -lIlmImfCtl @OPENEXR_LDFLAGS@ @CTL_LDFLAGS@
--Cflags: @CTL_CXXFLAGS_PC@ @OPENEXR_CXXFLAGS@ -I${OpenEXR_includedir}
-+Version: @CTL_VERSION@
-+Libs: -L${libdir} -lIlmImfCtl
-+Cflags: -I${OpenEXR_includedir}
-+Requires: CTL,OpenEXR
-diff --git a/configure.cmake b/configure.cmake
-index 1817071..eb7e14e 100644
---- a/configure.cmake
-+++ b/configure.cmake
-@@ -1,10 +1,7 @@
--# Until we get some of these modules into the upstream packages, put them here
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/cmake/modules/")
--set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_INSTALL_PREFIX}/share/CMake")
-+# Make Pkg-Config required.
-+find_package( PkgConfig )
- 
--find_package( PkgConfig QUIET )
--
--find_package( IlmBase QUIET )
-+PKG_CHECK_MODULES ( IlmBase REQUIRED IlmBase )
- if(IlmBase_FOUND)
-   message( STATUS "found IlmBase, version ${IlmBase_VERSION}" )
-   ###
-@@ -13,11 +10,11 @@ if(IlmBase_FOUND)
-   ###
-   include_directories( ${IlmBase_INCLUDE_DIRS} )
-   link_directories( ${IlmBase_LIBRARY_DIRS} )
--  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS}" )
--  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS}" )
--  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" )
--  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS}" )
--  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS}" )
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${IlmBase_CFLAGS_OTHER}" )
-+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${IlmBase_CFLAGS_OTHER}" )
-+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" )
-+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" )
-+  set(CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} ${IlmBase_LDFLAGS_OTHER}" )
- else()
-   message( SEND_ERROR "IlmBase not found, please set the include and library paths manually" )
- endif()
-@@ -39,20 +36,20 @@ else()
-   endif()
- endif()
- 
--find_package( OpenEXR QUIET )
-+PKG_CHECK_MODULES ( OpenEXR REQUIRED OpenEXR )
- if (OpenEXR_FOUND)
-   message( STATUS "Found OpenEXR, version ${OpenEXR_VERSION}" )
- else()
-   message( WARNING "Unable to find OpenEXR libraries, disabling" )
- endif()
- 
--find_package( AcesContainer )
--if (AcesContainer_FOUND)
--  message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" )
--else()
--  if ( PKG_CONFIG_FOUND )
--    pkg_check_modules( AcesContainer AcesContainer )
--  else()
--    message( WARNING "Unable to find AcesContainer libraries, disabling" )
--  endif()
--endif()
-+find_package( AcesContainer )		
-+ if (AcesContainer_FOUND)		
-+   message( STATUS "Found AcesContainer, version ${AcesContainer_VERSION}" )		
-+ else()		
-+   if ( PKG_CONFIG_FOUND )		
-+     pkg_check_modules( AcesContainer AcesContainer )		
-+   else()		
-+     message( WARNING "Unable to find AcesContainer libraries, disabling" )		
-+   endif()		
-+ endif()
-diff --git a/ctlrender/CMakeLists.txt b/ctlrender/CMakeLists.txt
-index 9fced14..d97093d 100644
---- a/ctlrender/CMakeLists.txt
-+++ b/ctlrender/CMakeLists.txt
-@@ -11,12 +11,12 @@ include_directories( ${OpenEXR_INCLUDE_DIRS} )
- link_directories( ${OpenEXR_LIBRARY_DIRS} )
- endif()
- 
--if ( AcesContainer_FOUND )
--add_definitions( -DHAVE_ACESFILE=1 )
--include_directories( ${AcesContainer_INCLUDE_DIRS} )
--link_directories( ${AcesContainer_LIBRARY_DIRS} )
--endif()
--
-+if ( AcesContainer_FOUND )		
-+add_definitions( -DHAVE_ACESFILE=1 )		
-+include_directories( ${AcesContainer_INCLUDE_DIRS} )		
-+link_directories( ${AcesContainer_LIBRARY_DIRS} )		
-+endif()		
-+ 
- include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" "${PROJECT_SOURCE_DIR}/lib/IlmCtlSimd" "${PROJECT_SOURCE_DIR}/lib/dpx" )
- 
- add_executable( ctlrender
-@@ -41,9 +41,9 @@ if (OpenEXR_FOUND)
- target_link_libraries( ctlrender ${OpenEXR_LIBRARIES} )
- target_link_libraries( ctlrender ${OpenEXR_LDFLAGS_OTHER} )
- endif()
--if (AcesContainer_FOUND)
--target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} )
--target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} )
-+if (AcesContainer_FOUND)		
-+target_link_libraries( ctlrender ${AcesContainer_LIBRARIES} )		
-+target_link_libraries( ctlrender ${AcesContainer_LDFLAGS_OTHER} )		
- endif()
- 
--install( TARGETS ctlrender DESTINATION bin )
-+install( TARGETS ctlrender DESTINATION ${CMAKE_INSTALL_BINDIR} )
-diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
-index 0b123d0..9776205 100644
---- a/doc/CMakeLists.txt
-+++ b/doc/CMakeLists.txt
-@@ -1 +1 @@
--install( FILES CtlManual.pdf CtlManual.doc DESTINATION doc/CTL )
-+install( FILES CtlManual.pdf CtlManual.doc DESTINATION ${CMAKE_INSTALL_DOCDIR} )
-diff --git a/lib/IlmCtl/CMakeLists.txt b/lib/IlmCtl/CMakeLists.txt
-index 3672a43..ef301bd 100644
---- a/lib/IlmCtl/CMakeLists.txt
-+++ b/lib/IlmCtl/CMakeLists.txt
-@@ -22,7 +22,7 @@ add_library( IlmCtl ${DO_SHARED}
- )
- 
- target_link_libraries( IlmCtl ${IlmBase_LDFLAGS_OTHER} )
--target_link_libraries( IlmCtl Iex IlmThread Half )
-+target_link_libraries( IlmCtl ${IlmBase_LIBRARIES} )
- 
- set_target_properties( IlmCtl PROPERTIES
-   VERSION ${CTL_VERSION}
-@@ -50,4 +50,4 @@ install( FILES
- 	CtlVersion.h
-  DESTINATION include/CTL )
- 
--install( TARGETS IlmCtl DESTINATION lib )
-+install( TARGETS IlmCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-diff --git a/lib/IlmCtlMath/CMakeLists.txt b/lib/IlmCtlMath/CMakeLists.txt
-index 96738cf..6997c74 100644
---- a/lib/IlmCtlMath/CMakeLists.txt
-+++ b/lib/IlmCtlMath/CMakeLists.txt
-@@ -18,8 +18,8 @@ install( FILES
-   CtlLookupTable.h
-   CtlRbfInterpolator.h
-   CtlSparseMatrix.h
-- DESTINATION include/CTL )
-+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL )
- 
--install( TARGETS IlmCtlMath DESTINATION lib )
-+install( TARGETS IlmCtlMath DESTINATION ${CMAKE_INSTALL_LIBDIR} )
- 
- # TODO Add Imath and Iex libadd dependency and version info
-diff --git a/lib/IlmCtlSimd/CMakeLists.txt b/lib/IlmCtlSimd/CMakeLists.txt
-index 2ba792a..5eaf87d 100644
---- a/lib/IlmCtlSimd/CMakeLists.txt
-+++ b/lib/IlmCtlSimd/CMakeLists.txt
-@@ -1,7 +1,7 @@
- include_directories( "${CMAKE_CURRENT_SOURCE_DIR}" "${PROJECT_SOURCE_DIR}/lib/IlmCtl" "${PROJECT_SOURCE_DIR}/lib/IlmCtlMath" )
- 
- add_executable( halfExpLogTable halfExpLogTable.cpp )
--target_link_libraries( halfExpLogTable Half )
-+target_link_libraries( halfExpLogTable ${IlmBase_LIBRARIES} )
- 
- add_custom_command( OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h"
-                     COMMAND halfExpLogTable "${CMAKE_CURRENT_BINARY_DIR}/halfExpLogTable.h" "${CMAKE_CURRENT_BINARY_DIR}/halfExpLog.h"
-@@ -40,6 +40,6 @@ set_target_properties( IlmCtlSimd PROPERTIES
-   SOVERSION ${CTL_VERSION}
- )
- 
--install( FILES CtlSimdInterpreter.h DESTINATION include/CTL )
-+install( FILES CtlSimdInterpreter.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/CTL )
- 
--install( TARGETS IlmCtlSimd DESTINATION lib )
-+install( TARGETS IlmCtlSimd DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-diff --git a/lib/IlmImfCtl/CMakeLists.txt b/lib/IlmImfCtl/CMakeLists.txt
-index 47563df..784e27f 100644
---- a/lib/IlmImfCtl/CMakeLists.txt
-+++ b/lib/IlmImfCtl/CMakeLists.txt
-@@ -7,10 +7,10 @@ add_library( IlmImfCtl ${DO_SHARED}
-   ImfCtlCopyFunctionArg.cpp
- )
- 
--target_link_libraries( IlmImfCtl IlmCtl IlmImf Iex IlmThread Half )
-+target_link_libraries( IlmImfCtl IlmCtl ${OpenEXR_LIBRARIES} ${IlmBase_LIBRARIES} )
- 
--install( FILES ImfCtlApplyTransforms.h DESTINATION include/OpenEXR )
-+install( FILES ImfCtlApplyTransforms.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OpenEXR )
- 
- export( TARGETS IlmImfCtl IlmCtl FILE "${PROJECT_BINARY_DIR}/CTLLibraryDepends.cmake" )
- 
--install( TARGETS IlmImfCtl DESTINATION lib )
-+install( TARGETS IlmImfCtl DESTINATION ${CMAKE_INSTALL_LIBDIR} )
-diff --git a/lib/dpx/CMakeLists.txt b/lib/dpx/CMakeLists.txt
-index c8be26e..918890e 100644
---- a/lib/dpx/CMakeLists.txt
-+++ b/lib/dpx/CMakeLists.txt
-@@ -11,3 +11,4 @@ add_library( ctldpx
-  dpx_rw.cc
- )
- 
-+target_link_libraries( ctldpx ${IlmBase_LIBRARIES} )
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index f3b25a2727bd..b3776ddac5d1 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -21,7 +21,7 @@ EBUILD gegl-0.3.0-r1.ebuild 5372 BLAKE2B 843c8bb6c10947cc0378be51d6b269ae866840f
 EBUILD gegl-0.3.0.ebuild 5290 BLAKE2B eb698fbe621dead0979582fa83a47c0cdab26a556194778375045b25b6774dc72375b9fe19dfda8b6ce64ad024a5ee69cb26aea51fd3693f3e80b13a78d812a6 SHA512 eae35de6ca10d0fee700ce98bcf4fe8ba4af0ec43325fb097f67d2934bc951cc356f9e07ad0b81f07e8d715ba3fba9c50babc27ba6b2670c2e23056d6108e41b
 EBUILD gegl-0.3.20.ebuild 5182 BLAKE2B 97e2103ba355c528511106181c826feffeb7a2956521212d4973167ea088e39e90ff8d01af17f2e46becbfbebbe8b72a0847a5a20ec5b466c9e1721023ef9bc1 SHA512 ce8f8bb01a6469f1a5cefc6bc2b127f6ba38e8492496bae712b811ce7227c2c6102d2ab84e0da2c25dbb8a4b48ced1b00e0fb173b54d3e325d2445249841c13e
 EBUILD gegl-0.3.24.ebuild 5227 BLAKE2B fa9df9507e86249d5ea604dd879b86aa8fcd323401ed2f34b1f172ebf82df88ac9618457c11da08f821de1bb013c5b85f660da7ed52f6e1069e45765ce27267a SHA512 ff2b34a6fda2bd47c38203010140988bdf6b7565638b3edb8a71a8c4e26318c028cc121ee99ab4d974c077ea2d7242498f6e98dcb38e57a9d10f0d68b250142d
-EBUILD gegl-0.3.26.ebuild 5227 BLAKE2B a65581b6ab154e674a00803c866f8db812e2e4c788ef0707c418fb173d3a749c2a43eb957a713e5e519a5c8adadc0b7cb5a5960314b0a12383de67d6053d2a71 SHA512 cdb77ce41224b968c74186680f05ba727c1bfbb36bb0b72777f5f04ddd0ced8c26f8384a12e78aef2c1c8c4392f178b52ee5322c42c832e82b666bbc9def0e9c
+EBUILD gegl-0.3.26.ebuild 5226 BLAKE2B df1eb6cc2d5f33463d291913eec095e3cff981acd5db18fc5f64dfa1eb157201c0a392711146c3a7cf76ea93497f489eab7808d347af043d1b5c0ab3cf3401cf SHA512 5994a999e7e78bde427c40189b7988c37ae53aa7df9b016498bd569cd79d96c0082fdce7619f246a0424d70c79c7942fa6850ac567c3792bc75049dd1fe4d6cb
 EBUILD gegl-0.3.8-r1.ebuild 5299 BLAKE2B 413dfe970b595bef38e51dd2e749b10b014952ff00d609587c23f61135864e4640e2ccefc7d2faba02cfa8769c00d46cdd48bf5b9197ff79be89a6f34d86fbe9 SHA512 9a53f0b3633c4374c696a6be3d69226ae6e2116eb5d7f3c1a5362353e840e6507aa189aeae89c178b2b8ba896fdbfb1a929d3e478060a0fd906e27db65a48501
 EBUILD gegl-0.3.8.ebuild 5219 BLAKE2B 093e9816058f439e3b18308256d8c00acdb7dd2fc3a6595df03a04f26ab4b13830160783a0c745a544a277ffa7b2e9290332d89bd93685cfe94157462a88ba9a SHA512 66deb4d2c45850c9ac870d741419c16bf84a20c14cd936f90aebf626f6d9a45471aa65d3f632c617c78d9717206b0418424614b9edc3e8643ec1f61c93c3ac42
 EBUILD gegl-9999.ebuild 4921 BLAKE2B c5e2f1513eb418db2b725759bee29b5c97cd3be89b020d7b86eac4edf56b295d93b3dfbc8b7d2766411b3dcd4fb3c618ed44e9ed5a27ed38b844e530465b6acf SHA512 c6acfcfa7e2c50aa64b1ad31dda9c52d530a886e4ef477f06c56d32eab809215bc018ccf0180175abd81745b4432b8f9563e51ec6e1df72cf0a6125c95635478
diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild
index fb8a39197884..f1024965079b 100644
--- a/media-libs/gegl/gegl-0.3.26.ebuild
+++ b/media-libs/gegl/gegl-0.3.26.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
 	SRC_URI=""
 else
 	SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="A graph based image processing framework"
diff --git a/media-libs/imlib/Manifest b/media-libs/imlib/Manifest
index f42e5b4f0435..9adde2247374 100644
--- a/media-libs/imlib/Manifest
+++ b/media-libs/imlib/Manifest
@@ -10,6 +10,5 @@ AUX imlib-1.9.15.patch 2253 BLAKE2B 8ab175dd3c22790dadde804d6de2f78497a1553a0b6c
 AUX imlib-security.patch 13040 BLAKE2B 65eb4e5435dea0bba755ae21548fd7c25cc65a0f5ac7130905cf064c2f59b3dbe21d1cdd90de25e9f7e27fa1905bb51a38845b8ec92cff86cff6fbed789309d4 SHA512 a75537267e9e276920fbc0360cd4832f727c6c9857401889bdb1466f3088c98e5ea2ef84a94a5873a3c12dda0b9aed36a5e2039fece87e51154a3b773d97aa5c
 DIST gtk-1-for-imlib.m4.bz2 2742 BLAKE2B af16f586cbfb53522bb53b55d551d21ddf765e06694bebe93637b24c31bfdfff95f7ef250e66b784d7371bb309e4939c7db40c0ba1f1b1d73526e16cf745a93f SHA512 83708af1c7d7cf10960463b785bad096d77e985be5907dd59c73c2cb86c4b89fb5453a02ffddca1519185b91d205dbd96c4c4c1df4da4b67e64bad413cd8a40e
 DIST imlib-1.9.15.tar.bz2 683242 BLAKE2B 16cc11d2ddc69af7201215454c465d104354b63b4e0b1d8aadd07daf889368478dce28ea8ecf6b16daef3019891fcf7a794abccf02b236d1a6c737b0e9db08d3 SHA512 f50d9141b3c54b44921aa09c0a5ea848aefaa904efdd6da132dace42604671f8dbd3e4b71a596f054f0db4525ba2002864b5e5b21f8805cf1b5514b661ac254a
-EBUILD imlib-1.9.15-r4.ebuild 2098 BLAKE2B 818f6a88989140005f2cc16f4879d7aa10681225bd724457e86deade33f86a12499035188808ec8cdc5e51a20cb7d34094f28aa1ea68775441c0d7be9d5eb3d8 SHA512 57b6c5a17dcdcba92096d3bdd130e5eec737d01e85884934440957e60c5c43c3060d540082ec070a342148d508f920dbf05b6843b2123bb72dabce3cacaa7e4e
 EBUILD imlib-1.9.15-r5.ebuild 2153 BLAKE2B 35363265a87d45b2f888edd4b66e693bc70a5699cdd83b717b8cad4fe52c31384bcb3a60d9d2c1c8fbf4145759ae6411f762d6874b933bf18e340074fe722b2d SHA512 6850be17155da958d736adf291cf3f571b49b5997ff4940891cff3f6899147e7f7384edb34dfc9943db1d6893c3a9a250f8728be5a57779380b05307bb1305d6
 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f
diff --git a/media-libs/imlib/imlib-1.9.15-r4.ebuild b/media-libs/imlib/imlib-1.9.15-r4.ebuild
deleted file mode 100644
index e01eca215528..000000000000
--- a/media-libs/imlib/imlib-1.9.15-r4.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-inherit autotools eutils multilib-minimal
-
-PVP=(${PV//[-\._]/ })
-DESCRIPTION="Image loading and rendering library"
-HOMEPAGE="http://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/"
-SRC_URI="mirror://gnome/sources/${PN}/${PVP[0]}.${PVP[1]}/${P}.tar.bz2
-	mirror://gentoo/gtk-1-for-imlib.m4.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd"
-IUSE="doc static-libs"
-
-RDEPEND=">=media-libs/tiff-3.9.7-r1[${MULTILIB_USEDEP}]
-	>=media-libs/giflib-4.1.6-r3[${MULTILIB_USEDEP}]
-	>=media-libs/libpng-1.2.51[${MULTILIB_USEDEP}]
-	>=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}]
-	>=x11-libs/libICE-1.0.8-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libSM-1.2.1-r1[${MULTILIB_USEDEP}]
-	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-	abi_x86_32? (
-		!app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)]
-		!<=app-emulation/emul-linux-x86-gtklibs-20140406
-	)"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	# Fix aclocal underquoted definition warnings.
-	# Conditionalize gdk functions for bug 40453.
-	# Fix imlib-config for bug 3425.
-	epatch "${FILESDIR}"/${P}.patch
-	epatch "${FILESDIR}"/${PN}-security.patch #security #72681
-	epatch "${FILESDIR}"/${P}-bpp16-CVE-2007-3568.patch # security #201887
-	epatch "${FILESDIR}"/${P}-fix-rendering.patch #197489
-	epatch "${FILESDIR}"/${P}-asneeded.patch #207638
-	epatch "${FILESDIR}"/${P}-libpng15.patch #357167
-	epatch "${FILESDIR}"/${P}-underlinking-test.patch #367645
-	epatch "${FILESDIR}"/${P}-no-LDFLAGS-in-pc.patch
-
-	mkdir m4 && cp "${WORKDIR}"/gtk-1-for-imlib.m4 m4
-
-	AT_M4DIR="m4" eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--sysconfdir=/etc/imlib \
-		$(use_enable static-libs static) \
-		--disable-gdk \
-		--disable-gtktest
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install || die
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS ChangeLog README
-	use doc && dohtml doc/*
-
-	# Punt unused files
-	rm -f "${D}"/usr/lib*/pkgconfig/imlibgdk.pc
-	find "${D}" -name '*.la' -exec rm -f {} +
-}
diff --git a/media-libs/libdvdcss/Manifest b/media-libs/libdvdcss/Manifest
index 6313468459a4..2353c20cc21c 100644
--- a/media-libs/libdvdcss/Manifest
+++ b/media-libs/libdvdcss/Manifest
@@ -1,10 +1,7 @@
-DIST libdvdcss-1.2.13.tar.bz2 338588 BLAKE2B 325fefaa44b5a7d516c856ab2288eaa949d49ac8e66691dc385ec91392a4242bc90f59ee1285e931c804c7405c5187cbf13d396ae4abcf8efc849691d5d85633 SHA512 b7d912ef87854bca052c2f38709d49eeb72be9148b6598a7f71f9ccb1ad7f43a521f9533821fbd8d7ef16e2c36fe140209c9183f5ca91e8f806150cc16645717
 DIST libdvdcss-1.3.0.tar.bz2 355417 BLAKE2B 33fa609f8131f7b53d579805fcfcd4aa821f9d9d434f4f34720a4b9a8421bf64206609801da1ca6e36aed63db6c97103cf2303e4b83fbd4a563bf8bbe13147bf SHA512 f3254cb882f03d24e9fbe70fa9aa32ac34c104b57b3ad43727e26a4ab930bddd75de8d9a0e4ba68cdac23e1828f38c2b276679f5386f296cf20db46828836a3d
-DIST libdvdcss-1.3.99.tar.bz2 377167 BLAKE2B 9032bb6ba2595143079fb80bc8dce4197f80a45ba6f1d34b42a09db8f244cd22d4b9b41edb899a927be93a632dc9597dd49ba5b26d6c981091b091cf4a38ecda SHA512 d81ac96d81181dae4e6d63a11fa56fd4ff1ce1ee58c49a1354c10315eb5f9e743475d7e3896bac4dc7ea3ed35e52a964dd337a9b3f32f9ff9e37d11fcd4292b1
 DIST libdvdcss-1.4.0.tar.bz2 364373 BLAKE2B bad4bfaa17df33ff665684000d54b91c37b5d924b4b707a47756a2ef9b468256eff966379ab30f0c4d7650c0cd5617f70413a8508fa2279485a14b6b44c38680 SHA512 ad4503a37f47a9563da0b9e387ca3e812f6cdfbf109b8d92f8eccdd879b4270e5b0ee79041d7fb4c86698d72748f7bbf0257db8da6bb1c889dd4f78645e3371b
-EBUILD libdvdcss-1.2.13-r1.ebuild 796 BLAKE2B ece289e199e2ab568f3b16808e2f57e152c74f8aac752e757dfe2f08f80b77096a67fc5f4ebd106eeec24697764ac8f11592d610945c86096ae212ed5bb717e7 SHA512 b71400b39330a86ff5608e925152ae0f7d0d3274967c03b4762c8036d9f0af6f008f34facd04520e0106e02e7aca55bac7ad427969284a9cfa007b2de77550a1
-EBUILD libdvdcss-1.2.13.ebuild 789 BLAKE2B 44c7165710e77905983c593605e7791616f87eca0e229524e75feb9065ae4863687a583c7f41440947b3b44dce98677cadbec0db32a138381a406df7c329d852 SHA512 8e6e027ab816374665944ca300b67eca583e7c3c71afcbd6118e6375c4512571168fbb6f41708ee330521afbfd566f7b5a2f6606230636b369a9585e79984511
+DIST libdvdcss-1.4.1.tar.bz2 366169 BLAKE2B 54d3f8ccd76286a5b7082abdc8d134fb47d192bb62ee8d58b04f5eb387b804bdde4ec5c7a48627b9afebbb8d3a783a23189886e50277cf855a819fdd08eefd5e SHA512 4456ebcf8b53a8aaee97643261a14a05c929e9e9120cbe5fc6839ddf62be3dcfe7313fca3ee57c00bea43ddf623dc3d61fff7c2f6316338495df95c9c422f39e
 EBUILD libdvdcss-1.3.0.ebuild 796 BLAKE2B 46c60fc09583d30961b1526990b8d6f583b9d63acc4c1b2cca1ae44b621d964783ede275c2612f64bea635c2a32e1ad26294282e132e056e551db046883a0498 SHA512 84baa330a130ffd7f0246815ab3c987c9df2f26e59929f8413ea36b0208e5aca607f3865788632a348039cb5f7bcfdf179e5a2f12163ecbfc942007c100094f2
-EBUILD libdvdcss-1.3.99.ebuild 810 BLAKE2B 6be3006ba20bb7c453f20eb7a8788bbe45cab2a4fbb8f3635e827d8caa7c6046e9688a4b6d3b3fc370533e2063112d84eafa26fca139146e2db2993874c157cc SHA512 ee0a2d34aace87e88074cbd1349165fd9df6623af29f29d649b40bd69a31287457f88f3c1932cb90ed2c59f766dca1abbe822146836fc31c50e966cfe8f3ec21
 EBUILD libdvdcss-1.4.0.ebuild 809 BLAKE2B 176d9562c52261563c14a6d0f8e94fff5abca7ad7d1cffa6746f3083b81a5d9e44f7d918717246843bc99d04a99934048ee30040e9734cdbbccdac5f29d139b7 SHA512 62967a8f03b58cee3ebac30fced2da26c9218baad8f3695f4846ab03b5c2d06eb6dfc617ff3043192f231748b23160cf4c4cea7c0c837dc2185c00cefc778c68
+EBUILD libdvdcss-1.4.1.ebuild 817 BLAKE2B 3ec859850660f9f526587a76c993d1b00fc67624a97d6b88997dd44b201ab8e1f9120080cb2b38e8efe22ca2c996a426cfab1cbd19bde146859de2c5ff2d8f3b SHA512 5b264785c8051592e78c67f00a2bc8c1b3eab7a7d0f330ecdbfdee58f3a43e01c983cbef603ba0f43ad70ced2a40118a64c05c2551f1a2ad82eaa9f03919c2c2
 MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.13-r1.ebuild b/media-libs/libdvdcss/libdvdcss-1.2.13-r1.ebuild
deleted file mode 100644
index 10e07d63a383..000000000000
--- a/media-libs/libdvdcss/libdvdcss-1.2.13-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib
-
-DESCRIPTION="A portable abstraction library for DVD decryption"
-HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
-SRC_URI="https://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="alpha amd64 arm 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="doc static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-#DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc)
-		--htmldir=/usr/share/doc/${PF}/html
-	)
-
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libdvdcss/libdvdcss-1.2.13.ebuild b/media-libs/libdvdcss/libdvdcss-1.2.13.ebuild
deleted file mode 100644
index 71650c57d155..000000000000
--- a/media-libs/libdvdcss/libdvdcss-1.2.13.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-utils
-
-DESCRIPTION="A portable abstraction library for DVD decryption"
-HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
-SRC_URI="https://www.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="alpha amd64 arm 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="doc static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-#DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc)
-		--htmldir=/usr/share/doc/${PF}/html
-	)
-
-	autotools-utils_src_configure
-}
diff --git a/media-libs/libdvdcss/libdvdcss-1.3.99.ebuild b/media-libs/libdvdcss/libdvdcss-1.3.99.ebuild
deleted file mode 100644
index 048034b19a11..000000000000
--- a/media-libs/libdvdcss/libdvdcss-1.3.99.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools-multilib
-
-DESCRIPTION="A portable abstraction library for DVD decryption"
-HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
-SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="1.2"
-KEYWORDS="~alpha ~amd64 ~arm ~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="doc static-libs"
-
-RDEPEND=""
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )"
-
-#DOCS=( AUTHORS ChangeLog NEWS README )
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable doc)
-		--htmldir=/usr/share/doc/${PF}/html
-	)
-
-	autotools-multilib_src_configure
-}
diff --git a/media-libs/libdvdcss/libdvdcss-1.4.1.ebuild b/media-libs/libdvdcss/libdvdcss-1.4.1.ebuild
new file mode 100644
index 000000000000..bda143969dff
--- /dev/null
+++ b/media-libs/libdvdcss/libdvdcss-1.4.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit autotools-multilib
+
+DESCRIPTION="A portable abstraction library for DVD decryption"
+HOMEPAGE="https://www.videolan.org/developers/libdvdcss.html"
+SRC_URI="https://download.videolan.org/pub/${PN}/${PV}/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="1.2"
+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="doc static-libs"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )"
+
+#DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable doc)
+		--htmldir=/usr/share/doc/${PF}/html
+	)
+
+	autotools-multilib_src_configure
+}
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index 3869cf7a3806..8677fc02fbfc 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -1,12 +1,15 @@
+AUX libv4l-1.14.1-sysmacros.patch 808 BLAKE2B 1dc608e836120e65140ffed8f9f4d19868eafbfb2e729665ad553fc44da4386d2197eb327f3f36ffafe8af45bea7adff72808d7cd7890e05c7fe5f3ba570ff8c SHA512 593f53b92ce947b1c2f75e7e1090b3f1e9ff3c39a69fcb96c4a6f1825db947b92bf4d45b93dc14eef7f439104d4a4090ef1823a38bd5e39687587afd6657671a
 AUX libv4l-1.6.2-sysmacros.patch 1821 BLAKE2B 9242ec9dccf2b14ab4d3ebc1246035ec3a1816d0b0389577638949cf8e493074132b7c13db6c1ca360ad5e2a2de271166126110d2f237d068185aeb2c3293c4b SHA512 ff6addf5d8e8da4f8502f1af8f21de60c9579da11b3aa3145d42030387bdcdd7c6263d5b6cdcba302ea8b8b3a578dbd17d75e11250d4074df2b6ca59d6de1d55
 DIST v4l-utils-1.10.0.tar.bz2 1335798 BLAKE2B 80e44a4e9681b3add4a96bb6040991029fe7f85cfc4871407690c370fbeb6fd8311ae2042acbf934717b34ff60cfcf25f426c4caaf38cfd1f55b23d9ffb4f4db SHA512 1c9d70c7a6c4eddd72951786b76d69b6bed682763a33d1a4ffd393e1589add353124af51fa976e4c362f98e8d5baba9e8fa8d50b27e99cd0363fc5c8e57d7a73
 DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 7ececae8ad5ebd999070b0c3626fdf5b0a4bc81562d2c2a712ff9625025d3e6c4ff664ba85998dedaa1ee77295d3cea39306305c20573c07156a07ec0ac8d10a SHA512 524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d
 DIST v4l-utils-1.12.3.tar.bz2 1588049 BLAKE2B 1f76e6cd76781119beb01a1d570599cd2710a4c00ea18c380e576cb8281bab07e09cb6c1469201d0fba53b8bb5f4c4fa812dcda06203d83566216272e9abe3b0 SHA512 6d0269d900c5dad08499ee551ce1507b8b750895f48423ccd534db51cf68794b59a279743fd22dc6da0c092ca31ef744aa564f26b6d6252cbbc7a62e2e1c714a
 DIST v4l-utils-1.12.5.tar.bz2 1588944 BLAKE2B b87c24c6fdaf3e80407dd28b047c27420ff70007e12200e69395021def3abb74eec3565337a6484cf44b5a5cc7678d9bc718876424fa58d6d16d0e0c37ab59cf SHA512 ed2e7545a728360b9684db68330885b498a3a5611f49b80e54da72109d9ba2aa75e85f89f085ff0a6f077b17c880101fa5b78c9dff8a0df2eac1866bd80a04ea
+DIST v4l-utils-1.14.1.tar.bz2 1672480 BLAKE2B bc5c50fa0b339c79439b54e54f0c0e3847068931e34831a05e214e785fe4063764ef0d76838ca3216a46db072003dc5d86dd2c563fbb73d237a6b5059df93f5a SHA512 78b863f2cba409138efd6744895e6b1e730ec7cd5dfd0bd6088dd1336572a5f6d0b422fb4ec6577c6038192d0a3b28ae91d7402d5733904913749eff263c2eb1
 DIST v4l-utils-1.6.2.tar.bz2 1148309 BLAKE2B 8153a1e3803b9e59eae064f2c88e4b865a56193788a8cb204dc34e9ae50e66794ba7f020ad4b0ff9af995f57d9b9a9e0225e0f8a09eeefae42d063131d7e549a SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2
 EBUILD libv4l-1.10.0.ebuild 1395 BLAKE2B 9137b578723257d586092a1f3fd81f8ea552d93f0e50ac7d7ec8c447925c4d5a50dd4cabc46066cad5c4036c5cfe9850ffeddbfe7a1451209916ecd788c0326c SHA512 4daf5f65f9b587107864e86f5108f194c103fd3af8a1c645fcc09700021289460b3ba5aa3bedfc4c70380d454c1e8ee3fb837a01379e769c14286fdf19f8a611
 EBUILD libv4l-1.10.1.ebuild 1398 BLAKE2B 0da4472606ac09cb6101835663157e07be64b89937563e1eeccf1878a27272c8d5489209a89c7da439ec8ea7fef8c57ceb23db43ac1309ee7c4cef451368fc98 SHA512 ceebbb892834d2b93310e5f855e93f3eaa70b2b6d3d4dfb0b05d7bc50f9ed0d7dc16d96356e948d6ca7f4a1956ed44216cb5d1d67c715c3f766ded9c52689074
 EBUILD libv4l-1.12.3.ebuild 1321 BLAKE2B ab3ff5aaaba94331523ca23db44a3103864a5b6014a025fabc1aa59c593217760bf2d3dbd65840113a4b8fec1c7b8be123193a72a64b03b7a07f7a28287eb0d4 SHA512 c08dc4720cd7fb7a3713c62b0cfd083e379cb015473f1b0455dbe2c63a2005523edc445aa925f42160e2dbba52f13442f3b7c8e59d648f5b4c78267abbf06788
 EBUILD libv4l-1.12.5.ebuild 1370 BLAKE2B b122ee457e5e0879d2d1e584b4165e2a9b49cdded83229d60b7a89f18f5ae5721158c698027672f7b7cd294e8f41a05aa7fce3cff9b40930412bf68853a09b2d SHA512 beb1632e4619a33c3c02f370bcc0c94ac53ea666fb8782da769379d541088f23b2034248f8f5c089fa1a8b1d5cc0a834871090ff3358c5bbb8519cccb993477e
+EBUILD libv4l-1.14.1.ebuild 1434 BLAKE2B 3fc61c41c012477e5b736b6ee488c99f5fc73c466b87228625ecd1822fd9d60f0999354a16eeae28394c5d9939c83a6cde15b14b9afd9ce6fe582d9f7661b504 SHA512 8d9bc01f3a6c3d27a8a896db01471d30dd0f56b65c5c6f60dd992171e4ba746089e9c6983646424fc3e449d6e1f725bcc7bfa8185dbdea8ba6075e496f10f209
 EBUILD libv4l-1.6.2.ebuild 1498 BLAKE2B ef70dd87b249c185fbb64ab82754bb51aa5915880dfd7c3516962796bcead440b5fea62e58c601266adb138cfdd98923eb1851d3679c9f6f9390de10a79f529a SHA512 5181a3fd3b3405f3809315cf922f0850b5c36cf0668fdbc774ca712c661b98a3d0555dbd75c34792317ec1775b019ca8b75d955e652f8018664cbdc2b8a528a7
 MISC metadata.xml 1125 BLAKE2B 3404da3f65f90eb87682c99c24feacf97f03616c55caf36c71538fb2f2da424be0ba5cd36b017872268d0efa34441440bcba95a482c0723c0b79ccf6a96a6e65 SHA512 5594f9030eb7da8b32c90e1710ebe6370339ef4fbb3a1b23a99024e9c0ef5bbbde31e421e3c9e23edf5e44709970fa1a60523c8fa615b90ce16437b28d5714c7
diff --git a/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch b/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch
new file mode 100644
index 000000000000..b8190507fc7d
--- /dev/null
+++ b/media-libs/libv4l/files/libv4l-1.14.1-sysmacros.patch
@@ -0,0 +1,26 @@
+Index: v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c
+===================================================================
+--- v4l-utils-1.14.1.orig/lib/libv4lconvert/control/libv4lcontrol.c
++++ v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c
+@@ -20,9 +20,7 @@
+  */
+ 
+ #include <sys/types.h>
+-#if defined(MAJOR_IN_SYSMACROS)
+ #include <sys/sysmacros.h>
+-#endif
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
+Index: v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp
+===================================================================
+--- v4l-utils-1.14.1.orig/utils/v4l2-ctl/v4l2-ctl.cpp
++++ v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/media-libs/libv4l/libv4l-1.14.1.ebuild b/media-libs/libv4l/libv4l-1.14.1.ebuild
new file mode 100644
index 000000000000..4ab5d3552591
--- /dev/null
+++ b/media-libs/libv4l/libv4l-1.14.1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit eutils libtool linux-info multilib-minimal
+
+MY_P="v4l-utils-${PV}"
+
+DESCRIPTION="Separate libraries ebuild from upstream v4l-utils package"
+HOMEPAGE="https://git.linuxtv.org/v4l-utils.git"
+SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2.1+"
+SLOT="0/0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="jpeg"
+
+# The libraries only link to -ljpeg, therefore multilib depend only for virtual/jpeg.
+RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+	virtual/libudev
+	!media-tv/v4l2-ctl
+	!<media-tv/ivtv-utils-1.4.0-r2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/os-headers
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-1.14.1-sysmacros.patch ) #580910
+
+pkg_setup() {
+	CONFIG_CHECK="~SHMEM"
+	linux-info_pkg_setup
+}
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+multilib_src_configure() {
+	# Hard disable the flags that apply only to the utils.
+	ECONF_SOURCE=${S} \
+	econf \
+		--disable-static \
+		--disable-qv4l2 \
+		--disable-v4l-utils \
+		$(use_with jpeg)
+}
+
+multilib_src_compile() {
+	emake -C lib
+}
+
+multilib_src_install() {
+	emake -j1 -C lib DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog README.lib* TODO
+	prune_libtool_files --all
+}
diff --git a/media-libs/openal/Manifest b/media-libs/openal/Manifest
index d570b88511e0..f0d2a34c8e1d 100644
--- a/media-libs/openal/Manifest
+++ b/media-libs/openal/Manifest
@@ -1,9 +1,5 @@
 DIST openal-soft-1.15.1.tar.bz2 253006 BLAKE2B 0023eed2e98d07190aa4301a84e6818224feb6459303681276525237c5de9c145cdaab3437cae6b7998307a2294aafebedf3852cbebe8c12232d1e39ba6e15e8 SHA512 ca6dafdd503d06892dff08763bc00b974ec6e7c4bf3dcebb4cb41a486b4ea777c278299a198db182fee888a19a5716bd57d91a2859b764a532138a79f2bd672f
-DIST openal-soft-1.17.2.tar.bz2 486934 BLAKE2B e707f59cc3eea0c43406b94eb48f41ca98336863af81d040cb60b1a557dd6037c53c752c7fa94fa0493d54337b59f70b9b9c6a5d8e4aee2798ee27baa2842fdb SHA512 50c20cd3ddada55d91643a79c2894d5a14315d5fc1ed8e870e3d8d3f410e8b7d8da29b838226e7fce37fbeca719ff919b51806f72e4cd529a18fbe8bd68860e3
-DIST openal-soft-1.18.1.tar.bz2 638913 BLAKE2B 6bdb50517a2cf77875226d5db6ae254f321ebcc3013f91ec1e712b336d3b1c1f0fdeceee9837d7b3567efe12726e926705f91d64b04242fafa5d5b969792b6ac SHA512 5ee86f21c499d79b139b78e3a8ddb6f79d293d7fb2076342396444a2a056eeb5bf39def18577280a41c9192ba5c6cfd3c67a68e97a6914a9c0ae81b4811c0c60
 DIST openal-soft-1.18.2.tar.bz2 639420 BLAKE2B 8e31db9d3c6eb49fe4833a6449603dc6284e39810942536594fb5e96d0bc2b867b69bd90e64d40cf99f9a279f3809509cf1c9af3114a4887057e78962a5463e8 SHA512 752e2fb0a5a014caa6d6bac1590d3df46140b463fbaa13378fb5de89f1c97ee8b62bec74f68484d4ec02ee8755c1a2d0c9394cdb477db1b7401deae2fb9eeb4d
 EBUILD openal-1.15.1-r2.ebuild 1461 BLAKE2B 96c339461509d21beccecef1f52a60f2181d1dc87b31d2cc05aad10dc3e8a4e47cc5be6721dcbaae07ad401650f38092bd20d501302137354ca668b0c631186a SHA512 0f4ce8cfdeb34c1ab3ef16cb7fdb72fd6d2e53ff306ac241c472f161f298fe9eec4b64603bda566e2fd45ed8fc89f8a4ad60f3043594e53568711b728af1a098
-EBUILD openal-1.17.2.ebuild 2120 BLAKE2B 5c0ce18900b7c632081f46708cfde883c330b1af1443e0321448818f2c7c10c3014decfbea8a8bc55cec1bd99fb195e0dca7dbafb2c4c8f73df11beb8a759d6d SHA512 0109cb4e2a9d7a5f4ae2017183e90e6a2c5f0606f6ff1fa14d125d13ec165c799342c6eb091922dca3bf6dfb1489687085f51e775a002dd9089ecf6593e3d0c6
-EBUILD openal-1.18.1.ebuild 2171 BLAKE2B 93c60fd93368db8ba58bdd2f49c0645a3f1034ebf69829ff7df421bd13836664dfd0e9ae32065cfd649b929e1f4d6cbd1945baecb80c36e82faa92783dc91808 SHA512 27171465aa343dba908725502227d29be020dc60894b4ecca5fa54ca3ddcce5cd8f7f49ade398eee39c9b1987cce36d72410a69f48d3ccff01ddafa712a1c130
-EBUILD openal-1.18.2.ebuild 2171 BLAKE2B 93c60fd93368db8ba58bdd2f49c0645a3f1034ebf69829ff7df421bd13836664dfd0e9ae32065cfd649b929e1f4d6cbd1945baecb80c36e82faa92783dc91808 SHA512 27171465aa343dba908725502227d29be020dc60894b4ecca5fa54ca3ddcce5cd8f7f49ade398eee39c9b1987cce36d72410a69f48d3ccff01ddafa712a1c130
+EBUILD openal-1.18.2-r1.ebuild 2027 BLAKE2B 96f03de444a5933b72104c88d6c76675b8823cf8e87905f2d398d6f7418125af2fcf8ceba1ab4025e989bf653e85c15e61d527a251fdf0e381fb262aded054f4 SHA512 81a7c17bde4045bed9eb54432e9d5d3c5db79d8750aeed50176ab1c3434b574e7b34d4254df5951305d5127620e9ed1f56dc140b9b6dd3056377f3b86304df90
 MISC metadata.xml 253 BLAKE2B 6426153a5fa5bbad2aaffd28a6460f87a35678319768c57ac8dfae02b2229f6278dead4f564e6bc2bfd54d7143aed95c382abc2ee16c1073e9fbaf4f84cc0fef SHA512 78b724be3e1dbd6fc3c2e92cdbacc15ea4b0e8ee6fa22f76ebdd882b3a7bbedeaf8f80a29e36ec67e0432d2dfad3f57de4bc46480f92c8e544322755292df894
diff --git a/media-libs/openal/openal-1.17.2.ebuild b/media-libs/openal/openal-1.17.2.ebuild
deleted file mode 100644
index 236afeea2e08..000000000000
--- a/media-libs/openal/openal-1.17.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit cmake-multilib
-
-MY_P=${PN}-soft-${PV}
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="http://kcat.strangesoft.net/openal.html"
-SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="
-	alsa coreaudio debug jack oss portaudio pulseaudio qt4
-	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
-	neon
-"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
-	abi_x86_32? (
-		!<app-emulation/emul-linux-x86-sdl-20131008-r1
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-S=${WORKDIR}/${MY_P}
-
-DOCS="alsoftrc.sample env-vars.txt hrtf.txt ChangeLog README"
-
-src_configure() {
-	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
-	my_configure() {
-		local mycmakeargs=(
-			"-DALSOFT_BACKEND_ALSA=$(usex alsa ON OFF)"
-			"-DALSOFT_BACKEND_COREAUDIO=$(usex coreaudio ON OFF)"
-			"-DALSOFT_BACKEND_JACK=$(usex jack ON OFF)"
-			"-DALSOFT_BACKEND_OSS=$(usex oss ON OFF)"
-			"-DALSOFT_BACKEND_PORTAUDIO=$(usex portaudio ON OFF)"
-			"-DALSOFT_BACKEND_PULSEAUDIO=$(usex pulseaudio ON OFF)"
-			"-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse ON OFF)"
-			"-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)"
-			"-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)"
-			"-DALSOFT_CPUEXT_NEON=$(usex neon ON OFF)"
-			"-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")"
-			"-DALSOFT_NO_CONFIG_UTIL=$(usex qt4 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)"
-			"-DALSOFT_EXAMPLES=OFF"
-		)
-
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
diff --git a/media-libs/openal/openal-1.18.1.ebuild b/media-libs/openal/openal-1.18.1.ebuild
deleted file mode 100644
index 746d507d9ee2..000000000000
--- a/media-libs/openal/openal-1.18.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-MY_P="${PN}-soft-${PV}"
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="http://kcat.strangesoft.net/openal.html"
-SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="
-	alsa coreaudio debug jack oss portaudio pulseaudio qt4
-	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
-	cpu_flags_arm_neon
-"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
-	abi_x86_32? (
-		!<app-emulation/emul-linux-x86-sdl-20131008-r1
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README )
-
-src_configure() {
-	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
-	my_configure() {
-		local mycmakeargs=(
-			"-DALSOFT_BACKEND_ALSA=$(usex alsa ON OFF)"
-			"-DALSOFT_BACKEND_COREAUDIO=$(usex coreaudio ON OFF)"
-			"-DALSOFT_BACKEND_JACK=$(usex jack ON OFF)"
-			"-DALSOFT_BACKEND_OSS=$(usex oss ON OFF)"
-			"-DALSOFT_BACKEND_PORTAUDIO=$(usex portaudio ON OFF)"
-			"-DALSOFT_BACKEND_PULSEAUDIO=$(usex pulseaudio ON OFF)"
-			"-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse ON OFF)"
-			"-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)"
-			"-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)"
-			"-DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon ON OFF)"
-			"-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")"
-			"-DALSOFT_NO_CONFIG_UTIL=$(usex qt4 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)"
-			"-DALSOFT_EXAMPLES=OFF"
-		)
-
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
diff --git a/media-libs/openal/openal-1.18.2-r1.ebuild b/media-libs/openal/openal-1.18.2-r1.ebuild
new file mode 100644
index 000000000000..fa00593534f4
--- /dev/null
+++ b/media-libs/openal/openal-1.18.2-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-multilib
+
+MY_P="${PN}-soft-${PV}"
+
+DESCRIPTION="A software implementation of the OpenAL 3D audio API"
+HOMEPAGE="http://kcat.strangesoft.net/openal.html"
+SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
+
+LICENSE="LGPL-2+"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+IUSE="
+	alsa coreaudio debug jack oss portaudio pulseaudio qt5
+	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
+	cpu_flags_arm_neon
+"
+
+RDEPEND="
+	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
+	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
+	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+	)
+"
+DEPEND="${RDEPEND}
+	oss? ( virtual/os-headers )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README )
+
+src_configure() {
+	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
+	my_configure() {
+		local mycmakeargs=(
+			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
+			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
+			-DALSOFT_REQUIRE_JACK=$(usex jack)
+			-DALSOFT_REQUIRE_OSS=$(usex oss)
+			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
+			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
+			-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
+			-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
+			-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+			-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
+			-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
+			-DALSOFT_EXAMPLES=OFF
+		)
+
+		use cpu_flags_arm_neon && mycmakeargs+=( -DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon) )
+
+		cmake-utils_src_configure
+	}
+
+	multilib_parallel_foreach_abi my_configure
+}
diff --git a/media-libs/openal/openal-1.18.2.ebuild b/media-libs/openal/openal-1.18.2.ebuild
deleted file mode 100644
index 746d507d9ee2..000000000000
--- a/media-libs/openal/openal-1.18.2.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-multilib
-
-MY_P="${PN}-soft-${PV}"
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="http://kcat.strangesoft.net/openal.html"
-SRC_URI="http://kcat.strangesoft.net/openal-releases/${MY_P}.tar.bz2"
-
-LICENSE="LGPL-2+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="
-	alsa coreaudio debug jack oss portaudio pulseaudio qt4
-	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
-	cpu_flags_arm_neon
-"
-
-RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 )
-	abi_x86_32? (
-		!<app-emulation/emul-linux-x86-sdl-20131008-r1
-		!app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README )
-
-src_configure() {
-	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
-	my_configure() {
-		local mycmakeargs=(
-			"-DALSOFT_BACKEND_ALSA=$(usex alsa ON OFF)"
-			"-DALSOFT_BACKEND_COREAUDIO=$(usex coreaudio ON OFF)"
-			"-DALSOFT_BACKEND_JACK=$(usex jack ON OFF)"
-			"-DALSOFT_BACKEND_OSS=$(usex oss ON OFF)"
-			"-DALSOFT_BACKEND_PORTAUDIO=$(usex portaudio ON OFF)"
-			"-DALSOFT_BACKEND_PULSEAUDIO=$(usex pulseaudio ON OFF)"
-			"-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse ON OFF)"
-			"-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)"
-			"-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1 ON OFF)"
-			"-DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon ON OFF)"
-			"-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")"
-			"-DALSOFT_NO_CONFIG_UTIL=$(usex qt4 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)"
-			"-DALSOFT_EXAMPLES=OFF"
-		)
-
-		cmake-utils_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 20218981eaeb..e92eeec2e3a9 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -1,9 +1,9 @@
 AUX opencolorio-1.0.8-documentation-gen.patch 1973 BLAKE2B dd84c68f70af7cd6ebef7b2651f1edc8352e97fa08290e6854175f30ddfda4fa3c2451d8313cdf3791777ced76974d0944b855eca8a52c76d034dcb94ae6c61c SHA512 779fa5311a889afb30a31b278e60aaa5253311d071ded8764d2f33e6f69432a41bffd9745059e0b20e28db8445494bdee4aa69908e709e1248a08ea5c2f9c93c
-AUX opencolorio-1.0.9-cmake-fixes-v1.patch 5887 BLAKE2B 6b3c6160ee55dece3156439a355433139c3ed081a5547c83c6c74b8476e5718234c7044a5a2d46eeaadbabde828e2f367d65444898d9c2eb93ac217984a0392d SHA512 d3f4624f673528f7f5e7663dc4fef2cfe3eb1d23eae5a66655b677710a9500504b025631f215da611da7aa619cdfb1052b3a19fd8d6266c4c099ef68bebe4ce4
 AUX opencolorio-1.0.9-remove-external-doc-utilities.patch 2674 BLAKE2B b5fc774305224345c642c2d1f8813e1229519768679e9ea9a21b6922d90831fcdefcd77b5462a581cd00349476a18c76eb02ba14ad806c23e355597a9b5f06c8 SHA512 f04dc9255dc9c84fd842eab14bb46d3084f1accfc9746a559a0b428a580669e8486d03229f9d00204c761c11c3962f15754d9667daf6b968a95ae2fc2b0f3ac5
+AUX opencolorio-1.1.0-cmake-fixes.patch 6937 BLAKE2B 509b1a11309a9854c15581ad0bdae40277473f5dcaf2c02377346ad5075ddd4c65bf2811c6975d53c0495384a123bc128d4b2c4ff0a52fdfae4f1a7d8bc2c7bd SHA512 aa50831b22740ccbfd6d990ac334f77f82725c6ce6701205857099ec662329309fb8cca6a472ec9650573a9b6c82f26f6076f570ca2066cde445139feea7691c
 DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 BLAKE2B 6eaabec7780cb4be9ec4b0b16f79b7114b187b13e3027b6cae3662c6a2b6dacb6566e36fbdf7b2edc77855be505e4cd2c84e16b58d49ccdc59341359419b7cc4 SHA512 8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc
 DIST opencolorio-1.0.9.tar.gz 12473406 BLAKE2B 54c867521b66d7479c175f65046ffd50ce41fb665c640cf5097b7178cc11dbf17cd324e7d861e4a56c990a109d7f80041d5e83a2438bbfb550e2d8affab7c2da SHA512 f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8
-DIST opencolorio-1.0.9_p20170719.tar.gz 13752783 BLAKE2B 2f6a0e095bb3fd56a49b6d43f5c4f3690a2c735c1cc84c337bcb19abf391bedd600bcb6fc512fd8e1c56fe1e337ee57358329490f2dc2c92362b8c939a579917 SHA512 1ee86cae951afed963bc62e251975a6c721553fc1bb7650faccb6160fcd6b3e030c509667cb7b2543a3ca32ed6777259d98bf25e2bb8150fee8054310b9d2590
+DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998
 EBUILD opencolorio-1.0.9-r2.ebuild 2375 BLAKE2B 6e50184ecd9df51cec933a55fbdb9365c82661b7e9d66d804bebdc329433c996d616898334bd3f1856b381371083584488faa46476962fe3c306db324d891575 SHA512 0e3d7dc603f5811e547ba6de400ae05c519e87ba6135bcda8d7fdbc1d5d87526c0fd8a2f8dd26062b39826bacdc6590fda538036d3cd7d09a0b86e70ccb202c1
-EBUILD opencolorio-1.0.9_p20170719.ebuild 2263 BLAKE2B 863c66788e80a083a93ed18afa648c4ff63b69c0899998a3fd8b6bc35107a1ed1f02fec74e5356409abf72a2af61bdf451bcca7b9f6733fdf179f5be249c8189 SHA512 1723b1b792f94a5d39d2568354d766ad6367de56824ce279bf888478ba700c7a420594e64750420e965051b69629833d8e45714b5cc75510204711f0ecfabb27
+EBUILD opencolorio-1.1.0.ebuild 2186 BLAKE2B 0dfafb7a611aaa519e4a20ba464c778976f0feaa9ad6bbbbda397c3aeb044074363f584f7b1db244bdb2f91b67edc6424ffca257506032efe89a9d52718b8f88 SHA512 3512e32d06ad7d43e51266f480fbc366e0ef0cafbd7bf5e6cfd40023f0a3020cdf08915eae291509b238d9c0b4bfe8fa64ce7ecd3cf3944aeb17e790e5491cbf
 MISC metadata.xml 634 BLAKE2B b707f9f7705642ba845a2d2c624432198dc2006bfeffce5d62407e3a078e04a963b297ecf0d615d73cc0cc2ab352bc191ea5f11347b84b137d2aa8acceb25b45 SHA512 4557bc67a3d3e02c66335890947b85a2d8f46c7c73eceae8b29a3e732ea6c0bb767ee87a932a7148f4cfc0f125c184657fc8d7e23c8ba5ba1523f7e35ce4e047
diff --git a/media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch b/media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch
deleted file mode 100644
index 23f67cae55c5..000000000000
--- a/media-libs/opencolorio/files/opencolorio-1.0.9-cmake-fixes-v1.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-diff -purN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt	2017-07-19 21:38:48.000000000 +0100
-+++ b/CMakeLists.txt	2017-08-15 14:14:02.223744929 +0100
-@@ -59,6 +59,7 @@ endif()
- include(ParseArguments)
- include(OCIOMacros)
- include(ExternalProject)
-+include(GNUInstallDirs)
- 
- enable_language(CXX)
- 
-@@ -519,7 +520,7 @@ endif()
- configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
-     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
- 
--INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
-+INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ocio/)
- 
- ###############################################################################
- ### CPACK ###
-@@ -634,4 +635,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
-     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
-     "
- )
--install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
-+install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/CMake)
-diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
---- a/docs/CMakeLists.txt	2017-07-19 21:38:48.000000000 +0100
-+++ b/docs/CMakeLists.txt	2017-08-15 14:10:29.645282585 +0100
-@@ -1,68 +1,5 @@
- 
- ###############################################################################
--### External Doc Apps ###
--
--# setuptools
--# https://pypi.python.org/pypi/setuptools
--set(SETUPTOOLS_VERSION 1.1.6)
--ExternalProject_Add(setuptools
--    URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
--    BUILD_IN_SOURCE 1
--    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# docutils
--# https://pypi.python.org/pypi/docutils
--set(DOCUTILS_VERSION 0.11)
--ExternalProject_Add(docutils
--    DEPENDS setuptools
--    URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz
--    BUILD_IN_SOURCE 1
--    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# jinja2
--# https://pypi.python.org/pypi/Jinja2
--set(JINJA2_VERSION 2.7.1)
--ExternalProject_Add(Jinja2
--    DEPENDS setuptools
--    URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz
--    BUILD_IN_SOURCE 1
--    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# Pygments
--# https://pypi.python.org/pypi/Pygments
--set(PYGMENTS_VERSION 1.6)
--ExternalProject_Add(Pygments
--    DEPENDS setuptools
--    URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz
--    BUILD_IN_SOURCE 1
--    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT}
--)
--
--# sphinx
--# https://pypi.python.org/pypi/Sphinx
--set(SPHINX_VERSION 1.2b3)
--ExternalProject_Add(Sphinx
--    DEPENDS setuptools docutils Jinja2 Pygments
--    URL ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.tar.gz
--    PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
--    BUILD_IN_SOURCE 1
--    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
--    BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build
--    INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --install-scripts=${EXTDIST_ROOT}/bin
--)
--
--###############################################################################
- ### Create Doc Targets ###
- 
- message(STATUS "Create sphinx conf.py from conf.py.in")
-@@ -99,7 +36,7 @@ else()
- endif()
- 
- add_custom_target(doc ALL
--    COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
-+    COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
-     DEPENDS
-         ${DEPLIBS}
-         ${CMAKE_BINARY_DIR}/docs/conf.py
-@@ -110,20 +47,18 @@ add_custom_target(doc ALL
-     COMMENT "Building html docs"
-     SOURCES ${DOCFILES})
- 
--# note: ExternalProject will not build when added to a add_custom_target this
--# works around this problem. This seems to be fixed in the cmake ^HEAD
--add_dependencies(doc Sphinx) 
--
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
--        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
-+        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
-         PATTERN .* EXCLUDE
- )
- 
-+if(OCIO_BUILD_PDF_DOCS)
-+
- find_package(LATEX)
- if(PDFLATEX_COMPILER)
-     
-     add_custom_target(latex
--        COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
-+        COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
-         DEPENDS
-             OpenColorIO
-             ${CMAKE_BINARY_DIR}/docs/conf.py
-@@ -133,7 +68,6 @@ if(PDFLATEX_COMPILER)
-             ${RSTDOC_OUTPUT}
-         COMMENT "Building latex doc"
-         SOURCES ${DOCFILES})
--    add_dependencies(latex Sphinx)
-     
-     add_custom_target(pdf ALL
-         COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
-@@ -143,6 +77,8 @@ if(PDFLATEX_COMPILER)
-     add_dependencies(pdf latex)
-     
-     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
--            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
-+            DESTINATION ${CMAKE_INSTALL_DOCDIR})
-     
- endif()
-+
-+endif()
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch b/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch
new file mode 100644
index 000000000000..9cb3500d9dab
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.1.0-cmake-fixes.patch
@@ -0,0 +1,173 @@
+diff -purN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt	2017-11-29 22:51:15.000000000 +0000
++++ b/CMakeLists.txt	2017-12-27 16:49:51.461300828 +0000
+@@ -59,6 +59,7 @@ endif()
+ include(ParseArguments)
+ include(OCIOMacros)
+ include(ExternalProject)
++include(GNUInstallDirs)
+ 
+ enable_language(CXX)
+ 
+@@ -531,7 +532,7 @@ endif()
+ configure_file(${CMAKE_SOURCE_DIR}/share/ocio/setup_ocio.sh.in
+     ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh @ONLY)
+ 
+-INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION share/ocio/)
++INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/share/ocio/setup_ocio.sh DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/ocio/)
+ 
+ ###############################################################################
+ ### CPACK ###
+@@ -646,4 +647,4 @@ file(WRITE "${CMAKE_BINARY_DIR}/OpenColo
+     message(STATUS OPENCOLORIO_FOUND=\${OPENCOLORIO_FOUND})
+     "
+ )
+-install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION .)
++install(FILES "${CMAKE_BINARY_DIR}/OpenColorIOConfig.cmake" DESTINATION ${CMAKE_INSTALL_LIBDIR}/CMake)
+diff -purN a/docs/CMakeLists.txt b/docs/CMakeLists.txt
+--- a/docs/CMakeLists.txt	2017-11-29 22:51:15.000000000 +0000
++++ b/docs/CMakeLists.txt	2017-12-27 16:53:28.976491353 +0000
+@@ -1,91 +1,5 @@
+ 
+ ###############################################################################
+-### External Doc Apps ###
+-
+-if (WIN32)
+-    # Workaround to mimic *nix '> PYTHONPATH=XXX CMD' 
+-    #  on windows, it becomes  '> set PYTHONPATH=XXX \n call CMD'
+-    #   '\n' is here because '\\&' does not work.
+-    set(PYT_PRE_CMD set PYTHONPATH=${PYTHONPATH} "\n" call )
+-    # Unfortunately some windows tools require to have
+-    #  the paths with the '\' (not working with '//').
+-    set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
+-    string(REGEX REPLACE "/" "\\\\" PYT_LIB_OUTPUT ${PYT_LIB_OUTPUT})
+-    set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
+-    string(REGEX REPLACE "/" "\\\\" PYT_EXTDIST_BINPATH ${PYT_EXTDIST_BINPATH})
+-else()
+-    set(PYT_PRE_CMD PYTHONPATH=${PYTHONPATH})
+-    set(PYT_LIB_OUTPUT ${EXTDIST_ROOT})
+-    set(PYT_EXTDIST_BINPATH ${EXTDIST_BINPATH})
+-endif()
+-
+-# setuptools
+-# https://pypi.python.org/pypi/setuptools
+-set(SETUPTOOLS_VERSION 1.1.6)
+-
+-ExternalProject_Add(setuptools
+-    URL ${CMAKE_SOURCE_DIR}/ext/setuptools-${SETUPTOOLS_VERSION}.tar.gz
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+-    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+-    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/setuptools-prefix/src/setuptools
+-)
+-
+-# docutils
+-# https://pypi.python.org/pypi/docutils
+-set(DOCUTILS_VERSION 0.11)
+-ExternalProject_Add(docutils
+-    DEPENDS setuptools
+-    URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+-    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+-    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/docutils-prefix/src/docutils
+-)
+-
+-# jinja2
+-# https://pypi.python.org/pypi/Jinja2
+-set(JINJA2_VERSION 2.7.1)
+-ExternalProject_Add(Jinja2
+-    DEPENDS setuptools
+-    URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+-    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+-    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Jinja2-prefix/src/Jinja2
+-)
+-
+-# Pygments
+-# https://pypi.python.org/pypi/Pygments
+-set(PYGMENTS_VERSION 1.6)
+-ExternalProject_Add(Pygments
+-    DEPENDS setuptools
+-    URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+-    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+-    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT}
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Pygments-prefix/src/Pygments
+-)
+-
+-# sphinx
+-# https://pypi.python.org/pypi/Sphinx
+-set(SPHINX_VERSION 1.2b3)
+-ExternalProject_Add(Sphinx
+-    DEPENDS setuptools docutils Jinja2 Pygments
+-    URL ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.tar.gz
+-    PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch
+-    BUILD_IN_SOURCE 1
+-    CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH}
+-    BUILD_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py build
+-    INSTALL_COMMAND ${PYT_PRE_CMD} ${PYTHON} setup.py install --prefix=${PYT_LIB_OUTPUT} --install-scripts=${PYT_EXTDIST_BINPATH}
+-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/Sphinx-prefix/src/Sphinx
+-)
+-
+-###############################################################################
+ ### Create Doc Targets ###
+ 
+ message(STATUS "Create sphinx conf.py from conf.py.in")
+@@ -122,7 +36,7 @@ else()
+ endif()
+ 
+ add_custom_target(doc ALL
+-    COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
++    COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html
+     DEPENDS
+         ${DEPLIBS}
+         ${CMAKE_BINARY_DIR}/docs/conf.py
+@@ -133,20 +47,18 @@ add_custom_target(doc ALL
+     COMMENT "Building html docs"
+     SOURCES ${DOCFILES})
+ 
+-# note: ExternalProject will not build when added to a add_custom_target this
+-# works around this problem. This seems to be fixed in the cmake ^HEAD
+-add_dependencies(doc Sphinx) 
+-
+ install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/
+-        DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html
++        DESTINATION ${CMAKE_INSTALL_DOCDIR}/html
+         PATTERN .* EXCLUDE
+ )
+ 
++if(OCIO_BUILD_PDF_DOCS)
++
+ find_package(LATEX)
+ if(PDFLATEX_COMPILER)
+     
+     add_custom_target(latex
+-        COMMAND ${PYT_PRE_CMD} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
++        COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex
+         DEPENDS
+             OpenColorIO
+             ${CMAKE_BINARY_DIR}/docs/conf.py
+@@ -156,7 +68,6 @@ if(PDFLATEX_COMPILER)
+             ${RSTDOC_OUTPUT}
+         COMMENT "Building latex doc"
+         SOURCES ${DOCFILES})
+-    add_dependencies(latex Sphinx)
+     
+     add_custom_target(pdf ALL
+         COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex
+@@ -166,6 +77,8 @@ if(PDFLATEX_COMPILER)
+     add_dependencies(pdf latex)
+     
+     install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf
+-            DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/)
++            DESTINATION ${CMAKE_INSTALL_DOCDIR})
+     
+ endif()
++
++endif()
diff --git a/media-libs/opencolorio/opencolorio-1.0.9_p20170719.ebuild b/media-libs/opencolorio/opencolorio-1.0.9_p20170719.ebuild
deleted file mode 100644
index cfcbd93bf47f..000000000000
--- a/media-libs/opencolorio/opencolorio-1.0.9_p20170719.ebuild
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Compatibility with Python 3 is declared by upstream, but it is broken in fact, check on bump
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit cmake-utils python-single-r1 vcs-snapshot
-
-DESCRIPTION="A color management framework for visual effects and animation"
-HOMEPAGE="http://opencolorio.org/"
-
-MY_GIT_COMMIT="7e7f10afce97254cdc1295a3594ddd5e6fb555d6"
-SRC_URI="https://github.com/imageworks/OpenColorIO/archive/${MY_GIT_COMMIT}.tar.gz \
-		-> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc opengl pdf python cpu_flags_x86_sse2 test"
-REQUIRED_USE="
-	doc? ( python )
-	python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	opengl? (
-		media-libs/lcms:2
-		media-libs/openimageio
-		media-libs/glew:=
-		media-libs/freeglut
-		virtual/opengl
-	)
-	python? ( ${PYTHON_DEPS} )
-	>=dev-cpp/yaml-cpp-0.5
-	dev-libs/tinyxml"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		pdf? ( dev-python/sphinx[latex,${PYTHON_USEDEP}] )
-		!pdf? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-	)"
-
-# Restricting tests, bugs #439790 and #447908
-RESTRICT="test"
-
-PATCHES=( "${FILESDIR}/${PN}-1.0.9-cmake-fixes-v1.patch" )
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	cmake-utils_src_prepare
-
-	use python && python_fix_shebang .
-}
-
-src_configure() {
-	# Missing features:
-	# - Truelight and Nuke are not in portage for now, so their support are disabled
-	# - Java bindings was not tested, so disabled
-	# Notes:
-	# - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
-	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
-	local mycmakeargs=(
-		-DOCIO_BUILD_JNIGLUE=OFF
-		-DOCIO_BUILD_NUKE=OFF
-		-DOCIO_BUILD_SHARED=ON
-		-DOCIO_BUILD_STATIC=OFF
-		-DOCIO_STATIC_JNIGLUE=OFF
-		-DOCIO_BUILD_TRUELIGHT=OFF
-		-DUSE_EXTERNAL_LCMS=ON
-		-DUSE_EXTERNAL_TINYXML=ON
-		-DUSE_EXTERNAL_YAML=ON
-		-DOCIO_BUILD_DOCS="$(usex doc)"
-		-DOCIO_BUILD_APPS="$(usex opengl)"
-		-DOCIO_BUILD_PDF_DOCS="$(usex pdf)"
-		-DOCIO_BUILD_PYGLUE="$(usex python)"
-		-DOCIO_USE_SSE="$(usex cpu_flags_x86_sse2)"
-		-DOCIO_BUILD_TESTS="$(usex test)"
-		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-	)
-	cmake-utils_src_configure
-}
diff --git a/media-libs/opencolorio/opencolorio-1.1.0.ebuild b/media-libs/opencolorio/opencolorio-1.1.0.ebuild
new file mode 100644
index 000000000000..c1504ae4a464
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-1.1.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Compatibility with Python 3 is declared by upstream, but it is broken in fact, check on bump
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
+
+inherit cmake-utils python-single-r1 vcs-snapshot
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="http://opencolorio.org/"
+
+SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz \
+		-> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc opengl pdf python cpu_flags_x86_sse2 test"
+REQUIRED_USE="
+	doc? ( python )
+	python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	opengl? (
+		media-libs/lcms:2
+		media-libs/openimageio
+		media-libs/glew:=
+		media-libs/freeglut
+		virtual/opengl
+	)
+	python? ( ${PYTHON_DEPS} )
+	>=dev-cpp/yaml-cpp-0.5
+	dev-libs/tinyxml"
+
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	doc? (
+		pdf? ( dev-python/sphinx[latex,${PYTHON_USEDEP}] )
+		!pdf? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+	)"
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-cmake-fixes.patch" )
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+
+	use python && python_fix_shebang .
+}
+
+src_configure() {
+	# Missing features:
+	# - Truelight and Nuke are not in portage for now, so their support are disabled
+	# - Java bindings was not tested, so disabled
+	# Notes:
+	# - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
+	# - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
+	local mycmakeargs=(
+		-DOCIO_BUILD_JNIGLUE=OFF
+		-DOCIO_BUILD_NUKE=OFF
+		-DOCIO_BUILD_SHARED=ON
+		-DOCIO_BUILD_STATIC=OFF
+		-DOCIO_STATIC_JNIGLUE=OFF
+		-DOCIO_BUILD_TRUELIGHT=OFF
+		-DUSE_EXTERNAL_LCMS=ON
+		-DUSE_EXTERNAL_TINYXML=ON
+		-DUSE_EXTERNAL_YAML=ON
+		-DOCIO_BUILD_DOCS="$(usex doc)"
+		-DOCIO_BUILD_APPS="$(usex opengl)"
+		-DOCIO_BUILD_PDF_DOCS="$(usex pdf)"
+		-DOCIO_BUILD_PYGLUE="$(usex python)"
+		-DOCIO_USE_SSE="$(usex cpu_flags_x86_sse2)"
+		-DOCIO_BUILD_TESTS="$(usex test)"
+		-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+	)
+	cmake-utils_src_configure
+}
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index fb724a28b6d2..6f60a0e3f220 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -2,12 +2,7 @@ AUX openh264-1.5.0-pkgconfig-pathfix.patch 1903 BLAKE2B e1287e4f3bb2453c170c1fb2
 AUX openh264-1.7.0-pkgconfig-pathfix.patch 1921 BLAKE2B 22d3ab7bd9cbe4c0ac638760a0c2b947eb6749a18d61cd3aca22ac84647af24d6dced048f9eae2ae9e9ee9b0813a255a6d1c8a1ff04e3e6ae2bdc1d508c82d7b SHA512 4545c9c2a696d9ceaf463fe74f391614ba41abc51ce00c32b285baf37e34d8e8bc55f2c3288309a2b44a4ff420ed7d1bc2aa26f2214abe65576d267488dd0849
 AUX pkgconfig-pathfix.patch 1921 BLAKE2B 1f807eeca318dd8e78033291e3465f0da92c156b42f3aa848b2af81be4ac5d1980b791e63da41947a9c7ffc3df3eb9b39cb248b61efb49222554c21e9b378126 SHA512 b080d65385e384ea0402d829dabd38959f10b7f0880d3fb3f5611593493e2a2c5679c7f37a48c58c0cbccce04bffdc58a359fd5262614d5c98e98c491c5807d8
 AUX pkgconfig_install.patch 711 BLAKE2B c75f750f3c4419323a34acc4c8490525a1dc6b1c628ea1233a124e4689c6ac1ef4338c5786cc040b9a87fd446708cbbc338fe37b2edfc16298391bdd7c66fe7a SHA512 1d3a38b35ac73cc3af6ae24d9bd537712d66f99faa9687bb8c26b3a45d559ccad6917ea1aff11030ff61c9b4c4e89701584d72e35b80b52c514e5f4e56516fe0
-DIST gmp-api-Firefox38.tar.gz 16209 BLAKE2B 688aceb707ca0c5bacbce6dca6d039b31634d4ea21973103fb147e6a9f7abf019166ecf8326a707ff87fe48774111b2b77cc02d33bc31b33eb16537348ddb368 SHA512 9aecbc84b1ba2fcfcb10c56680d92a72dd55f7ef7b8a68a3950dbce65fb7eb2c5e6a211149889f618bef2468ba1f3f8c01dc63e86e0a30d9295b019b75657eb8
 DIST gmp-api-Firefox39.tar.gz 16363 BLAKE2B dd92d851c4f09476f1e394fd42c5e40ea707ac6dcabc3ceee62400eb998f1c98c781fbde581253ddd8f45b7447a0c7fdc61e74ef60b6fc3397cd4bf8995154ab SHA512 da6f05c5f0540be8d4f48d25b947b21214d34a6eed365ee5fa4a38c69f77325add4be902e0dcd9d06be43914a3518ded7e4f2289dab034a24325f0bff201692a
-DIST openh264-1.4.0.tar.gz 37681189 BLAKE2B 273389f39bec341d9509521b5910b9e0fce6b092623c531a6117060ab5bdd21e0de17c4f3e6770b987a267ba136f101b8e0b9a4bec911fcf48bb3b9b13aa6e3b SHA512 8192494698cb5557331be56ecbe2b7b143e0ed95739a69a88bdb34a58f66710ef1cd9234f1e98c9b16432a41a3243634e6ca63c58119315f2f9360cb2959e42b
-DIST openh264-1.5.0.tar.gz 37851166 BLAKE2B 90e25d87248bdcf5d2a0b2eaa87e104d6045b4b69859c96301c519ddded9c383d7fb32bcbc4ad39e38374b51754bb1d28fb7f9e4293b37a75f83ef7de1fd23bc SHA512 30599fed5e928af7dfec079d101a22885e52874c1d7db91ff289b989a9a20548b6bbd5d25e4e546efedd4e5aba97cbc42b1e847970b93116d86efc7af394aeaf
 DIST openh264-1.7.0.tar.gz 38681895 BLAKE2B 2e0e88bd446fdbea29ea4e863eb391dce1cc271c289165233aa1375e10ce6e60f7be7307eeb7acedd459c3170b57fbc5c7a0e9b6bd0c355be6447fb036192f35 SHA512 3e30584d6adb69c162f5b044f49155c22d44ab8e399f6bf09194593df84475b49979406f3e461d25ef1e4422c2721b975c58bc64d40a143d8493d45380ad96aa
-EBUILD openh264-1.4.0-r1.ebuild 2619 BLAKE2B b671ea8d2c6078ca7bd6054667fbd8c7f026c4408a0b8f5788fe256d84baaf6c9f209201c71f9aa76da27ebda00d307f9080573d6cb3538f64ad3c51aa3084e1 SHA512 1cdd4d436f1f83b8c42dfc0c313b41a765b2d3a77afaf0e9f6c5123f25364deb3e6f0eb1cf6b2c3140e14770cf40cbf55e1e5c4db730d9309d65333de0d2e682
-EBUILD openh264-1.5.0.ebuild 2689 BLAKE2B 39f4ead0d19f2502e02492eec5486091e8991465d0310ea814e75ccd55712e5fb3a88786b86fa75380202e248b29b91b0f948524282be35ad823e6589aeeae0b SHA512 14c727969ea3471a6038e65c323d62f2cda602e32da8d99196e7e333c4f5ffa328c7e287e1e98eb1255a855387ffd983f97ce138bcb0c0be60f6af749387a109
-EBUILD openh264-1.7.0.ebuild 2703 BLAKE2B 309c7dac407b9bb49a67153f4e4a7fd028f3dd4e4127fdb2d7b168d223a6ce3a07a04730c8fbec3820d20055311f3872751d24f7a38148a2379c8a09bd7ddb96 SHA512 67205997297e88013b810cf67f1bf0bcf9001c99671888be1c19559c5ac3faabdb4b5abaf25588efd745c6860808cdfacce2b371e4136c1c85bc1abd3fa542ac
+EBUILD openh264-1.7.0-r1.ebuild 2929 BLAKE2B 9e72b4b26c0748f1d8293943a1bae1fc90346ed78474e508d7c265dcd86366b8a737ea556b9f58cf9516bb5b91e153402b371af4f2a34813388bf2e93a594d89 SHA512 dd008099e9cea12ad28f5ab1b447cca9308e3cdb3f859818eb5889b540241d7ef7e460fca4d9fd00b964cc65119cd6e5b764e4b0f3902ab42576b06851ed17cd
 MISC metadata.xml 595 BLAKE2B 9d5fd608235086cb070457016516be296db695e67d50e8b3c0958133bff3cfa24a87c9abb42c043d94d5d64ba6fb3e9d485b4c9d07042054a9eb25e6ee73ad4b SHA512 8fc3fa7f260a188f7ebf43d85da27a49a924a2ce0835fd37f0db356caa401102eee0ade0fa414303d8a0681ddb4b10abd4da5a9bb5cf79ea31f5b96199897220
diff --git a/media-libs/openh264/openh264-1.4.0-r1.ebuild b/media-libs/openh264/openh264-1.4.0-r1.ebuild
deleted file mode 100644
index 9a705d5dd6f7..000000000000
--- a/media-libs/openh264/openh264-1.4.0-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit nsplugins multilib-minimal
-
-MOZVER=38
-DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
-HOMEPAGE="http://www.openh264.org/"
-SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+plugin utils"
-
-RESTRICT="bindist"
-
-RDEPEND="!<www-client/firefox-${MOZVER}"
-DEPEND="dev-lang/nasm"
-
-DOCS=( LICENSE CONTRIBUTORS README.md )
-
-src_prepare() {
-	epatch "${FILESDIR}"/pkgconfig-pathfix.patch
-	epatch "${FILESDIR}"/pkgconfig_install.patch
-	epatch_user
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ln -s "${WORKDIR}"/gmp-api-Firefox${MOZVER} gmp-api || die
-}
-
-emakecmd() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
-		PREFIX="${EPREFIX}/usr" \
-		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
-		$@
-}
-
-multilib_src_compile() {
-	local mybits="ENABLE64BIT=No"
-	case "${ABI}" in
-		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
-	esac
-
-	emakecmd ${mybits} ${tgt}
-	use plugin && emakecmd ${mybits} plugin
-}
-
-multilib_src_install() {
-	emakecmd DESTDIR="${D}" install-shared
-
-	use utils && dobin h264{enc,dec}
-
-	if use plugin; then
-		local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed"
-		insinto "/${plugpath}"
-		doins libgmpopenh264.so* gmpopenh264.info
-		echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
-		doenvd "${T}"/98-moz-gmp-${PN}
-
-		cat <<PREFEOF >"${T}"/${P}.js
-pref("media.gmp-gmp${PN}.autoupdate", false);
-pref("media.gmp-gmp${PN}.version", "system-installed");
-PREFEOF
-
-		insinto /usr/$(get_libdir)/firefox/defaults/pref
-		doins "${T}"/${P}.js
-
-		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
-		doins "${T}"/${P}.js
-	fi
-}
-
-pkg_postinst() {
-	if use plugin; then
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			elog "Please restart your login session, in order for the session's environment"
-			elog "to include the new MOZ_GMP_PATH variable."
-			elog ""
-		fi
-		elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
-		elog "however even if it is not successful in doing so the profile-installed plugin"
-		elog "will not be used unless this package is removed.  This package will take precedence"
-		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
-		elog ""
-	fi
-}
diff --git a/media-libs/openh264/openh264-1.5.0.ebuild b/media-libs/openh264/openh264-1.5.0.ebuild
deleted file mode 100644
index aab9349bbcfe..000000000000
--- a/media-libs/openh264/openh264-1.5.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit nsplugins multilib-minimal
-
-MOZVER=39
-DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
-HOMEPAGE="http://www.openh264.org/"
-SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 x86"
-IUSE="+plugin utils"
-
-RESTRICT="bindist"
-
-RDEPEND="!<www-client/firefox-${MOZVER}"
-DEPEND="
-	abi_x86_32? ( dev-lang/nasm )
-	abi_x86_64? ( dev-lang/nasm )"
-
-DOCS=( LICENSE CONTRIBUTORS README.md )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-pkgconfig-pathfix.patch
-	epatch_user
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ln -s "${WORKDIR}"/gmp-api-Firefox${MOZVER} gmp-api || die
-}
-
-emakecmd() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR_NAME="$(get_libdir)" \
-		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
-		$@
-}
-
-multilib_src_compile() {
-	local mybits="ENABLE64BIT=No"
-	case "${ABI}" in
-		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
-	esac
-
-	emakecmd ${mybits} ${tgt}
-	use plugin && emakecmd ${mybits} plugin
-}
-
-multilib_src_install() {
-	emakecmd DESTDIR="${D}" install-shared
-
-	use utils && dobin h264{enc,dec}
-
-	if use plugin; then
-		local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed"
-		insinto "/${plugpath}"
-		doins libgmpopenh264.so* gmpopenh264.info
-		echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
-		doenvd "${T}"/98-moz-gmp-${PN}
-
-		cat <<PREFEOF >"${T}"/${P}.js
-pref("media.gmp-gmp${PN}.autoupdate", false);
-pref("media.gmp-gmp${PN}.version", "system-installed");
-PREFEOF
-
-		insinto /usr/$(get_libdir)/firefox/defaults/pref
-		doins "${T}"/${P}.js
-
-		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
-		doins "${T}"/${P}.js
-	fi
-}
-
-pkg_postinst() {
-	if use plugin; then
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			elog "Please restart your login session, in order for the session's environment"
-			elog "to include the new MOZ_GMP_PATH variable."
-			elog ""
-		fi
-		elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
-		elog "however even if it is not successful in doing so the profile-installed plugin"
-		elog "will not be used unless this package is removed.  This package will take precedence"
-		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
-		elog ""
-	fi
-}
diff --git a/media-libs/openh264/openh264-1.7.0-r1.ebuild b/media-libs/openh264/openh264-1.7.0-r1.ebuild
new file mode 100644
index 000000000000..ef0c663fca56
--- /dev/null
+++ b/media-libs/openh264/openh264-1.7.0-r1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit nsplugins multilib-minimal
+
+MOZVER=39
+DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
+HOMEPAGE="http://www.openh264.org/"
+SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86"
+IUSE="+plugin utils"
+
+RESTRICT="bindist"
+
+RDEPEND="!<www-client/firefox-${MOZVER}"
+DEPEND="
+	abi_x86_32? ( dev-lang/nasm )
+	abi_x86_64? ( dev-lang/nasm )"
+
+DOCS=( LICENSE CONTRIBUTORS README.md )
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-1.7.0-pkgconfig-pathfix.patch
+	epatch_user
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	ln -s "${WORKDIR}"/gmp-api-Firefox${MOZVER} gmp-api || die
+}
+
+emakecmd() {
+	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
+	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
+		PREFIX="${EPREFIX}/usr" \
+		LIBDIR_NAME="$(get_libdir)" \
+		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
+		$@
+}
+
+multilib_src_compile() {
+	local mybits="ENABLE64BIT=No"
+	case "${ABI}" in
+		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
+	esac
+
+	emakecmd ${mybits} ${tgt}
+	use plugin && emakecmd ${mybits} plugin
+}
+
+multilib_src_install() {
+	emakecmd DESTDIR="${D}" install-shared
+
+	if use utils ; then
+		newbin h264enc openh264enc
+		newbin h264dec openh264dec
+	fi
+
+	if use plugin; then
+		local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed"
+		insinto "/${plugpath}"
+		doins libgmpopenh264.so* gmpopenh264.info
+		echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
+		doenvd "${T}"/98-moz-gmp-${PN}
+
+		cat <<PREFEOF >"${T}"/${P}.js
+pref("media.gmp-gmp${PN}.autoupdate", false);
+pref("media.gmp-gmp${PN}.version", "system-installed");
+PREFEOF
+
+		insinto /usr/$(get_libdir)/firefox/defaults/pref
+		doins "${T}"/${P}.js
+
+		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
+		doins "${T}"/${P}.js
+	fi
+}
+
+pkg_postinst() {
+	if use plugin; then
+		if [[ -z ${REPLACING_VERSIONS} ]]; then
+			elog "Please restart your login session, in order for the session's environment"
+			elog "to include the new MOZ_GMP_PATH variable."
+			elog ""
+		fi
+		elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
+		elog "however even if it is not successful in doing so the profile-installed plugin"
+		elog "will not be used unless this package is removed.  This package will take precedence"
+		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
+		elog ""
+	fi
+	if use utils; then
+		elog "Utilities h264enc and h264dec are installed as openh264enc and openh264dec"
+		elog "to avoid file collisions with media-video/h264enc"
+		elog ""
+	fi
+}
diff --git a/media-libs/openh264/openh264-1.7.0.ebuild b/media-libs/openh264/openh264-1.7.0.ebuild
deleted file mode 100644
index 1c42837a9727..000000000000
--- a/media-libs/openh264/openh264-1.7.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit nsplugins multilib-minimal
-
-MOZVER=39
-DESCRIPTION="Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages"
-HOMEPAGE="http://www.openh264.org/"
-SRC_URI="https://github.com/cisco/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	https://github.com/mozilla/gmp-api/archive/Firefox${MOZVER}.tar.gz -> gmp-api-Firefox${MOZVER}.tar.gz"
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 x86"
-IUSE="+plugin utils"
-
-RESTRICT="bindist"
-
-RDEPEND="!<www-client/firefox-${MOZVER}"
-DEPEND="
-	abi_x86_32? ( dev-lang/nasm )
-	abi_x86_64? ( dev-lang/nasm )"
-
-DOCS=( LICENSE CONTRIBUTORS README.md )
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.7.0-pkgconfig-pathfix.patch
-	epatch_user
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	ln -s "${WORKDIR}"/gmp-api-Firefox${MOZVER} gmp-api || die
-}
-
-emakecmd() {
-	CC="$(tc-getCC)" CXX="$(tc-getCXX)" LD="$(tc-getLD)" \
-	emake V=Yes CFLAGS_M32="" CFLAGS_M64="" CFLAGS_OPT="" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR_NAME="$(get_libdir)" \
-		SHAREDLIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
-		INCLUDES_DIR="${EPREFIX}/usr/include/${PN}" \
-		$@
-}
-
-multilib_src_compile() {
-	local mybits="ENABLE64BIT=No"
-	case "${ABI}" in
-		s390x|alpha|*64) mybits="ENABLE64BIT=Yes";;
-	esac
-
-	emakecmd ${mybits} ${tgt}
-	use plugin && emakecmd ${mybits} plugin
-}
-
-multilib_src_install() {
-	emakecmd DESTDIR="${D}" install-shared
-
-	use utils && dobin h264{enc,dec}
-
-	if use plugin; then
-		local plugpath="usr/$(get_libdir)/${PLUGINS_DIR}/gmp-gmp${PN}/system-installed"
-		insinto "/${plugpath}"
-		doins libgmpopenh264.so* gmpopenh264.info
-		echo "MOZ_GMP_PATH=\"${EROOT}${plugpath}\"" >"${T}"/98-moz-gmp-${PN}
-		doenvd "${T}"/98-moz-gmp-${PN}
-
-		cat <<PREFEOF >"${T}"/${P}.js
-pref("media.gmp-gmp${PN}.autoupdate", false);
-pref("media.gmp-gmp${PN}.version", "system-installed");
-PREFEOF
-
-		insinto /usr/$(get_libdir)/firefox/defaults/pref
-		doins "${T}"/${P}.js
-
-		insinto /usr/$(get_libdir)/seamonkey/defaults/pref
-		doins "${T}"/${P}.js
-	fi
-}
-
-pkg_postinst() {
-	if use plugin; then
-		if [[ -z ${REPLACING_VERSIONS} ]]; then
-			elog "Please restart your login session, in order for the session's environment"
-			elog "to include the new MOZ_GMP_PATH variable."
-			elog ""
-		fi
-		elog "This package attempts to override the Mozilla GMPInstaller auto-update process,"
-		elog "however even if it is not successful in doing so the profile-installed plugin"
-		elog "will not be used unless this package is removed.  This package will take precedence"
-		elog "over any gmp-gmpopenh264 that may be installed in a user's profile."
-		elog ""
-	fi
-}
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index a43fc7c102fd..1bce0b9ace79 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -1,6 +1,6 @@
 AUX simage-1.7.0-libpng15.patch 572 BLAKE2B 7f4eacdd5aac3e6634fd26824d0dfb7ec779fcf6be86e642f2870c62b1f0bd86b1ef767e19034e05fd62cba9904ef45e13a85be7657e00133febb67b0469c337 SHA512 0a867187b0dbc644182784e56dfd26b51f48c9355b01228fe3386fab05cee084e0066d4b18eb3f63110a25c0d2abf8f8b214d9b94e2e7dc7438e90308653e4e8
 AUX simage-1.7.0-pkgconfig-partial.patch 467 BLAKE2B a2957c1d5fc6939df7ecb1bb15743253294142a87f98d4043368f189dc4f5ee302de16e84572a69e3ea5755124326fb075b2e45d3574a1759c899d9e96eaf828 SHA512 791db9c02fc0dc7526ed43b340ab6f92baea91a5bf9005099f6adf1550a7ab73ef36790d2e761f0b50b88098e9124f3035ff21149cca00d819c2262d8e180618
 DIST simage-1.7.0.tar.gz 752602 BLAKE2B feca31f8d41ae67271e43c9c664243d872985068ffc8496d43c9b59a47ae5c3067956acced3ff9abbdc5a360aec662e3972a93d8523a704a72ac9d12dd4cfaa0 SHA512 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f
-EBUILD simage-1.7.0-r1.ebuild 1821 BLAKE2B e780549328c705454166eaa1b3bf0517fed5dc24700154f42c49f4bf6511e389cf5c40f3e01346d6ec87d7a1d8c4152b98980fec6abada6931734c685d85e100 SHA512 9ba3e0eb866e5cf75786ade61de8b6aa64ed453ce5da78bc79aa0739aa18e66472c72e07c18b6260b64ff1d42b166cb9bf78932b4d4ea87f2be2c93401cc9da5
+EBUILD simage-1.7.0-r1.ebuild 1820 BLAKE2B 6042cc61c5c2a1663617519b3220cdef11b6439b1aab26279c74f0add1583014f9e5c130135e5e1000012a526b666e1478eb104bd01f9c085083e846ac3ca8a9 SHA512 5ba19751344b39d929d779d42b533ab58728930749f201bb3713383ef214f749bfa4eb8fd0e666c86d27963f2afad1245373b8187d91524e5090aad12a50bb6a
 EBUILD simage-1.7.0.ebuild 1797 BLAKE2B a59ec07def228a517d059b4b7bcb1ee1ec177feb681220c3bfc072ae73e3d431760b1b04c3cdeb75bac6d5840233a8ce7725ba243408be6bf659b0de5b421f49 SHA512 fee38faec0e6671220b7eda84c5639be3ea66d88384bda168296de2184e8cc38b45555801ab0c6988fc737af0b60c3d78a34984f48faad99c0236a3baf6182c3
 MISC metadata.xml 298 BLAKE2B 312f7a48552438ce1231a58486f19aca02bbb281b72733645ffad42a3f82df778145bfc66a61c1216e47bd68e54668725fe08274482be7fb3997c99bf3089fdc SHA512 b72572413e5e40d55658049b4624de687dd1011553fc384deb0c837830b6f82d060b6356ad25e803f27d3be697b07a8c3fbc45932d20d89e4d9918ed6fecd84a
diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild
index 5cf1e9156c36..7d2ebd4d9581 100644
--- a/media-libs/simage/simage-1.7.0-r1.ebuild
+++ b/media-libs/simage/simage-1.7.0-r1.ebuild
@@ -8,7 +8,7 @@ HOMEPAGE="https://bitbucket.org/Coin3D/simage"
 SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz"
 
 LICENSE="public-domain mpeg2enc"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
 SLOT="0"
 IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib"
 RESTRICT="mirror bindist" #465086
diff --git a/media-libs/vips/Manifest b/media-libs/vips/Manifest
index e899fb1079b5..ed6fdb76d604 100644
--- a/media-libs/vips/Manifest
+++ b/media-libs/vips/Manifest
@@ -1,3 +1,3 @@
-DIST vips-7.38.5.tar.gz 3447505 SHA256 495dc8ca70910eca33a867f0a7e6903b076d6dd9fbdf2ddbb2ffd4270f0fe00e SHA512 99b3a3efb32a976d17e5ce7d7d79e8bb708c148e981f866a8997a07f641866ba237cd677de9f7cafab30afb182a5bde7cc130368c8ff5d8f413d38801a24ed37 WHIRLPOOL a40d38956a476e74669288ba14f6a5c49f5485221c90e8455702bbfde411a871a5f31cfdeefa1329a17f773a14668af187e92189e4f592dba459a0b20a3c16ba
+DIST vips-7.38.5.tar.gz 3447505 BLAKE2B e0db7357054969618a7bc226a652425ee2cd2b0a4964ed5e575f62c7659796d7ba71439ec2a01efc10f615eb748119edbf66bf23b2b807b54fef49fc469f1efd SHA512 99b3a3efb32a976d17e5ce7d7d79e8bb708c148e981f866a8997a07f641866ba237cd677de9f7cafab30afb182a5bde7cc130368c8ff5d8f413d38801a24ed37
 EBUILD vips-7.38.5-r1.ebuild 1989 BLAKE2B 4b33f697032f3e888234f04dbf76496a225ab98a6c884284cb775dc279a0b1925307b175eb09a3b2ac6a4e7cba88a5b817724a20e4f6488fcc3b7e2f6094ace4 SHA512 ae4e4ceb744a3fb3065b412f32ef97a772ef8ecc4762d0953de5796f0626a6e288f6194f96e3eb4463f8a70ded2cfa428bdaebe7a9810118d68b8f9cc19f0a7d
 MISC metadata.xml 566 BLAKE2B ab76f070f1f02b13cf430c389b015b1c05af226ef4385108dabdafc75c78cee43ff1ec5ef29460bb35388ae145cfc01d5b1d12e4cf064e9c20dbf0d69372fbc1 SHA512 ec9f48afdc5c9dc261e4b6732c80d8fac42f579070bfb26ef1a83e0af90a40914424a7a30b7f3688e6455b2c089ded67fab4093248d378b6a7acb78b3d635d30
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index c8657fa8a9c6..fccfd8fc54bc 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -4,7 +4,9 @@ AUX xine-lib-1.2.6-libxcb-1.12.patch 1304 BLAKE2B e60d0d5ee86fc7cd9e9d7f846d0666
 AUX xine-lib-1.2.6-sysmacros.patch 425 BLAKE2B df1e3569716777e15737248b30be7491eae9099d8e0126e71eca6fd7622b128b1600c212f2a481117ac780ce11ab74032fb15089aab51753b5a2e80f00f1bae1 SHA512 fed191b8d1c4d1a4b4c5f399a720f07065feda2962f760b7b03bbfc7c19dfbd92e5a621172b84ee6776a55c052b79ecf06707a6d406417796c5f08adced79fe0
 DIST xine-lib-1.2.6.tar.xz 5020964 BLAKE2B 832a05897b233773569d74caf5320b5a11fddf6290310b51ab68e61f329faa2aeed2e3410ebc0aee8f4584ef441d97c279522eabca052e96783e389a5bdc4dd7 SHA512 ed4b1bc29daf85021cb83393d010ddca0ce9da508a8ddb9fec554f18eda1d156fc08f0aeaabeb7afe93fc445f049f84057e0708e6c87cd123c5cd2b20f8a25fd
 DIST xine-lib-1.2.8.tar.xz 5151580 BLAKE2B e0b62aa74545aa40737673e8fb4b6f493f65cbb14f059aaafdeab52f0ad6a34832558b0e1f6cad3bc288e584594de3a4e842d1e770dbc1244247431bb5bd1829 SHA512 ef7cdf1090f4e113f441055963dce9751b548398ff1a4da5e45b7fea45d4f8b5443622e675d343984ec956f3fc054ff9214a2aee3edd3a79d8ddb77afc3e17b2
+DIST xine-lib-1.2.9.tar.xz 5180452 BLAKE2B 43d977d31bf2fcabd896c806e56d5cd12cf579951a4e0df5451df7323fb43cff2770fb2bf1b65b9041e761ec9e9e68d55f761e18522c787aa643f71bb73bd0b7 SHA512 bc672b32d6d72e6fa5641319e0bd15d721ea4b65e6d025e3cdbf6ba3655a7b2c714809d919a53fca8a908a7ce37541a341c13dd8a336799c2e942d5f86b84d3c
 EBUILD xine-lib-1.2.6-r2.ebuild 5726 BLAKE2B 47bc92135d960c6d94970e86c3e02b7e325feb5aa2ba73cf62c43d4a15b0b87c3fec03978f5345c043b12482383668e7b86c968298fb87d51ea8e31da8fe35b2 SHA512 5b92b1712da307acd84b3e0afa091cbb395e169d434b640cb3b44e4b02fae0d7c48e8296511124679e1e478a948b8a261933b27f8ce64d4f669bdc3ed445bd79
 EBUILD xine-lib-1.2.8.ebuild 5697 BLAKE2B d8baf5cd1478665d092e74da71f23bf23e598545c1f3c32b62a5e667f84ec66e7a26735688598fcd6fbf9d80b297ce5e42d93b2f220f8db5a200548790c99dec SHA512 c25ea834cada0b68d19adacfc8e338608e4f855693b989913900f9ddc86c56b386825f399a830ddfd19eadfbf255c81be61da30d8dbc213848f7c85bbbecb7f2
-EBUILD xine-lib-1.2.9999.ebuild 5648 BLAKE2B 3d6d44b476327453c2ba711d53103d9b72b8fe820e0454e1c78e286f85e623fabcdacfebc16a3f16b388e0f0d17d1473ea0353d17dd3f181bd00de610f3f0cf8 SHA512 fc3bbe13f66ae98f08ce3d8a60970adbf15fd36b461b23cb22a1dbe51413d1cb97d06a22b0fea6145bd7dd58882ead91b95de52436123c2b37416f654f97f2d1
+EBUILD xine-lib-1.2.9.ebuild 5565 BLAKE2B 6e5ca0d27be4dae22f23dbc822e849c2b24696ebfbc2dd788b1391470cea49c9ad5ee5ebc44b2c76c55c94e256e80cf1c95d8d91d630a933eb1b4ddee2bfbf05 SHA512 7cd31a34ec4cb49b0faf0c56a3b6e672b5d602f50a3d732ddcab8934808531599f49bce3ef599bb72fef30b2b4a7de735f43b53f996d3671590aafe1fffd4763
+EBUILD xine-lib-1.2.9999.ebuild 5449 BLAKE2B 03d41975b7a68c73c3331f5be5086042f514a55f28eb16b62117afdab1657909281af440b4ff9a87e950ef6cd7e0f9b9e0bc8b7e29acc0b1a3e44cf37e69cd15 SHA512 7996e99e79a9bd761ce4fe8e0694ab53e8f9c3ea394953489ee0f64906b374a6883d8487e9b0f3229e2f3e1dfd9c6a6663b574ae64475b75023e84c3e4fd993c
 MISC metadata.xml 2668 BLAKE2B 64956b27b10284478ae15509a1aa4a1408104c1e98263ac7e1ea376cbb8e596f532e049f4b3381c51f86d4cd4187784be6ad481177ffc62aef0964c90094d6b1 SHA512 17263da5cdc28752dc9344b9806665d236d8a5d3ccad7b19209912a3510b17c9d6587fd1aa847e509a3c4accd53cc96c7d1fc476f6adf9aa63c90b7eed45183b
diff --git a/media-libs/xine-lib/xine-lib-1.2.9.ebuild b/media-libs/xine-lib/xine-lib-1.2.9.ebuild
new file mode 100644
index 000000000000..993b8a7a53ec
--- /dev/null
+++ b/media-libs/xine-lib/xine-lib-1.2.9.ebuild
@@ -0,0 +1,230 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic libtool multilib
+
+if [[ ${PV} == *9999* ]]; then
+	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
+	inherit autotools mercurial
+	unset NLS_IUSE
+	NLS_DEPEND="sys-devel/gettext"
+	NLS_RDEPEND="virtual/libintl"
+else
+	KEYWORDS="~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+	NLS_IUSE="nls"
+	NLS_DEPEND="nls? ( sys-devel/gettext )"
+	NLS_RDEPEND="nls? ( virtual/libintl )"
+fi
+
+DESCRIPTION="Core libraries for Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="1"
+IUSE="a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc ${NLS_IUSE}"
+
+RDEPEND="${NLS_RDEPEND}
+	dev-libs/libxdg-basedir
+	media-libs/libdvdnav
+	sys-libs/zlib
+	virtual/libiconv
+	a52? ( media-libs/a52dec )
+	aac? ( media-libs/faad2 )
+	aalib? ( media-libs/aalib )
+	alsa? ( media-libs/alsa-lib )
+	bluray? ( >=media-libs/libbluray-0.2.1:= )
+	css? ( >=media-libs/libdvdcss-1.2.10 )
+	directfb? ( dev-libs/DirectFB )
+	dts? ( media-libs/libdca )
+	dxr3? ( media-libs/libfame )
+	flac? ( media-libs/flac )
+	fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] )
+	gtk? ( x11-libs/gdk-pixbuf:2 )
+	imagemagick? ( virtual/imagemagick-tools )
+	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
+	jpeg? ( virtual/jpeg:0 )
+	!libav? ( media-video/ffmpeg:0= )
+	libav? (
+		media-libs/libpostproc:0=
+		media-video/libav:0=
+		)
+	libcaca? ( media-libs/libcaca )
+	mad? ( media-libs/libmad )
+	mng? ( media-libs/libmng )
+	modplug? ( >=media-libs/libmodplug-0.8.8.1 )
+	musepack? ( >=media-sound/musepack-tools-444 )
+	opengl? (
+		virtual/glu
+		virtual/opengl
+		)
+	pulseaudio? ( media-sound/pulseaudio )
+	samba? ( net-fs/samba )
+	sdl? ( media-libs/libsdl )
+	speex? (
+		media-libs/libogg
+		media-libs/speex
+		)
+	theora? (
+		media-libs/libogg
+		media-libs/libtheora
+		)
+	truetype? (
+		media-libs/fontconfig
+		media-libs/freetype:2
+		)
+	v4l? ( media-libs/libv4l )
+	vaapi? ( x11-libs/libva[X,opengl] )
+	vcd? (
+		>=media-video/vcdimager-0.7.23
+		dev-libs/libcdio:0=[-minimal]
+		)
+	vdpau? ( x11-libs/libvdpau )
+	vorbis? (
+		media-libs/libogg
+		media-libs/libvorbis
+		)
+	vpx? ( media-libs/libvpx:0= )
+	wavpack? ( media-sound/wavpack )
+	X? (
+		x11-libs/libX11
+		x11-libs/libXext
+		)
+	xcb? ( x11-libs/libxcb )
+	xinerama? ( x11-libs/libXinerama )
+	xv? ( x11-libs/libXv )
+	xvmc? ( x11-libs/libXvMC )"
+DEPEND="${RDEPEND}
+	${NLS_DEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	>=sys-devel/libtool-2.2.6b
+	oss? ( virtual/os-headers )
+	v4l? ( virtual/os-headers )
+	X? (
+		x11-libs/libXt
+		x11-proto/xf86vidmodeproto
+		x11-proto/xproto
+		)
+	xv? ( x11-proto/videoproto )
+	xvmc? ( x11-proto/videoproto )
+	xinerama? ( x11-proto/xineramaproto )"
+REQUIRED_USE="vidix? ( || ( X fbcon ) )
+	xv? ( X )
+	xinerama? ( X )"
+
+src_prepare() {
+	default
+
+	if has_version '>=media-gfx/imagemagick-7.0.1.0' ; then
+		eapply "${FILESDIR}/${PN}-1.2.6-imagemagick7.patch"
+	fi
+
+	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
+
+	if [[ "${PV}" = *9999* ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
+
+	local x
+	for x in 0 1 2 3; do
+		sed -i -e "/^O${x}_CFLAGS=\"-O${x}\"/d" configure || die
+	done
+}
+
+src_configure() {
+	[[ ${CHOST} == i?86-* ]] && append-flags -fomit-frame-pointer #422519
+
+	local win32dir #197236
+	if has_multilib_profile; then
+		win32dir=/usr/$(ABI="x86" get_libdir)/win32
+	else
+		win32dir=/usr/$(get_libdir)/win32
+	fi
+
+	local myconf=(
+		--disable-gnomevfs
+		--disable-optimizations
+		--disable-real-codecs
+		--disable-v4l
+		--disable-w32dll
+		--with-external-dvdnav
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs
+		--with-w32-path=${win32dir}
+		--with-xv-path=/usr/$(get_libdir)
+		--without-esound
+		$(use_enable a52 a52dec)
+		$(use_enable aac faad)
+		$(use_enable aalib)
+		$(use_enable altivec)
+		$(use_enable bluray)
+		$(use_enable directfb)
+		$(use_enable dts)
+		$(use_enable dvb)
+		$(use_enable dxr3)
+		$(use_enable fbcon fb)
+		$(use_enable gtk gdkpixbuf)
+		$(use_enable ipv6)
+		$(use_enable jpeg libjpeg)
+		$(use_enable mad)
+		$(use_enable mmap)
+		$(use_enable mng)
+		$(use_enable modplug)
+		$(use_enable musepack)
+		$(use_enable opengl)
+		$(use_enable opengl glu)
+		$(use_enable oss)
+		$(use_enable samba)
+		$(use_enable v4l libv4l)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi)
+		$(use_enable vdpau)
+		$(use_enable vis)
+		$(use_enable vidix)
+		$(use_enable xinerama)
+		$(use_enable xvmc)
+		$(use_enable vcd)
+		$(use_enable vdr)
+		$(use_enable vpx)
+		$(use_with alsa)
+		$(use_with flac libflac)
+		$(use_with fusionsound)
+		$(use_with imagemagick)
+		$(use_with jack)
+		$(use_with libcaca caca)
+		$(use_with pulseaudio)
+		$(use_with sdl)
+		$(use_with speex)
+		$(use_with theora)
+		$(use_with truetype fontconfig)
+		$(use_with truetype freetype)
+		$(use_with vorbis)
+		$(use_with wavpack)
+		$(use_with X x)
+		$(use_with xcb)
+	)
+	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
+
+	if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
+		myconf+=( --enable-avformat ) #507474
+	fi
+
+	econf "${myconf[@]}"
+}
+
+src_compile() {
+	# enable verbose building, bug #448140
+	emake V=1
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	rm -f \
+		"${ED%/}"usr/lib*/libxine*.la \
+		"${ED%/}"usr/share/doc/${PF}/COPYING
+}
diff --git a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
index a7d83b367faa..8e2f4aec7966 100644
--- a/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,7 +7,7 @@ inherit flag-o-matic libtool multilib
 
 if [[ ${PV} == *9999* ]]; then
 	EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2"
-	inherit autotools mercurial eutils
+	inherit autotools mercurial
 	unset NLS_IUSE
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
@@ -30,11 +30,6 @@ RDEPEND="${NLS_RDEPEND}
 	dev-libs/libxdg-basedir
 	media-libs/libdvdnav
 	sys-libs/zlib
-	!libav? ( media-video/ffmpeg:0= )
-	libav? (
-		media-libs/libpostproc:0=
-		media-video/libav:0=
-	)
 	virtual/libiconv
 	a52? ( media-libs/a52dec )
 	aac? ( media-libs/faad2 )
@@ -51,6 +46,11 @@ RDEPEND="${NLS_RDEPEND}
 	imagemagick? ( virtual/imagemagick-tools )
 	jack? ( >=media-sound/jack-audio-connection-kit-0.100 )
 	jpeg? ( virtual/jpeg:0 )
+	!libav? ( media-video/ffmpeg:0= )
+	libav? (
+		media-libs/libpostproc:0=
+		media-video/libav:0=
+		)
 	libcaca? ( media-libs/libcaca )
 	mad? ( media-libs/libmad )
 	mng? ( media-libs/libmng )
@@ -120,8 +120,7 @@ src_prepare() {
 
 	sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die
 
-	if [[ ${PV} == *9999* ]]; then
-		epatch_user
+	if [[ "${PV}" = *9999* ]] ; then
 		eautoreconf
 	else
 		elibtoolize
@@ -143,70 +142,74 @@ src_configure() {
 		win32dir=/usr/$(get_libdir)/win32
 	fi
 
-	local myconf=()
-	[[ ${PV} == *9999* ]] || myconf=( $(use_enable nls) )
+	local myconf=(
+		--disable-gnomevfs
+		--disable-optimizations
+		--disable-real-codecs
+		--disable-v4l
+		--disable-w32dll
+		--with-external-dvdnav
+		--with-real-codecs-path=/usr/$(get_libdir)/codecs
+		--with-w32-path=${win32dir}
+		--with-xv-path=/usr/$(get_libdir)
+		--without-esound
+		$(use_enable a52 a52dec)
+		$(use_enable aac faad)
+		$(use_enable aalib)
+		$(use_enable altivec)
+		$(use_enable bluray)
+		$(use_enable directfb)
+		$(use_enable dts)
+		$(use_enable dvb)
+		$(use_enable dxr3)
+		$(use_enable fbcon fb)
+		$(use_enable gtk gdkpixbuf)
+		$(use_enable ipv6)
+		$(use_enable jpeg libjpeg)
+		$(use_enable mad)
+		$(use_enable mmap)
+		$(use_enable mng)
+		$(use_enable modplug)
+		$(use_enable musepack)
+		$(use_enable opengl)
+		$(use_enable opengl glu)
+		$(use_enable oss)
+		$(use_enable samba)
+		$(use_enable v4l libv4l)
+		$(use_enable v4l v4l2)
+		$(use_enable vaapi)
+		$(use_enable vdpau)
+		$(use_enable vis)
+		$(use_enable vidix)
+		$(use_enable xinerama)
+		$(use_enable xvmc)
+		$(use_enable vcd)
+		$(use_enable vdr)
+		$(use_enable vpx)
+		$(use_with alsa)
+		$(use_with flac libflac)
+		$(use_with fusionsound)
+		$(use_with imagemagick)
+		$(use_with jack)
+		$(use_with libcaca caca)
+		$(use_with pulseaudio)
+		$(use_with sdl)
+		$(use_with speex)
+		$(use_with theora)
+		$(use_with truetype fontconfig)
+		$(use_with truetype freetype)
+		$(use_with vorbis)
+		$(use_with wavpack)
+		$(use_with X x)
+		$(use_with xcb)
+	)
+	[[ ${PV} == *9999* ]] || myconf+=( $(use_enable nls) )
 
 	if ! use libav && has_version '>=media-video/ffmpeg-2.2:0'; then
 		myconf+=( --enable-avformat ) #507474
 	fi
 
-	econf \
-		$(use_enable ipv6) \
-		$(use_enable altivec) \
-		$(use_enable vis) \
-		--disable-optimizations \
-		$(use_enable mmap) \
-		$(use_enable oss) \
-		$(use_enable aalib) \
-		$(use_enable directfb) \
-		$(use_enable dxr3) \
-		$(use_enable fbcon fb) \
-		$(use_enable opengl) $(use_enable opengl glu) \
-		$(use_enable vidix) \
-		$(use_enable xinerama) \
-		$(use_enable xvmc) \
-		$(use_enable vdpau) \
-		$(use_enable vaapi) \
-		$(use_enable dvb) \
-		--disable-gnomevfs \
-		$(use_enable samba) \
-		--disable-v4l $(use_enable v4l v4l2) $(use_enable v4l libv4l) \
-		$(use_enable vcd) \
-		$(use_enable vdr) \
-		$(use_enable bluray) \
-		$(use_enable a52 a52dec) \
-		$(use_enable aac faad) \
-		$(use_enable gtk gdkpixbuf) \
-		$(use_enable jpeg libjpeg) \
-		$(use_enable dts) \
-		$(use_enable mad) \
-		$(use_enable modplug) \
-		$(use_enable musepack) \
-		$(use_enable mng) \
-		--disable-real-codecs \
-		--disable-w32dll \
-		$(use_enable vpx) \
-		$(use_with truetype freetype) $(use_with truetype fontconfig) \
-		$(use_with X x) \
-		$(use_with alsa) \
-		--without-esound \
-		$(use_with fusionsound) \
-		$(use_with jack) \
-		$(use_with pulseaudio) \
-		$(use_with libcaca caca) \
-		$(use_with sdl) \
-		$(use_with xcb) \
-		--with-xv-path=/usr/$(get_libdir) \
-		$(use_with imagemagick) \
-		--with-external-dvdnav \
-		$(use_with flac libflac) \
-		$(use_with speex) \
-		$(use_with theora) \
-		$(use_with vorbis) \
-		--with-real-codecs-path=/usr/$(get_libdir)/codecs \
-		--with-w32-path=${win32dir} \
-		$(use_with wavpack) \
-		"${myconf[@]}"
+	econf "${myconf[@]}"
 }
 
 src_compile() {
@@ -215,13 +218,9 @@ src_compile() {
 }
 
 src_install() {
-	emake \
-		DESTDIR="${D}" \
-		docdir="/usr/share/doc/${PF}" \
-		htmldir="/usr/share/doc/${PF}/html" \
-		install
+	emake DESTDIR="${D}" install
 
 	rm -f \
-		"${ED}"usr/lib*/libxine*.la \
-		"${ED}"usr/share/doc/${PF}/COPYING
+		"${ED%/}"usr/lib*/libxine*.la \
+		"${ED%/}"usr/share/doc/${PF}/COPYING
 }
diff --git a/media-plugins/Manifest.gz b/media-plugins/Manifest.gz
index e169498a6c8d..961294d08d4e 100644
--- a/media-plugins/Manifest.gz
+++ b/media-plugins/Manifest.gz
diff --git a/media-plugins/gkrellmpc/Manifest b/media-plugins/gkrellmpc/Manifest
index 9d5d0b02187c..2c02679119a3 100644
--- a/media-plugins/gkrellmpc/Manifest
+++ b/media-plugins/gkrellmpc/Manifest
@@ -1,5 +1,4 @@
 AUX gkrellmpc-0.1_beta10-mt.patch 4392 BLAKE2B 2a249c576091573c4f5c92f622b0d9ac1a8ffb1a38c0b4a6f8b1d475ea2db85c1358deaec8ac72570d09379167f63deb5a947711928ab86525a7eeb5980b7b9d SHA512 5928192cde4513470f9af952d6aa8a3b5044a6bdcc8aead26420a2cc7e9ed21dd3ac0043a5d481559c6eaad770de54c44b6d5395efb1baa2de80bc26d2536cdb
-AUX gkrellmpc-0.1_beta9-mt.patch 4427 BLAKE2B e3aea0f5a15cf589dd614a4080c38c04a39bf590cab23d1986fea74d05826582c97877d824f670e222e887257a2f4fe147c175d8aa9a505ede2e1aae3e181761 SHA512 0bf96cba88e6b2596b86318f72a87842d0641068a18bb3a07a9b5654296322bb12e58f281e8ab412e2f9a4c6fc5e0aef9714e91b97ec41d41c39cf5ec720b09b
 DIST gkrellmpc-0.1_beta10.tar.gz 25388 BLAKE2B 2e3c97e7d5887e1c3ea6a693cde19470e476943658de607266aac9a3ecbc2a5215fcc266638909d2ad024f303adb19475504ea4f7b79b3e97f566d90899721d3 SHA512 f5d687264f08146bf1eb54aee6d42a200fb97008a355d26a68be91b04e4bd622fc222725bf498c0837eacb8b94d6aede5aa1a05ed504fe5f9b790a9cd08d3973
 EBUILD gkrellmpc-0.1_beta10.ebuild 859 BLAKE2B 89421c770f6ced3a94022a4a3659b9a180644431c395145b4093e7b3177f40933c22bfb6bc6cee152a41c8841a9339507ffcda64f9976c3ab50c7941946c1471 SHA512 37bbf33f883dd373f490e947030c4dcf4d92fdbbf0d8d79cbe17795e085def544e05e3c8016e53eff7eb6e94276aebb59bb0b630a2eecb2afccc446b5a61bad4
 MISC metadata.xml 346 BLAKE2B d69895932fc6b3694132354e64a117da6105daa64ba1cb40a41ea2597f96c3e548c02196b2fda8256ef7813ab71d2b668b0d83e89caef95d4ae444a884668fe6 SHA512 119190e5845f3d61be09d34f525870e139c566f3ec4838c23425b764dd1c53507286c55d437e620d4e9958e195dfd58bc778cca58afc97cb4b52c76ba05f56c0
diff --git a/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta9-mt.patch b/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta9-mt.patch
deleted file mode 100644
index 4de5688a2b5e..000000000000
--- a/media-plugins/gkrellmpc/files/gkrellmpc-0.1_beta9-mt.patch
+++ /dev/null
@@ -1,152 +0,0 @@
-diff -uNr gkrellmpc-0.1_beta9/gkrellmpc.c gkrellmpc-0.1_beta9.mine/gkrellmpc.c
---- gkrellmpc-0.1_beta9/gkrellmpc.c	2005-01-05 22:33:16.000000000 +0300
-+++ gkrellmpc-0.1_beta9.mine/gkrellmpc.c	2009-04-05 19:51:12.000000000 +0400
-@@ -132,7 +132,7 @@
- 	/* Create the status decal */
- 	mpc_status_decal = gkrellm_create_decal_pixmap(mpc_panel, gkrellm_decal_misc_pixmap(), gkrellm_decal_misc_mask(), N_MISC_DECALS, style, 0, t);
- 	mpc_status_decal->x = w - mpc_status_decal->w;
--	gkrellm_draw_decal_pixmap(mpc_panel, mpc_status_decal, (mpc_mpd ? D_MISC_LED1 : D_MISC_LED0));
-+	gkrellm_draw_decal_pixmap(mpc_panel, mpc_status_decal, (mpc_mpd_connected() ? D_MISC_LED1 : D_MISC_LED0));
- 
- 	/* Update t */
- 	t += mpc_label_decal->h > mpc_status_decal->h ? mpc_label_decal->h : mpc_status_decal->h;
-@@ -254,7 +254,7 @@
- 	static gint	x_scroll;
- 
- 	/* Try to connect to mpd */
--	if (!mpc_mpd && mpc_ticker->ten_second_tick) {
-+	if (!mpc_mpd_connected() && mpc_ticker->ten_second_tick) {
- 		mpc_mpd_connect();
- 	}
- 
-@@ -428,7 +428,7 @@
- 	status = mpc_mpd_get("status\n");
- 	currentsong = mpc_mpd_get("currentsong\n");
- 
--	if (!mpc_mpd) {
-+	if (!mpc_mpd_connected()) {
- 		mpc_update_label("NO MPD");
- 		mpc_update_songname("");
- 	}
-diff -uNr gkrellmpc-0.1_beta9/mpd.c gkrellmpc-0.1_beta9.mine/mpd.c
---- gkrellmpc-0.1_beta9/mpd.c	2005-01-05 22:33:16.000000000 +0300
-+++ gkrellmpc-0.1_beta9.mine/mpd.c	2009-04-05 20:30:38.000000000 +0400
-@@ -12,18 +12,32 @@
- #include <sys/socket.h>
- #include <netdb.h>
- 
-+#include <errno.h>
-+#include <pthread.h>
-+
- GIOChannel   * mpc_mpd = NULL;
-+pthread_mutex_t mpc_mutex = { { 0, 0, 0, PTHREAD_MUTEX_RECURSIVE_NP, 0, { 0 } } }; //PTHREAD_MUTEX_INITIALIZER;
-+
-+gboolean mpc_mpd_connected() {
-+	if(pthread_mutex_trylock(&mpc_mutex)){
-+		return (FALSE);
-+	}
-+	pthread_mutex_unlock(&mpc_mutex);
-+	return (gboolean)mpc_mpd;
-+}
- 
- /*
-  * Connects to the MPD server, sets up the mpd object, sets the status decal to ON
-  */
--gboolean mpc_mpd_connect() {
-+void* mpc_mpd_connect_worker(void* arg) {
- 	int sockfd;
- 	struct hostent *server;
- 	struct sockaddr_in serv_addr;
- 	gchar * line;
- 	gchar ** parts;
- 	gboolean retval;
-+	
-+	pthread_mutex_lock(&mpc_mutex);
- 
- 	if (mpc_mpd) {
- 		/*
-@@ -33,11 +47,11 @@
- 	}
- 
- 	if (!mpc_conf_hostname || !mpc_conf_port) {
--		return (FALSE);
-+		goto err;
- 	}
- 
--	if ((sockfd = socket(PF_INET, SOCK_STREAM, 0)) == -1) return(FALSE);
--	if (!(server = gethostbyname(mpc_conf_hostname))) return(FALSE);
-+	if ((sockfd = socket(PF_INET, SOCK_STREAM, 0)) == -1) goto err;
-+	if (!(server = gethostbyname(mpc_conf_hostname))) goto err;
- 
- 	bzero((char *) &serv_addr, sizeof(serv_addr));
- 	serv_addr.sin_family = AF_INET;
-@@ -46,7 +60,7 @@
- 			server->h_length);
- 	serv_addr.sin_port = htons(mpc_conf_port);
- 
--	if (connect(sockfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) return(FALSE);
-+	if (connect(sockfd, (struct sockaddr*)&serv_addr, sizeof(serv_addr)) < 0) goto err;
- 	
- 	/* Getup the mpd object */
- 	mpc_mpd = g_io_channel_unix_new(sockfd);
-@@ -72,29 +86,40 @@
- 		retval = FALSE;
- 	}
- 
--	if (retval) {
--		gkrellm_draw_decal_pixmap(mpc_panel, mpc_status_decal, D_MISC_LED1);
--		mpc_update_label("MPD");
--		mpc_update_songname("");
--	}
- 
--	return(retval);
-+err:	
-+	pthread_mutex_unlock(&mpc_mutex);
-+	return NULL;
-+}
-+
-+gboolean mpc_mpd_connect() {
-+	pthread_attr_t attr;
-+	pthread_t thread_id;
-+	
-+	if(pthread_mutex_trylock(&mpc_mutex)){
-+		return (FALSE);
-+	}
-+	
-+	pthread_attr_init(&attr);
-+	pthread_create(&thread_id, &attr, mpc_mpd_connect_worker, NULL);
-+	
-+	pthread_mutex_unlock(&mpc_mutex);
-+	
-+	return (FALSE);
- }
- 
- /*
-  * Disconnects from MPD, destroys the mpd object, sets the status decal to off
-  */
- gboolean mpc_mpd_disconnect() {
--
-+	pthread_mutex_lock(&mpc_mutex);
- 	if (mpc_mpd) {
- 		g_io_channel_shutdown(mpc_mpd, FALSE, NULL);
- 		free(mpc_mpd);
- 		mpc_mpd = NULL;
- 	}
- 	
--	gkrellm_draw_decal_pixmap(mpc_panel, mpc_status_decal, D_MISC_LED0);
--	mpc_update_label("NO MPD");
--	mpc_update_songname("");
-+	pthread_mutex_unlock(&mpc_mutex);
- 	return (TRUE);
- }
- 
-diff -uNr gkrellmpc-0.1_beta9/mpd.h gkrellmpc-0.1_beta9.mine/mpd.h
---- gkrellmpc-0.1_beta9/mpd.h	2005-01-05 22:33:16.000000000 +0300
-+++ gkrellmpc-0.1_beta9.mine/mpd.h	2009-04-05 19:51:25.000000000 +0400
-@@ -10,5 +10,6 @@
- gboolean     mpc_mpd_do(gchar *);
- GHashTable * mpc_mpd_get(gchar *);
- GPtrArray  * mpc_mpd_get_clumps(gchar *, gboolean);
-+gboolean     mpc_mpd_connected();
- 
- #endif
diff --git a/media-plugins/mediastreamer-silk/Manifest b/media-plugins/mediastreamer-silk/Manifest
index 61692df04b99..61b2b0fa38d5 100644
--- a/media-plugins/mediastreamer-silk/Manifest
+++ b/media-plugins/mediastreamer-silk/Manifest
@@ -1,5 +1,5 @@
 AUX mediastreamer-silk-0.0.1-sdk.patch 1570 BLAKE2B a87dbe2e941f3dfb9bd5b10304a6311d08f1a96a70b605c96d25d009f9143e7967ad1642c918569972993b1546450cbc43ac23c81f5a168f63ff04e1144158f7 SHA512 c3bc9086c1a08e1a5757d4a06bb4f63ff115896deb704358b09f356a639c2f82addc05ec7da700f192d85aba13a7ab76741d5e22786f00d84ff50542ca9bd719
-DIST SILK_SDK_SRC_v1.0.8.zip 65910872 SHA256 424536084ac2d5c105e22f8048d19103dd83cb54bc32187377f5341d17e1b838 SHA512 2d56552052ec8180de9bbbce2f89d76df63c1bf6a8ac936dacab104d39526c16b9ccac33e5602f3a757bb12057c2e6da6f955ae370b05b93ff1427632c3a9489 WHIRLPOOL a301ba53e3fd1d56bc45d75709eb1b13edcacb7b68811862f2bbb7eba561242594feff6ac13f460593eb97917ecf63d947997316561a74d0d879e7823caccbea
-DIST mssilk-0.0.1.tar.gz 57674 SHA256 58f89360a06e5b8414c2a1389b2e0d801ea1548041d7791ca16c1fc3f136e1b0 SHA512 78325c0cf28bf035212583c76aa92f1291442e3f4fbe4c354056ad2b20ff72ba8d7149250431906942352c4deec7912567f512775d5a1dfe07b6b2bd44b5552e WHIRLPOOL da0d9ef8f0d0d83c8a29e981346c876e19f207dbc5f662d53e81dfd2d92c158294008625a9a261e153e33fd50a4bbf4af0d3d58da5a2e66f2871539d01da14bb
+DIST SILK_SDK_SRC_v1.0.8.zip 65910872 BLAKE2B e51dd92c1a13fe36475ac997ddd27dfca94dcc8f417e343e5d55657da67b5b32b7d7248fa9a202b051edd4be133fce5e07bae8720a2fb66dbe0f5bd4631978aa SHA512 2d56552052ec8180de9bbbce2f89d76df63c1bf6a8ac936dacab104d39526c16b9ccac33e5602f3a757bb12057c2e6da6f955ae370b05b93ff1427632c3a9489
+DIST mssilk-0.0.1.tar.gz 57674 BLAKE2B 87d43e3d66fe53c5965ee7edec3a69a80dff9839fdf37dbb7ff9b161c3b470cbe0aad9db1d59b28f9b2daf835b501562e6ee65cc0894ef33ba546813e4d7167c SHA512 78325c0cf28bf035212583c76aa92f1291442e3f4fbe4c354056ad2b20ff72ba8d7149250431906942352c4deec7912567f512775d5a1dfe07b6b2bd44b5552e
 EBUILD mediastreamer-silk-0.0.1.ebuild 774 BLAKE2B 787cb5c044d5080646f20f7eac9d8e6b77a6480e2e051aab1b821dc241b8f7845e3ac0e0c7fb504dcef67a2e59bb64a8d2954187ecf51bb518e8ec971b0d67c1 SHA512 123535dcfc6c4b4197f25009321a7b4e29abd1f1b5f97baa87a90fb0a96565ee5bc3e7d6b61f79afb2ecef97ad8f3bd6fbc67d454242652b9d1754484f02157f
 MISC metadata.xml 250 BLAKE2B 2ea879960a826fa9be35ec3a0988634da4268c54a8f4a484936356f1fac9e100b779dd43d7a3a684f121e5de5bae7195991e4d378d36b18f97155208fae728d0 SHA512 a5334e41fb3acb7a8cce473ca9616ecea8fe484e870173f0a26042cd8aca0bc7fa4fe52e9cf10b7495c44608e15f1c71564b3f92a44611ba830b08785666b2ac
diff --git a/media-radio/Manifest.gz b/media-radio/Manifest.gz
index eb6385a103db..3baea8f41b7c 100644
--- a/media-radio/Manifest.gz
+++ b/media-radio/Manifest.gz
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index fe37a966d03f..05e01e6cb0eb 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -1,6 +1,8 @@
 AUX fldigi-c++11.patch 1140 BLAKE2B 987d33126e80340d7687cc1e346a8cc8b5701c9f6a4259357c08c8ab828eb71d871e1bb70652f4d35a57243fbb0738db2c59717a822f178bf2c7afb960305c42 SHA512 a2399caf67947b129d32563d3deb0f209f0814e39ea48ea46f664bacf7b64a2639f9c237889004af45df6553ef5668ec9d5c389d3ea7a6fb9922f54654bcc9ee
 DIST fldigi-4.0.12.tar.gz 3636531 BLAKE2B 0a8a70afde9001e8f01ace5abfbe0a700d4df3d4592edb9c68f11b50d226c35d4ccb9c41d88e023140e791a2d0a1a6e7cf42fe7dc990f08eee381f8c79d8ed42 SHA512 f8fd5d2d761a963820c08ffd01cf6849309eb0ea47cd07429f8dac43af7490deb0a3d62aba8b8ca122ea2d6f2747f2bcf122fc02c9fce64f0c0e1f81ca5d9344
 DIST fldigi-4.0.13.tar.gz 3715981 BLAKE2B 598473de1306b57674409c60b297f4e4e13f3c2c429f4044cfae92f92ce7584a03c1d867aa5d15d662d300f9f667a38475e0a26c741d5efdb8e3fa10714efb84 SHA512 e5a74da404657356663dd5c115572efcf6525fb8851f5b6e9efc49c042d281d9cbf163ac99ee63396cb08737a5ae9223c1c985d72483b7031b5003174ac80d0d
+DIST fldigi-4.0.14.tar.gz 3717246 BLAKE2B 6df050df36fb7000144ced61313eb0585c85d99c17c031829fb100dbea2a6d9cc189fb48de5b44201b26128e3b55112fbcd1e999f404ced92bd53d3af0a6c722 SHA512 5faa009451c43d4bec4f67d3e51630251877c3ddce990bfc41760c8ff8ded600d3df89c4a7fba11a6b7c2b1d33005f45f5770a84ce2e3502fc433c70aa53ffd0
 EBUILD fldigi-4.0.12.ebuild 963 BLAKE2B 40d3a14326eca2e180f17393928b8a856f419ff8f7c5f5d53c71a11677242f51f109efb51ebedb86dbc36592e11b694398f0537a49d52f2aa49f55de0509f918 SHA512 cd049738e4d063b4a23121e0a7890875b5dc19dc70bc183dcd748063717e03ab143a6c588a7c1383f0a1425517bb8b7b35e9af517567cfde82078456c367cc9d
 EBUILD fldigi-4.0.13.ebuild 965 BLAKE2B 249c84924b752a7f34b17713d9bcba9496ecea87d19c3ca45706f1f8a6ed8bed649e1d47e168637046974730ffbaecab1800d8bcfd3638dab1698b4318c7d415 SHA512 58087bc28d121bc466dc89355de61ce0e1630aca431c5954099e6c5774ad7ef24e34d6ac686b306794464b6cf35696fd12a24aceaeaa53515f3adde7f0b517a0
+EBUILD fldigi-4.0.14.ebuild 965 BLAKE2B a93061981be1aa6c653b0bdba3c93c202b5d0b97df5f065ac634244e400621ac2404b911cea9fd886ffe78e636e3d056df51b64dd3e38653289f7d49e72d755c SHA512 2be335257d9954b6a4ab61b7f22a4ca25f19c1b5c3d0a7593bec0cd2880382a18b52053d3d24547c0c882dca15eb84d05a6d75acc6de6a57f9406022b181852e
 MISC metadata.xml 495 BLAKE2B 9c6f1b29ffb13a553b74ded93c11d29ffdc5a02336adb8fef55b862800a1856e712cdcb06c4e7d90858712d43aafce79f6cf9a357dc0a3c3ca0fc5cdb0ff770e SHA512 fdd9bc3f065ccb354ed0ad5c6544ca70f2011828870b942f2bf2f7001bf1342f858d60a6031cf005623795d1f1d2ccbc3a42fb54dcbd465c3c73f29a928d9091
diff --git a/media-radio/fldigi/fldigi-4.0.14.ebuild b/media-radio/fldigi/fldigi-4.0.14.ebuild
new file mode 100644
index 000000000000..e180da8b5f4f
--- /dev/null
+++ b/media-radio/fldigi/fldigi-4.0.14.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit eutils
+
+DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hamlib nls pulseaudio"
+
+RDEPEND="x11-libs/fltk:1[threads,xft]
+	media-libs/libsamplerate
+	media-libs/libpng:0
+	x11-misc/xdg-utils
+	dev-perl/RPC-XML
+	dev-perl/Term-ReadLine-Perl
+	>=media-libs/portaudio-19_pre20071207
+	hamlib? ( media-libs/hamlib )
+	pulseaudio? ( media-sound/pulseaudio )
+	>=media-libs/libsndfile-1.0.10"
+DEPEND="${RDEPEND}
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_prepare() {
+	epatch "$FILESDIR"/$PN-c++11.patch
+}
+
+src_configure() {
+	econf --with-sndfile \
+		$(use_with hamlib) \
+		$(use_enable nls) \
+		$(use_with pulseaudio) \
+		--without-asciidoc
+}
diff --git a/media-radio/flrig/Manifest b/media-radio/flrig/Manifest
index b44ff2b4fab4..3cb54ebdae84 100644
--- a/media-radio/flrig/Manifest
+++ b/media-radio/flrig/Manifest
@@ -1,6 +1,8 @@
 AUX fix-bashism.patch 547 BLAKE2B b04673f95b56dc9258b2953e90aabf81b2ef3d2b7bc7e3aee736dad07c96bbb962ddb37061713ddebf39f543bc1ad46c2667345660e07aed37576487e95d8dd8 SHA512 4e37cac97a340171fbe995fa17b63827e278ce1b46fdafbd82ed03c5967565e1e09348d43fec9801a500e3d3793dde3111fb4c3bd4b0541cb2a0696e78f645a9
 DIST flrig-1.3.36.tar.gz 692799 BLAKE2B 5fbe2a38a5b76f850c3ac7760481e2ae0b11e9115b239caf9c6a3fd8a39495baf7e00b615ce340fd60739aba36f3c2bb7fc25a6034f1d73add7c964b5db5a6b9 SHA512 8d8797ed09d9314eb4fa2100056b2f9f84cdb104a516a30b36c6341c05d09c5868cd3b9b256c967bed5514ac3362be28b46aca8f9af871f9261904bc12d6401e
 DIST flrig-1.3.37.tar.gz 700906 BLAKE2B f37e858b23476b9b2cdcc3a07f011889b33118030b3b8a9d8e46c53ee57426554ff8db2a9a9e458eed6ffa2c84193b3aba7a8c5e6db994f5ad291f4e645d9da7 SHA512 a8d611cae7bf23c92689e75b75b8de72bf4ea56a5039e54c97dcfeca186afcdebb13782dffafb507047e1d5574e2af1fb6f88bc8a01452ac8921bfa6295c0c90
+DIST flrig-1.3.38.tar.gz 706694 BLAKE2B bc69731fb1cc386ddafe476743aae3747b9dd0fd27610defc53dd9a21dee222c30d101668aa8a040feecde3baf87f3d76a2b758575c6428e4c644fe5bfcecbcb SHA512 905c32923820cfb11da4b94f69df780c5d62bc1fde1c6d569feca7a6aa3a30665953aeb349823dfa5331c527dc4d494dc126a70929f28da561a621533578ab01
 EBUILD flrig-1.3.36.ebuild 624 BLAKE2B 35f05d522308aedf4919926975417e6052f44503f533b2496d2bbb594ed74beab0dc1fce65fb3975bf1e69ec4be190c9fabd8679223988b2d09376d16299ae24 SHA512 5d2cae5c29172ee70aa5dcbe65cf449094980b4ae75b1dc6dd23cfd368ac24d396b1154107a0506e6981c089e56626e4abe8e28e15fb12b0e68a84a3d587cae1
 EBUILD flrig-1.3.37.ebuild 626 BLAKE2B ee1d3a031a3cc026faaedacdacdc728f4b37f674fb1555eb29527b3bdd0852ad15094203d4909436a71b65b7afb5ebdaf0320ce27b4145452591b31b43ad4691 SHA512 e6c243bd911e9f894524d9366c6dd344941524a1811614056d547a68d56bf58996b3c4ff02b5e80bf27ced913c602589d480188b425d38fe5deaff3efbca7c9d
+EBUILD flrig-1.3.38.ebuild 626 BLAKE2B 0b0869afd239a791eb95c904bbccfa11dd332cd06b51873ad1e2449a514600bb83fe7958703758243234ce3e4e8b43956d4c4bc89191fd3d68b3f184c98dfe91 SHA512 c74380b192490fb007d231e5b5b547ae822bdd6e5bcee3e443f232429c7eabdb152cde450dc7015a79b1ba7194092aaaa61a8d16085fa132a03453629a39b34e
 MISC metadata.xml 325 BLAKE2B c4c98ed723dff91c8935c44ee552e25a08366edb7b73593d29d790622a49e130ef56137de21e1df16e1f968b1d5a0c984ce6df5b817a39f38523fb71353a3e1f SHA512 ca601e14e79450d08e0679e86827071a323fbc60cdf89412257747490046ca6efb2e78ae27f69c0e3ad449427049a35d478f2a7524a0606658ef9b302d9c0d43
diff --git a/media-radio/flrig/flrig-1.3.38.ebuild b/media-radio/flrig/flrig-1.3.38.ebuild
new file mode 100644
index 000000000000..19d88bf2c029
--- /dev/null
+++ b/media-radio/flrig/flrig-1.3.38.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit autotools eutils
+
+DESCRIPTION="Transceiver control program for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/flrig-help/index.html"
+SRC_URI="mirror://sourceforge/fldigi/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="nls"
+
+RDEPEND="x11-libs/libX11
+	x11-libs/fltk:1
+	x11-misc/xdg-utils"
+
+DEPEND="${RDEPEND}
+	sys-devel/gettext"
+
+src_prepare() {
+	epatch "${FILESDIR}"/fix-bashism.patch
+	eautoreconf
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc AUTHORS ChangeLog README
+}
diff --git a/media-radio/qsstv/Manifest b/media-radio/qsstv/Manifest
index ebcf2b3b2668..ed3961f4190c 100644
--- a/media-radio/qsstv/Manifest
+++ b/media-radio/qsstv/Manifest
@@ -1,5 +1,5 @@
 DIST qsstv_9.2.4.tar.gz 11883587 BLAKE2B 028805eb2486208d72fb0bd16909b2923a2d95d8e6e28d84d564488cedd2da570d0e6c4178101141a4374979958ba97b26c252da67ced3b3be0059c865c6d235 SHA512 a354fcc086c08b5bea69416d9d5f9ad7bde5ff496edeecf6403249c77d8f27176b6928dc9885c924a8f61db087a4c8286f1b6f26a73034b72723ba390ce8a9fd
 DIST qsstv_9.2.6.tar.gz 11385735 BLAKE2B b7192255a3df32d5fbf07f54e1a8b7a7fd092fc4f7cca794df66d73687342e2169cdf8a2e08e7d665e6c27cefa3e9e4574c10c685cc9647caae1156d5c88522f SHA512 10ad86db8a4db432dc757314375487d4128a612a54496105c2acaadce4f2cba8d044f1c5bf1d38534664ef7c065742606027306b3542ae834673ffce58885557
 EBUILD qsstv-9.2.4.ebuild 1085 BLAKE2B d78b6c47ddb06766aea981020a22aa6d07f0f68629044b079c0f028b4db5d5f32b4cec5ea5d00642b80e4f6acda4ed7fcf87d0cc04d39a76d7f706f5cb2103b0 SHA512 67a9e4165e110d171079460ad2296c21315a2a4de6434c5e17497770a4201acc6ccb20d71d4a205297b22bb3d1bf931f65fadaadc4a5a0d21adc5b076857fcde
-EBUILD qsstv-9.2.6.ebuild 1017 BLAKE2B 507c90bb580b207c8d5cedc4dc30adb3b159fa9d11d8eb41a0ea7b32c7350a59875e1cec0496ad8581094d78cc3955898a4cedcd275909dd6f2b9ac41448097c SHA512 2672e887c454b25b7b5ef21fafe85955ede1b6704d31dd07ffcef4d4cdc268e776831eb310f7ade58d1a8010d36e83058cdb78fa8dbf52bc467789feca3ced7e
+EBUILD qsstv-9.2.6.ebuild 1016 BLAKE2B c2a4ea58071a1229b74209b67ef5cea8518c2230154700a105edcd09174ed8c38dea34b1273fc2dcc2a98873e42bbd89d6de66f36f265cde656ef7ee0f4cfe42 SHA512 8570f5f85dc8f5602da75ef69d45eeb3651db64f1d94e5b343e3af19382ac16a251c50b89521f0c6c3d5f132fdbce4e52d44f01b56d39ba584248b86e2b907b4
 MISC metadata.xml 410 BLAKE2B ce47d5a977b2b6b76940c5b2c74434ea382d4188f319234935a12fa4927f4b493ea664ec6fca2302aea1a31b8234d20819b585f5e56384085541445f4e8bab2d SHA512 2c6aca4abe5c944966fd5c63f9534024453cd67560f406971d6281604bfed5800f384cee8d1aadb0b85bf636530a2b7eb5c2ba002a499eb41f2670d38a89b69c
diff --git a/media-radio/qsstv/qsstv-9.2.6.ebuild b/media-radio/qsstv/qsstv-9.2.6.ebuild
index 61520944b93e..d88025d73846 100644
--- a/media-radio/qsstv/qsstv-9.2.6.ebuild
+++ b/media-radio/qsstv/qsstv-9.2.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="http://users.telenet.be/on4qz/qsstv/downloads/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 CDEPEND="dev-qt/qtcore:5
diff --git a/media-radio/svxlink/Manifest b/media-radio/svxlink/Manifest
index 514526635244..c3f586169290 100644
--- a/media-radio/svxlink/Manifest
+++ b/media-radio/svxlink/Manifest
@@ -6,6 +6,8 @@ AUX svxlink.init 782 BLAKE2B 536435d70a3a5afbcf533ce39cc1b8bc0de5320ac57728a4ef7
 AUX svxlink.rc 568 BLAKE2B 7e0fa55b6d7d099778f2b20cf3b85b54a943460ade694bdf75159945f0be671eefefbffdfceaf28b092dcd4078970f88194d63311f3cea9cfb38922d83e9f1de SHA512 96e95116c031e3e5f21d1239362736c093c3e5c32adcb4eef1fa667c89a08d62cdb82640a246cf11b9fddc62544f98a660f626e91c67dd7a0d608904b8ddf6dd
 AUX svxlink.service 690 BLAKE2B 7f62518556c7c0fd0a4e759031520181f5a9a61a4d5ebcf874e60e8cd400327feee0306011ab8c88b17b8a5b666cc0fda90244b7a9e5ad9734ec629e0bf3d2f3 SHA512 2879820eaa64bc574e1a2c57492ba429cb4b5748b56132fac8922727a8924197b719075c39a6ab0ffcb698b3cf4b5eb889f19c2aac0a9d143f0aef6de778b225
 DIST svxlink-15.11.tar.gz 1528034 BLAKE2B 70a8f0f0181aee836738fba0b570d5fe5a896685267b8a9bbd09e6f6139fd764f5dac58dd57cff1ec2531b748511bb210a2aacc30704c5aee7d378489316a9b5 SHA512 b5c36e1a5e1dd0f954b7c2318d32d1bd52d8ec0a94a98e9c2de0b61ebbc6d0809d87fefbf13271c20a1a55e1a965e1a98f14c819df7b16a523b7cfc0fd4562ac
+DIST svxlink-17.12.1.tar.gz 1621559 BLAKE2B 8a1d9498f451a730ee8d961d4ebd548f34f977367069658bdf4af7d91726e558c9e1ab084423b0238ae1f5fdcafd8e88480b818491e5f91d176d07d81fced5a3 SHA512 90bd74420fcd78d974d12ee13ac792f2a0ecd7cb483ec36ef1085e905f9d6c62af707cb65d04079ec66d7df6da615080a2058a0a559c82171b4882a4b20289f9
 EBUILD svxlink-15.11-r1.ebuild 1750 BLAKE2B 0dd7c2ce869e18ea801c27c3af4aee7f0cac76e5c39807a36049c54734c14d108d57d5971c1aca1c71d3ebb8b8ce6594ab3455a8b0f64bce749dc4c98e4eada4 SHA512 033529dbe42592d5c650b62a08a48808c5bd5e2583d1505860abd1ce8cea6c93c3b91c1ec4937f92977e658d0bc236f327438cdc25461efd5fb5ba0d8f98f07d
 EBUILD svxlink-15.11.ebuild 1646 BLAKE2B 459ecb702fa6d5951ef130acbb34303b77b19dc0abd31c86f4179e5f175115739c3427448e5115b57d234b43ac69f49d5c98a1782ed4ac42c918268345f6e973 SHA512 8bb7ffe3775e1915256365cf8db31676db333d21217c2f6186fa0c36acc9aaff9f32bfddc35013f220b3461142b59cfec9a390206ef05761840e99ff0f4b2a5d
+EBUILD svxlink-17.12.1.ebuild 1649 BLAKE2B 00c5289dc9de4ce3077952908d753c855b0afbbc411b50d6d877fc45e346b49b3eae8070c2d6875738b4b9afb46a6e090a9b232bb58d41fd3e947fc3d4e0923a SHA512 c3ba8e8fd159be5e32558fcbfd0476f005460ff898f8313704ddb62aa803821e784982f4eef5d0bf85307d28515fe7f89d4e2cd9c15b5377201aa368251fde99
 MISC metadata.xml 696 BLAKE2B 51be8858bc950793e0044d7d8dfa695f3f4c1fa0f373be8908d00c0fdc73ee0fbbe06b118a28da147978ad204d63f2eb02183c961123d71c078fcaa9cc8306f0 SHA512 8e514fc2f15af5d7520a371ab802aa2a024276514d184f31b00b96c09b06e7b7c69904a0ea256f17fbe9e97f8da4cd908a91072284b274ba6488982e92182bc5
diff --git a/media-radio/svxlink/svxlink-17.12.1.ebuild b/media-radio/svxlink/svxlink-17.12.1.ebuild
new file mode 100644
index 000000000000..e63fd2cb6cfe
--- /dev/null
+++ b/media-radio/svxlink/svxlink-17.12.1.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils systemd user
+
+CMAKE_USE_DIR="${S}/src"
+
+DESCRIPTION="Multi Purpose Voice Services System, including Qtel for EchoLink"
+HOMEPAGE="http://www.svxlink.org"
+SRC_URI="https://github.com/sm0svx/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND="dev-lang/tcl:0
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	media-libs/alsa-lib
+	media-sound/gsm
+	dev-libs/libgcrypt:0
+	media-libs/speex
+	media-libs/opus
+	dev-libs/libsigc++:2
+	dev-libs/popt"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+pkg_setup() {
+	enewgroup svxlink
+	enewuser svxlink -1 -1 -1 svxlink
+}
+
+src_prepare() {
+	cmake-utils_src_prepare
+	# drop deprecated desktop category (bug #475730)
+	sed -i -e "s:Categories=Application;:Categories=:g" src/qtel/qtel.desktop || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DSYSCONF_INSTALL_DIR=/etc
+		-DLOCAL_STATE_DIR=/var
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+}
+
+src_install() {
+	cmake-utils_src_install
+
+	fowners -R svxlink.svxlink /var/spool/svxlink
+
+	rm -R "${D}"/usr/share/doc/svxlink || die
+	doman src/doc/man/*.1 src/doc/man/*.5
+
+	insinto /etc/logrotate.d
+	doins   distributions/gentoo/etc/logrotate.d/*
+
+	newinitd "${FILESDIR}"/remotetrx.init remotetrx
+	newinitd "${FILESDIR}"/svxlink.init svxlink
+	newconfd "${FILESDIR}"/remotetrx.rc remotetrx
+	newconfd "${FILESDIR}"/svxlink.rc svxlink
+
+	systemd_dounit "${FILESDIR}"/remotetrx.service
+	systemd_dounit "${FILESDIR}"/svxlink.service
+}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 270cac081c41..d25c79cb6cbc 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/qtagger/Manifest b/media-sound/qtagger/Manifest
index db55c570358e..dca88328ccea 100644
--- a/media-sound/qtagger/Manifest
+++ b/media-sound/qtagger/Manifest
@@ -1,5 +1,3 @@
-DIST qtagger-1.0.1.tar.gz 60791 BLAKE2B 617f8bcff6e3627ad9f36b814662111ad7cdb9a782e4cd3703e2010ce019ec247e77f6e7dd620409338b1561fcaa356924de009778a812ddbd57ee27abc79a39 SHA512 45969475abefa865244946fb6a74dcfa7397f0a9bd57b0fda4de98fc8c8edb2c0c3a631eccfa199bebb8442df38b0beaca9234fae4166629bcb5c08aee42b47a
 DIST qtagger-1.0.1_p20150402.tar.gz 60745 BLAKE2B 0260ac8cf4b07cdb3b5887357ac4034f4c02a801cc91568cc54cb73293884fefcdbf2019d1b61542353f4ef2e79c07ffda1c1414ff4b99d10faff1e8dcab95fb SHA512 2510350d479008b0c2af4b489aa16ab88003b18f1cbb66796dece6c93dd4222ff073f575b9de8136fb6a46ece1c67ace7de605ef3db0c73038a52472d652f279
-EBUILD qtagger-1.0.1-r2.ebuild 906 BLAKE2B b92ce2eb06c8c053a8dcd943cdd64bc9d50e41f5d86eca5d03b98137b5434c01334a5e66589231b6f438b2409e735dc95b2b1e84dad397fa6f8d12dd6ff4a313 SHA512 d1a61f34be72cc595a19adbe8b6856896bb6c07d73ec1205bc27cac42a1744519180679beeccf26ca37195196dfd170977f38336dbe36405f2abdf182c041dac
-EBUILD qtagger-1.0.1_p20150402.ebuild 1042 BLAKE2B 400191e12c5afa0100d8e3ce979a8b289a05992ababc3abce37f716f4b3d9b337ddd8cab19e73ee12e0dc054f924aae91a20ed91d99cdd77763c36d2781ee065 SHA512 f07ce8858d9d4f5a3c79d7c9623b7f5f65bb6f944aad92fc340477adbe6fd7f07813ffd71801db91d8f1027dd5bef353c483f9d5ac981d4b17897208508039b0
+EBUILD qtagger-1.0.1_p20150402.ebuild 1042 BLAKE2B 65e641ec7e66754bb23ddace61747a437b22fc41c1146fd32ee9fe96ea6e95d6c99ea8ad8bb54605b23cdc953e34b2560c21f6562c0f537d6e5758657767cd7a SHA512 17d1da69e1c6c45d212e21efb6709de101b23033d08ce1732f5437c06b4b7586d59a17033c6c03e6f86d3e371b9e495eea4615cb2fcd060b9f96e6f4732cdf97
 MISC metadata.xml 326 BLAKE2B 176217a8a77bdd384e28da6436cbd32a61420981e5ab63ea76c9c4681463c6ce69bc9ca197591d9620a48abb145563de081122ecffe976118f7e2276687dd775 SHA512 e73586aa673a0b41300f88e9523c322d3dd42c2f319bd237b8b88fe346327c068c8d9e272ebc0e5503adbfb2562925231663da7fbf86a9edf7b48026d65a3854
diff --git a/media-sound/qtagger/qtagger-1.0.1-r2.ebuild b/media-sound/qtagger/qtagger-1.0.1-r2.ebuild
deleted file mode 100644
index 2412d4a4374d..000000000000
--- a/media-sound/qtagger/qtagger-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-CMAKE_MAKEFILE_GENERATOR="emake"
-inherit cmake-utils
-
-DESCRIPTION="Simple Qt4 ID3v2 tag editor"
-HOMEPAGE="https://github.com/DOOMer/qtagger"
-SRC_URI="https://github.com/DOOMer/qtagger/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	media-libs/taglib
-"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	# fix doc installation path
-	sed -i -e "s/doc\/${PN}/doc\/${PF}/" CMakeLists.txt || die
-	sed -i -e "s/share%1doc%1qtagger/share%1doc%1${PF}/" src/mainwindow.cpp || die
-
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_NO_BUILTIN_CHRPATH:BOOL=ON
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-
-	rm -f "${ED}"/usr/share/doc/${PF}/{ChangeLog~,LICENSE} || die
-}
diff --git a/media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild b/media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild
index 17e012ecab95..460a0e654404 100644
--- a/media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild
+++ b/media-sound/qtagger/qtagger-1.0.1_p20150402.ebuild
@@ -7,7 +7,7 @@ CMAKE_MAKEFILE_GENERATOR="emake"
 COMMIT=0e74fe022ddbb689f7bae0460a21be303114029b
 inherit cmake-utils qmake-utils vcs-snapshot
 
-DESCRIPTION="Simple Qt4 ID3v2 tag editor"
+DESCRIPTION="Simple Qt5 ID3v2 tag editor"
 HOMEPAGE="https://github.com/DOOMer/qtagger"
 SRC_URI="https://github.com/DOOMer/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 
diff --git a/media-sound/ventrilo-server-bin/Manifest b/media-sound/ventrilo-server-bin/Manifest
index 4cc0787108c5..3e6016a5dc68 100644
--- a/media-sound/ventrilo-server-bin/Manifest
+++ b/media-sound/ventrilo-server-bin/Manifest
@@ -2,8 +2,8 @@ AUX 3.0.3-conf.d.ventrilo 84 BLAKE2B 73d9732a8a53bff8600cde7ef5ff940fae859d03e49
 AUX 3.0.3-init.d.ventrilo 654 BLAKE2B bfb8ad3ab959623c085758e2a4accbaf13ad2bb550fe5611770bec13fbabecd1cb74f305c89934ae685be006b9e483debecac1f6c659ba7b6c62948f73cc51fb SHA512 55c4245de9045b012ff85fe3b025318522c7eb01f96671d5b8c48ad2ea4ba5778d25320ea7b9bec86d64cbfa8d13aaae88b0080d5547c43792ce5427b5ac6917
 AUX conf.d.ventrilo 82 BLAKE2B 16096c124731a288743e50ad2bca4a6dff12a2f54a9bd05275e1376e1170fcb811a79b7f23f72b223e4549eecdf5ad61c299a883ae5920bef04946b721558e9e SHA512 ada8c5fa3bb6a80cb31f8ce220527e91e9e70e39e12ef3db28ab42a0b2327e89684cb825b4e6d6ddaaf439c0797f3509eb6f5fc587226a967e9f2fcfc54eba45
 AUX init.d.ventrilo 601 BLAKE2B 98d59cf7bcf3ba0a29713c5203367e458d8fecf3f6179185ca502ccb187947bafd49090d65baea65ddc846a5ae770ef8bd0b766f72160a85f7b594b0aabe663d SHA512 5d3821e9dfc25709cbf54bd73ce2a4f44bbe2e73590f8b9349840a5bf235e375efa80966e25c92a8f79d38652cdf4d9a074e43c248a1e8ce02f50735bfbc09a1
-DIST ventrilo_srv-2.3.1-Linux-i386.tar.gz 166862 SHA256 5fd929056be6e44e61617080b157680cd3cd3432721a237076c01651ec2bb32f SHA512 01e8bce092f8b1ef0f08e736040871e221f4e039d21671d451abfcaf077be104e1f3488b90661e4895118d971f5e56040a01290734a02a4d5e67d183dc91cd5d WHIRLPOOL bcb226d07e8b52e82260b35c0d08dbe2ed06468519e596bdd1a0854b14050aba124a661181c7e697e75060eb1504b8806bbd77dbe1ea83dc378fcc69fc0abb6d
-DIST ventrilo_srv-3.0.3-Linux-i386.tar.gz 211494 SHA256 702a0cf88234e229b68e7a1f2624e23879541cb4e2c2b2f5f88591a85b364e56 SHA512 ac4b38d7ee5cb66b88507e5cfb810d28b98252dfbabdb8d3777ae4b4dfd7a793ae8e0ee0a4d3a03cf7d0d1b1b34162e5f026c7217d296201e48607e44f04e79f WHIRLPOOL 0fdfee56ac1457dc892033bd8de4b7d12628ecb62b1f0e06c083a87ae45b339356429879dfb5d080b1427572027722643db9aec2cfacc48fc48d710f3586a86e
+DIST ventrilo_srv-2.3.1-Linux-i386.tar.gz 166862 BLAKE2B 6eb4c55088d2aa6c9c7da0973f96dc849c9b0a93994206ed7ffcf2abdcce3fa73f0bead50158fc74c9275bfc7964826ce3b22328aaf0d73434a1185e3ca6b34e SHA512 01e8bce092f8b1ef0f08e736040871e221f4e039d21671d451abfcaf077be104e1f3488b90661e4895118d971f5e56040a01290734a02a4d5e67d183dc91cd5d
+DIST ventrilo_srv-3.0.3-Linux-i386.tar.gz 211494 BLAKE2B e75fba4c9f660de84913728aa0ad08af65b07004368640e47810110c0f694634d00421226accd904f23e2141e6be849da31b3604fe441f6ad610db2a1eb58147 SHA512 ac4b38d7ee5cb66b88507e5cfb810d28b98252dfbabdb8d3777ae4b4dfd7a793ae8e0ee0a4d3a03cf7d0d1b1b34162e5f026c7217d296201e48607e44f04e79f
 EBUILD ventrilo-server-bin-2.3.1.ebuild 894 BLAKE2B 0072076825fb50475418d63a16a5ed38b937c70601bb28b2b2f2b246ba63697f76d2fa485821acd620dbdc4f263aabecb124332e4379087d2515a0a9ded55e3a SHA512 5b58199a0ee8d844905593671cb228e0bc917a604329bcf0daed1d312c59225b564c05de144738d8c8ca1e341400fd0bdc5dc6448bccc2aed74a94efd39d8dd0
 EBUILD ventrilo-server-bin-3.0.3.ebuild 1081 BLAKE2B fb66a31cfcc3b067b5f8f0c5f35a71a0512dc83202f8053583883dea9e66b95027fad684b83d2545d87ea43c1852b3e0c38c7378c57e9994abeab163f38ceeb9 SHA512 687a6e67981d7125d4d36e9f383290a0c60bf1a8b535de8aad85d9eef8e3fea69deb73d73851ceb32fc388a92474d9f80e7b5f418dd6da335c2a4bac773a6b19
 MISC metadata.xml 372 BLAKE2B 1b26d3bb36d1dc84ed27fe0ebf0ce02abc995f9b17c16718b01ed35979daeb01fa9a9021c8314026a43e8d0baa69a67504890604f2bca5e6e3a4d1d6d9bfd17d SHA512 53e71d78ef4609a60a0f11d5579197455abf9fe5a050d387e92a0e1c2af50721cfd5b4756dfe61064b59d69c097650a94af5232fc9027fd62f9ca1a0e3977277
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 8d072829a4da..e6ccf75045b9 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 0c0da194d433..78ed36e0064c 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -18,7 +18,7 @@ DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 BLAKE2B 3
 EBUILD kodi-17.3-r1.ebuild 8577 BLAKE2B 89b0b422d7aafcd17a23d85e9821185e2afb7ae86e39cd0bee8355b7dbbd4478dc08f2010312d6af7a1987e33578b3a6db2c1b28549e2541c843617594168989 SHA512 be9bf1b24d6bcd3d797ee9f12a9495a7bd1245904b1a361a5bb67fff64eae69a9c5f8f3ae9b2a9c2aebe28b62c755135daeea7ae4f077e68ce5f0cad3169a78c
 EBUILD kodi-17.5-r1.ebuild 8830 BLAKE2B 8f09f8a724708f406157cb6a3acb81e06ca2c2f54bc81dab24b44b539ac1f3ca20cc450ce369fb516f7e8f80e0586af7e654418bca701e9df897e5f0f579a04d SHA512 68e7232a7a45afdfe8b042b4b999e2b7d803bf2812d021155636c40789ec713da025c7c8d01e094bc94121e7f8b22e6cccfc6871f99086646886059476da8df0
 EBUILD kodi-17.6-r1.ebuild 8741 BLAKE2B 63512c0c3c77736a551d2b0a255048a7579f852a5c3b592cb70581747dd7fc04a7beb9b1ceee60222266cb9e478e01f39dbb07f4e84f1a35b509bdb6552ff779 SHA512 6be7bb9f2bc68ef8dfbdf71972d221c503133f99ad42d1b434256d4c55fa6b9edeadc097f928c5176b1038d687b3dc5b38ce083aae969af6147e64562f68cf9e
-EBUILD kodi-17.6-r2.ebuild 8743 BLAKE2B d0d6014cc8735bf9cc273ca9848aff83c466257f551694c3dbd67ce3882b85f7dfab8c29302289f3406848935f8ee4700ad16e8ab7e9445ead5dca29d7d12fd4 SHA512 01ef54d3ae4404f768c126fac8a39ba66ebcf038104322a2f14bd903d336430d935f0201dc84d1025f9d1fd1ea4109de73c7de2342c8f47154a8b08e9c73a571
+EBUILD kodi-17.6-r2.ebuild 8744 BLAKE2B 1e8a1d28258d268c9e05615834bca208d88a3ccf67785b13e09f361e557575375415dcfc3f60e7280fc77333e365b2c6548406d42c21afeba43c2be6899140ea SHA512 c46593185982d5540df103543dff367cd6edac982aeffbbc7d4608663741ab2fc04ba2d048cdaea0abe36e7f92156736ec44f1a51d055c2e9fe6c9dcfdbb5074
 EBUILD kodi-17.6.ebuild 8745 BLAKE2B 98d3a0a1b855474eb0bf68b49bbf26a229ad0e8d7a825f10aa131e423401de090bc237a1dae00da87575a851b5f62e27c086964f58afdc6b8e3649b5093b3bab SHA512 e0ab4f578136da46ae6910886d2a8239bf81acdb39256158d616d12a4a6ee168fb45424a3fbd5f31d110117223dcae85d9d881485d238c9c7f59101ca112cc57
 EBUILD kodi-9999.ebuild 8927 BLAKE2B fa914e304a3ab6de604a7cb9522ab2b49827c200eb0c227e93db0d63ecebccd23f1996ca3011377b3474cdaaf1ce846d669d057ef23a918da4a50ce17b4e49a5 SHA512 d41df079f17e00f876e1a4154a8e6176cbdb9d6b77b815ce916a1b079bf0d4692e2c284800646f5730d26c12294a73cb260c0961d217d28ae70ea95c7603e04f
 MISC metadata.xml 1716 BLAKE2B cc5a56b572fc4bc5b17a303e266e66c06450e9ef111f080a57bef31f847d522edd01354be20cbd5450b6773321c49618ae74f9a5caed39948d672314b06c27c0 SHA512 4ea0d31caa3a4c10ff5a421fa830c9db3eeb2628cecc19759ad218eb551d2c4382016ec5655a5c5be1e257eec29cad0717523a9fe3f251ff762cdf0ba60b4355
diff --git a/media-tv/kodi/kodi-17.6-r2.ebuild b/media-tv/kodi/kodi-17.6-r2.ebuild
index 2cabe7ef521d..9faa56b3abdb 100644
--- a/media-tv/kodi/kodi-17.6-r2.ebuild
+++ b/media-tv/kodi/kodi-17.6-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -73,7 +73,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
 	>=media-libs/taglib-1.11.1
 	system-ffmpeg? (
 		>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
-		<media-video/ffmpeg-3.4
+		!~media-video/ffmpeg-3.4
 	)
 	mysql? ( virtual/mysql )
 	>=net-misc/curl-7.51.0
diff --git a/media-tv/v4l-utils/Manifest b/media-tv/v4l-utils/Manifest
index cf5a0100894e..eebb68bc4f14 100644
--- a/media-tv/v4l-utils/Manifest
+++ b/media-tv/v4l-utils/Manifest
@@ -1,10 +1,13 @@
+AUX v4l-utils-1.14.1-sysmacros.patch 808 BLAKE2B 1dc608e836120e65140ffed8f9f4d19868eafbfb2e729665ad553fc44da4386d2197eb327f3f36ffafe8af45bea7adff72808d7cd7890e05c7fe5f3ba570ff8c SHA512 593f53b92ce947b1c2f75e7e1090b3f1e9ff3c39a69fcb96c4a6f1825db947b92bf4d45b93dc14eef7f439104d4a4090ef1823a38bd5e39687587afd6657671a
 AUX v4l-utils-1.6.2-sysmacros.patch 1853 BLAKE2B ed1f474be9650b0b4e5812746499935ac8a483ea71b335183c1648f97309d1d01209df1dbaf70f4e5b8e0d838ca97750bc37b4943dbeadbcac7c31ed9077969f SHA512 ea3e4a19c8b57833519b6356e647572021ac2a6a00942394a89949ff02aa3e0f70a72b0ef0f025615a7c81c0c79f1cacaa01a82161a05d806e3c8c792995353d
 DIST v4l-utils-1.10.1.tar.bz2 1352235 BLAKE2B 7ececae8ad5ebd999070b0c3626fdf5b0a4bc81562d2c2a712ff9625025d3e6c4ff664ba85998dedaa1ee77295d3cea39306305c20573c07156a07ec0ac8d10a SHA512 524bfd4e93e82f2dd55f0baa3e8be5850d4675b46fd0197b6d1287fc0d502c6b5c64bdf461af9630345f2d847d6aa5b6dc483693cee452da0b6729f156a5d98d
 DIST v4l-utils-1.12.3.tar.bz2 1588049 BLAKE2B 1f76e6cd76781119beb01a1d570599cd2710a4c00ea18c380e576cb8281bab07e09cb6c1469201d0fba53b8bb5f4c4fa812dcda06203d83566216272e9abe3b0 SHA512 6d0269d900c5dad08499ee551ce1507b8b750895f48423ccd534db51cf68794b59a279743fd22dc6da0c092ca31ef744aa564f26b6d6252cbbc7a62e2e1c714a
 DIST v4l-utils-1.12.5.tar.bz2 1588944 BLAKE2B b87c24c6fdaf3e80407dd28b047c27420ff70007e12200e69395021def3abb74eec3565337a6484cf44b5a5cc7678d9bc718876424fa58d6d16d0e0c37ab59cf SHA512 ed2e7545a728360b9684db68330885b498a3a5611f49b80e54da72109d9ba2aa75e85f89f085ff0a6f077b17c880101fa5b78c9dff8a0df2eac1866bd80a04ea
+DIST v4l-utils-1.14.1.tar.bz2 1672480 BLAKE2B bc5c50fa0b339c79439b54e54f0c0e3847068931e34831a05e214e785fe4063764ef0d76838ca3216a46db072003dc5d86dd2c563fbb73d237a6b5059df93f5a SHA512 78b863f2cba409138efd6744895e6b1e730ec7cd5dfd0bd6088dd1336572a5f6d0b422fb4ec6577c6038192d0a3b28ae91d7402d5733904913749eff263c2eb1
 DIST v4l-utils-1.6.2.tar.bz2 1148309 BLAKE2B 8153a1e3803b9e59eae064f2c88e4b865a56193788a8cb204dc34e9ae50e66794ba7f020ad4b0ff9af995f57d9b9a9e0225e0f8a09eeefae42d063131d7e549a SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2
 EBUILD v4l-utils-1.10.1.ebuild 1677 BLAKE2B ee20cb0d015e70978f713d720978614cc0844c0e5d9d4dde951c3380a094d5d5769ee64883a8a9952917e9d5eee1615caf4008ab6940c13c6932985a2bc466d6 SHA512 4d800bceff5d5c7abe6687455c102de865017f19cc6bb22ad0c1b16359c492c920ff7a6f32f601bdad6d7d9df860860beba4487ed63094deb832f17c64a0341e
 EBUILD v4l-utils-1.12.3.ebuild 1546 BLAKE2B 85be33f5e42353cf2edf3839451c77d89cb1a638d3c001cd09e3ba6e14d368a9d7fa54acd6847a4170721d420f572836119b5a6c01cbceaf8c8cfdc310d20aca SHA512 c51a9eca93a84e8814b7e6e2e365261492722c248448f1767f8753f7574196178fc099542d0c7307bce42e543c19eacb2b02282e8f4fcc279a04065723a3baec
 EBUILD v4l-utils-1.12.5.ebuild 1546 BLAKE2B 85be33f5e42353cf2edf3839451c77d89cb1a638d3c001cd09e3ba6e14d368a9d7fa54acd6847a4170721d420f572836119b5a6c01cbceaf8c8cfdc310d20aca SHA512 c51a9eca93a84e8814b7e6e2e365261492722c248448f1767f8753f7574196178fc099542d0c7307bce42e543c19eacb2b02282e8f4fcc279a04065723a3baec
+EBUILD v4l-utils-1.14.1.ebuild 1553 BLAKE2B 3c0fb661abee957cfc2fccfc238ca6d3dfc0940c68551e212977de4ca570eb57497151dba63477a13a52d486fee2cf0b7598e90072a4fdb87b2763848d3f2fe4 SHA512 bc0ff2683782cc4ce526aa84e7e8f2bc3809b9abb9a256aac4bddcb92d21d594b5ad4d13f1d39858e19b351f0eaa42d5859158d8a8729eea4f2a08d1e7be6253
 EBUILD v4l-utils-1.6.2.ebuild 1358 BLAKE2B ffd56191291dea491b054e46a5e2e4a675c69e71a62ae845a800037f8c223f521df2a4e47ccc8128fe6bd130c04ff78987fbf7a9e09f8a33a659ae3e13b51eda SHA512 92a7469693ab83d81f9c2e03da48d1442f0b5cf86bf8cea6e11be0096d0b48b5d79010ef948423356a5d479571968089bbff511f09543140aea6a9cf6771f36c
 MISC metadata.xml 256 BLAKE2B 328c05c417050a2312f4b9e62188c1bcf9a694a2136c4c9ed8f31e818c968398458459bc87784157677f0da7a648f5d07c2246563cb5ef534fd9d97232dee982 SHA512 efe3e668ae6d6c6e11e5783c9133fbc6378a4cf21d502aaf7ada64dec0418f457480754a907ac037bb9f7acc008410c6c2f9db57322b9b44256aec74b14ef63c
diff --git a/media-tv/v4l-utils/files/v4l-utils-1.14.1-sysmacros.patch b/media-tv/v4l-utils/files/v4l-utils-1.14.1-sysmacros.patch
new file mode 100644
index 000000000000..b8190507fc7d
--- /dev/null
+++ b/media-tv/v4l-utils/files/v4l-utils-1.14.1-sysmacros.patch
@@ -0,0 +1,26 @@
+Index: v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c
+===================================================================
+--- v4l-utils-1.14.1.orig/lib/libv4lconvert/control/libv4lcontrol.c
++++ v4l-utils-1.14.1/lib/libv4lconvert/control/libv4lcontrol.c
+@@ -20,9 +20,7 @@
+  */
+ 
+ #include <sys/types.h>
+-#if defined(MAJOR_IN_SYSMACROS)
+ #include <sys/sysmacros.h>
+-#endif
+ #include <sys/mman.h>
+ #include <fcntl.h>
+ #include <sys/stat.h>
+Index: v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp
+===================================================================
+--- v4l-utils-1.14.1.orig/utils/v4l2-ctl/v4l2-ctl.cpp
++++ v4l-utils-1.14.1/utils/v4l2-ctl/v4l2-ctl.cpp
+@@ -21,6 +21,7 @@
+  */
+ 
+ #include <unistd.h>
++#include <sys/sysmacros.h>
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include <string.h>
diff --git a/media-tv/v4l-utils/v4l-utils-1.14.1.ebuild b/media-tv/v4l-utils/v4l-utils-1.14.1.ebuild
new file mode 100644
index 000000000000..eebf081d09ac
--- /dev/null
+++ b/media-tv/v4l-utils/v4l-utils-1.14.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit flag-o-matic udev xdg-utils
+
+DESCRIPTION="Separate utilities ebuild from upstream v4l-utils package"
+HOMEPAGE="http://git.linuxtv.org/v4l-utils.git"
+SRC_URI="http://linuxtv.org/downloads/v4l-utils/${P}.tar.bz2"
+
+LICENSE="GPL-2+ LGPL-2.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
+IUSE="qt5"
+
+RDEPEND=">=media-libs/libv4l-${PV}
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtopengl:5
+		virtual/opengl
+		media-libs/alsa-lib
+	)
+	virtual/libudev
+	!media-tv/v4l2-ctl
+	!<media-tv/ivtv-utils-1.4.0-r2"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.14.1-sysmacros.patch ) #580910
+
+src_configure() {
+	if use qt5; then
+		append-cxxflags -std=c++11
+		local qt5_paths=( \
+			MOC="$(pkg-config --variable=host_bins Qt5Core)/moc" \
+			UIC="$(pkg-config --variable=host_bins Qt5Core)/uic" \
+			RCC="$(pkg-config --variable=host_bins Qt5Core)/rcc" \
+		)
+	fi
+	# Hard disable the flags that apply only to the libs.
+	econf \
+		--disable-static \
+		$(use_enable qt5 qv4l2) \
+		--with-udevdir="$(get_udevdir)" \
+		--without-jpeg \
+		"${qt5_paths[@]}"
+}
+
+src_install() {
+	emake -C utils DESTDIR="${D}" install
+	emake -C contrib DESTDIR="${D}" install
+
+	dodoc README
+	newdoc utils/libv4l2util/TODO TODO.libv4l2util
+	newdoc utils/libmedia_dev/README README.libmedia_dev
+	newdoc utils/dvb/README README.dvb
+	newdoc utils/v4l2-compliance/fixme.txt fixme.txt.v4l2-compliance
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index abc8f48dccec..60cc0f440d8f 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/dvdstyler/Manifest b/media-video/dvdstyler/Manifest
index 14c6ff7bc96d..79b916adfe72 100644
--- a/media-video/dvdstyler/Manifest
+++ b/media-video/dvdstyler/Manifest
@@ -1,7 +1,5 @@
-DIST DVDStyler-2.9.6.tar.bz2 8373340 BLAKE2B eb2be82ffa95433de516b5d5bba4b804f9be97869aad1e43576382bd6aac7da9324656aa241999f21c48408d0ea5d1313885c26518fcadf85a7f24fee7453caf SHA512 7e45a61ecc5df29957c6ff71bf7d5032bc1cba3b43b8444f7cd065aabf3991961f998e220d41c05c3d4e9a3bc213c96bc484b467a40d1b10ab33630ea4cbbcea
-DIST DVDStyler-3.0.2.tar.bz2 8818276 BLAKE2B 302bc42c2fcb562ab11fe56c405f46e4023ace0e90329c51eb198b732cd21fc33edc394b85dc20f777d53a71580c9f935a60c579eb4faf861e23f5af8af97aa4 SHA512 2ae54a3679bea0a6ea6b98c6bd26af13b9e2cb938dd58cf263e2ca2999d5ad48b58598d6f6a4a230e1ca1988cf6095c5ce17c1c2d8c103e28238ddedc5ead006
 DIST DVDStyler-3.0.3.tar.bz2 8850630 BLAKE2B 1fac6687bad0c80728894f1a19ef823d3ba4ea5b648e8e9b6e1b4c98c5d12a353a1bda0499d612ab508ccae16e773c04af6781e189fb09e9799001074d6f7b66 SHA512 b5e5a93d127bc45b844cadce036b2d70ede5b3ea9d5fd026a93d6a6813684873db41ca0d4cd15680e63a63f2ba4314f65c2a0c08e44d0b4bbcce703874c2c3ed
-EBUILD dvdstyler-2.9.6-r1.ebuild 1741 BLAKE2B 69a908b895b5820885c8324ba14b719e1b12a7b690bc8f43a33995204e02566ba845ba6194ca6bfd46c7d3657d6f1a8e92d3aa72398f7b4ab978b33f5acd0cd7 SHA512 ab1d8e6644179f68f27e8f4f39eec702d400816597411b03aebc4874e9b960695a6bddaf1488a67837d8f7bd2418fc8c9ec91354a57c837505236b2a5f8ee003
-EBUILD dvdstyler-3.0.2.ebuild 1741 BLAKE2B 31e77c6ce4a604b8d722ee9f952965a97b375eb87aac41ccdbbc1b201a8885e2ab0fe304973b2979ac64bb8b5f3dc8588e77a027b5a7af5fe23059a325abb80f SHA512 a21936420a612da0be5d238fb1631a54e35b5d1692f84ace793128b8041dc31b7263d248701b4aea5ab50519332ed02a17561e4a5d697c9d2b30f7e85af7da15
+DIST DVDStyler-3.0.4.tar.bz2 8870498 BLAKE2B c1ec7651d90613cebbd8d4e62b4626b8a7e2069eadc07bfe9a91e51bf33638135ca975f4857242b3f9ff34606a4e6084200059c82ebc3aa146f446f9b77483ae SHA512 2747e6a494d331b6f35405d7d2ed47789f4452bb3d4e86b0c68cf0fafffb4e6de452b28fac0e9995c312017c7e4e8a3f89ad42bf0a0c99ce19c5d6c0ca6e351a
 EBUILD dvdstyler-3.0.3.ebuild 1742 BLAKE2B 3d177cfe322bddbd8fee6fd7a385ddb9eb045c3339769d8cdbd2db28e51c4b17b153a7b7c6674eaa7f1c418b3188fb8b5336771ec19192832a4ebe8dc71fe117 SHA512 ad0abd52ec284e6889cd63b87f663a6330da4b1505d4ef2136c70b9eca973bd2f337b298bbf9261c4e4d8da2ddc44bc478db2404b126dbec2af7b08fa2aac2f7
+EBUILD dvdstyler-3.0.4.ebuild 1742 BLAKE2B 878fdd6969693746aa3c0d36315cb20904c81a132f08bd2959cca856f51b569842d92c875e28a7e748b13afbc83c3383aa68512a7d52772d3afef0a12854b5b4 SHA512 14aaeba45b316e7bbafdc7e54991421b53cd3200e3b01279e7d532fabe118a54ea2bc5fe34f5ffe8409af62ee25b5c1ef3d0c27fcd10a37f9611eeae1d34f3a3
 MISC metadata.xml 302 BLAKE2B 2e58ce53fb249f7e8c837a58561ac4724b7ca19ae8002465e2c98da67674103bfc4d949cebabc8fb11e313d2eda33a476482e253fb8d3d55bc00b79f3c63e633 SHA512 ebc7b7d7e9d24c31f2e6f3cd811dbf7b36e142974cb909bace0929882230be34552aca8741e471374e62ffed749675440d2ee9b723bfd774a1c503d2a5bd40c2
diff --git a/media-video/dvdstyler/dvdstyler-2.9.6-r1.ebuild b/media-video/dvdstyler/dvdstyler-2.9.6-r1.ebuild
deleted file mode 100644
index fbfdb6e87c35..000000000000
--- a/media-video/dvdstyler/dvdstyler-2.9.6-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${P/dvds/DVDS}
-WX_GTK_VER=3.0
-
-inherit wxwidgets eutils
-
-DESCRIPTION="A cross-platform free DVD authoring application"
-HOMEPAGE="http://www.dvdstyler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug libav +udev"
-
-COMMON_DEPEND="
-	>=app-cdr/dvd+rw-tools-7.1
-	media-libs/libexif:=
-	>=media-libs/wxsvg-1.5.5:=
-	>=media-video/dvdauthor-0.7.1
-	>=media-video/xine-ui-0.99.7
-	virtual/cdrtools
-	libav? ( >=media-video/libav-9:0=[encode] )
-	!libav? ( >=media-video/ffmpeg-2.6:0=[encode] )
-	virtual/jpeg:0
-	x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
-	sys-apps/dbus
-	udev? ( >=virtual/libudev-215:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-cdr/dvdisaster-0.72.4
-	media-video/mjpegtools
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/zip
-	app-text/xmlto
-	sys-devel/gettext
-	virtual/yacc
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	need-wxwidgets unicode
-	# disable obsolete GNOME 2.x libraries wrt #508854
-	sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die
-	# rmdir: failed to remove `tempfoobar': Directory not empty
-	sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
-	# fix underlinking wrt #367863
-	sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die
-	# silence desktop-file-validate QA check
-	sed -i \
-		-e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \
-		data/dvdstyler.desktop || die
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable debug) \
-		--with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
-}
diff --git a/media-video/dvdstyler/dvdstyler-3.0.2.ebuild b/media-video/dvdstyler/dvdstyler-3.0.2.ebuild
deleted file mode 100644
index c705685063c2..000000000000
--- a/media-video/dvdstyler/dvdstyler-3.0.2.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-MY_P=${P/dvds/DVDS}
-WX_GTK_VER=3.0
-
-inherit wxwidgets eutils
-
-DESCRIPTION="A cross-platform free DVD authoring application"
-HOMEPAGE="http://www.dvdstyler.org/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug libav +udev"
-
-COMMON_DEPEND="
-	>=app-cdr/dvd+rw-tools-7.1
-	media-libs/libexif:=
-	>=media-libs/wxsvg-1.5.9:=
-	>=media-video/dvdauthor-0.7.1
-	>=media-video/xine-ui-0.99.7
-	virtual/cdrtools
-	libav? ( >=media-video/libav-9:0=[encode] )
-	!libav? ( >=media-video/ffmpeg-2.6:0=[encode] )
-	virtual/jpeg:0
-	x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
-	sys-apps/dbus
-	udev? ( >=virtual/libudev-215:= )
-"
-RDEPEND="${COMMON_DEPEND}
-	>=app-cdr/dvdisaster-0.72.4
-	media-video/mjpegtools
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/zip
-	app-text/xmlto
-	sys-devel/gettext
-	virtual/yacc
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	need-wxwidgets unicode
-	# disable obsolete GNOME 2.x libraries wrt #508854
-	sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die
-	# rmdir: failed to remove `tempfoobar': Directory not empty
-	sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
-	# fix underlinking wrt #367863
-	sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die
-	# silence desktop-file-validate QA check
-	sed -i \
-		-e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \
-		data/dvdstyler.desktop || die
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable debug) \
-		--with-wx-config=${WX_CONFIG}
-}
-
-src_install() {
-	default
-	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
-}
diff --git a/media-video/dvdstyler/dvdstyler-3.0.4.ebuild b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
new file mode 100644
index 000000000000..668ddd64d8d3
--- /dev/null
+++ b/media-video/dvdstyler/dvdstyler-3.0.4.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+MY_P=${P/dvds/DVDS}
+WX_GTK_VER=3.0
+
+inherit wxwidgets eutils
+
+DESCRIPTION="A cross-platform free DVD authoring application"
+HOMEPAGE="http://www.dvdstyler.org/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug libav +udev"
+
+COMMON_DEPEND="
+	>=app-cdr/dvd+rw-tools-7.1
+	media-libs/libexif:=
+	>=media-libs/wxsvg-1.5.11:=
+	>=media-video/dvdauthor-0.7.1
+	>=media-video/xine-ui-0.99.7
+	virtual/cdrtools
+	libav? ( >=media-video/libav-9:0=[encode] )
+	!libav? ( >=media-video/ffmpeg-2.6:0=[encode] )
+	virtual/jpeg:0
+	x11-libs/wxGTK:${WX_GTK_VER}=[gstreamer,X]
+	sys-apps/dbus
+	udev? ( >=virtual/libudev-215:= )
+"
+RDEPEND="${COMMON_DEPEND}
+	>=app-cdr/dvdisaster-0.72.4
+	media-video/mjpegtools
+"
+DEPEND="${COMMON_DEPEND}
+	app-arch/zip
+	app-text/xmlto
+	sys-devel/gettext
+	virtual/yacc
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+	need-wxwidgets unicode
+	# disable obsolete GNOME 2.x libraries wrt #508854
+	sed -i -e '/PKG_CONFIG/s:libgnomeui-2.0:dIsAbLeAuToMaGiC&:' configure || die
+	# rmdir: failed to remove `tempfoobar': Directory not empty
+	sed -i -e '/rmdir "$$t"/d' docs/Makefile.in || die
+	# fix underlinking wrt #367863
+	sed -i -e 's:@LIBS@:& -ljpeg:' wxVillaLib/Makefile.in || die
+	# silence desktop-file-validate QA check
+	sed -i \
+		-e '/Icon/s:.png::' -e '/^Encoding/d' -e '/Categories/s:Application;::' \
+		data/dvdstyler.desktop || die
+}
+
+src_configure() {
+	econf \
+		--docdir=/usr/share/doc/${PF} \
+		$(use_enable debug) \
+		--with-wx-config=${WX_CONFIG}
+}
+
+src_install() {
+	default
+	rm -f "${ED}"/usr/share/doc/${PF}/{COPYING*,INSTALL*}
+}
diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest
index a4453bd4d491..caeb8cd623a3 100644
--- a/media-video/ffdiaporama/Manifest
+++ b/media-video/ffdiaporama/Manifest
@@ -12,5 +12,6 @@ DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B af558994a8115
 DIST openclipart-0.18-svgonly.tar.bz2 82108957 BLAKE2B 25c13f7fc05898daef78fbc09e8d1506331677bac2a0fb1b9646fe7d8dff92927325faf2e2fd9e9d91d7f1136de91159124152d5e8dd55b63e3184998180fe0a SHA512 71ad11fd2e94f4c3d560ff0fa6e0cee70ec2c8506fd4c4d7a4b7a0db25480aaca9b36d0e91862cf05347be5caa614bfb528bdfdb151342e28efba31d9a8b0473
 EBUILD ffdiaporama-2.1-r1.ebuild 2275 BLAKE2B b5216e5e6c85e2184cffa8364dc73116bcb3b4cb5026561630c5090d60ea8c57aa538bde441ddda3aaeea205d3561ced5b1726fb870b51304ffc37516505b1e2 SHA512 d235e42333d57429e6e03a41df3c7168d984c4a8ddfc16ddc0614bee0c79b49e3b342c6302fae27c3c625bacf5fbf1558c76f4efa969bfc1aa361efcfda8413f
 EBUILD ffdiaporama-2.1.ebuild 2163 BLAKE2B f3594ffa917a15ea0fb609224d48d90b222037032a3bfc3c4d33a28b31bfdd3ece5a6f9ef1c067318f97c3c8bce16f241f3d095f00f16511b4acff9aa6b683c6 SHA512 245ab88c90cda8da404778282003efd8253399988439b88766b647eb0bc3a37f5e6c1e843bc855194daf868097f4fc9fac26db5696cabaebe0d5a2d9bdd96a52
+EBUILD ffdiaporama-2.2_pre20140701-r1.ebuild 2044 BLAKE2B 4dc752cdabbd712227d197c9efe086a98d35f6152cbf1680f36e0b25874f512443dd5d93aa248c7a15609f66c1f58fd8fd87e0a4314ec7c304014878153941fe SHA512 73258f49196f2b0ed7600ac2d224575f6e6f2d5db6549cc0828da28cbd4b76a48265267790a3add57fefae4d969d67d1de6099a4a353fb59cea5800c53b8aa37
 EBUILD ffdiaporama-2.2_pre20140701.ebuild 2303 BLAKE2B 5995296adc68000b6d20b337f0d5b0c8ee76b7b8982602de7d842f699be860bf8d8795c851674f5d31836ddf14c1147d1e3ab31d7bf7ee1d62f68dea240c7453 SHA512 932d83e57f7fc6a097c46c129be6eaa69e01bf10d22481c9265eaf4d8f9eeb91359ee60709195d90db357dd76e286f363bb37f2fd0ed7c9cd10da94d052a018e
 MISC metadata.xml 2318 BLAKE2B e83dfffb315aa1cd69db71adf162fcd99579c9b0679c71bfabed3a5a48cc1b4b92b8f93dca7d4fc38e9d80b26dde542308db5784269404d0da3d543767439067 SHA512 7e1181a2cc8a5cd739ebf3a8ee34cdfd5c8fed4fe36c65da136a0ca9b479f0f11f7911ab09d32424d64027f01e3d0d3d1616f01eb903d2dab051eee3f68424bc
diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
new file mode 100644
index 000000000000..0ec5707e0aa6
--- /dev/null
+++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20140701-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit xdg-utils gnome2-utils qmake-utils
+
+MY_PV=${PV%_pre20140701}
+BIN_PV=${MY_PV}.devel.2014.0701
+RSC_PV=${MY_PV}.devel.2014.0503
+TMT_PV=1.0.2014.0125
+DESCRIPTION="Movie creator from photos and video clips"
+HOMEPAGE="http://ffdiaporama.tuxfamily.org"
+SRC_URI="http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_bin_${BIN_PV}.tar.gz
+	http://download.tuxfamily.org/${PN}/Packages/Devel/${PN}_rsc_${RSC_PV}.tar.gz
+	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch
+	https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch
+	texturemate? ( http://download.tuxfamily.org/${PN}/Packages/Stable/${PN}_texturemate_${TMT_PV}.tar.gz )"
+
+LICENSE="GPL-2
+	texturemate? ( CC-BY-3.0 )"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="libav openclipart texturemate"
+
+RDEPEND="
+	media-gfx/exiv2
+	media-libs/taglib
+	openclipart? ( media-gfx/openclipart[svg,-gzip] )
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qthelp:5
+	dev-qt/qtmultimedia:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtxml:5
+	libav? ( >=media-video/libav-11:0=[encode] )
+	!libav? ( >=media-video/ffmpeg-2.8:0=[encode] )"
+DEPEND="${RDEPEND}"
+
+DOCS=( authors.txt )
+PATCHES=( "${DISTDIR}"/${PN}-${MY_PV}-{ffmpeg-3.0,libav11}.patch )
+
+S="${WORKDIR}/ffDiaporama"
+
+src_prepare() {
+	echo "SUBDIRS += ../ffDiaporama_rsc" >> ffDiaporama.pro || die
+	if use texturemate; then
+		echo "SUBDIRS += ../ffDiaporama_texturemate" >> ffDiaporama.pro || die
+	fi
+	default_src_prepare
+}
+
+src_configure() {
+	eqmake5 QMAKE_CFLAGS_ISYSTEM=
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	if use openclipart; then
+		dosym ../../clipart/openclipart /usr/share/ffDiaporama/clipart/openclipart
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+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/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index f1f65403e21e..3bb7ba54ee62 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -4,19 +4,15 @@ AUX openjpeg22.patch 4770 BLAKE2B b5fd034e2af9d180b2e0ee76e5227fcc948e20bacc5e46
 AUX openjpeg23.patch 5105 BLAKE2B 64aab97ec21e44f7ab94c9513ebf63e60a76698889ed3cafebec3a25adb07dddffe9358c4c3b29f89b0d0b4c8bb54d9197a5b8ca2e4105c539fd6b513ad5c247 SHA512 a1e3b91add49a80633e19eb49870ecb7ef1493cf3503d121bdeb74f2fcd0320b8e5f04a3505241f7375f4a598f5da651afb92350e3b92412977f55b9193409a7
 DIST ffmpeg-3.2.6.tar.bz2 9623111 BLAKE2B 76ed10d969ec5e85c0ad23fee1118ccfd66689b07062dc51526fca5427507124751d957b57b1a002ba585b9d35afc80cc6f3113c559b160b2751fc526b3d304f SHA512 eca75524374003eac78033bd2a744b459a4dc631c59150b6c9291e06a693bdd14e0b11cae9c800446f0648edccc066480c2b869bcb456a74eeabb91ab41f8285
 DIST ffmpeg-3.2.7.tar.bz2 9622391 BLAKE2B 7d6f094ca0bd5e2cab02e051acc8e554873bca2d165fc9326de0b12e145ec939567aed95c01589c47291970a89fb3462c75d32db1c4c2c8cf6d4a14956cd8a79 SHA512 a5b6df77d2d4ede0cc2f398b763d7405f43f43e37c11a596ec1a2a8921714875fd8fa9ffbcff84355854780872ab7313c859a4a19bf419298b4d3bc797ad8ac4
-DIST ffmpeg-3.3.3.tar.bz2 9940959 BLAKE2B 0f12aedca08df05478b6bae8b6a0e5dca85cc2bb2a462713533e73964e709f07b84164bba81d29f2f739b81b4d5dbb86abb17ee8d7fccfb7f57305e3cbc35be7 SHA512 1cc63bf73356f4e618c0d3572a216bdf5689f10deff56b4262f6d740b0bee5a4b3eac234f45fca3d4d2da77903a507b4fba725b76d2d2070f31b6dae9e7a2dab
 DIST ffmpeg-3.3.4.tar.bz2 9944256 BLAKE2B 72d42a16396882b30641fb057bb597f8e98ecfa482a087ece48189acba8a80a72e931e70ad961db8c01c93a556f619ebdecb39bae9d4559cc504d0f7eabf15a7 SHA512 d2257a71f9ae7856390b807d70bf643d4360fe4f2ad7c76af3ac5332cda353a1a543cdcdea0c510dbb6141f7a3a36ffbf26ae87b0ffc9ce4b3b7641814a40e3a
 DIST ffmpeg-3.3.5.tar.bz2 9945243 BLAKE2B 0fb9aad3d35f6173085e5a790e84c3a45c2051b656e9fb12b13af372778861121d6595e1f929144c32c77861d101fdb2a67c4411907147bd5534ce09d0fae3b9 SHA512 b97eb61f1c8f8ee95d79c6c28b37a0a99ad7752605714bfe8827366d319aed8bcaf2403cefb856604e8d61bca54573838c2ea0d38fa89ab453ccdd46b104725a
 DIST ffmpeg-3.3.6.tar.bz2 9943322 BLAKE2B 2526fdf9580045131426e554a9bf44fdc6567c12213ea4d5b78aa27f14513f14e07f38b8380183686fa1a62440fe4108eaecddca96f4dec3c74c410b1f90ee03 SHA512 1305760fa981bcb43c8fcb5dd1bf7dd8d3f405a124975f062062b741d49e12386e4d3eec3de6a032fc93cd7f6086d939275a669a9997ffa400f70c20f7eb3d23
 DIST ffmpeg-3.4.1.tar.bz2 10177055 BLAKE2B b92f5a5d03770a52d1b3c2f20f0327acd17bff1dcc59ce3193f23695544838768addd807d38459c433172e9ad7410617cf1f30f3b2027a6558231138cac0233f SHA512 e509995eac0d54ebb7c0896303d1060ca1425841811df1b2bd61c9e41363cc50c91144bd3a7cf47e0d618591368763d054c3270b7a0a4b0e794c49bbdc59c4c5
-DIST ffmpeg-3.4.tar.bz2 10171702 BLAKE2B 72af48359db365cf366c618e861571849f038a06da1da1ed0b232e02e423bb906e2b2b99a80aa56c276713344e37811bffdeff861d1c4745d6d28eb6d6fcbff5 SHA512 43a8825140efdd41e2dd53fb0475adeb74e003842690cbc189aea0f1af696eec675951db30f9742d063f4e31ae6883256bdceaf2cc73d1dab0d144f72a0741e0
 EBUILD ffmpeg-3.2.6.ebuild 15078 BLAKE2B 5d8e389481ae3ddbd2848fedc7292cdb2131b2c5be63a9d8a5271bee58729dd014e1843ab55c9e5ddb616d4290e8daca0eac8f4c586fbfc5faae989e16929be7 SHA512 56e3a5e60aab2c15d22e9ce9630138ed95ff6e751a41b4211704b052f290d8748a0859766b39e0221d4cb1ad2b1163982a25179861eee7b85707053f99b5f869
 EBUILD ffmpeg-3.2.7.ebuild 15083 BLAKE2B 313da834e164cca1c3fd1fdef6fb0094aefd8b2f752e28895a292221e5005b5d496e480a9dffc779790ee4036121e18fea8ded2eacd5c9e34aa51fc335c11688 SHA512 2645eada5e381a5df2b3972dee7435f51dea461f4535796ededcc4f705979b289c48c289f3384bb58bbe1b6f64dadfda10e2c9d1674bf00d566dfe107f52a42e
-EBUILD ffmpeg-3.3.3.ebuild 16075 BLAKE2B c8ec2b217cec0a29e6ec213f2a5fc17e8567df522f16db50f56008e62fa77726a7b54788519e9204655a5e462f2345599090a7b145e7c7eec93fbbd370810902 SHA512 037ba3846ccdc462945800af3438b4d852f026f0261c0264409f0e5960168457fd37c20bd9f332d2149bcf11af075b130fc7f27adb09fc6887e693fc86090204
 EBUILD ffmpeg-3.3.4.ebuild 16107 BLAKE2B 2dabd381f934dde36e6a1cd25c9c44a93a702bc09f41718649a4bf7139eb18b7854b93350e3b46df1be87fe5f1421683f24a3173431b69901527b7cc63bb97db SHA512 ed129a8ee9f66bed5c2ab724114ed77ad345e7dec13f541ede5371ca442352b2e16666a715c30bac967210464d970bd4728c7753bd08dd542478d43da83b598b
 EBUILD ffmpeg-3.3.5.ebuild 16109 BLAKE2B 53b38d47499dc3ec2d9cf5864ef35999032894dc100d935221ef34294610c980d058288c3ff177b4e4ecd21933426cc57a60611133bf74db9065a09bffcb8f11 SHA512 5a3d8e7d84d0cbe1e23918263be4ef1f379f563c81be266d7e7a8333674f056f69db6e3f88fb8e0521a7f4944fd427c5e91f66b277a19b7029834be9810aa616
-EBUILD ffmpeg-3.3.6.ebuild 16114 BLAKE2B 759002213b112bda8afd07fd5dda8b79963c6924219faaad747f5e608286b562fd1414026a0d349761c7c63eccbe4d7ce18251ca8c73bfa9d36956546418acfc SHA512 a5bd925073bb7f9ff86e013a181f911c430364b1cfa820ba59f94cc0a38cbb35760f85e1396d710a05167492fc7267ce2b924c3f1cd9f19e54dfea881dc672e3
+EBUILD ffmpeg-3.3.6.ebuild 16112 BLAKE2B 9ed6f79b8077b4cb8402963ef7a48bed40a5cfd2cd277ae1fe2a05862927593e060ee18414f0f4226857038c253b4e44e302dfea3e50b3fda610fbc631e7fc02 SHA512 6ca88a7099bfb63c04b6e4a4580de3b4523e58eb04e730da24de4abdd48d7583757f050dc8259cc31090ca34abe06d0741d8f66481b9b3ee380d109008ce3d7c
 EBUILD ffmpeg-3.4.1.ebuild 15673 BLAKE2B e5b0aecb018af1733c0c013e132e1c5060cff109421a54f63953e4df3a15a275d746981003533e5e4bdc5ade07d2ff17977e93a0a603dc7f5bb82dfe459a69e5 SHA512 061a487f8791b210ef2e593eb5e78382b158113f61b771f92c7c51e17d3d436056f22441f814ed81d23e5b4c3c6281b7853a48433731a89dc142aac08b5d2f39
-EBUILD ffmpeg-3.4.ebuild 15664 BLAKE2B dd8fada6e763bf8222e39600c80402c945a68ebb5acba44c4010f1c6a4b824723aaa5bf327e84fcb965f269145be6ff62d9fc7f145dd79ceae35622135ce531b SHA512 2060c89e73a059b6626505c1632f727536f711fb7b723633ac8b8c2a057776a2c7e7b1f98561585addadd6317f4ef506057033097d1c15c5553969e31d07008e
-EBUILD ffmpeg-9999.ebuild 16055 BLAKE2B 43c19c43be4911c8cf1c49f1cde03f7caa67fe7c368fe923e6755f759afcb52c0e3299a701c2d3fa5589e766fdc6c34698c98bea42bfc431ee6216e62aa4befc SHA512 9e9c9617bffe0727efc40fd7e8890698ad3fa360b1c1430fee1d903e4cdd80fe7efed8e888253904972dd4153641835dd8281ffb8cca9d6e36a44ef47e59620f
+EBUILD ffmpeg-9999.ebuild 16054 BLAKE2B 764a29d4cdbb2497c5de98244547e55d1b8ea44fecdf26fdc087019a2589087864d9efb7be58ac8486dddc104353fc65285902c3b8a09a39c881558781c7c856 SHA512 805f234318e8de2db5fbf436d51e76bdec834f75743bd7fc029281f9dfc1b4040ab2392da012393a293dbffe3cb5279b6f61c60c9c65e569cdf8e77e7320f819
 MISC metadata.xml 5618 BLAKE2B cfca20347486aaead0039c0a256f31949609fd3c15f35273bd783657052fe8675f08e60cfe0df4c567b88f44f801d17326b6eb77ef39324e3e45e57b09a6001f SHA512 7a235250f9177343afb6ffcf6a3ff77bdc7cf028fd2c26bf84c05c049ebb89ce9d489a86b6b37d1e90262b8b3995c57f201586737e293458d2747ed1bf12e3c3
diff --git a/media-video/ffmpeg/ffmpeg-3.3.3.ebuild b/media-video/ffmpeg/ffmpeg-3.3.3.ebuild
deleted file mode 100644
index 9c490223fed4..000000000000
--- a/media-video/ffmpeg/ffmpeg-3.3.3.ebuild
+++ /dev/null
@@ -1,509 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
-		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
-		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		schroedinger:libschroedinger speex:libspeex vorbis:libvorbis vpx:libvpx
-		zvbi:libzvbi
-		# libavfilter options
-		bs2b:libbs2b chromaprint flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-		rubberband:librubberband sofalizer:netcdf zeromq:libzmq zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar nvenc:nvenc
-	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa chromium doc +encode jack oss pic static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_thumb:armv5te
-	cpu_flags_arm_v6:armv6
-	cpu_flags_arm_thumb2:armv6t2
-	cpu_flags_arm_neon:neon
-	cpu_flags_arm_vfp:vfp
-	cpu_flags_arm_vfpv3:vfpv3
-	cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-	arm64? ( cpu_flags_arm_v8 )
-	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-IUSE="${IUSE}
-	${ARM_CPU_FEATURES[@]%:*}
-	${MIPS_CPU_FEATURES[@]%:*}
-	${PPC_CPU_FEATURES[@]%:*}
-	${X86_CPU_FEATURES[@]%:*}
-"
-
-CPU_REQUIRED_USE="
-	${ARM_CPU_REQUIRED_USE}
-	${X86_CPU_REQUIRED_USE}
-"
-
-# "$(tc-arch):XXX" form where XXX_CPU_FEATURES are the cpu features that apply to
-# $(tc-arch).
-CPU_FEATURES_MAP="
-	arm:ARM
-	arm64:ARM
-	mips:MIPS
-	ppc:PPC
-	ppc64:PPC
-	x86:X86
-	amd64:X86
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		nvenc? ( media-video/nvidia_video_sdk )
-		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	sofalizer? (
-		>=sci-libs/netcdf-4.3.2-r1[hdf5]
-		>=sci-libs/hdf5-1.8.18[hl]
-	)
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-	zeromq? ( >=net-libs/zeromq-4.1.6 )
-	zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	postproc? ( !media-libs/libpostproc )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 )
-	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-PATCHES=(
-	"${FILESDIR}"/openjpeg22.patch
-	"${FILESDIR}"/chromium.patch
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	default
-	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl && use gpl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r netcdf libzmq ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in ${CPU_FEATURES_MAP} ; do
-		if [ "$(tc-arch)" = "${i%:*}" ] ; then
-			local var="${i#*:}_CPU_FEATURES[@]"
-			for j in ${!var} ; do
-				use ${j%:*} || myconf+=( --disable-${j#*:} )
-			done
-		fi
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282
-	is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-
-	if multilib_is_native_abi && use chromium; then
-		einfo "Configuring for Chromium"
-		mkdir -p ../chromium || die
-		pushd ../chromium >/dev/null || die
-		set -- "${@}" \
-			--disable-shared \
-			--enable-static \
-			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
-		echo "${@}"
-		"${@}" || die
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
index 26152a97df44..c081af04fa2b 100644
--- a/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.3.6.ebuild
@@ -54,7 +54,7 @@ LICENSE="
 	samba? ( GPL-3 )
 "
 if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
 fi
 
 # Options to use as use_enable in the foo[:bar] form.
diff --git a/media-video/ffmpeg/ffmpeg-3.4.ebuild b/media-video/ffmpeg/ffmpeg-3.4.ebuild
deleted file mode 100644
index 5fc93de56d55..000000000000
--- a/media-video/ffmpeg/ffmpeg-3.4.ebuild
+++ /dev/null
@@ -1,489 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Subslot: libavutil major.libavcodec major.libavformat major
-# Since FFmpeg ships several libraries, subslot is kind of limited here.
-# Most consumers will use those three libraries, if a "less used" library
-# changes its soname, consumers will have to be rebuilt the old way
-# (preserve-libs).
-# If, for example, a package does not link to libavformat and only libavformat
-# changes its ABI then this package will be rebuilt needlessly. Hence, such a
-# package is free _not_ to := depend on FFmpeg but I would strongly encourage
-# doing so since such a case is unlikely.
-FFMPEG_SUBSLOT=55.57.57
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
-fi
-
-inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
-
-DESCRIPTION="Complete solution to record, convert and stream audio and video. Includes libavcodec"
-HOMEPAGE="http://ffmpeg.org/"
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SRC_URI=""
-elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot
-	SRC_URI="mirror://gentoo/${P}.tar.bz2"
-else # Release
-	SRC_URI="http://ffmpeg.org/releases/${P/_/-}.tar.bz2"
-fi
-FFMPEG_REVISION="${PV#*_p}"
-
-SLOT="0/${FFMPEG_SUBSLOT}"
-LICENSE="
-	!gpl? ( LGPL-2.1 )
-	gpl? ( GPL-2 )
-	amr? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	gmp? (
-		gpl? ( GPL-3 )
-		!gpl? ( LGPL-3 )
-	)
-	encode? (
-		amrenc? (
-			gpl? ( GPL-3 )
-			!gpl? ( LGPL-3 )
-		)
-	)
-	samba? ( GPL-3 )
-"
-if [ "${PV#9999}" = "${PV}" ] ; then
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# Options to use as use_enable in the foo[:bar] form.
-# This will feed configure with $(use_enable foo bar)
-# or $(use_enable foo foo) if no :bar is set.
-# foo is added to IUSE.
-FFMPEG_FLAG_MAP=(
-		+bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt gnutls gmp
-		+gpl +hardcoded-tables +iconv lzma +network openssl +postproc
-		samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau X:xlib xcb:libxcb
-		xcb:libxcb-shm xcb:libxcb-xfixes +zlib
-		# libavdevice options
-		cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal
-		opengl
-		# indevs
-		libv4l:libv4l2 pulseaudio:libpulse
-		# decoders
-		amr:libopencore-amrwb amr:libopencore-amrnb fdk:libfdk-aac
-		jpeg2k:libopenjpeg bluray:libbluray celt:libcelt gme:libgme gsm:libgsm
-		mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh
-		speex:libspeex svg:librsvg vorbis:libvorbis
-		vpx:libvpx zvbi:libzvbi
-		# libavfilter options
-		bs2b:libbs2b chromaprint flite:libflite frei0r
-		fribidi:libfribidi fontconfig ladspa libass truetype:libfreetype
-		rubberband:librubberband zeromq:libzmq zimg:libzimg
-		# libswresample options
-		libsoxr
-		# Threads; we only support pthread for now but ffmpeg supports more
-		+threads:pthreads
-)
-
-# Same as above but for encoders, i.e. they do something only with USE=encode.
-FFMPEG_ENCODER_FLAG_MAP=(
-	amrenc:libvo-amrwbenc mp3:libmp3lame
-	kvazaar:libkvazaar nvenc:nvenc
-	openh264:libopenh264 snappy:libsnappy theora:libtheora twolame:libtwolame
-	wavpack:libwavpack webp:libwebp x264:libx264 x265:libx265 xvid:libxvid
-)
-
-IUSE="
-	alsa chromium doc +encode jack oss pic static-libs test v4l
-	${FFMPEG_FLAG_MAP[@]%:*}
-	${FFMPEG_ENCODER_FLAG_MAP[@]%:*}
-"
-
-# Strings for CPU features in the useflag[:configure_option] form
-# if :configure_option isn't set, it will use 'useflag' as configure option
-ARM_CPU_FEATURES=(
-	cpu_flags_arm_thumb:armv5te
-	cpu_flags_arm_v6:armv6
-	cpu_flags_arm_thumb2:armv6t2
-	cpu_flags_arm_neon:neon
-	cpu_flags_arm_vfp:vfp
-	cpu_flags_arm_vfpv3:vfpv3
-	cpu_flags_arm_v8:armv8
-)
-ARM_CPU_REQUIRED_USE="
-	arm64? ( cpu_flags_arm_v8 )
-	cpu_flags_arm_v8? (  cpu_flags_arm_vfpv3 cpu_flags_arm_neon )
-	cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp )
-	cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp )
-	cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 )
-	cpu_flags_arm_v6? ( cpu_flags_arm_thumb )
-"
-MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu )
-PPC_CPU_FEATURES=( altivec )
-X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop )
-X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} )
-X86_CPU_REQUIRED_USE="
-	cpu_flags_x86_avx2? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma4? ( cpu_flags_x86_avx )
-	cpu_flags_x86_fma3? ( cpu_flags_x86_avx )
-	cpu_flags_x86_xop?  ( cpu_flags_x86_avx )
-	cpu_flags_x86_avx?  ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 )
-	cpu_flags_x86_sse4_2?  ( cpu_flags_x86_sse4_1 )
-	cpu_flags_x86_sse4_1?  ( cpu_flags_x86_ssse3 )
-	cpu_flags_x86_ssse3?  ( cpu_flags_x86_sse3 )
-	cpu_flags_x86_sse3?  ( cpu_flags_x86_sse2 )
-	cpu_flags_x86_sse2?  ( cpu_flags_x86_sse )
-	cpu_flags_x86_sse?  ( cpu_flags_x86_mmxext )
-	cpu_flags_x86_mmxext?  ( cpu_flags_x86_mmx )
-	cpu_flags_x86_3dnowext?  ( cpu_flags_x86_3dnow )
-	cpu_flags_x86_3dnow?  ( cpu_flags_x86_mmx )
-"
-
-CPU_FEATURES_MAP=(
-	${ARM_CPU_FEATURES[@]}
-	${MIPS_CPU_FEATURES[@]}
-	${PPC_CPU_FEATURES[@]}
-	${X86_CPU_FEATURES[@]}
-)
-IUSE="${IUSE}
-	${CPU_FEATURES_MAP[@]%:*}"
-
-CPU_REQUIRED_USE="
-	${ARM_CPU_REQUIRED_USE}
-	${X86_CPU_REQUIRED_USE}
-"
-
-FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher )
-IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}"
-
-RDEPEND="
-	alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
-	amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] )
-	bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] )
-	bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] )
-	bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
-	cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] )
-	celt? ( >=media-libs/celt-0.11.1-r1[${MULTILIB_USEDEP}] )
-	chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] )
-	encode? (
-		amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] )
-		kvazaar? ( media-libs/kvazaar[${MULTILIB_USEDEP}] )
-		mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] )
-		nvenc? ( media-video/nvidia_video_sdk )
-		openh264? ( >=media-libs/openh264-1.4.0-r1[${MULTILIB_USEDEP}] )
-		snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] )
-		theora? (
-			>=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}]
-			>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-		)
-		twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] )
-		wavpack? ( >=media-sound/wavpack-4.60.1-r1[${MULTILIB_USEDEP}] )
-		webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] )
-		x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] )
-		x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] )
-		xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] )
-	)
-	fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] )
-	flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	frei0r? ( media-plugins/frei0r-plugins )
-	fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] )
-	gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] )
-	gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] )
-	gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] )
-	gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] )
-	iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
-	iec61883? (
-		>=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-		>=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}]
-	)
-	ieee1394? (
-		>=media-libs/libdc1394-2.2.1[${MULTILIB_USEDEP}]
-		>=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}]
-	)
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] )
-	libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] )
-	libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] )
-	libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] )
-	libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] )
-	libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
-	mmal? ( media-libs/raspberrypi-userland )
-	modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] )
-	openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] )
-	opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
-	openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[${MULTILIB_USEDEP}] )
-	opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] )
-	pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
-	librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] )
-	rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] )
-	samba? ( >=net-fs/samba-3.6.23-r1[${MULTILIB_USEDEP}] )
-	sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] )
-	speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] )
-	ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] )
-	svg? ( gnome-base/librsvg:2=[${MULTILIB_USEDEP}] )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	vaapi? ( >=x11-libs/libva-1.2.1-r1[${MULTILIB_USEDEP}] )
-	vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] )
-	vorbis? (
-		>=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}]
-		>=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}]
-	)
-	vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] )
-	X? (
-		>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
-		>=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
-	)
-	xcb? ( >=x11-libs/libxcb-1.4[${MULTILIB_USEDEP}] )
-	zeromq? ( >=net-libs/zeromq-4.1.6 )
-	zimg? ( >=media-libs/zimg-2.4:=[${MULTILIB_USEDEP}] )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
-	zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] )
-	!media-video/qt-faststart
-	postproc? ( !media-libs/libpostproc )
-"
-
-DEPEND="${RDEPEND}
-	>=sys-devel/make-3.81
-	doc? ( sys-apps/texinfo )
-	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
-	ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] )
-	cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) )
-	test? ( net-misc/wget sys-devel/bc )
-	v4l? ( sys-kernel/linux-headers )
-"
-
-RDEPEND="${RDEPEND}
-	abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3
-		!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
-
-# Code requiring FFmpeg to be built under gpl license
-GPL_REQUIRED_USE="
-	postproc? ( gpl )
-	frei0r? ( gpl )
-	cdio? ( gpl )
-	samba? ( gpl )
-	encode? (
-		x264? ( gpl )
-		x265? ( gpl )
-		xvid? ( gpl )
-		X? ( !xcb? ( gpl ) )
-	)
-"
-REQUIRED_USE="
-	libv4l? ( v4l )
-	fftools_cws2fws? ( zlib )
-	test? ( encode )
-	${GPL_REQUIRED_USE}
-	${CPU_REQUIRED_USE}"
-RESTRICT="
-	gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-"
-
-S=${WORKDIR}/${P/_/-}
-
-PATCHES=(
-	"${FILESDIR}"/chromium.patch
-)
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/libavutil/avconfig.h
-)
-
-src_prepare() {
-	if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot
-		export revision=git-N-${FFMPEG_REVISION}
-	fi
-	default
-	echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die
-}
-
-multilib_src_configure() {
-	local myconf=( ${EXTRA_FFMPEG_CONF} )
-
-	local ffuse=( "${FFMPEG_FLAG_MAP[@]}" )
-	use openssl && use gpl && myconf+=( --enable-nonfree )
-	use samba && myconf+=( --enable-version3 )
-
-	# Encoders
-	if use encode ; then
-		ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" )
-
-		# Licensing.
-		if use amrenc ; then
-			myconf+=( --enable-version3 )
-		fi
-	else
-		myconf+=( --disable-encoders )
-	fi
-
-	# Indevs
-	use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 )
-	for i in alsa oss jack ; do
-		use ${i} || myconf+=( --disable-indev=${i} )
-	done
-
-	# Outdevs
-	for i in alsa oss sdl ; do
-		use ${i} || myconf+=( --disable-outdev=${i} )
-	done
-
-	# Decoders
-	use amr && myconf+=( --enable-version3 )
-	use gmp && myconf+=( --enable-version3 )
-	use fdk && use gpl && myconf+=( --enable-nonfree )
-
-	for i in "${ffuse[@]#+}" ; do
-		myconf+=( $(use_enable ${i%:*} ${i#*:}) )
-	done
-
-	# (temporarily) disable non-multilib deps
-	if ! multilib_is_native_abi; then
-		for i in frei0r libzmq ; do
-			myconf+=( --disable-${i} )
-		done
-	fi
-
-	# CPU features
-	for i in "${CPU_FEATURES_MAP[@]}" ; do
-		use ${i%:*} || myconf+=( --disable-${i#*:} )
-	done
-
-	if use pic ; then
-		myconf+=( --enable-pic )
-		# disable asm code if PIC is required
-		# as the provided asm decidedly is not PIC for x86.
-		[[ ${ABI} == x86 ]] && myconf+=( --disable-asm )
-	fi
-	[[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004
-
-	# Try to get cpu type based on CFLAGS.
-	# Bug #172723
-	# We need to do this so that features of that CPU will be better used
-	# If they contain an unknown CPU it will not hurt since ffmpeg's configure
-	# will just ignore it.
-	for i in $(get-flag mcpu) $(get-flag march) ; do
-		[[ ${i} = native ]] && i="host" # bug #273421
-		myconf+=( --cpu=${i} )
-		break
-	done
-
-	# LTO support, bug #566282
-	is-flagq "-flto*" && myconf+=( "--enable-lto" )
-
-	# Mandatory configuration
-	myconf=(
-		--enable-avfilter
-		--enable-avresample
-		--disable-stripping
-		"${myconf[@]}"
-	)
-
-	# cross compile support
-	if tc-is-cross-compiler ; then
-		myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" )
-		case ${CHOST} in
-			*freebsd*)
-				myconf+=( --target-os=freebsd )
-				;;
-			*mingw32*)
-				myconf+=( --target-os=mingw32 )
-				;;
-			*linux*)
-				myconf+=( --target-os=linux )
-				;;
-		esac
-	fi
-
-	# doc
-	myconf+=(
-		$(multilib_native_use_enable doc)
-		$(multilib_native_use_enable doc htmlpages)
-		$(multilib_native_enable manpages)
-	)
-
-	set -- "${S}/configure" \
-		--prefix="${EPREFIX}/usr" \
-		--libdir="${EPREFIX}/usr/$(get_libdir)" \
-		--shlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--enable-shared \
-		--cc="$(tc-getCC)" \
-		--cxx="$(tc-getCXX)" \
-		--ar="$(tc-getAR)" \
-		--optflags="${CFLAGS}" \
-		$(use_enable static-libs static) \
-		"${myconf[@]}"
-	echo "${@}"
-	"${@}" || die
-
-	if multilib_is_native_abi && use chromium; then
-		einfo "Configuring for Chromium"
-		mkdir -p ../chromium || die
-		pushd ../chromium >/dev/null || die
-		set -- "${@}" \
-			--disable-shared \
-			--enable-static \
-			--enable-pic \
-			--extra-cflags="-DFF_API_CONVERGENCE_DURATION=0"
-		echo "${@}"
-		"${@}" || die
-		popd >/dev/null || die
-	fi
-}
-
-multilib_src_compile() {
-	emake V=1
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				emake V=1 tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Compiling for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install() {
-	emake V=1 DESTDIR="${D}" install install-doc
-
-	if multilib_is_native_abi; then
-		for i in "${FFTOOLS[@]}" ; do
-			if use fftools_${i} ; then
-				dobin tools/${i}$(get_exeext)
-			fi
-		done
-
-		if use chromium; then
-			einfo "Installing for Chromium"
-			pushd ../chromium >/dev/null || die
-			emake V=1 DESTDIR="${D}" install-libffmpeg
-			popd >/dev/null || die
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges
-	[ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES"
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil:${BUILD_DIR}/libavresample" \
-		emake V=1 fate
-}
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index 8c98ce138b09..f78260745ad0 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ FFMPEG_SUBSLOT=56.58.58
 SCM=""
 if [ "${PV#9999}" != "${PV}" ] ; then
 	SCM="git-r3"
-	EGIT_REPO_URI="git://source.ffmpeg.org/ffmpeg.git"
+	EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git"
 fi
 
 inherit eutils flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM}
diff --git a/media-video/ttcut/Manifest b/media-video/ttcut/Manifest
index b5eab5e21411..ae96f75c2d0b 100644
--- a/media-video/ttcut/Manifest
+++ b/media-video/ttcut/Manifest
@@ -6,5 +6,5 @@ AUX ttcut.desktop 304 BLAKE2B 9f0f6c6de3beae152b280a280953ddc156373cd3bfeacb35f2
 DIST ttcut-0.19.6.tar.gz 283977 BLAKE2B 1ff2d7c77a54f12cd9fe6c0c4a25af05b6baaa3d29083ebac52e510b68a246caabde9fbd9cd76487897072fe6390a43180096fa224e1e11cdb3011e200483fcb SHA512 796dfb6759f7e9c96f8a8481cb280044c1744a43935f226f352b9e867ebdbaeaed90c3d96acf00b5ae8afb7b2350cbd6a384eb2d38136fef38c2983467d25cf6
 DIST ttcut-0.19.6_p1.tar.gz 283304 BLAKE2B ee0d000a1cc091be1848746d3b32930ae5f59865d7fc04779be9aac4bc9621eaace88a6d9263c767671643d9ce381af2cf57fc5b87707903a5abe8a59eb6cb99 SHA512 9d104436145ef209db4eaca1566d718ccdf84636a391e3f47bd829a165741f57a6123942f37ba2eb361dd46716e78e36832cb9a459ca9ed0130a70af92287494
 EBUILD ttcut-0.19.6-r3.ebuild 862 BLAKE2B aa0af7778e5094cbc306d2af0f7da680c40e26c9544eb7ef133ca89a334e8b5d9ded522d09f77057ba9997970111e20a6f509b39f212a0ec431a890fd9c7990c SHA512 3cdffa3004495a7ad6521e9112760b8a8186d197aaa508d809aec50130bee36c80bc55540498dbfc18df58a8e95eb0e5d43518536792769a90538bd15d8824e6
-EBUILD ttcut-0.19.6_p1.ebuild 784 BLAKE2B a60083dfe4bb2eb09624c08eac3cb478c284530bc0ff6cc4c981fb062a0adb1afef9ae560228c07db4b00f92134bcb927f456d8bff866ff3f7f5032c28b65960 SHA512 e9a5bd8573f7b99137523f7f90dc626666f0601d164654c1e3aca831354a4293ae8317495a4b70bb05914d0fa001f1de30d9a21482aad7d0da94f33f2a68be91
+EBUILD ttcut-0.19.6_p1.ebuild 783 BLAKE2B 22ca1f4e963c2ac281436dd150e72bc8f1ce0b33a1d6dd35db6406345a7e4e5de3d59696468b3e2de39c494e7480f53d85b326b5e46219e2727473f159ef9ef6 SHA512 4f856094125e5e90bb26275260c14a59fb744f0579add4e8276f0bec042811f21a8df141acd02c00e6c307dbe4b609d8684ea70fd07c8b402f7d0fde629446e9
 MISC metadata.xml 929 BLAKE2B d33a2f957a306c08d1d4b03d947b975db3f77bd726df50d60de1ab4803dc2abcadd0f19d8a48f19692cde36f094556172cd9adfb120c6b5d053870c713a767c3 SHA512 b22ede083a2bec13d32c88a9f503a7ceddd13892c521bd0532168d4d7fdf8537415f256fa7548240e19ca1c949ad3215c28f6533a0eaa5ee37fcfa7093fde0ca
diff --git a/media-video/ttcut/ttcut-0.19.6_p1.ebuild b/media-video/ttcut/ttcut-0.19.6_p1.ebuild
index e00e37db471b..443d4abb2b0a 100644
--- a/media-video/ttcut/ttcut-0.19.6_p1.ebuild
+++ b/media-video/ttcut/ttcut-0.19.6_p1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~billie/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND=">=media-libs/libmpeg2-0.4.0
diff --git a/media-video/vcdgear/Manifest b/media-video/vcdgear/Manifest
index e3ecd09ee8d5..42dadb44f0a2 100644
--- a/media-video/vcdgear/Manifest
+++ b/media-video/vcdgear/Manifest
@@ -1,3 +1,3 @@
-DIST vcdgear176-040415_linux.tar.gz 442937 SHA256 d6fc156b5c4960cf5e7cf047ae1101da772e13255ec02f71cbc07b2a8ca567a7 SHA512 c6fbefc2a5f96a629f70611da61245f7b23b03a524e67f75db5a873952abcb1db226f4b9bdee18298a8a21d0ae14ffee816ffcd7a732605c0a445015b7507b19 WHIRLPOOL 0aa2b1a1fcfc1a74ed62a0546cf465deb97dfd584086c081198310615feb6242e8450b22641e1848f3bc5384e3d2f2fe9fdfcac618e25d1258070f28283fe604
+DIST vcdgear176-040415_linux.tar.gz 442937 BLAKE2B 5dac584db2b0293e1923842451bda6cfa0876a54bb07c1e1b36c85278f0a1324a4c9ebce0edbfa9f697b76a0cc36a1e00f712effdda09f6eb5cad9962e793247 SHA512 c6fbefc2a5f96a629f70611da61245f7b23b03a524e67f75db5a873952abcb1db226f4b9bdee18298a8a21d0ae14ffee816ffcd7a732605c0a445015b7507b19
 EBUILD vcdgear-1.76-r2.ebuild 748 BLAKE2B 353435eb74c948d9e17e63de6480e90dcd2fefc5bba3446035b7f93b42596b4ccf414cb59eca6c2721b7e172219f85437ba375ba3587274563339aa79f687807 SHA512 58a841064cb949e2a959725f87c2b564ba201b993b907835dba86e87c5bac8756213203e36c4b7489061b01c7eaa9cf51269f994b035d2c04c3d9c7908684662
 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-video/xine-ui/Manifest b/media-video/xine-ui/Manifest
index 31fa780e07d7..bcf84194e6d7 100644
--- a/media-video/xine-ui/Manifest
+++ b/media-video/xine-ui/Manifest
@@ -1,3 +1,5 @@
+DIST xine-ui-0.99.10.tar.xz 1762968 BLAKE2B eede1a7b43f3fca37c092541145a4d13813185a740c396503bdfc93fd96d4d3bf52ad2daed4389634e2a517972c1233e3d9b1af74b718dd9def58eb2e702d967 SHA512 73cbc72375b27335e9d5f5527c35dab12d1ae40539b587630b3d8709471e4c61ce7b619062b75f587252c0647c234ffcf611f3b4e38e0447f7041b7ca5d7289e
 DIST xine-ui-0.99.9.tar.xz 1759568 BLAKE2B 5e8d94c64d254f52c0e5f6926b5c0e8cc7ba065f00363e728e48d6dafb26e2cd5496fb20e3d81a1c4f5bf6165b6f13ed2b28eea31e6efd4f9e9256bed5bafc49 SHA512 575b20a19c5740ba0336af9dea0a1bc15d23b7471379b9d72aeb585e23f95b336368b96a28d4804726507f059dc431cc3f9adfd8b615b08c0e67b65287c2b6c7
+EBUILD xine-ui-0.99.10.ebuild 1982 BLAKE2B 84047792207225211a4851de894eea621c57dc72889e59d8502902b875e6bea0a9f983052b18cc58b3f7a25dc05d441d0238bb34d734efcad3b8cb04deb55ee3 SHA512 4dc9afc62c7272e76057cf25a00af2b4e72e8d0287d841df289f0a89b79ca4cb9e9701601af46e9a7b9bb5b375e59cf3da7cf8f00166ddeae7517611274f7ae3
 EBUILD xine-ui-0.99.9.ebuild 1977 BLAKE2B 19c50da97f557da127508f4eb26357593cba077af435c6297a3ca9a5f2ef7106f6fdfb26caaad4d04ab15ac92cb28c8833d897127aec9576720ff96f0bda3677 SHA512 4d131f4a7dfd8b169ea57469d64ab1966f5b89578e87c5f14949fdcf072553afa4b6d2e08a13c1d7fd75608dbc33899a1e3e61fba58bde6f9f9b4d5647c9692a
 MISC metadata.xml 386 BLAKE2B 8874545c1b0a0b9f60505dc08c933e3268f42b64fb1eed4e889d30af4ba3b6c74b1b1986f06425aa00ca81ab91e993a37e2c723ec4f53bbf69a2ccae8ba3ed69 SHA512 ead8587493161ece36b38168e0c628a05a97d1dfc7dddec3d7a966a783621634be28bd661a6e0d65e370dd7066ef49019265967f7394aa4026b3ae97de26a820
diff --git a/media-video/xine-ui/xine-ui-0.99.10.ebuild b/media-video/xine-ui/xine-ui-0.99.10.ebuild
new file mode 100644
index 000000000000..e030de84625a
--- /dev/null
+++ b/media-video/xine-ui/xine-ui-0.99.10.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit fdo-mime gnome2-utils
+
+DESCRIPTION="Xine movie player"
+HOMEPAGE="http://xine.sourceforge.net/"
+SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="aalib curl debug libcaca lirc nls readline vdr X xinerama"
+
+RDEPEND="|| ( app-arch/tar app-arch/libarchive )
+	media-libs/libpng:0=
+	>=media-libs/xine-lib-1.2:=[aalib?,libcaca?]
+	virtual/jpeg:0
+	aalib? ( media-libs/aalib:= )
+	curl? ( >=net-misc/curl-7.10.2:= )
+	libcaca? ( media-libs/libcaca:= )
+	lirc? ( app-misc/lirc:= )
+	nls? ( virtual/libintl )
+	readline? ( >=sys-libs/readline-6.2:= )
+	X? (
+		x11-libs/libICE:=
+		x11-libs/libSM:=
+		x11-libs/libX11:=
+		x11-libs/libXext:=
+		x11-libs/libXft:=
+		x11-libs/libXrender:=
+		x11-libs/libXScrnSaver:=
+		x11-libs/libXtst:=
+		x11-libs/libXv:=
+		x11-libs/libXxf86vm:=
+		xinerama? ( x11-libs/libXinerama:= )
+		)"
+DEPEND="${RDEPEND}
+	nls? ( >=sys-devel/gettext-0.18.3 )
+	X? (
+		x11-libs/libXt
+		x11-proto/inputproto
+		x11-proto/xf86vidmodeproto
+		xinerama? ( x11-proto/xineramaproto )
+		)
+	virtual/pkgconfig"
+
+src_prepare() {
+	rm -f misc/xine-bugreport
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_enable xinerama) \
+		$(use_enable lirc) \
+		$(use_enable vdr vdr-keys) \
+		--disable-nvtvsimple \
+		$(use_enable debug) \
+		$(use_with X x) \
+		$(use_with readline) \
+		$(use_with curl) \
+		$(use_with aalib) \
+		$(use_with libcaca caca) \
+		--without-fb
+}
+
+src_install() {
+	emake \
+		DESTDIR="${D}" \
+		docdir="/usr/share/doc/${PF}" \
+		docsdir="/usr/share/doc/${PF}" \
+		install
+	dodoc AUTHORS ChangeLog NEWS README
+}
+
+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/metadata/Manifest.gz b/metadata/Manifest.gz
index 95a843ddfb20..fe92ed20a0da 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 749c873f8b58..f124a8652ca5 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Jan 2018 05:38:53 +0000
+Tue, 16 Jan 2018 16:39:18 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 0730e81f1a2f..d9186c85908e 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 414930 BLAKE2B 54c8bec7c47b900f490e4e34024351be14f456a48cacf2b39c9c543980f7b457877607be1b1a2619bba3921e272569dddbe7cbe408004596209bfaef3ad1f30e SHA512 fe8b5b4b09d48323bfe7f07a9b7216c4b61eb0986f2508a393f9a5266ae4d6f5c8fb70ea146fd1e2823a5d5995190c0817a11d4bedf5624b5eaaddf74d3af007
-TIMESTAMP 2018-01-13T05:38:57Z
+MANIFEST Manifest.files.gz 415494 BLAKE2B 2f34f7614c57c1227dca4ba5e94448aaaf1c88b58bde62fd5023825ca6fa9f91eb38f3fc870e5d0d4a9f61ba5e0b405b4e56e0a0f3d0f445a310f64d9879a20c SHA512 cbaf62f7039ef26866be8def74a0d98d86a632fc08f42981aae6f6d5fefb8a9b2f798ee6b1f54c1b6175290da8a63d9dd985f66413f2f6347c1e7a0c92871051
+TIMESTAMP 2018-01-16T16:39:21Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpZm3FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpeKrlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAWuA//UdGefSrX8EJ+MKit+CCilc7b1s9qwlwbJ4TwQvOzzLI3+pZaEZCJLLD9
-eLUiUCuegKbXF55yMd1LWK72NZKeKgdeMLYn7rLFJq6kxJ5HQG12MsA0Gt5QrToj
-CsKHhlOuhDwZGSpa8ppwF4XJeZ8uUif+xaW14dYaRnBQ7nyEGRSPnXhwKd5S/fqN
-m4g6kfaHp6uORmLGD2Aag5Iqz+kX1jQo2DWF5yuxpHd2qSgO3n4Lzl/eA7IqkWHC
-xNLTI1fBrBtsvAZEqNy7IbFbAEDXPnyMaA4wuTpdX6E56GHJkJTK6OVYD3UNxe8O
-loz+Y03NfslKDmchp74781fcC8VRpW4X+G/em0fwLlc8r6WrJPGYG845PFdcfmIX
-G8FN7Vx5i4QuWNWynR/TGOyFyIxGblle1mEytDq3r+9NRxDKfBeDOgzaM/Vb/+kA
-bq+DgI8WwuF3L5WzCXO3Mkx41BmjTHakPLJK8pHRDfoCxnTtfvHo+aoxPzYdBg8c
-VTzy0gkNof7xId25g2MhxISej/bqQZRfmgQocqIVj2IBFSfMSHf+lxUpLP0AmWp/
-jnoniFokq39Mta8+jp22agt1pKk0+u5PncdkdrFvPVWK4oBsHwWZIO7oV+gBTZVF
-lUjvrkO1F8xfoVUSJlEgMbE7ifK1VHxts3mcu2vpbuqIMP4Q4b4=
-=RuEd
+klCFQg/6AyW7ZXlYIDK+vuWTPbB4c/ZP0cgaFvhZMPkh5mSEpN/ynHrBy8V/rAe1
+eUsKterzCZdjnRZ4B7otA79bgWeleiePDSXopIfYnJaHhXx5nvyzHMpA4VJ98anQ
+sA5BG5gIgrvkalkO4vZoWxQMz5onpqpne7OqsEWaO+90XfagsDKj3UzBIeSJC9dV
+knJrvAwu4qIbZVkM68X8JoHx60xMVBEdxEgcAdllke+U15U1JEbgivKsX2IRPyRh
+S/61oYdvDYKdzl5aRztkYdJnfdeGUsn8aOgyO52h4Gs8qoJyZm3KXGRi8pAju0uC
+pkSJCEkFhOjuOGtV0cNtgUw1iH7U54osZWcJ+39MjPQOTAWGMHtH8tzKIo7BpGa9
+JNue73VqyiiRWVaVK/bzRar3s2RJMErc2kKk/IHbHOPCof5ZtV1Tsj/10Pinv3SG
+YcJqXr2niwB5sK3bMGr4jUJONF9MNRfutFnxy8V4BKwMlYEcE2mVV2XTzzVN+qYE
+xs35MaSjyYD80zpBdLw7SquSKfrCWoLk+wZ1zIzVwCfIOr850XOmA6DvN64sgVRD
+1Sg6NqWO7afYBGP1dZeALzVbwWohsCbFvbHWH/hYyLgYeXSItKwxm/H5ifSm+aHh
+aT8XS1YiFCK0HSKiJDWKAWMO2h4VUM/Wd9ATv90OKHWbyzxp4N0=
+=g+oe
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/Manifest.files.gz b/metadata/glsa/Manifest.files.gz
index 8ea3f1eb83d4..e90385a46f35 100644
--- a/metadata/glsa/Manifest.files.gz
+++ b/metadata/glsa/Manifest.files.gz
diff --git a/metadata/glsa/glsa-200310-03.xml b/metadata/glsa/glsa-200310-03.xml
index 5d9e7093df1a..8b3308a259f6 100644
--- a/metadata/glsa/glsa-200310-03.xml
+++ b/metadata/glsa/glsa-200310-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Apache</product>
   <announced>2003-10-28</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>32194</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200310-04.xml b/metadata/glsa/glsa-200310-04.xml
index d5858fd1e37d..efdce1905e60 100644
--- a/metadata/glsa/glsa-200310-04.xml
+++ b/metadata/glsa/glsa-200310-04.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild">Apache</product>
   <announced>2003-10-31</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>32271</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200311-01.xml b/metadata/glsa/glsa-200311-01.xml
index 1932b80a1b7e..3a12447abeb0 100644
--- a/metadata/glsa/glsa-200311-01.xml
+++ b/metadata/glsa/glsa-200311-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kdebase</product>
   <announced>2003-11-15</announced>
-  <revised>2003-11-15: 01</revised>
+  <revised count="01">2003-11-15</revised>
   <bug>29406</bug>
   <access>local / remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200311-02.xml b/metadata/glsa/glsa-200311-02.xml
index f28dd60f6df6..f0fb2207a6fa 100644
--- a/metadata/glsa/glsa-200311-02.xml
+++ b/metadata/glsa/glsa-200311-02.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Opera</product>
   <announced>2003-11-19</announced>
-  <revised>2003-11-19: 01</revised>
+  <revised count="01">2003-11-19</revised>
   <bug>31775</bug>
   <access>local / remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200311-03.xml b/metadata/glsa/glsa-200311-03.xml
index aa7c8e521644..7205e4947f76 100644
--- a/metadata/glsa/glsa-200311-03.xml
+++ b/metadata/glsa/glsa-200311-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">HylaFAX</product>
   <announced>2003-11-10</announced>
-  <revised>2003-11-10: 01</revised>
+  <revised count="01">2003-11-10</revised>
   <bug>33368</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200311-04.xml b/metadata/glsa/glsa-200311-04.xml
index d959f75a9470..e252e20f5ce8 100644
--- a/metadata/glsa/glsa-200311-04.xml
+++ b/metadata/glsa/glsa-200311-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">FreeRADIUS</product>
   <announced>2003-11-23</announced>
-  <revised>2003-11-23: 01</revised>
+  <revised count="01">2003-11-23</revised>
   <bug>33989</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200311-05.xml b/metadata/glsa/glsa-200311-05.xml
index 12d029f23add..471b11e2345d 100644
--- a/metadata/glsa/glsa-200311-05.xml
+++ b/metadata/glsa/glsa-200311-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Ethereal</product>
   <announced>2003-11-22</announced>
-  <revised>2003-11-22: 01</revised>
+  <revised count="01">2003-11-22</revised>
   <bug>32691</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200311-06.xml b/metadata/glsa/glsa-200311-06.xml
index 2e9f9fb551bd..f5a824252851 100644
--- a/metadata/glsa/glsa-200311-06.xml
+++ b/metadata/glsa/glsa-200311-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">glibc</product>
   <announced>2003-11-22</announced>
-  <revised>2003-11-22: 01</revised>
+  <revised count="01">2003-11-22</revised>
   <bug>33383</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200311-07.xml b/metadata/glsa/glsa-200311-07.xml
index 3c9074d0516f..6701c5b044cf 100644
--- a/metadata/glsa/glsa-200311-07.xml
+++ b/metadata/glsa/glsa-200311-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpSysInfo</product>
   <announced>2003-11-22</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>26782</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200311-08.xml b/metadata/glsa/glsa-200311-08.xml
index dc74215239b9..d7e74aa3af6b 100644
--- a/metadata/glsa/glsa-200311-08.xml
+++ b/metadata/glsa/glsa-200311-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Libnids</product>
   <announced>2003-11-22</announced>
-  <revised>2003-11-22: 01</revised>
+  <revised count="01">2003-11-22</revised>
   <bug>32724</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200312-01.xml b/metadata/glsa/glsa-200312-01.xml
index 01720a92115a..ae25b6df6eb4 100644
--- a/metadata/glsa/glsa-200312-01.xml
+++ b/metadata/glsa/glsa-200312-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="infrastructure">rsync mirror</product>
   <announced>2003-12-02</announced>
-  <revised>2003-12-02: 01</revised>
+  <revised count="01">2003-12-02</revised>
   <affected>
     <service type="rsync" fixed="yes"/>
   </affected>
diff --git a/metadata/glsa/glsa-200312-03.xml b/metadata/glsa/glsa-200312-03.xml
index 5abb70314a39..ba3a51f33b9c 100644
--- a/metadata/glsa/glsa-200312-03.xml
+++ b/metadata/glsa/glsa-200312-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rsync</product>
   <announced>2003-12-04</announced>
-  <revised>2003-12-04: 01</revised>
+  <revised count="01">2003-12-04</revised>
   <access>remote</access>
   <affected>
     <package name="net-misc/rsync" auto="yes" arch="*">
diff --git a/metadata/glsa/glsa-200312-04.xml b/metadata/glsa/glsa-200312-04.xml
index 322e47217010..1f938427a057 100644
--- a/metadata/glsa/glsa-200312-04.xml
+++ b/metadata/glsa/glsa-200312-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">CVS</product>
   <announced>2003-12-08</announced>
-  <revised>2003-12-08: 01</revised>
+  <revised count="01">2003-12-08</revised>
   <bug>35371</bug>
   <access>unknown</access>
   <affected>
diff --git a/metadata/glsa/glsa-200312-05.xml b/metadata/glsa/glsa-200312-05.xml
index 3a00e4760300..a07faf7ba339 100644
--- a/metadata/glsa/glsa-200312-05.xml
+++ b/metadata/glsa/glsa-200312-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">GnuPG</product>
   <announced>2003-12-12</announced>
-  <revised>2003-12-12: 01</revised>
+  <revised count="01">2003-12-12</revised>
   <bug>34504</bug>
   <access>unknown</access>
   <affected>
diff --git a/metadata/glsa/glsa-200312-06.xml b/metadata/glsa/glsa-200312-06.xml
index 71c7b1e707c2..584f42ae57cd 100644
--- a/metadata/glsa/glsa-200312-06.xml
+++ b/metadata/glsa/glsa-200312-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xchat</product>
   <announced>2003-12-14</announced>
-  <revised>2003-12-14: 01</revised>
+  <revised count="01">2003-12-14</revised>
   <bug>35623</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200312-07.xml b/metadata/glsa/glsa-200312-07.xml
index 90346eccf602..cd9870a03b29 100644
--- a/metadata/glsa/glsa-200312-07.xml
+++ b/metadata/glsa/glsa-200312-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lftp</product>
   <announced>2003-12-13</announced>
-  <revised>2003-12-07: 2</revised>
+  <revised count="2">2003-12-07</revised>
   <bug>35866</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200312-08.xml b/metadata/glsa/glsa-200312-08.xml
index 6ef1ec138148..f1b5831de4e5 100644
--- a/metadata/glsa/glsa-200312-08.xml
+++ b/metadata/glsa/glsa-200312-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cvs</product>
   <announced>2003-12-28</announced>
-  <revised>2003-12-28: 01</revised>
+  <revised count="01">2003-12-28</revised>
   <bug>36142</bug>
   <access>unknown</access>
   <affected>
diff --git a/metadata/glsa/glsa-200401-01.xml b/metadata/glsa/glsa-200401-01.xml
index 2922a8bffd8d..4d6e2829bc39 100644
--- a/metadata/glsa/glsa-200401-01.xml
+++ b/metadata/glsa/glsa-200401-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Kernel</product>
   <announced>2004-01-08</announced>
-  <revised>2004-01-08: 01</revised>
+  <revised count="01">2004-01-08</revised>
   <bug>37292</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200401-02.xml b/metadata/glsa/glsa-200401-02.xml
index 86bd801f9d0c..5136e90bfa49 100644
--- a/metadata/glsa/glsa-200401-02.xml
+++ b/metadata/glsa/glsa-200401-02.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">honeyd</product>
   <announced>2004-01-21</announced>
-  <revised>2004-01-21: 01</revised>
+  <revised count="01">2004-01-21</revised>
   <bug>38934</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200401-03.xml b/metadata/glsa/glsa-200401-03.xml
index 811de0adde06..05ec55fce802 100644
--- a/metadata/glsa/glsa-200401-03.xml
+++ b/metadata/glsa/glsa-200401-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mod_python</product>
   <announced>2004-01-27</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>39154</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200401-04.xml b/metadata/glsa/glsa-200401-04.xml
index bb7979d95568..18ff7c576368 100644
--- a/metadata/glsa/glsa-200401-04.xml
+++ b/metadata/glsa/glsa-200401-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">GAIM</product>
   <announced>2004-01-26</announced>
-  <revised>2004-01-26: 01</revised>
+  <revised count="01">2004-01-26</revised>
   <bug>39470</bug>
   <access>man-in-the-middle</access>
   <affected>
diff --git a/metadata/glsa/glsa-200402-01.xml b/metadata/glsa/glsa-200402-01.xml
index 92d65863df45..5a6d84a313ac 100644
--- a/metadata/glsa/glsa-200402-01.xml
+++ b/metadata/glsa/glsa-200402-01.xml
@@ -12,7 +12,7 @@
   </synopsis>
   <product type="ebuild">PHP</product>
   <announced>2004-02-07</announced>
-  <revised>2004-02-07: 01</revised>
+  <revised count="01">2004-02-07</revised>
   <bug>39952</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200402-02.xml b/metadata/glsa/glsa-200402-02.xml
index f4906cfbe375..007bbf00ad57 100644
--- a/metadata/glsa/glsa-200402-02.xml
+++ b/metadata/glsa/glsa-200402-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">200402-02</product>
   <announced>2004-02-11</announced>
-  <revised>2004-02-11: 01</revised>
+  <revised count="01">2004-02-11</revised>
   <access>local</access>
   <affected>
     <package name="x11-base/xfree" auto="yes" arch="*">
diff --git a/metadata/glsa/glsa-200402-03.xml b/metadata/glsa/glsa-200402-03.xml
index 8c719c15b519..5ebd0375da39 100644
--- a/metadata/glsa/glsa-200402-03.xml
+++ b/metadata/glsa/glsa-200402-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">monkeyd</product>
   <announced>2004-02-11</announced>
-  <revised>2004-02-11: 01</revised>
+  <revised count="01">2004-02-11</revised>
   <bug>41156</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200402-04.xml b/metadata/glsa/glsa-200402-04.xml
index 9700e9412bdd..f1128e938d9c 100644
--- a/metadata/glsa/glsa-200402-04.xml
+++ b/metadata/glsa/glsa-200402-04.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Gallery</product>
   <announced>2004-02-11</announced>
-  <revised>2004-02-11: 01</revised>
+  <revised count="01">2004-02-11</revised>
   <bug>39638</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200402-05.xml b/metadata/glsa/glsa-200402-05.xml
index 32b445a54d42..607d8d63a649 100644
--- a/metadata/glsa/glsa-200402-05.xml
+++ b/metadata/glsa/glsa-200402-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpmyadmin</product>
   <announced>2004-02-17</announced>
-  <revised>2004-02-17: 01</revised>
+  <revised count="01">2004-02-17</revised>
   <bug>40268</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200402-06.xml b/metadata/glsa/glsa-200402-06.xml
index b4ec7afd7d00..74d464f6ddfb 100644
--- a/metadata/glsa/glsa-200402-06.xml
+++ b/metadata/glsa/glsa-200402-06.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Kernel</product>
   <announced>2004-02-17</announced>
-  <revised>2004-02-17: 01</revised>
+  <revised count="01">2004-02-17</revised>
   <access>local</access>
   <affected>
     <package name="sys-kernel/ck-sources" auto="yes" arch="amd64">
diff --git a/metadata/glsa/glsa-200402-07.xml b/metadata/glsa/glsa-200402-07.xml
index 633dbd725dd5..56ce1869f6d4 100644
--- a/metadata/glsa/glsa-200402-07.xml
+++ b/metadata/glsa/glsa-200402-07.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2004-02-17</announced>
-  <revised>2004-02-17: 01</revised>
+  <revised count="01">2004-02-17</revised>
   <bug>41248</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200403-01.xml b/metadata/glsa/glsa-200403-01.xml
index 1c6ecdabe015..982f9ebfc6fb 100644
--- a/metadata/glsa/glsa-200403-01.xml
+++ b/metadata/glsa/glsa-200403-01.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">libxml</product>
   <announced>2004-03-05</announced>
-  <revised>2004-03-05: 01</revised>
+  <revised count="01">2004-03-05</revised>
   <bug>42735</bug>
   <access>local and remote combination</access>
   <affected>
diff --git a/metadata/glsa/glsa-200403-02.xml b/metadata/glsa/glsa-200403-02.xml
index 8a3951743ef1..d93f6242f889 100644
--- a/metadata/glsa/glsa-200403-02.xml
+++ b/metadata/glsa/glsa-200403-02.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Kernel</product>
   <announced>2004-03-05</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>42024</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200403-03.xml b/metadata/glsa/glsa-200403-03.xml
index d515bafcf429..973db79640d1 100644
--- a/metadata/glsa/glsa-200403-03.xml
+++ b/metadata/glsa/glsa-200403-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">OpenSSL</product>
   <announced>2004-03-17</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>44941</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200403-04.xml b/metadata/glsa/glsa-200403-04.xml
index 8e1ed7ca9e29..e39329486ca0 100644
--- a/metadata/glsa/glsa-200403-04.xml
+++ b/metadata/glsa/glsa-200403-04.xml
@@ -11,7 +11,7 @@
   </synopsis>
   <product type="ebuild">Apache</product>
   <announced>2004-03-22</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>45206</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200403-05.xml b/metadata/glsa/glsa-200403-05.xml
index da9467bbfc23..2f13ee30d4f6 100644
--- a/metadata/glsa/glsa-200403-05.xml
+++ b/metadata/glsa/glsa-200403-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">UUDeview</product>
   <announced>2004-03-26</announced>
-  <revised>2004-03-26: 01</revised>
+  <revised count="01">2004-03-26</revised>
   <bug>44859</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200403-06.xml b/metadata/glsa/glsa-200403-06.xml
index 3b878e8ddd55..8af4e523d78d 100644
--- a/metadata/glsa/glsa-200403-06.xml
+++ b/metadata/glsa/glsa-200403-06.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Courier</product>
   <announced>2004-03-26</announced>
-  <revised>2004-03-26: 01</revised>
+  <revised count="01">2004-03-26</revised>
   <bug>45584</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200403-07.xml b/metadata/glsa/glsa-200403-07.xml
index bdfa196aae44..10ac6a07f09c 100644
--- a/metadata/glsa/glsa-200403-07.xml
+++ b/metadata/glsa/glsa-200403-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ethereal</product>
   <announced>2004-03-28</announced>
-  <revised>2004-03-28: 01</revised>
+  <revised count="01">2004-03-28</revised>
   <bug>45543</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200403-08.xml b/metadata/glsa/glsa-200403-08.xml
index 387902531d17..adc5684c8c7e 100644
--- a/metadata/glsa/glsa-200403-08.xml
+++ b/metadata/glsa/glsa-200403-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">oftpd</product>
   <announced>2004-03-29</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>45738</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200403-09.xml b/metadata/glsa/glsa-200403-09.xml
index 12c43631a237..f8d998b712ad 100644
--- a/metadata/glsa/glsa-200403-09.xml
+++ b/metadata/glsa/glsa-200403-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mc</product>
   <announced>2004-03-29</announced>
-  <revised>2004-03-29: 01</revised>
+  <revised count="01">2004-03-29</revised>
   <bug>45957</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200403-10.xml b/metadata/glsa/glsa-200403-10.xml
index f592667ba498..61eb8e98fe08 100644
--- a/metadata/glsa/glsa-200403-10.xml
+++ b/metadata/glsa/glsa-200403-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">fetchmail</product>
   <announced>2004-03-30</announced>
-  <revised>2004-03-30: 01</revised>
+  <revised count="01">2004-03-30</revised>
   <bug>37717</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200403-11.xml b/metadata/glsa/glsa-200403-11.xml
index 7abb28f92e13..61ab429130a7 100644
--- a/metadata/glsa/glsa-200403-11.xml
+++ b/metadata/glsa/glsa-200403-11.xml
@@ -11,7 +11,7 @@
   </synopsis>
   <product type="ebuild">Squid</product>
   <announced>2004-03-30</announced>
-  <revised>2004-09-02: 02</revised>
+  <revised count="02">2004-09-02</revised>
   <bug>45273</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200403-12.xml b/metadata/glsa/glsa-200403-12.xml
index b04d50e95406..b6c8aef7296c 100644
--- a/metadata/glsa/glsa-200403-12.xml
+++ b/metadata/glsa/glsa-200403-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openldap</product>
   <announced>2004-03-31</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>26728</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200403-13.xml b/metadata/glsa/glsa-200403-13.xml
index a63078e7eb2b..8bf227962ea4 100644
--- a/metadata/glsa/glsa-200403-13.xml
+++ b/metadata/glsa/glsa-200403-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mplayer</product>
   <announced>2004-03-31</announced>
-  <revised>2006-10-11: 03</revised>
+  <revised count="03">2006-10-11</revised>
   <bug>46246</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200403-14.xml b/metadata/glsa/glsa-200403-14.xml
index f2939a5d373e..fd11798f16fc 100644
--- a/metadata/glsa/glsa-200403-14.xml
+++ b/metadata/glsa/glsa-200403-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">app-admin/monit</product>
   <announced>2004-03-31</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>43967</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-01.xml b/metadata/glsa/glsa-200404-01.xml
index 36fda1de6dbe..8f53759e9b17 100644
--- a/metadata/glsa/glsa-200404-01.xml
+++ b/metadata/glsa/glsa-200404-01.xml
@@ -11,7 +11,7 @@
   </synopsis>
   <product type="ebuild">Portage</product>
   <announced>2004-04-04</announced>
-  <revised>2004-04-04: 01</revised>
+  <revised count="01">2004-04-04</revised>
   <bug>21923</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-02.xml b/metadata/glsa/glsa-200404-02.xml
index 2d9e3f5fce76..3be7d5726337 100644
--- a/metadata/glsa/glsa-200404-02.xml
+++ b/metadata/glsa/glsa-200404-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kde-base/kde</product>
   <announced>2004-04-06</announced>
-  <revised>2004-04-06: 01</revised>
+  <revised count="01">2004-04-06</revised>
   <bug>38256</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-03.xml b/metadata/glsa/glsa-200404-03.xml
index 841bd80fa46b..e432882108ee 100644
--- a/metadata/glsa/glsa-200404-03.xml
+++ b/metadata/glsa/glsa-200404-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tcpdump</product>
   <announced>2004-03-31</announced>
-  <revised>2004-03-31: 01</revised>
+  <revised count="01">2004-03-31</revised>
   <bug>38206</bug>
   <bug>46258</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200404-04.xml b/metadata/glsa/glsa-200404-04.xml
index 3a0c35bf9eea..8409fff1ad5c 100644
--- a/metadata/glsa/glsa-200404-04.xml
+++ b/metadata/glsa/glsa-200404-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sysstat</product>
   <announced>2004-04-06</announced>
-  <revised>2004-04-06: 01</revised>
+  <revised count="01">2004-04-06</revised>
   <bug>45159</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-05.xml b/metadata/glsa/glsa-200404-05.xml
index a10ae20dcf32..3ebd4268c68b 100644
--- a/metadata/glsa/glsa-200404-05.xml
+++ b/metadata/glsa/glsa-200404-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ipsec-tools</product>
   <announced>2004-04-07</announced>
-  <revised>2004-04-07: 01</revised>
+  <revised count="01">2004-04-07</revised>
   <bug>47013</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-06.xml b/metadata/glsa/glsa-200404-06.xml
index a00f338a6083..a7b67253eda6 100644
--- a/metadata/glsa/glsa-200404-06.xml
+++ b/metadata/glsa/glsa-200404-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"> </product>
   <announced>2004-04-07</announced>
-  <revised>2004-04-07: 01</revised>
+  <revised count="01">2004-04-07</revised>
   <bug>46422</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-07.xml b/metadata/glsa/glsa-200404-07.xml
index 3084f67f99f7..26bce01d41b5 100644
--- a/metadata/glsa/glsa-200404-07.xml
+++ b/metadata/glsa/glsa-200404-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2004-04-07</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>45357</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-08.xml b/metadata/glsa/glsa-200404-08.xml
index f96f8c174276..6055ca1e37dc 100644
--- a/metadata/glsa/glsa-200404-08.xml
+++ b/metadata/glsa/glsa-200404-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">automake</product>
   <announced>2004-04-08</announced>
-  <revised>2005-01-31: 05</revised>
+  <revised count="05">2005-01-31</revised>
   <bug>45646</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-09.xml b/metadata/glsa/glsa-200404-09.xml
index ae644470e378..87b6f570a547 100644
--- a/metadata/glsa/glsa-200404-09.xml
+++ b/metadata/glsa/glsa-200404-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">heimdal</product>
   <announced>2004-04-09</announced>
-  <revised>2004-04-09: 01</revised>
+  <revised count="01">2004-04-09</revised>
   <bug>46590</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-10.xml b/metadata/glsa/glsa-200404-10.xml
index 4052c658175a..0a2203f60ac5 100644
--- a/metadata/glsa/glsa-200404-10.xml
+++ b/metadata/glsa/glsa-200404-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2004-04-09</announced>
-  <revised>2004-04-09: 01</revised>
+  <revised count="01">2004-04-09</revised>
   <bug>34294</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-11.xml b/metadata/glsa/glsa-200404-11.xml
index 40d1cfd8a82d..cb51d5cfc8cc 100644
--- a/metadata/glsa/glsa-200404-11.xml
+++ b/metadata/glsa/glsa-200404-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dev-libs/pwlib</product>
   <announced>2004-04-09</announced>
-  <revised>2004-04-09: 01</revised>
+  <revised count="01">2004-04-09</revised>
   <bug>45846</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-12.xml b/metadata/glsa/glsa-200404-12.xml
index d2d85a63c9e2..0e35e4a2113a 100644
--- a/metadata/glsa/glsa-200404-12.xml
+++ b/metadata/glsa/glsa-200404-12.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">scorched3d</product>
   <announced>2004-04-09</announced>
-  <revised>2004-04-09: 08</revised>
+  <revised count="08">2004-04-09</revised>
   <bug>39302</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-13.xml b/metadata/glsa/glsa-200404-13.xml
index 88e5be17cb32..ad9d0fcd2731 100644
--- a/metadata/glsa/glsa-200404-13.xml
+++ b/metadata/glsa/glsa-200404-13.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">cvs</product>
   <announced>2004-04-14</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>47800</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-14.xml b/metadata/glsa/glsa-200404-14.xml
index 7ddc6bcc1652..c2b3a6694757 100644
--- a/metadata/glsa/glsa-200404-14.xml
+++ b/metadata/glsa/glsa-200404-14.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">cadaver</product>
   <announced>2004-04-19</announced>
-  <revised>2004-04-19: 01</revised>
+  <revised count="01">2004-04-19</revised>
   <bug>47799</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-15.xml b/metadata/glsa/glsa-200404-15.xml
index 862e77b5d4eb..d20ae1fac552 100644
--- a/metadata/glsa/glsa-200404-15.xml
+++ b/metadata/glsa/glsa-200404-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xchat</product>
   <announced>2004-04-19</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>46856</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-16.xml b/metadata/glsa/glsa-200404-16.xml
index 18ab6fdabc47..fe2a114ee4d0 100644
--- a/metadata/glsa/glsa-200404-16.xml
+++ b/metadata/glsa/glsa-200404-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">monit</product>
   <announced>2004-04-19</announced>
-  <revised>2004-04-19: 01</revised>
+  <revised count="01">2004-04-19</revised>
   <bug>47631</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-17.xml b/metadata/glsa/glsa-200404-17.xml
index e6d014aed00b..128e5ddd79c0 100644
--- a/metadata/glsa/glsa-200404-17.xml
+++ b/metadata/glsa/glsa-200404-17.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild">ipsec-utils</product>
   <announced>2004-04-24</announced>
-  <revised>2004-04-24: 01</revised>
+  <revised count="01">2004-04-24</revised>
   <bug>48847</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-18.xml b/metadata/glsa/glsa-200404-18.xml
index 5989c4ceb863..1a6b321655b2 100644
--- a/metadata/glsa/glsa-200404-18.xml
+++ b/metadata/glsa/glsa-200404-18.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">ssmtp</product>
   <announced>2004-04-26</announced>
-  <revised>2004-04-26: 01</revised>
+  <revised count="01">2004-04-26</revised>
   <bug>47918</bug>
   <bug>48435</bug>
   <access>remote root </access>
diff --git a/metadata/glsa/glsa-200404-19.xml b/metadata/glsa/glsa-200404-19.xml
index e81bb30af78f..b6e4b43db64b 100644
--- a/metadata/glsa/glsa-200404-19.xml
+++ b/metadata/glsa/glsa-200404-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lcdproc</product>
   <announced>2004-04-27</announced>
-  <revised>2004-04-27: 01</revised>
+  <revised count="01">2004-04-27</revised>
   <bug>47340</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200404-20.xml b/metadata/glsa/glsa-200404-20.xml
index 9218b44d23a6..6bb40160bab9 100644
--- a/metadata/glsa/glsa-200404-20.xml
+++ b/metadata/glsa/glsa-200404-20.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">xine</product>
   <announced>2004-04-27</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>45448</bug>
   <bug>48107</bug>
   <bug>48108</bug>
diff --git a/metadata/glsa/glsa-200404-21.xml b/metadata/glsa/glsa-200404-21.xml
index 3557ecb61bb3..b2d4fcc2d6a1 100644
--- a/metadata/glsa/glsa-200404-21.xml
+++ b/metadata/glsa/glsa-200404-21.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">samba</product>
   <announced>2004-04-29</announced>
-  <revised>2004-04-29: 01</revised>
+  <revised count="01">2004-04-29</revised>
   <bug>41800</bug>
   <bug>45965</bug>
   <access>local </access>
diff --git a/metadata/glsa/glsa-200405-01.xml b/metadata/glsa/glsa-200405-01.xml
index dbb59f7a18f7..cbc184393b7b 100644
--- a/metadata/glsa/glsa-200405-01.xml
+++ b/metadata/glsa/glsa-200405-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">neon</product>
   <announced>2004-05-09</announced>
-  <revised>2004-05-09: 01</revised>
+  <revised count="01">2004-05-09</revised>
   <bug>48448</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-02.xml b/metadata/glsa/glsa-200405-02.xml
index 46b64b6a2f87..d6212b288b87 100644
--- a/metadata/glsa/glsa-200405-02.xml
+++ b/metadata/glsa/glsa-200405-02.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">lha</product>
   <announced>2004-05-09</announced>
-  <revised>2006-10-20: 02</revised>
+  <revised count="02">2006-10-20</revised>
   <bug>49961</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-03.xml b/metadata/glsa/glsa-200405-03.xml
index e7bdbdeeedfb..2a523fb9cd64 100644
--- a/metadata/glsa/glsa-200405-03.xml
+++ b/metadata/glsa/glsa-200405-03.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">ClamAV</product>
   <announced>2004-05-11</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>46264</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-04.xml b/metadata/glsa/glsa-200405-04.xml
index 1e88fd2fa0fb..cb6cdf07ae3d 100644
--- a/metadata/glsa/glsa-200405-04.xml
+++ b/metadata/glsa/glsa-200405-04.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">openoffice</product>
   <announced>2004-05-11</announced>
-  <revised>2004-10-27: 02</revised>
+  <revised count="02">2004-10-27</revised>
   <bug>47926</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-05.xml b/metadata/glsa/glsa-200405-05.xml
index 8f194d579d23..49db31a34aa7 100644
--- a/metadata/glsa/glsa-200405-05.xml
+++ b/metadata/glsa/glsa-200405-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">utempter</product>
   <announced>2004-05-13</announced>
-  <revised>2004-05-13: 01</revised>
+  <revised count="01">2004-05-13</revised>
   <bug>49536</bug>
   <access>local </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-06.xml b/metadata/glsa/glsa-200405-06.xml
index a322d81523ca..fc45ddee794a 100644
--- a/metadata/glsa/glsa-200405-06.xml
+++ b/metadata/glsa/glsa-200405-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2004-05-14</announced>
-  <revised>2004-05-14: 01</revised>
+  <revised count="01">2004-05-14</revised>
   <bug>49887</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-07.xml b/metadata/glsa/glsa-200405-07.xml
index 423862bbc913..ca5e5f76aeb0 100644
--- a/metadata/glsa/glsa-200405-07.xml
+++ b/metadata/glsa/glsa-200405-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Exim</product>
   <announced>2004-05-14</announced>
-  <revised>2004-05-14: 01</revised>
+  <revised count="01">2004-05-14</revised>
   <bug>50217</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-08.xml b/metadata/glsa/glsa-200405-08.xml
index 34c3adf87a1f..d092d90bc05c 100644
--- a/metadata/glsa/glsa-200405-08.xml
+++ b/metadata/glsa/glsa-200405-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pound</product>
   <announced>2004-05-18</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>50421</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-09.xml b/metadata/glsa/glsa-200405-09.xml
index c07ea510a910..30ae02d9ec1a 100644
--- a/metadata/glsa/glsa-200405-09.xml
+++ b/metadata/glsa/glsa-200405-09.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">proftpd</product>
   <announced>2004-05-19</announced>
-  <revised>2004-05-19: 01</revised>
+  <revised count="01">2004-05-19</revised>
   <bug>49496</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-10.xml b/metadata/glsa/glsa-200405-10.xml
index b6d0d15f5297..94f49fc1e46a 100644
--- a/metadata/glsa/glsa-200405-10.xml
+++ b/metadata/glsa/glsa-200405-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">icecast</product>
   <announced>2004-05-19</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>50935</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-11.xml b/metadata/glsa/glsa-200405-11.xml
index 140c6569b425..ef08f85a9fb3 100644
--- a/metadata/glsa/glsa-200405-11.xml
+++ b/metadata/glsa/glsa-200405-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kdelibs</product>
   <announced>2004-05-19</announced>
-  <revised>2004-05-19: 01</revised>
+  <revised count="01">2004-05-19</revised>
   <bug>51276</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-12.xml b/metadata/glsa/glsa-200405-12.xml
index 990556c7f7b7..47d6f3e0f5a5 100644
--- a/metadata/glsa/glsa-200405-12.xml
+++ b/metadata/glsa/glsa-200405-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cvs</product>
   <announced>2004-05-20</announced>
-  <revised>2004-05-20: 01</revised>
+  <revised count="01">2004-05-20</revised>
   <bug>51460</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-13.xml b/metadata/glsa/glsa-200405-13.xml
index 7158d5f21ac0..ae8207774b12 100644
--- a/metadata/glsa/glsa-200405-13.xml
+++ b/metadata/glsa/glsa-200405-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">neon</product>
   <announced>2004-05-20</announced>
-  <revised>2004-05-20: 01</revised>
+  <revised count="01">2004-05-20</revised>
   <bug>51490</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-14.xml b/metadata/glsa/glsa-200405-14.xml
index 6b89f0291bfe..77f806fb3b3d 100644
--- a/metadata/glsa/glsa-200405-14.xml
+++ b/metadata/glsa/glsa-200405-14.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">subversion</product>
   <announced>2004-05-20</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>51462</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-15.xml b/metadata/glsa/glsa-200405-15.xml
index 587258d329ba..5cf103c4ab89 100644
--- a/metadata/glsa/glsa-200405-15.xml
+++ b/metadata/glsa/glsa-200405-15.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">cadaver</product>
   <announced>2004-05-20</announced>
-  <revised>2004-05-20: 01</revised>
+  <revised count="01">2004-05-20</revised>
   <bug>51461</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-16.xml b/metadata/glsa/glsa-200405-16.xml
index 6ddb603a1354..e447645a74a1 100644
--- a/metadata/glsa/glsa-200405-16.xml
+++ b/metadata/glsa/glsa-200405-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">SquirrelMail</product>
   <announced>2004-05-25</announced>
-  <revised>2006-05-27: 04</revised>
+  <revised count="04">2006-05-27</revised>
   <bug>49675</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-17.xml b/metadata/glsa/glsa-200405-17.xml
index 679862769daf..9eff948cbf1c 100644
--- a/metadata/glsa/glsa-200405-17.xml
+++ b/metadata/glsa/glsa-200405-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">metamail</product>
   <announced>2004-05-21</announced>
-  <revised>2004-05-21: 01</revised>
+  <revised count="01">2004-05-21</revised>
   <bug>42133</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-18.xml b/metadata/glsa/glsa-200405-18.xml
index f0edf32130d5..993fc4a0d592 100644
--- a/metadata/glsa/glsa-200405-18.xml
+++ b/metadata/glsa/glsa-200405-18.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">firebird</product>
   <announced>2004-05-23</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>20837</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-19.xml b/metadata/glsa/glsa-200405-19.xml
index 6c63715844ac..0e2f2535748d 100644
--- a/metadata/glsa/glsa-200405-19.xml
+++ b/metadata/glsa/glsa-200405-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2004-05-25</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>50857</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-20.xml b/metadata/glsa/glsa-200405-20.xml
index 72b31efb928c..880c01beb54a 100644
--- a/metadata/glsa/glsa-200405-20.xml
+++ b/metadata/glsa/glsa-200405-20.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">MySQL</product>
   <announced>2004-05-25</announced>
-  <revised>2004-05-25: 01</revised>
+  <revised count="01">2004-05-25</revised>
   <bug>46242</bug>
   <access>local </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-21.xml b/metadata/glsa/glsa-200405-21.xml
index bd72cd2ab91d..bbcfcb9687bc 100644
--- a/metadata/glsa/glsa-200405-21.xml
+++ b/metadata/glsa/glsa-200405-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">MC</product>
   <announced>2004-05-26</announced>
-  <revised>2004-05-26: 01</revised>
+  <revised count="01">2004-05-26</revised>
   <bug>49990</bug>
   <access>local </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-22.xml b/metadata/glsa/glsa-200405-22.xml
index ffe51487bbdb..c8519fbe2962 100644
--- a/metadata/glsa/glsa-200405-22.xml
+++ b/metadata/glsa/glsa-200405-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Apache</product>
   <announced>2004-05-26</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>51815</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-23.xml b/metadata/glsa/glsa-200405-23.xml
index 334ae3d193c7..ada0d684e753 100644
--- a/metadata/glsa/glsa-200405-23.xml
+++ b/metadata/glsa/glsa-200405-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Heimdal</product>
   <announced>2004-05-27</announced>
-  <revised>2004-05-27: 01</revised>
+  <revised count="01">2004-05-27</revised>
   <bug>50208</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-24.xml b/metadata/glsa/glsa-200405-24.xml
index 9f21a01796da..bef6d315dcdd 100644
--- a/metadata/glsa/glsa-200405-24.xml
+++ b/metadata/glsa/glsa-200405-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mplayer</product>
   <announced>2004-05-28</announced>
-  <revised>2004-05-28: 01</revised>
+  <revised count="01">2004-05-28</revised>
   <bug>49387</bug>
   <access>remote </access>
   <affected>
diff --git a/metadata/glsa/glsa-200405-25.xml b/metadata/glsa/glsa-200405-25.xml
index e272bac32213..c9fc4e0d5a03 100644
--- a/metadata/glsa/glsa-200405-25.xml
+++ b/metadata/glsa/glsa-200405-25.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tla</product>
   <announced>2004-05-30</announced>
-  <revised>2004-06-02: 02</revised>
+  <revised count="02">2004-06-02</revised>
   <bug>51586</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-01.xml b/metadata/glsa/glsa-200406-01.xml
index 58cf57889f7a..15770adf4dfd 100644
--- a/metadata/glsa/glsa-200406-01.xml
+++ b/metadata/glsa/glsa-200406-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Ethereal</product>
   <announced>2004-06-04</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>51022</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-02.xml b/metadata/glsa/glsa-200406-02.xml
index dcc9c2fe720f..e769d94788c1 100644
--- a/metadata/glsa/glsa-200406-02.xml
+++ b/metadata/glsa/glsa-200406-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tripwire</product>
   <announced>2004-06-04</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>52945</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-03.xml b/metadata/glsa/glsa-200406-03.xml
index 1b5c88db8019..c6b5509e8437 100644
--- a/metadata/glsa/glsa-200406-03.xml
+++ b/metadata/glsa/glsa-200406-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sitecopy</product>
   <announced>2004-06-05</announced>
-  <revised>2004-08-15: 04</revised>
+  <revised count="04">2004-08-15</revised>
   <bug>51585</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-04.xml b/metadata/glsa/glsa-200406-04.xml
index 30bd71360eed..417f0605ee3e 100644
--- a/metadata/glsa/glsa-200406-04.xml
+++ b/metadata/glsa/glsa-200406-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mailman</product>
   <announced>2004-06-09</announced>
-  <revised>2004-06-09: 01</revised>
+  <revised count="01">2004-06-09</revised>
   <bug>51671</bug>
   <access>remote  </access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-05.xml b/metadata/glsa/glsa-200406-05.xml
index 56b1153397cd..16b60a7b66b7 100644
--- a/metadata/glsa/glsa-200406-05.xml
+++ b/metadata/glsa/glsa-200406-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Apache</product>
   <announced>2004-06-09</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>51368</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-06.xml b/metadata/glsa/glsa-200406-06.xml
index ac1c3ca68e80..0f441030e6c6 100644
--- a/metadata/glsa/glsa-200406-06.xml
+++ b/metadata/glsa/glsa-200406-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">CVS</product>
   <announced>2004-06-10</announced>
-  <revised>2004-06-10: 01</revised>
+  <revised count="01">2004-06-10</revised>
   <bug>53408</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-07.xml b/metadata/glsa/glsa-200406-07.xml
index bbd13804ffef..c8dcea56c14b 100644
--- a/metadata/glsa/glsa-200406-07.xml
+++ b/metadata/glsa/glsa-200406-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dev-util/subversion</product>
   <announced>2004-06-10</announced>
-  <revised>2004-06-10: 01</revised>
+  <revised count="01">2004-06-10</revised>
   <access>remote</access>
   <affected>
     <package name="dev-util/subversion" auto="yes" arch="*">
diff --git a/metadata/glsa/glsa-200406-08.xml b/metadata/glsa/glsa-200406-08.xml
index 78c12c63c5e3..5a11f07033b5 100644
--- a/metadata/glsa/glsa-200406-08.xml
+++ b/metadata/glsa/glsa-200406-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Squirrelmail</product>
   <announced>2004-06-15</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>52434</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-09.xml b/metadata/glsa/glsa-200406-09.xml
index b0e6b0e5d294..7b8cc6023347 100644
--- a/metadata/glsa/glsa-200406-09.xml
+++ b/metadata/glsa/glsa-200406-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">www-apps/horde-chora</product>
   <announced>2004-06-15</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>53800</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-10.xml b/metadata/glsa/glsa-200406-10.xml
index 78647b228ca5..b5bbb1387bee 100644
--- a/metadata/glsa/glsa-200406-10.xml
+++ b/metadata/glsa/glsa-200406-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gallery</product>
   <announced>2004-06-15</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>52798</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-11.xml b/metadata/glsa/glsa-200406-11.xml
index bde9abcc220b..315c962ee716 100644
--- a/metadata/glsa/glsa-200406-11.xml
+++ b/metadata/glsa/glsa-200406-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">horde-imp</product>
   <announced>2004-06-16</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>53862</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-12.xml b/metadata/glsa/glsa-200406-12.xml
index 3838de006767..1c56fd779d0f 100644
--- a/metadata/glsa/glsa-200406-12.xml
+++ b/metadata/glsa/glsa-200406-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">webmin</product>
   <announced>2004-06-16</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>53375</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-13.xml b/metadata/glsa/glsa-200406-13.xml
index b1225bd50e37..8f81e1499a17 100644
--- a/metadata/glsa/glsa-200406-13.xml
+++ b/metadata/glsa/glsa-200406-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">squid</product>
   <announced>2004-06-17</announced>
-  <revised>2004-09-02: 02</revised>
+  <revised count="02">2004-09-02</revised>
   <bug>53367</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-14.xml b/metadata/glsa/glsa-200406-14.xml
index 8072c3d22e9f..87e9fdb1855c 100644
--- a/metadata/glsa/glsa-200406-14.xml
+++ b/metadata/glsa/glsa-200406-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">aspell</product>
   <announced>2004-06-17</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>53389</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-15.xml b/metadata/glsa/glsa-200406-15.xml
index f2ccee206c14..80ea283d0b0c 100644
--- a/metadata/glsa/glsa-200406-15.xml
+++ b/metadata/glsa/glsa-200406-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Usermin</product>
   <announced>2004-06-18</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>54030</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-16.xml b/metadata/glsa/glsa-200406-16.xml
index dc196c78317d..b81f203fad2b 100644
--- a/metadata/glsa/glsa-200406-16.xml
+++ b/metadata/glsa/glsa-200406-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Apache</product>
   <announced>2004-06-21</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>53544</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-17.xml b/metadata/glsa/glsa-200406-17.xml
index 7bc7e6786490..7768236bf810 100644
--- a/metadata/glsa/glsa-200406-17.xml
+++ b/metadata/glsa/glsa-200406-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">IPsec-Tools</product>
   <announced>2004-06-22</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>53915</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-18.xml b/metadata/glsa/glsa-200406-18.xml
index b293ec71ad43..96511680d3ba 100644
--- a/metadata/glsa/glsa-200406-18.xml
+++ b/metadata/glsa/glsa-200406-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gzip</product>
   <announced>2004-06-24</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>54890</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-19.xml b/metadata/glsa/glsa-200406-19.xml
index 90df51d24cd1..7083de8de6eb 100644
--- a/metadata/glsa/glsa-200406-19.xml
+++ b/metadata/glsa/glsa-200406-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">giFT-FastTrack</product>
   <announced>2004-06-24</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>54452</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-20.xml b/metadata/glsa/glsa-200406-20.xml
index 03a64e3eea57..b442a8057d7b 100644
--- a/metadata/glsa/glsa-200406-20.xml
+++ b/metadata/glsa/glsa-200406-20.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Openswan</product>
   <announced>2004-06-25</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <access>remote</access>
   <affected>
     <package name="net-misc/freeswan" auto="yes" arch="*">
diff --git a/metadata/glsa/glsa-200406-21.xml b/metadata/glsa/glsa-200406-21.xml
index d02b35055fb9..3b01b15c27ff 100644
--- a/metadata/glsa/glsa-200406-21.xml
+++ b/metadata/glsa/glsa-200406-21.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2004-06-29</announced>
-  <revised>2004-06-29: 01</revised>
+  <revised count="01">2004-06-29</revised>
   <bug>52744</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200406-22.xml b/metadata/glsa/glsa-200406-22.xml
index 5ff727bdaa8c..f58cfbfc2420 100644
--- a/metadata/glsa/glsa-200406-22.xml
+++ b/metadata/glsa/glsa-200406-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Pavuk</product>
   <announced>2004-06-30</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <access>remote</access>
   <affected>
     <package name="net-misc/pavuk" auto="yes" arch="*">
diff --git a/metadata/glsa/glsa-200407-01.xml b/metadata/glsa/glsa-200407-01.xml
index ff68388d9507..06a82445316d 100644
--- a/metadata/glsa/glsa-200407-01.xml
+++ b/metadata/glsa/glsa-200407-01.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">esearch</product>
   <announced>2004-07-01</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>55424</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-02.xml b/metadata/glsa/glsa-200407-02.xml
index fe44d7c0eba1..297daa0e0bec 100644
--- a/metadata/glsa/glsa-200407-02.xml
+++ b/metadata/glsa/glsa-200407-02.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Kernel</product>
   <announced>2004-07-03</announced>
-  <revised>2011-03-27: 04</revised>
+  <revised count="04">2011-03-27</revised>
   <bug>47881</bug>
   <bug>49637</bug>
   <bug>53804</bug>
diff --git a/metadata/glsa/glsa-200407-03.xml b/metadata/glsa/glsa-200407-03.xml
index 2554ce37b94f..4375a5008541 100644
--- a/metadata/glsa/glsa-200407-03.xml
+++ b/metadata/glsa/glsa-200407-03.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Apache</product>
   <announced>2004-07-04</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>55441</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-04.xml b/metadata/glsa/glsa-200407-04.xml
index 47efc8c80c93..670de15bd3ce 100644
--- a/metadata/glsa/glsa-200407-04.xml
+++ b/metadata/glsa/glsa-200407-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Pure-FTPd</product>
   <announced>2004-07-04</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>54590</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-05.xml b/metadata/glsa/glsa-200407-05.xml
index e4cf0bb6628a..24a17c4638d5 100644
--- a/metadata/glsa/glsa-200407-05.xml
+++ b/metadata/glsa/glsa-200407-05.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild">xdm</product>
   <announced>2004-07-05</announced>
-  <revised>2004-07-05: 01</revised>
+  <revised count="01">2004-07-05</revised>
   <bug>53226</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-06.xml b/metadata/glsa/glsa-200407-06.xml
index 5142b92f1623..75f33bb95d8b 100644
--- a/metadata/glsa/glsa-200407-06.xml
+++ b/metadata/glsa/glsa-200407-06.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2004-07-08</announced>
-  <revised>2004-07-08: 01</revised>
+  <revised count="01">2004-07-08</revised>
   <bug>56307</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-07.xml b/metadata/glsa/glsa-200407-07.xml
index b3a06999f8ba..370a26a4fff6 100644
--- a/metadata/glsa/glsa-200407-07.xml
+++ b/metadata/glsa/glsa-200407-07.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Shorewall</product>
   <announced>2004-07-08</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>55675</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-08.xml b/metadata/glsa/glsa-200407-08.xml
index 0232aaa6e928..8f798dc5ea8b 100644
--- a/metadata/glsa/glsa-200407-08.xml
+++ b/metadata/glsa/glsa-200407-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Ethereal</product>
   <announced>2004-07-09</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>56423</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-09.xml b/metadata/glsa/glsa-200407-09.xml
index 2ef4d2f0c5d3..8e38022dd454 100644
--- a/metadata/glsa/glsa-200407-09.xml
+++ b/metadata/glsa/glsa-200407-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">MoinMoin</product>
   <announced>2004-07-11</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>53126</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-10.xml b/metadata/glsa/glsa-200407-10.xml
index a7a76bac1c61..ff131b4d96ae 100644
--- a/metadata/glsa/glsa-200407-10.xml
+++ b/metadata/glsa/glsa-200407-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rsync</product>
   <announced>2004-07-12</announced>
-  <revised>2004-07-12: 01</revised>
+  <revised count="01">2004-07-12</revised>
   <bug>49534</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-11.xml b/metadata/glsa/glsa-200407-11.xml
index 4bc5da952130..1aae330727e8 100644
--- a/metadata/glsa/glsa-200407-11.xml
+++ b/metadata/glsa/glsa-200407-11.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">app-text/wv</product>
   <announced>2004-07-14</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>56595</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-12.xml b/metadata/glsa/glsa-200407-12.xml
index 05c22c78ccff..0eb420899056 100644
--- a/metadata/glsa/glsa-200407-12.xml
+++ b/metadata/glsa/glsa-200407-12.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Kernel</product>
   <announced>2004-07-14</announced>
-  <revised>2004-10-10: 02</revised>
+  <revised count="02">2004-10-10</revised>
   <bug>55694</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-13.xml b/metadata/glsa/glsa-200407-13.xml
index 7fc892cb59cd..7dd6b6e416b7 100644
--- a/metadata/glsa/glsa-200407-13.xml
+++ b/metadata/glsa/glsa-200407-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">PHP</product>
   <announced>2004-07-15</announced>
-  <revised>2004-07-15: 01</revised>
+  <revised count="01">2004-07-15</revised>
   <bug>56985</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-14.xml b/metadata/glsa/glsa-200407-14.xml
index 26ada0781c32..ddf44b07d392 100644
--- a/metadata/glsa/glsa-200407-14.xml
+++ b/metadata/glsa/glsa-200407-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Unreal Tournament</product>
   <announced>2004-07-19</announced>
-  <revised>2004-07-19: 01</revised>
+  <revised count="01">2004-07-19</revised>
   <bug>54726</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-15.xml b/metadata/glsa/glsa-200407-15.xml
index 8d9b2c42a638..851a55752a22 100644
--- a/metadata/glsa/glsa-200407-15.xml
+++ b/metadata/glsa/glsa-200407-15.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2004-07-20</announced>
-  <revised>2004-07-20: 01</revised>
+  <revised count="01">2004-07-20</revised>
   <bug>56311</bug>
   <bug>56109</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200407-16.xml b/metadata/glsa/glsa-200407-16.xml
index 36f8a2986149..139167009dd3 100644
--- a/metadata/glsa/glsa-200407-16.xml
+++ b/metadata/glsa/glsa-200407-16.xml
@@ -14,7 +14,7 @@
   </synopsis>
   <product type="ebuild">Kernel</product>
   <announced>2004-07-22</announced>
-  <revised>2011-03-27: 03</revised>
+  <revised count="03">2011-03-27</revised>
   <bug>56171</bug>
   <bug>56479</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-200407-17.xml b/metadata/glsa/glsa-200407-17.xml
index 1241478ac6b4..f765f391633b 100644
--- a/metadata/glsa/glsa-200407-17.xml
+++ b/metadata/glsa/glsa-200407-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">net-dialup/l2tpd</product>
   <announced>2004-07-22</announced>
-  <revised>2004-07-22: 01</revised>
+  <revised count="01">2004-07-22</revised>
   <bug>53009</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-18.xml b/metadata/glsa/glsa-200407-18.xml
index d35b3cc2e7f9..126e9fa57233 100644
--- a/metadata/glsa/glsa-200407-18.xml
+++ b/metadata/glsa/glsa-200407-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mod_ssl</product>
   <announced>2004-07-22</announced>
-  <revised>2004-07-22: 01</revised>
+  <revised count="01">2004-07-22</revised>
   <bug>57379</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-19.xml b/metadata/glsa/glsa-200407-19.xml
index d2e7dbd0d1ed..cf9085d675da 100644
--- a/metadata/glsa/glsa-200407-19.xml
+++ b/metadata/glsa/glsa-200407-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Pavuk</product>
   <announced>2004-07-26</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <access>remote</access>
   <affected>
     <package name="net-misc/pavuk" auto="yes" arch="*">
diff --git a/metadata/glsa/glsa-200407-20.xml b/metadata/glsa/glsa-200407-20.xml
index 393b01ca7cfb..0642f08d6067 100644
--- a/metadata/glsa/glsa-200407-20.xml
+++ b/metadata/glsa/glsa-200407-20.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">subversion</product>
   <announced>2004-07-26</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>57747</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-21.xml b/metadata/glsa/glsa-200407-21.xml
index b3b2a97eb54b..e2debe5e913a 100644
--- a/metadata/glsa/glsa-200407-21.xml
+++ b/metadata/glsa/glsa-200407-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Samba</product>
   <announced>2004-07-29</announced>
-  <revised>2004-07-29: 02</revised>
+  <revised count="02">2004-07-29</revised>
   <bug>57962</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-22.xml b/metadata/glsa/glsa-200407-22.xml
index 5f5a8a03b2da..e86f3f41ec1c 100644
--- a/metadata/glsa/glsa-200407-22.xml
+++ b/metadata/glsa/glsa-200407-22.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">dev-db/phpmyadmin</product>
   <announced>2004-07-29</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>57890</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200407-23.xml b/metadata/glsa/glsa-200407-23.xml
index 6f197d1ab86f..fcaed002781a 100644
--- a/metadata/glsa/glsa-200407-23.xml
+++ b/metadata/glsa/glsa-200407-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">SoX</product>
   <announced>2004-07-30</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>58733</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-01.xml b/metadata/glsa/glsa-200408-01.xml
index fabb5c22fc96..f6bfedbbca64 100644
--- a/metadata/glsa/glsa-200408-01.xml
+++ b/metadata/glsa/glsa-200408-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">MPlayer</product>
   <announced>2004-08-01</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>55456</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-02.xml b/metadata/glsa/glsa-200408-02.xml
index f9168c3f1811..44f5ffcf1072 100644
--- a/metadata/glsa/glsa-200408-02.xml
+++ b/metadata/glsa/glsa-200408-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Courier</product>
   <announced>2004-08-04</announced>
-  <revised>2004-08-04: 01</revised>
+  <revised count="01">2004-08-04</revised>
   <bug>58020</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-03.xml b/metadata/glsa/glsa-200408-03.xml
index 421d78b496eb..8d630a436c53 100644
--- a/metadata/glsa/glsa-200408-03.xml
+++ b/metadata/glsa/glsa-200408-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2004-08-05</announced>
-  <revised>2004-08-05: 01</revised>
+  <revised count="01">2004-08-05</revised>
   <bug>59424</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-04.xml b/metadata/glsa/glsa-200408-04.xml
index 023e62a942f2..e3c6fb882a8e 100644
--- a/metadata/glsa/glsa-200408-04.xml
+++ b/metadata/glsa/glsa-200408-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">PuTTY</product>
   <announced>2004-08-05</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>59383</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-05.xml b/metadata/glsa/glsa-200408-05.xml
index 20455548ae9b..dd1cbb7529ea 100644
--- a/metadata/glsa/glsa-200408-05.xml
+++ b/metadata/glsa/glsa-200408-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Opera</product>
   <announced>2004-08-05</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>59503</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-06.xml b/metadata/glsa/glsa-200408-06.xml
index ad33013da8ff..13e3ce248dae 100644
--- a/metadata/glsa/glsa-200408-06.xml
+++ b/metadata/glsa/glsa-200408-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">SpamAssassin</product>
   <announced>2004-08-09</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>59483</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-07.xml b/metadata/glsa/glsa-200408-07.xml
index 3d17987dd512..d03f0152fc39 100644
--- a/metadata/glsa/glsa-200408-07.xml
+++ b/metadata/glsa/glsa-200408-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">horde-imp</product>
   <announced>2004-08-10</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>59336</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-08.xml b/metadata/glsa/glsa-200408-08.xml
index bbb53f2a3a3c..1b7d0c4ef812 100644
--- a/metadata/glsa/glsa-200408-08.xml
+++ b/metadata/glsa/glsa-200408-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Cfengine</product>
   <announced>2004-08-10</announced>
-  <revised>2006-05-22: 05</revised>
+  <revised count="05">2006-05-22</revised>
   <bug>59895</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-09.xml b/metadata/glsa/glsa-200408-09.xml
index a4db0e937a8a..82e7075cb14c 100644
--- a/metadata/glsa/glsa-200408-09.xml
+++ b/metadata/glsa/glsa-200408-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Roundup</product>
   <announced>2004-08-11</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>53494</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-10.xml b/metadata/glsa/glsa-200408-10.xml
index 970b474e10d5..0b5cfe3d8fd7 100644
--- a/metadata/glsa/glsa-200408-10.xml
+++ b/metadata/glsa/glsa-200408-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gv</product>
   <announced>2004-08-12</announced>
-  <revised>2004-08-12: 01</revised>
+  <revised count="01">2004-08-12</revised>
   <bug>59385</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-11.xml b/metadata/glsa/glsa-200408-11.xml
index c55debc8dba7..6fa5e94620c3 100644
--- a/metadata/glsa/glsa-200408-11.xml
+++ b/metadata/glsa/glsa-200408-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Nessus</product>
   <announced>2004-08-12</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>58014</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-12.xml b/metadata/glsa/glsa-200408-12.xml
index 0477527b96c9..86038b2d56e9 100644
--- a/metadata/glsa/glsa-200408-12.xml
+++ b/metadata/glsa/glsa-200408-12.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">gaim</product>
   <announced>2004-08-12</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>60034</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-13.xml b/metadata/glsa/glsa-200408-13.xml
index 769037112f5e..c31dcdbb2536 100644
--- a/metadata/glsa/glsa-200408-13.xml
+++ b/metadata/glsa/glsa-200408-13.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">kde, kdebase, kdelibs</product>
   <announced>2004-08-12</announced>
-  <revised>2004-08-12: 01</revised>
+  <revised count="01">2004-08-12</revised>
   <bug>60068</bug>
   <access>remote and local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-14.xml b/metadata/glsa/glsa-200408-14.xml
index 3aeeb60806b3..d0b4e5b3fb72 100644
--- a/metadata/glsa/glsa-200408-14.xml
+++ b/metadata/glsa/glsa-200408-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2004-08-15</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>60205</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-15.xml b/metadata/glsa/glsa-200408-15.xml
index 1e7c845a2b64..8fd38c398a74 100644
--- a/metadata/glsa/glsa-200408-15.xml
+++ b/metadata/glsa/glsa-200408-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tomcat</product>
   <announced>2004-08-15</announced>
-  <revised>2006-05-22: 04</revised>
+  <revised count="04">2006-05-22</revised>
   <bug>59232</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-16.xml b/metadata/glsa/glsa-200408-16.xml
index 01bccfdc44b7..1e99c098f5ad 100644
--- a/metadata/glsa/glsa-200408-16.xml
+++ b/metadata/glsa/glsa-200408-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">glibc</product>
   <announced>2004-08-16</announced>
-  <revised>2006-05-28: 04</revised>
+  <revised count="04">2006-05-28</revised>
   <bug>59526</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-17.xml b/metadata/glsa/glsa-200408-17.xml
index 69e025bf9f32..e7614c5faaa7 100644
--- a/metadata/glsa/glsa-200408-17.xml
+++ b/metadata/glsa/glsa-200408-17.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">rsync</product>
   <announced>2004-08-17</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>60309</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-18.xml b/metadata/glsa/glsa-200408-18.xml
index 10d0dba60fb9..ae5ed1e8e145 100644
--- a/metadata/glsa/glsa-200408-18.xml
+++ b/metadata/glsa/glsa-200408-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xine-lib</product>
   <announced>2004-08-17</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>59948</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-19.xml b/metadata/glsa/glsa-200408-19.xml
index 6f29d10ab104..268a9c4c9b14 100644
--- a/metadata/glsa/glsa-200408-19.xml
+++ b/metadata/glsa/glsa-200408-19.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">courier-imap</product>
   <announced>2004-08-19</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>60865</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-20.xml b/metadata/glsa/glsa-200408-20.xml
index 4177dc709eaf..eac89e7672bd 100644
--- a/metadata/glsa/glsa-200408-20.xml
+++ b/metadata/glsa/glsa-200408-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Qt</product>
   <announced>2004-08-22</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>60855</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-21.xml b/metadata/glsa/glsa-200408-21.xml
index 5219a7310f3f..bd3e443d0d52 100644
--- a/metadata/glsa/glsa-200408-21.xml
+++ b/metadata/glsa/glsa-200408-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cacti</product>
   <announced>2004-08-23</announced>
-  <revised>2006-05-22: 04</revised>
+  <revised count="04">2006-05-22</revised>
   <bug>60630</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-22.xml b/metadata/glsa/glsa-200408-22.xml
index 70c81e3ee277..dd446b6cab2c 100644
--- a/metadata/glsa/glsa-200408-22.xml
+++ b/metadata/glsa/glsa-200408-22.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">www-client/mozilla, www-client/mozilla-firefox, mail-client/mozilla-thunderbird, www-client/galeon, www-client/epiphany</product>
   <announced>2004-08-23</announced>
-  <revised>2007-12-30: 06</revised>
+  <revised count="06">2007-12-30</revised>
   <bug>57380</bug>
   <bug>59419</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200408-23.xml b/metadata/glsa/glsa-200408-23.xml
index bdd7a0ad316c..2b2e6db826e9 100644
--- a/metadata/glsa/glsa-200408-23.xml
+++ b/metadata/glsa/glsa-200408-23.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">kdelibs</product>
   <announced>2004-08-24</announced>
-  <revised>2004-08-24: 01</revised>
+  <revised count="01">2004-08-24</revised>
   <bug>61389</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-24.xml b/metadata/glsa/glsa-200408-24.xml
index 96195d8123d4..60cb3a7e3200 100644
--- a/metadata/glsa/glsa-200408-24.xml
+++ b/metadata/glsa/glsa-200408-24.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Kernel</product>
   <announced>2004-08-25</announced>
-  <revised>2011-03-27: 03</revised>
+  <revised count="03">2011-03-27</revised>
   <bug>59378</bug>
   <bug>59769</bug>
   <bug>59905</bug>
diff --git a/metadata/glsa/glsa-200408-25.xml b/metadata/glsa/glsa-200408-25.xml
index 7ae2be9854b8..7d9f2cba967f 100644
--- a/metadata/glsa/glsa-200408-25.xml
+++ b/metadata/glsa/glsa-200408-25.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">MoinMoin</product>
   <announced>2004-08-26</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>57913</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-26.xml b/metadata/glsa/glsa-200408-26.xml
index f4111fb99052..aebe24910d39 100644
--- a/metadata/glsa/glsa-200408-26.xml
+++ b/metadata/glsa/glsa-200408-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">zlib</product>
   <announced>2004-08-27</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>61749</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200408-27.xml b/metadata/glsa/glsa-200408-27.xml
index a79c46db6c0e..a4bd5cad3c6c 100644
--- a/metadata/glsa/glsa-200408-27.xml
+++ b/metadata/glsa/glsa-200408-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Gaim</product>
   <announced>2004-08-27</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>61457</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-01.xml b/metadata/glsa/glsa-200409-01.xml
index fc933d981063..f41f3ead985e 100644
--- a/metadata/glsa/glsa-200409-01.xml
+++ b/metadata/glsa/glsa-200409-01.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild">vpopmail</product>
   <announced>2004-09-01</announced>
-  <revised>2004-09-01: 01</revised>
+  <revised count="01">2004-09-01</revised>
   <bug>60844</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-02.xml b/metadata/glsa/glsa-200409-02.xml
index fd3612b63908..7eec2681ea8e 100644
--- a/metadata/glsa/glsa-200409-02.xml
+++ b/metadata/glsa/glsa-200409-02.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">MySQL</product>
   <announced>2004-09-01</announced>
-  <revised>2004-09-01: 01</revised>
+  <revised count="01">2004-09-01</revised>
   <bug>60744</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-03.xml b/metadata/glsa/glsa-200409-03.xml
index d8b934d95ec8..0480e52e4fc0 100644
--- a/metadata/glsa/glsa-200409-03.xml
+++ b/metadata/glsa/glsa-200409-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Python</product>
   <announced>2004-09-02</announced>
-  <revised>2004-09-02: 01</revised>
+  <revised count="01">2004-09-02</revised>
   <bug>62440</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-04.xml b/metadata/glsa/glsa-200409-04.xml
index c0127d9a4020..178c58c27db7 100644
--- a/metadata/glsa/glsa-200409-04.xml
+++ b/metadata/glsa/glsa-200409-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">squid</product>
   <announced>2004-09-02</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>61280</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-05.xml b/metadata/glsa/glsa-200409-05.xml
index 8cbdaacbefd3..25991ca02873 100644
--- a/metadata/glsa/glsa-200409-05.xml
+++ b/metadata/glsa/glsa-200409-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Gallery</product>
   <announced>2004-09-02</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>60742</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-06.xml b/metadata/glsa/glsa-200409-06.xml
index 1d84f3c72ae5..2443ded9ce96 100644
--- a/metadata/glsa/glsa-200409-06.xml
+++ b/metadata/glsa/glsa-200409-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">eGroupWare</product>
   <announced>2004-09-02</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>61510</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-07.xml b/metadata/glsa/glsa-200409-07.xml
index 7a6825f9269c..8e0ca9e0706d 100644
--- a/metadata/glsa/glsa-200409-07.xml
+++ b/metadata/glsa/glsa-200409-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xv</product>
   <announced>2004-09-03</announced>
-  <revised>2004-09-03: 01</revised>
+  <revised count="01">2004-09-03</revised>
   <bug>61619</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-08.xml b/metadata/glsa/glsa-200409-08.xml
index 2d25653d60dc..455efcd14b13 100644
--- a/metadata/glsa/glsa-200409-08.xml
+++ b/metadata/glsa/glsa-200409-08.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">dev-lang/ruby</product>
   <announced>2004-09-03</announced>
-  <revised>2004-09-03: 01</revised>
+  <revised count="01">2004-09-03</revised>
   <bug>60525</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-09.xml b/metadata/glsa/glsa-200409-09.xml
index f6a42c1d9fd0..2b8fe41de343 100644
--- a/metadata/glsa/glsa-200409-09.xml
+++ b/metadata/glsa/glsa-200409-09.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2004-09-06</announced>
-  <revised>2004-09-06: 01</revised>
+  <revised count="01">2004-09-06</revised>
   <bug>62417</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-10.xml b/metadata/glsa/glsa-200409-10.xml
index 8aa164ede534..32ff648884f3 100644
--- a/metadata/glsa/glsa-200409-10.xml
+++ b/metadata/glsa/glsa-200409-10.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">multi-gnome-terminal</product>
   <announced>2004-09-06</announced>
-  <revised>2004-09-06: 01</revised>
+  <revised count="01">2004-09-06</revised>
   <bug>62322</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-11.xml b/metadata/glsa/glsa-200409-11.xml
index 49ed2dfd7af2..6cfee5e192e2 100644
--- a/metadata/glsa/glsa-200409-11.xml
+++ b/metadata/glsa/glsa-200409-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">star</product>
   <announced>2004-09-07</announced>
-  <revised>2006-05-30: 03</revised>
+  <revised count="03">2006-05-30</revised>
   <bug>61797</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-12.xml b/metadata/glsa/glsa-200409-12.xml
index 79a8fdf8c9ca..327f6ceddc03 100644
--- a/metadata/glsa/glsa-200409-12.xml
+++ b/metadata/glsa/glsa-200409-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">imagemagick imlib</product>
   <announced>2004-09-08</announced>
-  <revised>2004-09-08: 01</revised>
+  <revised count="01">2004-09-08</revised>
   <bug>62309</bug>
   <bug>62487</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200409-13.xml b/metadata/glsa/glsa-200409-13.xml
index fe9e59d8b4ed..c37af5d57c51 100644
--- a/metadata/glsa/glsa-200409-13.xml
+++ b/metadata/glsa/glsa-200409-13.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">lha</product>
   <announced>2004-09-08</announced>
-  <revised>2006-10-20: 02</revised>
+  <revised count="02">2006-10-20</revised>
   <bug>62618</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-14.xml b/metadata/glsa/glsa-200409-14.xml
index 06f270e66b62..22fa006b226f 100644
--- a/metadata/glsa/glsa-200409-14.xml
+++ b/metadata/glsa/glsa-200409-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">samba</product>
   <announced>2004-09-09</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>62476</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-15.xml b/metadata/glsa/glsa-200409-15.xml
index 886333fa4890..c1f1ed6418e1 100644
--- a/metadata/glsa/glsa-200409-15.xml
+++ b/metadata/glsa/glsa-200409-15.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild">Usermin</product>
   <announced>2004-09-12</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>63167</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-16.xml b/metadata/glsa/glsa-200409-16.xml
index 420837d7c779..6bb849a868df 100644
--- a/metadata/glsa/glsa-200409-16.xml
+++ b/metadata/glsa/glsa-200409-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Samba</product>
   <announced>2004-09-13</announced>
-  <revised>2004-09-13: 01</revised>
+  <revised count="01">2004-09-13</revised>
   <access>remote</access>
   <affected>
     <package name="net-fs/samba" auto="yes" arch="*">
diff --git a/metadata/glsa/glsa-200409-17.xml b/metadata/glsa/glsa-200409-17.xml
index ba472be79a2a..4daaa7c6ae16 100644
--- a/metadata/glsa/glsa-200409-17.xml
+++ b/metadata/glsa/glsa-200409-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">SUS</product>
   <announced>2004-09-14</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>63927</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-18.xml b/metadata/glsa/glsa-200409-18.xml
index 99683ad32d8e..82e3be9e856e 100644
--- a/metadata/glsa/glsa-200409-18.xml
+++ b/metadata/glsa/glsa-200409-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cdrtools</product>
   <announced>2004-09-14</announced>
-  <revised>2004-09-14: 01</revised>
+  <revised count="01">2004-09-14</revised>
   <bug>63187</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-19.xml b/metadata/glsa/glsa-200409-19.xml
index 53ae7d97bfd5..4838df07b581 100644
--- a/metadata/glsa/glsa-200409-19.xml
+++ b/metadata/glsa/glsa-200409-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">heimdal</product>
   <announced>2004-09-16</announced>
-  <revised>2004-09-16: 01</revised>
+  <revised count="01">2004-09-16</revised>
   <bug>61412</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-20.xml b/metadata/glsa/glsa-200409-20.xml
index 16684aeb5054..89fc3b3c08a9 100644
--- a/metadata/glsa/glsa-200409-20.xml
+++ b/metadata/glsa/glsa-200409-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mpg123</product>
   <announced>2004-09-16</announced>
-  <revised>2004-09-16: 01</revised>
+  <revised count="01">2004-09-16</revised>
   <bug>63079</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-21.xml b/metadata/glsa/glsa-200409-21.xml
index 58fb0c8e338d..6345f083d8e9 100644
--- a/metadata/glsa/glsa-200409-21.xml
+++ b/metadata/glsa/glsa-200409-21.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">apache</product>
   <announced>2004-09-16</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>62626</bug>
   <bug>63948</bug>
   <bug>64145</bug>
diff --git a/metadata/glsa/glsa-200409-22.xml b/metadata/glsa/glsa-200409-22.xml
index 5954d35e8366..f2e7831f0edb 100644
--- a/metadata/glsa/glsa-200409-22.xml
+++ b/metadata/glsa/glsa-200409-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpGroupWare</product>
   <announced>2004-09-16</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>63063</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-23.xml b/metadata/glsa/glsa-200409-23.xml
index b9710d6e991f..06b92cfe9b53 100644
--- a/metadata/glsa/glsa-200409-23.xml
+++ b/metadata/glsa/glsa-200409-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">snipsnap</product>
   <announced>2004-09-17</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>64154</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-24.xml b/metadata/glsa/glsa-200409-24.xml
index c45834b2bed4..a9938e0e082a 100644
--- a/metadata/glsa/glsa-200409-24.xml
+++ b/metadata/glsa/glsa-200409-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">foomatic</product>
   <announced>2004-09-20</announced>
-  <revised>2004-09-20: 01</revised>
+  <revised count="01">2004-09-20</revised>
   <bug>64166</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-25.xml b/metadata/glsa/glsa-200409-25.xml
index 6c97b08df1d9..1bb2e72b5269 100644
--- a/metadata/glsa/glsa-200409-25.xml
+++ b/metadata/glsa/glsa-200409-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">CUPS</product>
   <announced>2004-09-20</announced>
-  <revised>2004-09-21: 02</revised>
+  <revised count="02">2004-09-21</revised>
   <bug>64168</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-26.xml b/metadata/glsa/glsa-200409-26.xml
index c8c29e8683a3..d59247b06656 100644
--- a/metadata/glsa/glsa-200409-26.xml
+++ b/metadata/glsa/glsa-200409-26.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Mozilla</product>
   <announced>2004-09-20</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>63996</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-27.xml b/metadata/glsa/glsa-200409-27.xml
index ca50fe5dc141..0c6bcad800ac 100644
--- a/metadata/glsa/glsa-200409-27.xml
+++ b/metadata/glsa/glsa-200409-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">glftpd</product>
   <announced>2004-09-21</announced>
-  <revised>2004-09-21: 01</revised>
+  <revised count="01">2004-09-21</revised>
   <bug>64809</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-28.xml b/metadata/glsa/glsa-200409-28.xml
index d9bb49684f87..374361b9bbcf 100644
--- a/metadata/glsa/glsa-200409-28.xml
+++ b/metadata/glsa/glsa-200409-28.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">gtk+</product>
   <announced>2004-09-21</announced>
-  <revised>2004-09-21: 01</revised>
+  <revised count="01">2004-09-21</revised>
   <bug>64230</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-29.xml b/metadata/glsa/glsa-200409-29.xml
index 51161d8b05d5..717b6a7a7455 100644
--- a/metadata/glsa/glsa-200409-29.xml
+++ b/metadata/glsa/glsa-200409-29.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">FreeRADIUS</product>
   <announced>2004-09-22</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>60587</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-30.xml b/metadata/glsa/glsa-200409-30.xml
index f05c9eb6b9d6..a32d5ff7261d 100644
--- a/metadata/glsa/glsa-200409-30.xml
+++ b/metadata/glsa/glsa-200409-30.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-lib</product>
   <announced>2004-09-22</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>64348</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-31.xml b/metadata/glsa/glsa-200409-31.xml
index 09aa2b7bd628..9dd34b5cfc52 100644
--- a/metadata/glsa/glsa-200409-31.xml
+++ b/metadata/glsa/glsa-200409-31.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">jabberd</product>
   <announced>2004-09-23</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>64741</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-32.xml b/metadata/glsa/glsa-200409-32.xml
index f6084efd9048..45ac42840f58 100644
--- a/metadata/glsa/glsa-200409-32.xml
+++ b/metadata/glsa/glsa-200409-32.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">getmail</product>
   <announced>2004-09-23</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>64643</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-33.xml b/metadata/glsa/glsa-200409-33.xml
index aa79eea5aebd..f7de696a1ded 100644
--- a/metadata/glsa/glsa-200409-33.xml
+++ b/metadata/glsa/glsa-200409-33.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">net=www/apache</product>
   <announced>2004-09-24</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>64804</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-34.xml b/metadata/glsa/glsa-200409-34.xml
index 022ee134ea24..5ba3029237bc 100644
--- a/metadata/glsa/glsa-200409-34.xml
+++ b/metadata/glsa/glsa-200409-34.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild">X</product>
   <announced>2004-09-27</announced>
-  <revised>2006-05-27: 02</revised>
+  <revised count="02">2006-05-27</revised>
   <bug>64152</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200409-35.xml b/metadata/glsa/glsa-200409-35.xml
index 90f8d1e36b57..341aca50c98d 100644
--- a/metadata/glsa/glsa-200409-35.xml
+++ b/metadata/glsa/glsa-200409-35.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Subversion</product>
   <announced>2004-09-29</announced>
-  <revised>2004-09-29: 01</revised>
+  <revised count="01">2004-09-29</revised>
   <bug>65085</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-01.xml b/metadata/glsa/glsa-200410-01.xml
index 9036c18303da..592bd035b569 100644
--- a/metadata/glsa/glsa-200410-01.xml
+++ b/metadata/glsa/glsa-200410-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sharutils</product>
   <announced>2004-10-01</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>65773</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-02.xml b/metadata/glsa/glsa-200410-02.xml
index f88fc0a04503..afcab45310f4 100644
--- a/metadata/glsa/glsa-200410-02.xml
+++ b/metadata/glsa/glsa-200410-02.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Netpbm</product>
   <announced>2004-10-04</announced>
-  <revised>2004-10-04: 01</revised>
+  <revised count="01">2004-10-04</revised>
   <bug>65647</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-03.xml b/metadata/glsa/glsa-200410-03.xml
index f0d45ced2b4a..02ebe45e7a68 100644
--- a/metadata/glsa/glsa-200410-03.xml
+++ b/metadata/glsa/glsa-200410-03.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">netkit-telnetd</product>
   <announced>2004-10-05</announced>
-  <revised>2004-10-05: 01</revised>
+  <revised count="01">2004-10-05</revised>
   <bug>64632</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-04.xml b/metadata/glsa/glsa-200410-04.xml
index 33074e838adf..1df42a038714 100644
--- a/metadata/glsa/glsa-200410-04.xml
+++ b/metadata/glsa/glsa-200410-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">PHP</product>
   <announced>2004-10-06</announced>
-  <revised>2004-10-06: 01</revised>
+  <revised count="01">2004-10-06</revised>
   <bug>64223</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-05.xml b/metadata/glsa/glsa-200410-05.xml
index d2649f17889b..02ff6e97f81e 100644
--- a/metadata/glsa/glsa-200410-05.xml
+++ b/metadata/glsa/glsa-200410-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Cyrus-SASL</product>
   <announced>2004-10-07</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>56016</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-06.xml b/metadata/glsa/glsa-200410-06.xml
index 855e26ac6311..1b6049bceb15 100644
--- a/metadata/glsa/glsa-200410-06.xml
+++ b/metadata/glsa/glsa-200410-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cups</product>
   <announced>2004-10-09</announced>
-  <revised>2004-10-09: 01</revised>
+  <revised count="01">2004-10-09</revised>
   <bug>66501</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-07.xml b/metadata/glsa/glsa-200410-07.xml
index 1f513a9b46e5..cdf7277cdb53 100644
--- a/metadata/glsa/glsa-200410-07.xml
+++ b/metadata/glsa/glsa-200410-07.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">ed</product>
   <announced>2004-10-09</announced>
-  <revised>2004-10-09: 01</revised>
+  <revised count="01">2004-10-09</revised>
   <bug>66400</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-08.xml b/metadata/glsa/glsa-200410-08.xml
index 12dac3bb3cbd..c218f0655791 100644
--- a/metadata/glsa/glsa-200410-08.xml
+++ b/metadata/glsa/glsa-200410-08.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">ncompress</product>
   <announced>2004-10-09</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>66251</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-09.xml b/metadata/glsa/glsa-200410-09.xml
index c5ac9bd2c5e8..506bb70ffb87 100644
--- a/metadata/glsa/glsa-200410-09.xml
+++ b/metadata/glsa/glsa-200410-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lesstif</product>
   <announced>2004-10-09</announced>
-  <revised>2004-10-09: 01</revised>
+  <revised count="01">2004-10-09</revised>
   <bug>66647</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-10.xml b/metadata/glsa/glsa-200410-10.xml
index 35535da80f9a..03090614692a 100644
--- a/metadata/glsa/glsa-200410-10.xml
+++ b/metadata/glsa/glsa-200410-10.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">gettext</product>
   <announced>2004-10-10</announced>
-  <revised>2006-05-22: 04</revised>
+  <revised count="04">2006-05-22</revised>
   <bug>66355</bug>
   <bug>85766</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-200410-11.xml b/metadata/glsa/glsa-200410-11.xml
index 2f2120174bd0..5d60dfae035b 100644
--- a/metadata/glsa/glsa-200410-11.xml
+++ b/metadata/glsa/glsa-200410-11.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">tiff</product>
   <announced>2004-10-13</announced>
-  <revised>2004-10-13: 01</revised>
+  <revised count="01">2004-10-13</revised>
   <access>remote</access>
   <affected>
     <package name="media-libs/tiff" auto="yes" arch="*">
diff --git a/metadata/glsa/glsa-200410-12.xml b/metadata/glsa/glsa-200410-12.xml
index c25cbd1897e6..b2f1cab1d94a 100644
--- a/metadata/glsa/glsa-200410-12.xml
+++ b/metadata/glsa/glsa-200410-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wordpress</product>
   <announced>2004-10-14</announced>
-  <revised>2006-05-22: 04</revised>
+  <revised count="04">2006-05-22</revised>
   <bug>65798</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-13.xml b/metadata/glsa/glsa-200410-13.xml
index d1e21c0c9434..beb54b04098a 100644
--- a/metadata/glsa/glsa-200410-13.xml
+++ b/metadata/glsa/glsa-200410-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bnc</product>
   <announced>2004-10-15</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>66912</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-14.xml b/metadata/glsa/glsa-200410-14.xml
index 42ac75ae7a4f..ea26984ea23d 100644
--- a/metadata/glsa/glsa-200410-14.xml
+++ b/metadata/glsa/glsa-200410-14.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">phpMyAdmin</product>
   <announced>2004-10-18</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>67409</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-15.xml b/metadata/glsa/glsa-200410-15.xml
index b4284006ae8f..81240a259bef 100644
--- a/metadata/glsa/glsa-200410-15.xml
+++ b/metadata/glsa/glsa-200410-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">squid</product>
   <announced>2004-10-18</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>67167</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-16.xml b/metadata/glsa/glsa-200410-16.xml
index 0e70f2d75025..a27e3ca66a79 100644
--- a/metadata/glsa/glsa-200410-16.xml
+++ b/metadata/glsa/glsa-200410-16.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">PostgreSQL</product>
   <announced>2004-10-18</announced>
-  <revised>2009-05-28: 04</revised>
+  <revised count="04">2009-05-28</revised>
   <bug>66371</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-17.xml b/metadata/glsa/glsa-200410-17.xml
index f5ac3e2d8357..1e39209c59eb 100644
--- a/metadata/glsa/glsa-200410-17.xml
+++ b/metadata/glsa/glsa-200410-17.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">openoffice</product>
   <announced>2004-10-20</announced>
-  <revised>2004-10-20: 01</revised>
+  <revised count="01">2004-10-20</revised>
   <bug>63556</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-18.xml b/metadata/glsa/glsa-200410-18.xml
index aa02a924c1a2..2454ef90474e 100644
--- a/metadata/glsa/glsa-200410-18.xml
+++ b/metadata/glsa/glsa-200410-18.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Ghostscript</product>
   <announced>2004-10-20</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>66357</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-19.xml b/metadata/glsa/glsa-200410-19.xml
index 4da854efb97c..97d3496f10a3 100644
--- a/metadata/glsa/glsa-200410-19.xml
+++ b/metadata/glsa/glsa-200410-19.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">glibc</product>
   <announced>2004-10-21</announced>
-  <revised>2004-10-21: 01</revised>
+  <revised count="01">2004-10-21</revised>
   <bug>66358</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-20.xml b/metadata/glsa/glsa-200410-20.xml
index 6d74eea6c6be..d8b98b45600d 100644
--- a/metadata/glsa/glsa-200410-20.xml
+++ b/metadata/glsa/glsa-200410-20.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Xpdf</product>
   <announced>2004-10-21</announced>
-  <revised>2004-11-06: 02</revised>
+  <revised count="02">2004-11-06</revised>
   <bug>69662</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-21.xml b/metadata/glsa/glsa-200410-21.xml
index 216ced9ce03b..f9379704c09e 100644
--- a/metadata/glsa/glsa-200410-21.xml
+++ b/metadata/glsa/glsa-200410-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">apache</product>
   <announced>2004-10-21</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>66807</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-22.xml b/metadata/glsa/glsa-200410-22.xml
index bb5f90055e0a..52db20acb4be 100644
--- a/metadata/glsa/glsa-200410-22.xml
+++ b/metadata/glsa/glsa-200410-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">MySQL</product>
   <announced>2004-10-24</announced>
-  <revised>2004-10-24: 01</revised>
+  <revised count="01">2004-10-24</revised>
   <bug>67062</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-23.xml b/metadata/glsa/glsa-200410-23.xml
index 86e1abb1d845..25b44d6c2b07 100644
--- a/metadata/glsa/glsa-200410-23.xml
+++ b/metadata/glsa/glsa-200410-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gaim</product>
   <announced>2004-10-24</announced>
-  <revised>2004-10-24: 01</revised>
+  <revised count="01">2004-10-24</revised>
   <bug>68271</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-24.xml b/metadata/glsa/glsa-200410-24.xml
index 704c6031db12..f05a81d6ee3c 100644
--- a/metadata/glsa/glsa-200410-24.xml
+++ b/metadata/glsa/glsa-200410-24.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2004-10-25</announced>
-  <revised>2005-01-30: 02</revised>
+  <revised count="02">2005-01-30</revised>
   <bug>66359</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-25.xml b/metadata/glsa/glsa-200410-25.xml
index 6900e4ca6f82..21b97c5be877 100644
--- a/metadata/glsa/glsa-200410-25.xml
+++ b/metadata/glsa/glsa-200410-25.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Netatalk</product>
   <announced>2004-10-25</announced>
-  <revised>2004-10-25: 01</revised>
+  <revised count="01">2004-10-25</revised>
   <bug>66370</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-26.xml b/metadata/glsa/glsa-200410-26.xml
index 23260bba87f9..5c3cdf3ed815 100644
--- a/metadata/glsa/glsa-200410-26.xml
+++ b/metadata/glsa/glsa-200410-26.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">socat</product>
   <announced>2004-10-25</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>68547</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-27.xml b/metadata/glsa/glsa-200410-27.xml
index 167b81b691ac..8e32d7e21b2d 100644
--- a/metadata/glsa/glsa-200410-27.xml
+++ b/metadata/glsa/glsa-200410-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mpg123</product>
   <announced>2004-10-27</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>68343</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-28.xml b/metadata/glsa/glsa-200410-28.xml
index aa67382321de..1a70dac06277 100644
--- a/metadata/glsa/glsa-200410-28.xml
+++ b/metadata/glsa/glsa-200410-28.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">rssh</product>
   <announced>2004-10-27</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>66988</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-29.xml b/metadata/glsa/glsa-200410-29.xml
index dbafcbe1108f..eedde950e8a8 100644
--- a/metadata/glsa/glsa-200410-29.xml
+++ b/metadata/glsa/glsa-200410-29.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">putty</product>
   <announced>2004-10-27</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>69123</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200410-30.xml b/metadata/glsa/glsa-200410-30.xml
index 96985ef737f2..0acdd74f14d1 100644
--- a/metadata/glsa/glsa-200410-30.xml
+++ b/metadata/glsa/glsa-200410-30.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">GPdf</product>
   <announced>2004-10-28</announced>
-  <revised>2004-11-06: 02</revised>
+  <revised count="02">2004-11-06</revised>
   <bug>68558</bug>
   <bug>68665</bug>
   <bug>68571</bug>
diff --git a/metadata/glsa/glsa-200410-31.xml b/metadata/glsa/glsa-200410-31.xml
index bf9a71dc697c..0b3c9b01b943 100644
--- a/metadata/glsa/glsa-200410-31.xml
+++ b/metadata/glsa/glsa-200410-31.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Archive::Zip</product>
   <announced>2004-10-29</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>68616</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-01.xml b/metadata/glsa/glsa-200411-01.xml
index 710526a32e57..6f967b16ef3e 100644
--- a/metadata/glsa/glsa-200411-01.xml
+++ b/metadata/glsa/glsa-200411-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ppp</product>
   <announced>2004-11-01</announced>
-  <revised>2004-11-02: 02</revised>
+  <revised count="02">2004-11-02</revised>
   <bug>69152</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-02.xml b/metadata/glsa/glsa-200411-02.xml
index d0b2018aad4c..62383da4e78e 100644
--- a/metadata/glsa/glsa-200411-02.xml
+++ b/metadata/glsa/glsa-200411-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cherokee</product>
   <announced>2004-11-01</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>67667</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-03.xml b/metadata/glsa/glsa-200411-03.xml
index 3dd788f2f2ca..368ae1bfbd08 100644
--- a/metadata/glsa/glsa-200411-03.xml
+++ b/metadata/glsa/glsa-200411-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">apache</product>
   <announced>2004-11-02</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>68564</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-04.xml b/metadata/glsa/glsa-200411-04.xml
index 6b110a084d68..20990b150221 100644
--- a/metadata/glsa/glsa-200411-04.xml
+++ b/metadata/glsa/glsa-200411-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">speedtouch</product>
   <announced>2004-11-02</announced>
-  <revised>2004-11-02: 01</revised>
+  <revised count="01">2004-11-02</revised>
   <bug>68436</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-05.xml b/metadata/glsa/glsa-200411-05.xml
index e1b3427d37a6..ea637eca71b3 100644
--- a/metadata/glsa/glsa-200411-05.xml
+++ b/metadata/glsa/glsa-200411-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libxml2</product>
   <announced>2004-11-02</announced>
-  <revised>2004-11-02: 01</revised>
+  <revised count="01">2004-11-02</revised>
   <bug>69154</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-06.xml b/metadata/glsa/glsa-200411-06.xml
index af017f038c1f..f0d1df810fb5 100644
--- a/metadata/glsa/glsa-200411-06.xml
+++ b/metadata/glsa/glsa-200411-06.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">MIME-tools</product>
   <announced>2004-11-02</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>69181</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-07.xml b/metadata/glsa/glsa-200411-07.xml
index fbad50e58bbc..5463bdb35b8a 100644
--- a/metadata/glsa/glsa-200411-07.xml
+++ b/metadata/glsa/glsa-200411-07.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Proxytunnel</product>
   <announced>2004-11-03</announced>
-  <revised>2004-11-03: 01</revised>
+  <revised count="01">2004-11-03</revised>
   <bug>69379</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-08.xml b/metadata/glsa/glsa-200411-08.xml
index 078457b78cfe..5236824f617a 100644
--- a/metadata/glsa/glsa-200411-08.xml
+++ b/metadata/glsa/glsa-200411-08.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">GD</product>
   <announced>2004-11-03</announced>
-  <revised>2004-11-03: 01</revised>
+  <revised count="01">2004-11-03</revised>
   <bug>69070</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-09.xml b/metadata/glsa/glsa-200411-09.xml
index 0a2b29e2bee8..3d8b4b922763 100644
--- a/metadata/glsa/glsa-200411-09.xml
+++ b/metadata/glsa/glsa-200411-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">shadow</product>
   <announced>2004-11-04</announced>
-  <revised>2004-11-05: 02</revised>
+  <revised count="02">2004-11-05</revised>
   <bug>69212</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-10.xml b/metadata/glsa/glsa-200411-10.xml
index 16bfcfc6e2d2..9473bdac5d52 100644
--- a/metadata/glsa/glsa-200411-10.xml
+++ b/metadata/glsa/glsa-200411-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gallery</product>
   <announced>2004-11-06</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>69904</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-11.xml b/metadata/glsa/glsa-200411-11.xml
index 3be22123d90b..db0a5d1a0217 100644
--- a/metadata/glsa/glsa-200411-11.xml
+++ b/metadata/glsa/glsa-200411-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">imagemagick</product>
   <announced>2004-11-06</announced>
-  <revised>2004-11-06: 01</revised>
+  <revised count="01">2004-11-06</revised>
   <bug>69825</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-12.xml b/metadata/glsa/glsa-200411-12.xml
index 0a7575585742..4bafdda5968d 100644
--- a/metadata/glsa/glsa-200411-12.xml
+++ b/metadata/glsa/glsa-200411-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">zgv</product>
   <announced>2004-11-07</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>69150</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-13.xml b/metadata/glsa/glsa-200411-13.xml
index ba3644e00f4f..2c5d7845bcc2 100644
--- a/metadata/glsa/glsa-200411-13.xml
+++ b/metadata/glsa/glsa-200411-13.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">portage gentoolkit</product>
   <announced>2004-11-07</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>68846</bug>
   <bug>69147</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-200411-14.xml b/metadata/glsa/glsa-200411-14.xml
index 4e06a01c7e86..bb0f1551b2f7 100644
--- a/metadata/glsa/glsa-200411-14.xml
+++ b/metadata/glsa/glsa-200411-14.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">kaffeine gxine</product>
   <announced>2004-11-07</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>69663</bug>
   <bug>70055</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200411-15.xml b/metadata/glsa/glsa-200411-15.xml
index 773294f099e6..431a862755fb 100644
--- a/metadata/glsa/glsa-200411-15.xml
+++ b/metadata/glsa/glsa-200411-15.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild">OpenSSL</product>
   <announced>2004-11-08</announced>
-  <revised>2006-08-23: 02</revised>
+  <revised count="02">2006-08-23</revised>
   <bug>68404</bug>
   <bug>68407</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-200411-16.xml b/metadata/glsa/glsa-200411-16.xml
index 183641be2a67..f526ea900f97 100644
--- a/metadata/glsa/glsa-200411-16.xml
+++ b/metadata/glsa/glsa-200411-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">zip</product>
   <announced>2004-11-09</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>70227</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-17.xml b/metadata/glsa/glsa-200411-17.xml
index 7637eb6c3a89..3ae85fe3404d 100644
--- a/metadata/glsa/glsa-200411-17.xml
+++ b/metadata/glsa/glsa-200411-17.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">mtink</product>
   <announced>2004-11-09</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>70310</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-18.xml b/metadata/glsa/glsa-200411-18.xml
index 2d7ac3b8149c..c5bb52f60330 100644
--- a/metadata/glsa/glsa-200411-18.xml
+++ b/metadata/glsa/glsa-200411-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">apache</product>
   <announced>2004-11-10</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>70138</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-19.xml b/metadata/glsa/glsa-200411-19.xml
index 62f87808d82d..8e8e6bf70120 100644
--- a/metadata/glsa/glsa-200411-19.xml
+++ b/metadata/glsa/glsa-200411-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pavuk</product>
   <announced>2004-11-10</announced>
-  <revised>2004-11-10: 01</revised>
+  <revised count="01">2004-11-10</revised>
   <bug>70516</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-20.xml b/metadata/glsa/glsa-200411-20.xml
index dee1d74303a2..a961493f14d0 100644
--- a/metadata/glsa/glsa-200411-20.xml
+++ b/metadata/glsa/glsa-200411-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ez-ipupdate</product>
   <announced>2004-11-11</announced>
-  <revised>2004-11-11: 01</revised>
+  <revised count="01">2004-11-11</revised>
   <bug>69658</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-21.xml b/metadata/glsa/glsa-200411-21.xml
index 275719dc6851..92b70f718843 100644
--- a/metadata/glsa/glsa-200411-21.xml
+++ b/metadata/glsa/glsa-200411-21.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild">samba</product>
   <announced>2004-11-11</announced>
-  <revised>2004-11-15: 02</revised>
+  <revised count="02">2004-11-15</revised>
   <bug>70429</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-22.xml b/metadata/glsa/glsa-200411-22.xml
index c3072fd07f73..142b27c0aaec 100644
--- a/metadata/glsa/glsa-200411-22.xml
+++ b/metadata/glsa/glsa-200411-22.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">davfs2</product>
   <announced>2004-11-11</announced>
-  <revised>2004-11-11: 01</revised>
+  <revised count="01">2004-11-11</revised>
   <bug>68406</bug>
   <bug>69149</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-200411-23.xml b/metadata/glsa/glsa-200411-23.xml
index 3ee3ec1f2449..2291fd7f3113 100644
--- a/metadata/glsa/glsa-200411-23.xml
+++ b/metadata/glsa/glsa-200411-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Ruby</product>
   <announced>2004-11-16</announced>
-  <revised>2004-11-16: 01</revised>
+  <revised count="01">2004-11-16</revised>
   <bug>69985</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-24.xml b/metadata/glsa/glsa-200411-24.xml
index d2f04e298df1..640947bfce58 100644
--- a/metadata/glsa/glsa-200411-24.xml
+++ b/metadata/glsa/glsa-200411-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">BNC</product>
   <announced>2004-11-16</announced>
-  <revised>2004-11-16: 01</revised>
+  <revised count="01">2004-11-16</revised>
   <bug>70674</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-25.xml b/metadata/glsa/glsa-200411-25.xml
index 0fdb3ddfc475..9b3e8047bb14 100644
--- a/metadata/glsa/glsa-200411-25.xml
+++ b/metadata/glsa/glsa-200411-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">SquirrelMail</product>
   <announced>2004-11-17</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>70739</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-26.xml b/metadata/glsa/glsa-200411-26.xml
index 2aa329520373..cef38b73b45c 100644
--- a/metadata/glsa/glsa-200411-26.xml
+++ b/metadata/glsa/glsa-200411-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">GIMPS,SETI@home,ChessBrain</product>
   <announced>2004-11-17</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>69868</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-27.xml b/metadata/glsa/glsa-200411-27.xml
index 2e1753f9b2ce..04591f91d4e6 100644
--- a/metadata/glsa/glsa-200411-27.xml
+++ b/metadata/glsa/glsa-200411-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">fcron</product>
   <announced>2004-11-18</announced>
-  <revised>2004-11-18: 01</revised>
+  <revised count="01">2004-11-18</revised>
   <bug>71311</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-28.xml b/metadata/glsa/glsa-200411-28.xml
index 565b1a1b57f9..7507b1cf774e 100644
--- a/metadata/glsa/glsa-200411-28.xml
+++ b/metadata/glsa/glsa-200411-28.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">X.Org, XFree86</product>
   <announced>2004-11-19</announced>
-  <revised>2004-11-19: 01</revised>
+  <revised count="01">2004-11-19</revised>
   <bug>68544</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-29.xml b/metadata/glsa/glsa-200411-29.xml
index 0d87c7604547..5e7ce88ffbab 100644
--- a/metadata/glsa/glsa-200411-29.xml
+++ b/metadata/glsa/glsa-200411-29.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">unarj</product>
   <announced>2004-11-19</announced>
-  <revised>2004-11-19: 01</revised>
+  <revised count="01">2004-11-19</revised>
   <bug>70966</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-30.xml b/metadata/glsa/glsa-200411-30.xml
index 0d62636d824a..c7f115fc23ad 100644
--- a/metadata/glsa/glsa-200411-30.xml
+++ b/metadata/glsa/glsa-200411-30.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">pdftohtml</product>
   <announced>2004-11-23</announced>
-  <revised>2004-11-23: 01</revised>
+  <revised count="01">2004-11-23</revised>
   <bug>69019</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-31.xml b/metadata/glsa/glsa-200411-31.xml
index 4ea2f45a6f2d..5a56b6bc239d 100644
--- a/metadata/glsa/glsa-200411-31.xml
+++ b/metadata/glsa/glsa-200411-31.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">ProZilla</product>
   <announced>2004-11-23</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>70090</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-32.xml b/metadata/glsa/glsa-200411-32.xml
index 399b55b4eae9..9fe7c6383eda 100644
--- a/metadata/glsa/glsa-200411-32.xml
+++ b/metadata/glsa/glsa-200411-32.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpBB</product>
   <announced>2004-11-24</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>71681</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-33.xml b/metadata/glsa/glsa-200411-33.xml
index b8e00248a25a..45dac5022333 100644
--- a/metadata/glsa/glsa-200411-33.xml
+++ b/metadata/glsa/glsa-200411-33.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">www-apps/twiki</product>
   <announced>2004-11-24</announced>
-  <revised>2006-09-08: 02</revised>
+  <revised count="02">2006-09-08</revised>
   <bug>71035</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-34.xml b/metadata/glsa/glsa-200411-34.xml
index 9f5dec05ed67..58b9f453b8d1 100644
--- a/metadata/glsa/glsa-200411-34.xml
+++ b/metadata/glsa/glsa-200411-34.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cyrus-imapd</product>
   <announced>2004-11-25</announced>
-  <revised>2004-11-25: 01</revised>
+  <revised count="01">2004-11-25</revised>
   <bug>72194</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-35.xml b/metadata/glsa/glsa-200411-35.xml
index 92077c7970c4..c579c79e8eb1 100644
--- a/metadata/glsa/glsa-200411-35.xml
+++ b/metadata/glsa/glsa-200411-35.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">phpwebsite</product>
   <announced>2004-11-26</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>71502</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-36.xml b/metadata/glsa/glsa-200411-36.xml
index dcefea84ed0b..90f55a388bdf 100644
--- a/metadata/glsa/glsa-200411-36.xml
+++ b/metadata/glsa/glsa-200411-36.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">phpmyadmin</product>
   <announced>2004-11-27</announced>
-  <revised>2004-11-27: 01</revised>
+  <revised count="01">2004-11-27</revised>
   <bug>71819</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-37.xml b/metadata/glsa/glsa-200411-37.xml
index bdba394afcac..0e2d8fd135c5 100644
--- a/metadata/glsa/glsa-200411-37.xml
+++ b/metadata/glsa/glsa-200411-37.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">opendchub</product>
   <announced>2004-11-28</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>72371</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200411-38.xml b/metadata/glsa/glsa-200411-38.xml
index 167c5e782e1b..44d7fca1b25f 100644
--- a/metadata/glsa/glsa-200411-38.xml
+++ b/metadata/glsa/glsa-200411-38.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Java</product>
   <announced>2004-11-29</announced>
-  <revised>2006-05-31: 02</revised>
+  <revised count="02">2006-05-31</revised>
   <bug>72172</bug>
   <bug>72221</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200412-01.xml b/metadata/glsa/glsa-200412-01.xml
index a1e7e796a88d..100a5d68ac62 100644
--- a/metadata/glsa/glsa-200412-01.xml
+++ b/metadata/glsa/glsa-200412-01.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">scponly</product>
   <announced>2004-12-03</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>72815</bug>
   <bug>72816</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200412-02.xml b/metadata/glsa/glsa-200412-02.xml
index 563b7541be65..d8a71a9484c5 100644
--- a/metadata/glsa/glsa-200412-02.xml
+++ b/metadata/glsa/glsa-200412-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">PDFlib</product>
   <announced>2004-12-05</announced>
-  <revised>2004-12-05: 01</revised>
+  <revised count="01">2004-12-05</revised>
   <bug>69043</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-03.xml b/metadata/glsa/glsa-200412-03.xml
index 2cc5af6f4519..d2e5a0c5d4d1 100644
--- a/metadata/glsa/glsa-200412-03.xml
+++ b/metadata/glsa/glsa-200412-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">imlib</product>
   <announced>2004-12-06</announced>
-  <revised>2004-12-06: 01</revised>
+  <revised count="01">2004-12-06</revised>
   <bug>72681</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-04.xml b/metadata/glsa/glsa-200412-04.xml
index b15c90e99e54..9e30bd0457bd 100644
--- a/metadata/glsa/glsa-200412-04.xml
+++ b/metadata/glsa/glsa-200412-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">perl</product>
   <announced>2004-12-07</announced>
-  <revised>2004-12-07: 01</revised>
+  <revised count="01">2004-12-07</revised>
   <bug>66360</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-05.xml b/metadata/glsa/glsa-200412-05.xml
index 6c5e878694f0..7ffad0f72fcb 100644
--- a/metadata/glsa/glsa-200412-05.xml
+++ b/metadata/glsa/glsa-200412-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mirrorselect</product>
   <announced>2004-12-07</announced>
-  <revised>2006-05-22: 04</revised>
+  <revised count="04">2006-05-22</revised>
   <bug>73545</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-06.xml b/metadata/glsa/glsa-200412-06.xml
index 5b94c6c6801d..28022dd4fd6e 100644
--- a/metadata/glsa/glsa-200412-06.xml
+++ b/metadata/glsa/glsa-200412-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">PHProjekt</product>
   <announced>2004-12-10</announced>
-  <revised>2004-12-10: 01</revised>
+  <revised count="01">2004-12-10</revised>
   <bug>73021</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-07.xml b/metadata/glsa/glsa-200412-07.xml
index 2fe14c18fb17..a410f4d5bd9f 100644
--- a/metadata/glsa/glsa-200412-07.xml
+++ b/metadata/glsa/glsa-200412-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">file</product>
   <announced>2004-12-13</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>72521</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-08.xml b/metadata/glsa/glsa-200412-08.xml
index c97cb073f110..a7aeccf5cc25 100644
--- a/metadata/glsa/glsa-200412-08.xml
+++ b/metadata/glsa/glsa-200412-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nfs-utils</product>
   <announced>2004-12-14</announced>
-  <revised>2004-12-14: 01</revised>
+  <revised count="01">2004-12-14</revised>
   <bug>72113</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-09.xml b/metadata/glsa/glsa-200412-09.xml
index 6a1abdb34939..dd978aff66a3 100644
--- a/metadata/glsa/glsa-200412-09.xml
+++ b/metadata/glsa/glsa-200412-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ncpfs</product>
   <announced>2004-12-15</announced>
-  <revised>2004-12-15: 01</revised>
+  <revised count="01">2004-12-15</revised>
   <bug>72820</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-10.xml b/metadata/glsa/glsa-200412-10.xml
index 49ffc220bcf4..12e9525e8f2b 100644
--- a/metadata/glsa/glsa-200412-10.xml
+++ b/metadata/glsa/glsa-200412-10.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">vim</product>
   <announced>2004-12-15</announced>
-  <revised>2004-12-15: 01</revised>
+  <revised count="01">2004-12-15</revised>
   <bug>73715</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-11.xml b/metadata/glsa/glsa-200412-11.xml
index 0e26dc265984..61b065eef973 100644
--- a/metadata/glsa/glsa-200412-11.xml
+++ b/metadata/glsa/glsa-200412-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cscope</product>
   <announced>2004-12-16</announced>
-  <revised>2004-12-16: 01</revised>
+  <revised count="01">2004-12-16</revised>
   <bug>71595</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-12.xml b/metadata/glsa/glsa-200412-12.xml
index a4383d3f8f26..e102b9d2863e 100644
--- a/metadata/glsa/glsa-200412-12.xml
+++ b/metadata/glsa/glsa-200412-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2004-12-16</announced>
-  <revised>2004-12-16: 01</revised>
+  <revised count="01">2004-12-16</revised>
   <bug>74406</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-13.xml b/metadata/glsa/glsa-200412-13.xml
index ad038c1f444d..7f1d372bb207 100644
--- a/metadata/glsa/glsa-200412-13.xml
+++ b/metadata/glsa/glsa-200412-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Samba</product>
   <announced>2004-12-17</announced>
-  <revised>2004-12-17: 01</revised>
+  <revised count="01">2004-12-17</revised>
   <bug>73943</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-14.xml b/metadata/glsa/glsa-200412-14.xml
index 0e72e6b8a7a9..dfe3c05f4483 100644
--- a/metadata/glsa/glsa-200412-14.xml
+++ b/metadata/glsa/glsa-200412-14.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">PHP</product>
   <announced>2004-12-19</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>74547</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-15.xml b/metadata/glsa/glsa-200412-15.xml
index 11ece103c24e..a82d524ecf42 100644
--- a/metadata/glsa/glsa-200412-15.xml
+++ b/metadata/glsa/glsa-200412-15.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Ethereal</product>
   <announced>2004-12-19</announced>
-  <revised>2004-12-19: 01</revised>
+  <revised count="01">2004-12-19</revised>
   <bug>74443</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-16.xml b/metadata/glsa/glsa-200412-16.xml
index f28d9e232043..e9c0f129fa8a 100644
--- a/metadata/glsa/glsa-200412-16.xml
+++ b/metadata/glsa/glsa-200412-16.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">KDE</product>
   <announced>2004-12-19</announced>
-  <revised>2004-12-19: 01</revised>
+  <revised count="01">2004-12-19</revised>
   <bug>72804</bug>
   <bug>73869</bug>
   <access>remote and local</access>
diff --git a/metadata/glsa/glsa-200412-17.xml b/metadata/glsa/glsa-200412-17.xml
index 271000e45f28..9f54e2f00921 100644
--- a/metadata/glsa/glsa-200412-17.xml
+++ b/metadata/glsa/glsa-200412-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kfax</product>
   <announced>2004-12-19</announced>
-  <revised>2005-01-12: 04</revised>
+  <revised count="04">2005-01-12</revised>
   <bug>73795</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-18.xml b/metadata/glsa/glsa-200412-18.xml
index d608587e6b2e..a7a6f749239d 100644
--- a/metadata/glsa/glsa-200412-18.xml
+++ b/metadata/glsa/glsa-200412-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">abcm2ps</product>
   <announced>2004-12-19</announced>
-  <revised>2004-12-19: 02</revised>
+  <revised count="02">2004-12-19</revised>
   <bug>74702</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-19.xml b/metadata/glsa/glsa-200412-19.xml
index 3bc3901895ae..c3479137c62f 100644
--- a/metadata/glsa/glsa-200412-19.xml
+++ b/metadata/glsa/glsa-200412-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpmyadmin</product>
   <announced>2004-12-19</announced>
-  <revised>2004-12-19: 01</revised>
+  <revised count="01">2004-12-19</revised>
   <bug>74303</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-20.xml b/metadata/glsa/glsa-200412-20.xml
index 4ea8c9945b61..e005d940ab55 100644
--- a/metadata/glsa/glsa-200412-20.xml
+++ b/metadata/glsa/glsa-200412-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">NASM</product>
   <announced>2004-12-20</announced>
-  <revised>2004-12-20: 01</revised>
+  <revised count="01">2004-12-20</revised>
   <bug>74477</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-21.xml b/metadata/glsa/glsa-200412-21.xml
index 058eeb440fd7..2b3137006bcb 100644
--- a/metadata/glsa/glsa-200412-21.xml
+++ b/metadata/glsa/glsa-200412-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">MPlayer</product>
   <announced>2004-12-20</announced>
-  <revised>2004-12-20: 01</revised>
+  <revised count="01">2004-12-20</revised>
   <bug>74473</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-22.xml b/metadata/glsa/glsa-200412-22.xml
index db36087af781..9c32f1ff5399 100644
--- a/metadata/glsa/glsa-200412-22.xml
+++ b/metadata/glsa/glsa-200412-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mpg123</product>
   <announced>2004-12-21</announced>
-  <revised>2004-12-21: 01</revised>
+  <revised count="01">2004-12-21</revised>
   <bug>74692</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-23.xml b/metadata/glsa/glsa-200412-23.xml
index 51c1b80df84b..bcda94c0c62e 100644
--- a/metadata/glsa/glsa-200412-23.xml
+++ b/metadata/glsa/glsa-200412-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">zwiki</product>
   <announced>2004-12-21</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>72315</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200412-24.xml b/metadata/glsa/glsa-200412-24.xml
index 321d513edd40..b5e7e512bb28 100644
--- a/metadata/glsa/glsa-200412-24.xml
+++ b/metadata/glsa/glsa-200412-24.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Xpdf</product>
   <announced>2004-12-28</announced>
-  <revised>2004-12-28: 01</revised>
+  <revised count="01">2004-12-28</revised>
   <bug>75191</bug>
   <bug>75201</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200412-25.xml b/metadata/glsa/glsa-200412-25.xml
index 72f1dca99b81..eab50da80817 100644
--- a/metadata/glsa/glsa-200412-25.xml
+++ b/metadata/glsa/glsa-200412-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">CUPS</product>
   <announced>2004-12-28</announced>
-  <revised>2005-01-12: 02</revised>
+  <revised count="02">2005-01-12</revised>
   <bug>74479</bug>
   <bug>75197</bug>
   <bug>77023</bug>
diff --git a/metadata/glsa/glsa-200412-26.xml b/metadata/glsa/glsa-200412-26.xml
index 9c093f08d721..1e6eb3e130cc 100644
--- a/metadata/glsa/glsa-200412-26.xml
+++ b/metadata/glsa/glsa-200412-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ViewCVS</product>
   <announced>2004-12-28</announced>
-  <revised>2004-12-28: 01</revised>
+  <revised count="01">2004-12-28</revised>
   <bug>72461</bug>
   <bug>73772</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200412-27.xml b/metadata/glsa/glsa-200412-27.xml
index 7bdf45a64d66..fd06ced4a99d 100644
--- a/metadata/glsa/glsa-200412-27.xml
+++ b/metadata/glsa/glsa-200412-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">PHProjekt</product>
   <announced>2004-12-30</announced>
-  <revised>2004-12-30: 01</revised>
+  <revised count="01">2004-12-30</revised>
   <bug>75858</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-01.xml b/metadata/glsa/glsa-200501-01.xml
index 15bf3182e5aa..3cae77d0c884 100644
--- a/metadata/glsa/glsa-200501-01.xml
+++ b/metadata/glsa/glsa-200501-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Linpopup</product>
   <announced>2005-01-04</announced>
-  <revised>2005-01-04: 01</revised>
+  <revised count="01">2005-01-04</revised>
   <bug>74705</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-02.xml b/metadata/glsa/glsa-200501-02.xml
index d0eb3af3dc7c..098d2a4e310b 100644
--- a/metadata/glsa/glsa-200501-02.xml
+++ b/metadata/glsa/glsa-200501-02.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild">a2ps</product>
   <announced>2005-01-04</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>75784</bug>
   <bug>61500</bug>
   <access>local and remote</access>
diff --git a/metadata/glsa/glsa-200501-03.xml b/metadata/glsa/glsa-200501-03.xml
index eb2f959e58bb..21ab09080780 100644
--- a/metadata/glsa/glsa-200501-03.xml
+++ b/metadata/glsa/glsa-200501-03.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Mozilla</product>
   <announced>2005-01-05</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>76112</bug>
   <bug>68976</bug>
   <bug>70749</bug>
diff --git a/metadata/glsa/glsa-200501-04.xml b/metadata/glsa/glsa-200501-04.xml
index beb2b5d20097..e70624444cdb 100644
--- a/metadata/glsa/glsa-200501-04.xml
+++ b/metadata/glsa/glsa-200501-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Shoutcast-server-bin</product>
   <announced>2005-01-05</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>75482</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-05.xml b/metadata/glsa/glsa-200501-05.xml
index 61794c01d8b2..1f03b63595aa 100644
--- a/metadata/glsa/glsa-200501-05.xml
+++ b/metadata/glsa/glsa-200501-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2005-01-05</announced>
-  <revised>2005-01-05: 01</revised>
+  <revised count="01">2005-01-05</revised>
   <bug>75143</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-06.xml b/metadata/glsa/glsa-200501-06.xml
index 85522655cd3f..0914fa5550bb 100644
--- a/metadata/glsa/glsa-200501-06.xml
+++ b/metadata/glsa/glsa-200501-06.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">tiff</product>
   <announced>2005-01-05</announced>
-  <revised>2005-01-05: 01</revised>
+  <revised count="01">2005-01-05</revised>
   <bug>75213</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-07.xml b/metadata/glsa/glsa-200501-07.xml
index 077074c595ee..79849df5b7ff 100644
--- a/metadata/glsa/glsa-200501-07.xml
+++ b/metadata/glsa/glsa-200501-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-lib</product>
   <announced>2005-01-06</announced>
-  <revised>2005-01-06: 01</revised>
+  <revised count="01">2005-01-06</revised>
   <bug>74475</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-08.xml b/metadata/glsa/glsa-200501-08.xml
index 4ccdbe158308..452c5ca8e2d5 100644
--- a/metadata/glsa/glsa-200501-08.xml
+++ b/metadata/glsa/glsa-200501-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpgroupware</product>
   <announced>2005-01-06</announced>
-  <revised>2006-05-22: 04</revised>
+  <revised count="04">2006-05-22</revised>
   <bug>74487</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-09.xml b/metadata/glsa/glsa-200501-09.xml
index 325edc77275d..26f4ea7288e2 100644
--- a/metadata/glsa/glsa-200501-09.xml
+++ b/metadata/glsa/glsa-200501-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xzgv</product>
   <announced>2005-01-06</announced>
-  <revised>2005-01-06: 01</revised>
+  <revised count="01">2005-01-06</revised>
   <bug>74069</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-10.xml b/metadata/glsa/glsa-200501-10.xml
index ca72a46f1030..b383c290850c 100644
--- a/metadata/glsa/glsa-200501-10.xml
+++ b/metadata/glsa/glsa-200501-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">vilistextum</product>
   <announced>2005-01-06</announced>
-  <revised>2005-01-06: 01</revised>
+  <revised count="01">2005-01-06</revised>
   <bug>74694</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-11.xml b/metadata/glsa/glsa-200501-11.xml
index c16f5230ebcb..23297139f3b3 100644
--- a/metadata/glsa/glsa-200501-11.xml
+++ b/metadata/glsa/glsa-200501-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Dillo</product>
   <announced>2005-01-09</announced>
-  <revised>2005-01-09: 01</revised>
+  <revised count="01">2005-01-09</revised>
   <bug>76665</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-12.xml b/metadata/glsa/glsa-200501-12.xml
index 0fe8acee5f55..5da00071d287 100644
--- a/metadata/glsa/glsa-200501-12.xml
+++ b/metadata/glsa/glsa-200501-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tikiwiki</product>
   <announced>2005-01-10</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>75568</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-13.xml b/metadata/glsa/glsa-200501-13.xml
index 88759ffd9932..39faa8ce8799 100644
--- a/metadata/glsa/glsa-200501-13.xml
+++ b/metadata/glsa/glsa-200501-13.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">pdftohtml</product>
   <announced>2005-01-10</announced>
-  <revised>2005-01-10: 01</revised>
+  <revised count="01">2005-01-10</revised>
   <bug>75200</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-14.xml b/metadata/glsa/glsa-200501-14.xml
index 0f0487792b00..4b5df83f5df2 100644
--- a/metadata/glsa/glsa-200501-14.xml
+++ b/metadata/glsa/glsa-200501-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">media-sound/mpg123</product>
   <announced>2005-01-10</announced>
-  <revised>2005-01-10: 01</revised>
+  <revised count="01">2005-01-10</revised>
   <bug>76862</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-15.xml b/metadata/glsa/glsa-200501-15.xml
index c02462027c33..b4aa83cb48e3 100644
--- a/metadata/glsa/glsa-200501-15.xml
+++ b/metadata/glsa/glsa-200501-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">app-text/unrtf</product>
   <announced>2005-01-10</announced>
-  <revised>2005-01-10: 01</revised>
+  <revised count="01">2005-01-10</revised>
   <bug>74480</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-16.xml b/metadata/glsa/glsa-200501-16.xml
index 2e258891382d..a6194a2dd2e9 100644
--- a/metadata/glsa/glsa-200501-16.xml
+++ b/metadata/glsa/glsa-200501-16.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Konqueror, kde, kdelibs</product>
   <announced>2005-01-11</announced>
-  <revised>2005-01-12: 02</revised>
+  <revised count="02">2005-01-12</revised>
   <bug>72750</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-17.xml b/metadata/glsa/glsa-200501-17.xml
index b063ed26331c..e3070efaa5c3 100644
--- a/metadata/glsa/glsa-200501-17.xml
+++ b/metadata/glsa/glsa-200501-17.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">kpdf, koffice</product>
   <announced>2005-01-11</announced>
-  <revised>2005-01-12: 02</revised>
+  <revised count="02">2005-01-12</revised>
   <bug>75203</bug>
   <bug>75204</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200501-18.xml b/metadata/glsa/glsa-200501-18.xml
index 5c12a0a5fd8b..9a446af2cb4e 100644
--- a/metadata/glsa/glsa-200501-18.xml
+++ b/metadata/glsa/glsa-200501-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">konqueror</product>
   <announced>2005-01-11</announced>
-  <revised>2005-01-12: 02</revised>
+  <revised count="02">2005-01-12</revised>
   <bug>73759</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-19.xml b/metadata/glsa/glsa-200501-19.xml
index 76f1525cfe4a..b04f6226e0d0 100644
--- a/metadata/glsa/glsa-200501-19.xml
+++ b/metadata/glsa/glsa-200501-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">imlib2</product>
   <announced>2005-01-11</announced>
-  <revised>2005-01-11: 01</revised>
+  <revised count="01">2005-01-11</revised>
   <bug>77002</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-20.xml b/metadata/glsa/glsa-200501-20.xml
index 6540e3bc471e..a23a6886a60d 100644
--- a/metadata/glsa/glsa-200501-20.xml
+++ b/metadata/glsa/glsa-200501-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">o3read</product>
   <announced>2005-01-11</announced>
-  <revised>2005-01-11: 01</revised>
+  <revised count="01">2005-01-11</revised>
   <bug>74478</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-21.xml b/metadata/glsa/glsa-200501-21.xml
index 53e906ceb4f7..83e1d67a8c19 100644
--- a/metadata/glsa/glsa-200501-21.xml
+++ b/metadata/glsa/glsa-200501-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">HylaFAX</product>
   <announced>2005-01-11</announced>
-  <revised>2005-01-11: 01</revised>
+  <revised count="01">2005-01-11</revised>
   <bug>75941</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-22.xml b/metadata/glsa/glsa-200501-22.xml
index bf6bcb778403..be2daf103db8 100644
--- a/metadata/glsa/glsa-200501-22.xml
+++ b/metadata/glsa/glsa-200501-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">poppassd_pam</product>
   <announced>2005-01-11</announced>
-  <revised>2005-01-11: 01</revised>
+  <revised count="01">2005-01-11</revised>
   <bug>75820</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-23.xml b/metadata/glsa/glsa-200501-23.xml
index 86e98471fc3e..c56bf822d6f3 100644
--- a/metadata/glsa/glsa-200501-23.xml
+++ b/metadata/glsa/glsa-200501-23.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">exim</product>
   <announced>2005-01-12</announced>
-  <revised>2005-01-12: 01</revised>
+  <revised count="01">2005-01-12</revised>
   <bug>76893</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-24.xml b/metadata/glsa/glsa-200501-24.xml
index 29f23e26d102..1c0da1e6b278 100644
--- a/metadata/glsa/glsa-200501-24.xml
+++ b/metadata/glsa/glsa-200501-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tnftp</product>
   <announced>2005-01-14</announced>
-  <revised>2005-01-14: 01</revised>
+  <revised count="01">2005-01-14</revised>
   <bug>74704</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-25.xml b/metadata/glsa/glsa-200501-25.xml
index f40a70144257..03297488cc50 100644
--- a/metadata/glsa/glsa-200501-25.xml
+++ b/metadata/glsa/glsa-200501-25.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild">squid</product>
   <announced>2005-01-16</announced>
-  <revised>2005-02-07: 03</revised>
+  <revised count="03">2005-02-07</revised>
   <bug>77934</bug>
   <bug>77521</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200501-26.xml b/metadata/glsa/glsa-200501-26.xml
index a593b2c7f0c9..062217887ac2 100644
--- a/metadata/glsa/glsa-200501-26.xml
+++ b/metadata/glsa/glsa-200501-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">imagemagick</product>
   <announced>2005-01-20</announced>
-  <revised>2005-01-20: 01</revised>
+  <revised count="01">2005-01-20</revised>
   <bug>77932</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-27.xml b/metadata/glsa/glsa-200501-27.xml
index a3283897bd06..650aae069867 100644
--- a/metadata/glsa/glsa-200501-27.xml
+++ b/metadata/glsa/glsa-200501-27.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">ethereal</product>
   <announced>2005-01-20</announced>
-  <revised>2005-01-20: 01</revised>
+  <revised count="01">2005-01-20</revised>
   <bug>78559</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-28.xml b/metadata/glsa/glsa-200501-28.xml
index d8ac333fafc7..46835523c1dd 100644
--- a/metadata/glsa/glsa-200501-28.xml
+++ b/metadata/glsa/glsa-200501-28.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Xpdf</product>
   <announced>2005-01-21</announced>
-  <revised>2005-01-21: 01</revised>
+  <revised count="01">2005-01-21</revised>
   <bug>77888</bug>
   <bug>78128</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200501-29.xml b/metadata/glsa/glsa-200501-29.xml
index b60980a73f83..7fc553537cd0 100644
--- a/metadata/glsa/glsa-200501-29.xml
+++ b/metadata/glsa/glsa-200501-29.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mailman</product>
   <announced>2005-01-22</announced>
-  <revised>2005-01-22: 01</revised>
+  <revised count="01">2005-01-22</revised>
   <bug>77524</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-30.xml b/metadata/glsa/glsa-200501-30.xml
index 518f6220c363..bf869dd105a3 100644
--- a/metadata/glsa/glsa-200501-30.xml
+++ b/metadata/glsa/glsa-200501-30.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">CUPS</product>
   <announced>2005-01-22</announced>
-  <revised>2005-01-22: 01</revised>
+  <revised count="01">2005-01-22</revised>
   <bug>78249</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-31.xml b/metadata/glsa/glsa-200501-31.xml
index 72a038d647d7..3cb82298785a 100644
--- a/metadata/glsa/glsa-200501-31.xml
+++ b/metadata/glsa/glsa-200501-31.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">teTeX</product>
   <announced>2005-01-23</announced>
-  <revised>2005-01-23: 01</revised>
+  <revised count="01">2005-01-23</revised>
   <bug>75801</bug>
   <access>remote and local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-32.xml b/metadata/glsa/glsa-200501-32.xml
index c92495fb5c3f..bc9a8352330d 100644
--- a/metadata/glsa/glsa-200501-32.xml
+++ b/metadata/glsa/glsa-200501-32.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kpdf, koffice</product>
   <announced>2005-01-23</announced>
-  <revised>2005-01-23: 01</revised>
+  <revised count="01">2005-01-23</revised>
   <bug>78619</bug>
   <bug>78620</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200501-33.xml b/metadata/glsa/glsa-200501-33.xml
index a56261ed1ee5..56411e4a5a35 100644
--- a/metadata/glsa/glsa-200501-33.xml
+++ b/metadata/glsa/glsa-200501-33.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mysql</product>
   <announced>2005-01-23</announced>
-  <revised>2005-01-23: 01</revised>
+  <revised count="01">2005-01-23</revised>
   <bug>77805</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-34.xml b/metadata/glsa/glsa-200501-34.xml
index e01c05069b10..006261553b53 100644
--- a/metadata/glsa/glsa-200501-34.xml
+++ b/metadata/glsa/glsa-200501-34.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">konversation</product>
   <announced>2005-01-24</announced>
-  <revised>2005-01-24: 01</revised>
+  <revised count="01">2005-01-24</revised>
   <bug>78712</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-35.xml b/metadata/glsa/glsa-200501-35.xml
index a118b4810aab..f78cbc841122 100644
--- a/metadata/glsa/glsa-200501-35.xml
+++ b/metadata/glsa/glsa-200501-35.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">evolution</product>
   <announced>2005-01-24</announced>
-  <revised>2005-01-24: 01</revised>
+  <revised count="01">2005-01-24</revised>
   <bug>79183</bug>
   <access>local and remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-36.xml b/metadata/glsa/glsa-200501-36.xml
index 6e1556c85832..d07d0a5731e3 100644
--- a/metadata/glsa/glsa-200501-36.xml
+++ b/metadata/glsa/glsa-200501-36.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">awstats</product>
   <announced>2005-01-25</announced>
-  <revised>2009-05-28: 04</revised>
+  <revised count="04">2009-05-28</revised>
   <bug>77963</bug>
   <bug>81775</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200501-37.xml b/metadata/glsa/glsa-200501-37.xml
index 7525ba2eea32..fd8ef0bdfba6 100644
--- a/metadata/glsa/glsa-200501-37.xml
+++ b/metadata/glsa/glsa-200501-37.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">GraphicsMagick</product>
   <announced>2005-01-26</announced>
-  <revised>2005-01-26: 01</revised>
+  <revised count="01">2005-01-26</revised>
   <bug>79336</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-38.xml b/metadata/glsa/glsa-200501-38.xml
index 3a0ab17ff155..07aa368e6075 100644
--- a/metadata/glsa/glsa-200501-38.xml
+++ b/metadata/glsa/glsa-200501-38.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Perl</product>
   <announced>2005-01-26</announced>
-  <revised>2005-03-15: 03</revised>
+  <revised count="03">2005-03-15</revised>
   <bug>75696</bug>
   <bug>78634</bug>
   <bug>79685</bug>
diff --git a/metadata/glsa/glsa-200501-39.xml b/metadata/glsa/glsa-200501-39.xml
index 3f8a23289ebd..0091fd9c1cd2 100644
--- a/metadata/glsa/glsa-200501-39.xml
+++ b/metadata/glsa/glsa-200501-39.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">SquirrelMail</product>
   <announced>2005-01-28</announced>
-  <revised>2005-01-28: 01</revised>
+  <revised count="01">2005-01-28</revised>
   <bug>78116</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-40.xml b/metadata/glsa/glsa-200501-40.xml
index 4096f35c7bbe..431951aa0543 100644
--- a/metadata/glsa/glsa-200501-40.xml
+++ b/metadata/glsa/glsa-200501-40.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ngIRCd</product>
   <announced>2005-01-28</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>79705</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-41.xml b/metadata/glsa/glsa-200501-41.xml
index fbc619104510..6891df68fb5f 100644
--- a/metadata/glsa/glsa-200501-41.xml
+++ b/metadata/glsa/glsa-200501-41.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tikiwiki</product>
   <announced>2005-01-30</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>78944</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-42.xml b/metadata/glsa/glsa-200501-42.xml
index a1b2b5e9ccdc..cc2a687a9185 100644
--- a/metadata/glsa/glsa-200501-42.xml
+++ b/metadata/glsa/glsa-200501-42.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">VDR</product>
   <announced>2005-01-30</announced>
-  <revised>2005-01-30: 01</revised>
+  <revised count="01">2005-01-30</revised>
   <bug>78230</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-43.xml b/metadata/glsa/glsa-200501-43.xml
index 448554eed180..373507d71916 100644
--- a/metadata/glsa/glsa-200501-43.xml
+++ b/metadata/glsa/glsa-200501-43.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">f2c</product>
   <announced>2005-01-30</announced>
-  <revised>2005-01-30: 01</revised>
+  <revised count="01">2005-01-30</revised>
   <bug>79725</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-44.xml b/metadata/glsa/glsa-200501-44.xml
index c45290f43ba9..3e6d01f87b4b 100644
--- a/metadata/glsa/glsa-200501-44.xml
+++ b/metadata/glsa/glsa-200501-44.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">ncpfs</product>
   <announced>2005-01-30</announced>
-  <revised>2005-01-30: 01</revised>
+  <revised count="01">2005-01-30</revised>
   <bug>77414</bug>
   <access>remote and local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-45.xml b/metadata/glsa/glsa-200501-45.xml
index b272511a84fa..6fcc5780956e 100644
--- a/metadata/glsa/glsa-200501-45.xml
+++ b/metadata/glsa/glsa-200501-45.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gallery</product>
   <announced>2005-01-30</announced>
-  <revised>2006-05-22: 04</revised>
+  <revised count="04">2006-05-22</revised>
   <bug>78522</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200501-46.xml b/metadata/glsa/glsa-200501-46.xml
index 1cf14781c89b..858c91006e12 100644
--- a/metadata/glsa/glsa-200501-46.xml
+++ b/metadata/glsa/glsa-200501-46.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2005-01-31</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>78656</bug>
   <bug>79194</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200502-01.xml b/metadata/glsa/glsa-200502-01.xml
index 1173a8d2539f..b6feab2098b7 100644
--- a/metadata/glsa/glsa-200502-01.xml
+++ b/metadata/glsa/glsa-200502-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">FireHOL</product>
   <announced>2005-02-01</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>79330</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-02.xml b/metadata/glsa/glsa-200502-02.xml
index 253ff0d266f8..43ec02bf6bb7 100644
--- a/metadata/glsa/glsa-200502-02.xml
+++ b/metadata/glsa/glsa-200502-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">uw-imap</product>
   <announced>2005-02-02</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>79874</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-03.xml b/metadata/glsa/glsa-200502-03.xml
index 819d9b3e02c1..72ca568f6e57 100644
--- a/metadata/glsa/glsa-200502-03.xml
+++ b/metadata/glsa/glsa-200502-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">enscript</product>
   <announced>2005-02-02</announced>
-  <revised>2005-02-02: 01</revised>
+  <revised count="01">2005-02-02</revised>
   <bug>77408</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-04.xml b/metadata/glsa/glsa-200502-04.xml
index 43961f833402..a419c418200f 100644
--- a/metadata/glsa/glsa-200502-04.xml
+++ b/metadata/glsa/glsa-200502-04.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">squid</product>
   <announced>2005-02-02</announced>
-  <revised>2005-02-02: 02</revised>
+  <revised count="02">2005-02-02</revised>
   <bug>79495</bug>
   <bug>78776</bug>
   <bug>80201</bug>
diff --git a/metadata/glsa/glsa-200502-05.xml b/metadata/glsa/glsa-200502-05.xml
index d64923b13898..87e63da0de74 100644
--- a/metadata/glsa/glsa-200502-05.xml
+++ b/metadata/glsa/glsa-200502-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">newspost</product>
   <announced>2005-02-03</announced>
-  <revised>2005-02-21: 02</revised>
+  <revised count="02">2005-02-21</revised>
   <bug>78530</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-06.xml b/metadata/glsa/glsa-200502-06.xml
index 85af50681cbf..ce771accbe97 100644
--- a/metadata/glsa/glsa-200502-06.xml
+++ b/metadata/glsa/glsa-200502-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lesstif</product>
   <announced>2005-02-06</announced>
-  <revised>2005-02-06: 01</revised>
+  <revised count="01">2005-02-06</revised>
   <bug>78483</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-07.xml b/metadata/glsa/glsa-200502-07.xml
index faa1b365075c..403d270528d3 100644
--- a/metadata/glsa/glsa-200502-07.xml
+++ b/metadata/glsa/glsa-200502-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openmotif</product>
   <announced>2005-02-07</announced>
-  <revised>2005-02-25: 03</revised>
+  <revised count="03">2005-02-25</revised>
   <bug>78111</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-08.xml b/metadata/glsa/glsa-200502-08.xml
index 6d756972fb19..d3fb70c597d3 100644
--- a/metadata/glsa/glsa-200502-08.xml
+++ b/metadata/glsa/glsa-200502-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">postgresql</product>
   <announced>2005-02-07</announced>
-  <revised>2007-06-26: 06</revised>
+  <revised count="06">2007-06-26</revised>
   <bug>80342</bug>
   <access>remote and local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-09.xml b/metadata/glsa/glsa-200502-09.xml
index be774ed298d0..d9aa72277ce5 100644
--- a/metadata/glsa/glsa-200502-09.xml
+++ b/metadata/glsa/glsa-200502-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Python</product>
   <announced>2005-02-08</announced>
-  <revised>2005-02-08: 01</revised>
+  <revised count="01">2005-02-08</revised>
   <bug>80592</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-10.xml b/metadata/glsa/glsa-200502-10.xml
index 678d0790ba95..8f71017913f1 100644
--- a/metadata/glsa/glsa-200502-10.xml
+++ b/metadata/glsa/glsa-200502-10.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">pdftohtml</product>
   <announced>2005-02-09</announced>
-  <revised>2005-02-09: 01</revised>
+  <revised count="01">2005-02-09</revised>
   <bug>78629</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-11.xml b/metadata/glsa/glsa-200502-11.xml
index 61309e1f073c..23f9115697e6 100644
--- a/metadata/glsa/glsa-200502-11.xml
+++ b/metadata/glsa/glsa-200502-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mailman</product>
   <announced>2005-02-10</announced>
-  <revised>2005-02-10: 01</revised>
+  <revised count="01">2005-02-10</revised>
   <bug>81109</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-12.xml b/metadata/glsa/glsa-200502-12.xml
index a3096a422719..ba1fe404497d 100644
--- a/metadata/glsa/glsa-200502-12.xml
+++ b/metadata/glsa/glsa-200502-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Webmin</product>
   <announced>2005-02-11</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>77731</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-13.xml b/metadata/glsa/glsa-200502-13.xml
index b92795742ef1..bdd5cd9eb580 100644
--- a/metadata/glsa/glsa-200502-13.xml
+++ b/metadata/glsa/glsa-200502-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Perl</product>
   <announced>2005-02-11</announced>
-  <revised>2005-02-11: 01</revised>
+  <revised count="01">2005-02-11</revised>
   <bug>80460</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-14.xml b/metadata/glsa/glsa-200502-14.xml
index 9d3d73386da3..d20ac93b1fd4 100644
--- a/metadata/glsa/glsa-200502-14.xml
+++ b/metadata/glsa/glsa-200502-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mod_python</product>
   <announced>2005-02-13</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>80109</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-15.xml b/metadata/glsa/glsa-200502-15.xml
index 65df58bca75d..45080d52f800 100644
--- a/metadata/glsa/glsa-200502-15.xml
+++ b/metadata/glsa/glsa-200502-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">PowerDNS</product>
   <announced>2005-02-13</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>80713</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-16.xml b/metadata/glsa/glsa-200502-16.xml
index df725f504cd6..2b952d994374 100644
--- a/metadata/glsa/glsa-200502-16.xml
+++ b/metadata/glsa/glsa-200502-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">htdig</product>
   <announced>2005-02-13</announced>
-  <revised>2005-02-13: 01</revised>
+  <revised count="01">2005-02-13</revised>
   <bug>80602</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-17.xml b/metadata/glsa/glsa-200502-17.xml
index c891bc1f6c94..c96bdc667c34 100644
--- a/metadata/glsa/glsa-200502-17.xml
+++ b/metadata/glsa/glsa-200502-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Opera</product>
   <announced>2005-02-14</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>73871</bug>
   <bug>74076</bug>
   <bug>74321</bug>
diff --git a/metadata/glsa/glsa-200502-18.xml b/metadata/glsa/glsa-200502-18.xml
index fcc334eb9fba..ef50d9ea184d 100644
--- a/metadata/glsa/glsa-200502-18.xml
+++ b/metadata/glsa/glsa-200502-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">VMware</product>
   <announced>2005-02-14</announced>
-  <revised>2006-05-25: 03</revised>
+  <revised count="03">2006-05-25</revised>
   <bug>81344</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-19.xml b/metadata/glsa/glsa-200502-19.xml
index 1b0d993fd01a..4bd7537f5167 100644
--- a/metadata/glsa/glsa-200502-19.xml
+++ b/metadata/glsa/glsa-200502-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">postgresql</product>
   <announced>2005-02-14</announced>
-  <revised>2007-06-26: 04</revised>
+  <revised count="04">2007-06-26</revised>
   <bug>81350</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-20.xml b/metadata/glsa/glsa-200502-20.xml
index 79e60556ba53..7d088a69e2a4 100644
--- a/metadata/glsa/glsa-200502-20.xml
+++ b/metadata/glsa/glsa-200502-20.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Emacs</product>
   <announced>2005-02-15</announced>
-  <revised>2006-07-23: 02</revised>
+  <revised count="02">2006-07-23</revised>
   <bug>79686</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-21.xml b/metadata/glsa/glsa-200502-21.xml
index edebbf6478ab..c9a6effd3989 100644
--- a/metadata/glsa/glsa-200502-21.xml
+++ b/metadata/glsa/glsa-200502-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lighttpd</product>
   <announced>2005-02-15</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>81776</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-22.xml b/metadata/glsa/glsa-200502-22.xml
index 8c625df40ddc..843ee10181b1 100644
--- a/metadata/glsa/glsa-200502-22.xml
+++ b/metadata/glsa/glsa-200502-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wpa_supplicant</product>
   <announced>2005-02-16</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>81993</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-23.xml b/metadata/glsa/glsa-200502-23.xml
index b419e04b9d7f..a614f07471ba 100644
--- a/metadata/glsa/glsa-200502-23.xml
+++ b/metadata/glsa/glsa-200502-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kstars</product>
   <announced>2005-02-16</announced>
-  <revised>2005-02-16: 01</revised>
+  <revised count="01">2005-02-16</revised>
   <bug>79585</bug>
   <access>remote and local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-24.xml b/metadata/glsa/glsa-200502-24.xml
index 9e8bd04e262e..b7515530b554 100644
--- a/metadata/glsa/glsa-200502-24.xml
+++ b/metadata/glsa/glsa-200502-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mc</product>
   <announced>2005-02-17</announced>
-  <revised>2005-02-17: 01</revised>
+  <revised count="01">2005-02-17</revised>
   <bug>77992</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-25.xml b/metadata/glsa/glsa-200502-25.xml
index 9f814d11250c..df0cd435e590 100644
--- a/metadata/glsa/glsa-200502-25.xml
+++ b/metadata/glsa/glsa-200502-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Squid</product>
   <announced>2005-02-18</announced>
-  <revised>2005-02-18: 01</revised>
+  <revised count="01">2005-02-18</revised>
   <bug>81997</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-26.xml b/metadata/glsa/glsa-200502-26.xml
index 93e76f0bac48..18abe5725f61 100644
--- a/metadata/glsa/glsa-200502-26.xml
+++ b/metadata/glsa/glsa-200502-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">GProFTPD</product>
   <announced>2005-02-18</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>81894</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-27.xml b/metadata/glsa/glsa-200502-27.xml
index 15cb1ebd4b98..d47208735f27 100644
--- a/metadata/glsa/glsa-200502-27.xml
+++ b/metadata/glsa/glsa-200502-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gFTP</product>
   <announced>2005-02-19</announced>
-  <revised>2005-02-19: 01</revised>
+  <revised count="01">2005-02-19</revised>
   <bug>81994</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-28.xml b/metadata/glsa/glsa-200502-28.xml
index d515b7c64a46..1a7e7e9e5347 100644
--- a/metadata/glsa/glsa-200502-28.xml
+++ b/metadata/glsa/glsa-200502-28.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Putty</product>
   <announced>2005-02-21</announced>
-  <revised>2005-02-21: 01</revised>
+  <revised count="01">2005-02-21</revised>
   <bug>82753</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-29.xml b/metadata/glsa/glsa-200502-29.xml
index 4e479f38d36d..5f725ad5352f 100644
--- a/metadata/glsa/glsa-200502-29.xml
+++ b/metadata/glsa/glsa-200502-29.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cyrus-imapd</product>
   <announced>2005-02-23</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>82404</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-30.xml b/metadata/glsa/glsa-200502-30.xml
index b69638d94c7f..51d68b9c8fc4 100644
--- a/metadata/glsa/glsa-200502-30.xml
+++ b/metadata/glsa/glsa-200502-30.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cmd5checkpw</product>
   <announced>2005-02-25</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>78256</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-31.xml b/metadata/glsa/glsa-200502-31.xml
index 36521e334724..7be376d2e280 100644
--- a/metadata/glsa/glsa-200502-31.xml
+++ b/metadata/glsa/glsa-200502-31.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">uim</product>
   <announced>2005-02-28</announced>
-  <revised>2005-02-28: 01</revised>
+  <revised count="01">2005-02-28</revised>
   <bug>82678</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-32.xml b/metadata/glsa/glsa-200502-32.xml
index c7e698e6a92d..0fc201ea4952 100644
--- a/metadata/glsa/glsa-200502-32.xml
+++ b/metadata/glsa/glsa-200502-32.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">unace</product>
   <announced>2005-02-28</announced>
-  <revised>2014-05-19: 2</revised>
+  <revised count="2">2014-05-19</revised>
   <bug>81958</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200502-33.xml b/metadata/glsa/glsa-200502-33.xml
index 6174e7ca50ff..4686b8076e85 100644
--- a/metadata/glsa/glsa-200502-33.xml
+++ b/metadata/glsa/glsa-200502-33.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mediawiki</product>
   <announced>2005-02-28</announced>
-  <revised>2005-02-28: 01</revised>
+  <revised count="01">2005-02-28</revised>
   <bug>80729</bug>
   <bug>82954</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200503-01.xml b/metadata/glsa/glsa-200503-01.xml
index fdc43a842d21..db898fe78e07 100644
--- a/metadata/glsa/glsa-200503-01.xml
+++ b/metadata/glsa/glsa-200503-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">qt</product>
   <announced>2005-03-01</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>75181</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-02.xml b/metadata/glsa/glsa-200503-02.xml
index 99b566752e4c..61e13a3b8da8 100644
--- a/metadata/glsa/glsa-200503-02.xml
+++ b/metadata/glsa/glsa-200503-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpbb</product>
   <announced>2005-03-01</announced>
-  <revised>2005-03-01: 01</revised>
+  <revised count="01">2005-03-01</revised>
   <bug>82955</bug>
   <access>local and remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-03.xml b/metadata/glsa/glsa-200503-03.xml
index 90a6f6e98320..20029bc28a8f 100644
--- a/metadata/glsa/glsa-200503-03.xml
+++ b/metadata/glsa/glsa-200503-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gaim</product>
   <announced>2005-03-01</announced>
-  <revised>2005-03-01: 01</revised>
+  <revised count="01">2005-03-01</revised>
   <bug>83253</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-04.xml b/metadata/glsa/glsa-200503-04.xml
index 14307ba698a3..006067429d25 100644
--- a/metadata/glsa/glsa-200503-04.xml
+++ b/metadata/glsa/glsa-200503-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpwebsite</product>
   <announced>2005-03-01</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>83297</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-05.xml b/metadata/glsa/glsa-200503-05.xml
index 0ef8beaf3d2b..c55f2b9f0118 100644
--- a/metadata/glsa/glsa-200503-05.xml
+++ b/metadata/glsa/glsa-200503-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xli</product>
   <announced>2005-03-02</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>79762</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-06.xml b/metadata/glsa/glsa-200503-06.xml
index 2a7bf1c0211b..797dfc80d174 100644
--- a/metadata/glsa/glsa-200503-06.xml
+++ b/metadata/glsa/glsa-200503-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bidwatcher</product>
   <announced>2005-03-03</announced>
-  <revised>2005-03-03: 01</revised>
+  <revised count="01">2005-03-03</revised>
   <bug>82460</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-07.xml b/metadata/glsa/glsa-200503-07.xml
index 203a940119e1..bb535e2ea62a 100644
--- a/metadata/glsa/glsa-200503-07.xml
+++ b/metadata/glsa/glsa-200503-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpMyAdmin</product>
   <announced>2005-03-03</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>83190</bug>
   <bug>83792</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200503-08.xml b/metadata/glsa/glsa-200503-08.xml
index 4621b75d7e3e..47b6d2f358ad 100644
--- a/metadata/glsa/glsa-200503-08.xml
+++ b/metadata/glsa/glsa-200503-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openmotif</product>
   <announced>2005-03-04</announced>
-  <revised>2005-03-04: 01</revised>
+  <revised count="01">2005-03-04</revised>
   <bug>83655</bug>
   <bug>83656</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200503-09.xml b/metadata/glsa/glsa-200503-09.xml
index 5541c6026b7b..5bc07241fbc4 100644
--- a/metadata/glsa/glsa-200503-09.xml
+++ b/metadata/glsa/glsa-200503-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xv</product>
   <announced>2005-03-04</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>83686</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-10.xml b/metadata/glsa/glsa-200503-10.xml
index a810dbffa8ba..4df8a7ef192b 100644
--- a/metadata/glsa/glsa-200503-10.xml
+++ b/metadata/glsa/glsa-200503-10.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Firefox</product>
   <announced>2005-03-04</announced>
-  <revised>2005-03-04: 01</revised>
+  <revised count="01">2005-03-04</revised>
   <bug>83267</bug>
   <access>remote and local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-11.xml b/metadata/glsa/glsa-200503-11.xml
index ae8c7a8e2497..b7a06c2a156e 100644
--- a/metadata/glsa/glsa-200503-11.xml
+++ b/metadata/glsa/glsa-200503-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ImageMagick</product>
   <announced>2005-03-06</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>83542</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-12.xml b/metadata/glsa/glsa-200503-12.xml
index 5686e364cd5c..d04f9944c67d 100644
--- a/metadata/glsa/glsa-200503-12.xml
+++ b/metadata/glsa/glsa-200503-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Hashcash</product>
   <announced>2005-03-06</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>83541</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-13.xml b/metadata/glsa/glsa-200503-13.xml
index 742092638cf2..2dd8b611d16d 100644
--- a/metadata/glsa/glsa-200503-13.xml
+++ b/metadata/glsa/glsa-200503-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mlterm</product>
   <announced>2005-03-07</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>84174</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-14.xml b/metadata/glsa/glsa-200503-14.xml
index 030b9260b658..a0461e0acc26 100644
--- a/metadata/glsa/glsa-200503-14.xml
+++ b/metadata/glsa/glsa-200503-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dcopidlng</product>
   <announced>2005-03-07</announced>
-  <revised>2005-03-07: 01</revised>
+  <revised count="01">2005-03-07</revised>
   <bug>81652</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-15.xml b/metadata/glsa/glsa-200503-15.xml
index cf3c3651e0ad..c9315afe279b 100644
--- a/metadata/glsa/glsa-200503-15.xml
+++ b/metadata/glsa/glsa-200503-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">X.org</product>
   <announced>2005-03-12</announced>
-  <revised>2005-03-12: 02</revised>
+  <revised count="02">2005-03-12</revised>
   <bug>83598</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-16.xml b/metadata/glsa/glsa-200503-16.xml
index 64de0ea27473..eff3416df86e 100644
--- a/metadata/glsa/glsa-200503-16.xml
+++ b/metadata/glsa/glsa-200503-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ethereal</product>
   <announced>2005-03-12</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>84547</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-17.xml b/metadata/glsa/glsa-200503-17.xml
index 0f8d0fc27bb2..734ed5fac22d 100644
--- a/metadata/glsa/glsa-200503-17.xml
+++ b/metadata/glsa/glsa-200503-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libexif</product>
   <announced>2005-03-12</announced>
-  <revised>2005-03-12: 01</revised>
+  <revised count="01">2005-03-12</revised>
   <bug>84076</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-18.xml b/metadata/glsa/glsa-200503-18.xml
index f27152a368fc..3db4912a836b 100644
--- a/metadata/glsa/glsa-200503-18.xml
+++ b/metadata/glsa/glsa-200503-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ringtonetools</product>
   <announced>2005-03-15</announced>
-  <revised>2005-03-15: 01</revised>
+  <revised count="01">2005-03-15</revised>
   <bug>74700</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-19.xml b/metadata/glsa/glsa-200503-19.xml
index cf9780ec0b41..9fb2061779db 100644
--- a/metadata/glsa/glsa-200503-19.xml
+++ b/metadata/glsa/glsa-200503-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mysql</product>
   <announced>2005-03-16</announced>
-  <revised>2005-03-16: 02</revised>
+  <revised count="02">2005-03-16</revised>
   <bug>84819</bug>
   <access>remote and local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-20.xml b/metadata/glsa/glsa-200503-20.xml
index 17f89a8a99c7..b72e9b1a276e 100644
--- a/metadata/glsa/glsa-200503-20.xml
+++ b/metadata/glsa/glsa-200503-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">curl</product>
   <announced>2005-03-16</announced>
-  <revised>2005-03-16: 01</revised>
+  <revised count="01">2005-03-16</revised>
   <bug>82534</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-21.xml b/metadata/glsa/glsa-200503-21.xml
index 94539cc3aaa5..0708fbc0aa83 100644
--- a/metadata/glsa/glsa-200503-21.xml
+++ b/metadata/glsa/glsa-200503-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">grip</product>
   <announced>2005-03-17</announced>
-  <revised>2005-03-17: 01</revised>
+  <revised count="01">2005-03-17</revised>
   <bug>84704</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-22.xml b/metadata/glsa/glsa-200503-22.xml
index f9fd1d345654..dcd5c2142e6d 100644
--- a/metadata/glsa/glsa-200503-22.xml
+++ b/metadata/glsa/glsa-200503-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">kde, dcopserver</product>
   <announced>2005-03-19</announced>
-  <revised>2005-03-19: 01</revised>
+  <revised count="01">2005-03-19</revised>
   <bug>83814</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-23.xml b/metadata/glsa/glsa-200503-23.xml
index 085e511a7cd9..773dd6ede882 100644
--- a/metadata/glsa/glsa-200503-23.xml
+++ b/metadata/glsa/glsa-200503-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rxvt-unicode</product>
   <announced>2005-03-20</announced>
-  <revised>2005-03-20: 01</revised>
+  <revised count="01">2005-03-20</revised>
   <bug>84680</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-24.xml b/metadata/glsa/glsa-200503-24.xml
index 4e178cae90e5..6abcd3f81c1e 100644
--- a/metadata/glsa/glsa-200503-24.xml
+++ b/metadata/glsa/glsa-200503-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">LTris</product>
   <announced>2005-03-20</announced>
-  <revised>2005-03-20: 01</revised>
+  <revised count="01">2005-03-20</revised>
   <bug>85770</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-25.xml b/metadata/glsa/glsa-200503-25.xml
index f379c7b3c8cf..0ac747498ce1 100644
--- a/metadata/glsa/glsa-200503-25.xml
+++ b/metadata/glsa/glsa-200503-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">OpenSLP</product>
   <announced>2005-03-20</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>85347</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-26.xml b/metadata/glsa/glsa-200503-26.xml
index cf60bb09d891..b5c7402ecc70 100644
--- a/metadata/glsa/glsa-200503-26.xml
+++ b/metadata/glsa/glsa-200503-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sylpheed sylpheed-claws</product>
   <announced>2005-03-20</announced>
-  <revised>2005-03-20: 01</revised>
+  <revised count="01">2005-03-20</revised>
   <bug>84056</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-27.xml b/metadata/glsa/glsa-200503-27.xml
index 3b469457190b..6350c6f8f3a5 100644
--- a/metadata/glsa/glsa-200503-27.xml
+++ b/metadata/glsa/glsa-200503-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dyndnsupdate</product>
   <announced>2005-03-21</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>84659</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-28.xml b/metadata/glsa/glsa-200503-28.xml
index f4ccee9475c7..bc45fe4c81c0 100644
--- a/metadata/glsa/glsa-200503-28.xml
+++ b/metadata/glsa/glsa-200503-28.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Java</product>
   <announced>2005-03-24</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>85804</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-29.xml b/metadata/glsa/glsa-200503-29.xml
index 5ef4e03abc9d..97fa2ea2ad9a 100644
--- a/metadata/glsa/glsa-200503-29.xml
+++ b/metadata/glsa/glsa-200503-29.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">GnuPG</product>
   <announced>2005-03-24</announced>
-  <revised>2005-03-24: 01</revised>
+  <revised count="01">2005-03-24</revised>
   <bug>85547</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-30.xml b/metadata/glsa/glsa-200503-30.xml
index 1797a53d8d0f..71de2256b418 100644
--- a/metadata/glsa/glsa-200503-30.xml
+++ b/metadata/glsa/glsa-200503-30.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Mozilla</product>
   <announced>2005-03-25</announced>
-  <revised>2005-03-25: 01</revised>
+  <revised count="01">2005-03-25</revised>
   <bug>84074</bug>
   <access>remote and local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-31.xml b/metadata/glsa/glsa-200503-31.xml
index 3240cb836a4c..1196f79fad79 100644
--- a/metadata/glsa/glsa-200503-31.xml
+++ b/metadata/glsa/glsa-200503-31.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Firefox</product>
   <announced>2005-03-25</announced>
-  <revised>2005-03-25: 01</revised>
+  <revised count="01">2005-03-25</revised>
   <bug>86148</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-32.xml b/metadata/glsa/glsa-200503-32.xml
index b1607a23a010..7c17958fac80 100644
--- a/metadata/glsa/glsa-200503-32.xml
+++ b/metadata/glsa/glsa-200503-32.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Thunderbird</product>
   <announced>2005-03-25</announced>
-  <revised>2005-03-25: 01</revised>
+  <revised count="01">2005-03-25</revised>
   <bug>84075</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-33.xml b/metadata/glsa/glsa-200503-33.xml
index 3714a6035829..c2229fc7fb54 100644
--- a/metadata/glsa/glsa-200503-33.xml
+++ b/metadata/glsa/glsa-200503-33.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">IPsec-Tools</product>
   <announced>2005-03-25</announced>
-  <revised>2005-03-25: 01</revised>
+  <revised count="01">2005-03-25</revised>
   <bug>84479</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-34.xml b/metadata/glsa/glsa-200503-34.xml
index 648a7d482b5f..6a9b406756bd 100644
--- a/metadata/glsa/glsa-200503-34.xml
+++ b/metadata/glsa/glsa-200503-34.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mpg321</product>
   <announced>2005-03-28</announced>
-  <revised>2005-03-28: 01</revised>
+  <revised count="01">2005-03-28</revised>
   <bug>86033</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-35.xml b/metadata/glsa/glsa-200503-35.xml
index fc25b3fb9049..cc643fbe195a 100644
--- a/metadata/glsa/glsa-200503-35.xml
+++ b/metadata/glsa/glsa-200503-35.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">smarty</product>
   <announced>2005-03-30</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>86488</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-36.xml b/metadata/glsa/glsa-200503-36.xml
index 32973b6ef7b8..34e0b201690c 100644
--- a/metadata/glsa/glsa-200503-36.xml
+++ b/metadata/glsa/glsa-200503-36.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">netkit-telnetd</product>
   <announced>2005-03-31</announced>
-  <revised>2005-03-31: 01</revised>
+  <revised count="01">2005-03-31</revised>
   <bug>87211</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200503-37.xml b/metadata/glsa/glsa-200503-37.xml
index 1455ea41f07b..2ef3b33caa91 100644
--- a/metadata/glsa/glsa-200503-37.xml
+++ b/metadata/glsa/glsa-200503-37.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">LimeWire</product>
   <announced>2005-03-31</announced>
-  <revised>2005-03-31: 01</revised>
+  <revised count="01">2005-03-31</revised>
   <bug>85380</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-01.xml b/metadata/glsa/glsa-200504-01.xml
index bd5f2ecec6fd..48d7156505e1 100644
--- a/metadata/glsa/glsa-200504-01.xml
+++ b/metadata/glsa/glsa-200504-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">telnet</product>
   <announced>2005-04-01</announced>
-  <revised>2005-04-01: 01</revised>
+  <revised count="01">2005-04-01</revised>
   <bug>87019</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-02.xml b/metadata/glsa/glsa-200504-02.xml
index ce865c7f43d2..84dee796173d 100644
--- a/metadata/glsa/glsa-200504-02.xml
+++ b/metadata/glsa/glsa-200504-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sylpheed</product>
   <announced>2005-04-02</announced>
-  <revised>2005-04-02: 01</revised>
+  <revised count="01">2005-04-02</revised>
   <bug>86541</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-03.xml b/metadata/glsa/glsa-200504-03.xml
index 55ae1c00727f..b34ccf0f47dc 100644
--- a/metadata/glsa/glsa-200504-03.xml
+++ b/metadata/glsa/glsa-200504-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Dnsmasq</product>
   <announced>2005-04-04</announced>
-  <revised>2005-04-04: 01</revised>
+  <revised count="01">2005-04-04</revised>
   <bug>86718</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-04.xml b/metadata/glsa/glsa-200504-04.xml
index 3c9e6b5de531..0a57f1680fac 100644
--- a/metadata/glsa/glsa-200504-04.xml
+++ b/metadata/glsa/glsa-200504-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">telnet</product>
   <announced>2005-04-06</announced>
-  <revised>2005-04-06: 01</revised>
+  <revised count="01">2005-04-06</revised>
   <bug>87145</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-05.xml b/metadata/glsa/glsa-200504-05.xml
index 6151a33c64f2..4998813b64d9 100644
--- a/metadata/glsa/glsa-200504-05.xml
+++ b/metadata/glsa/glsa-200504-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Gaim</product>
   <announced>2005-04-06</announced>
-  <revised>2005-04-06: 03</revised>
+  <revised count="03">2005-04-06</revised>
   <bug>87903</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-06.xml b/metadata/glsa/glsa-200504-06.xml
index 14d0f29dde05..e71b0cbf1210 100644
--- a/metadata/glsa/glsa-200504-06.xml
+++ b/metadata/glsa/glsa-200504-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sharutils</product>
   <announced>2005-04-06</announced>
-  <revised>2005-04-06: 01</revised>
+  <revised count="01">2005-04-06</revised>
   <bug>87939</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-07.xml b/metadata/glsa/glsa-200504-07.xml
index b39d00989c2f..64928735f95e 100644
--- a/metadata/glsa/glsa-200504-07.xml
+++ b/metadata/glsa/glsa-200504-07.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">GnomeVFS</product>
   <announced>2005-04-08</announced>
-  <revised>2005-04-13: 02</revised>
+  <revised count="02">2005-04-13</revised>
   <bug>84936</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-08.xml b/metadata/glsa/glsa-200504-08.xml
index 3a98d4f2597b..a0aaf8fd01f8 100644
--- a/metadata/glsa/glsa-200504-08.xml
+++ b/metadata/glsa/glsa-200504-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">phpMyAdmin</product>
   <announced>2005-04-11</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>87952</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-09.xml b/metadata/glsa/glsa-200504-09.xml
index 4fcd1fc7a70a..9134eca94ffa 100644
--- a/metadata/glsa/glsa-200504-09.xml
+++ b/metadata/glsa/glsa-200504-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Axel</product>
   <announced>2005-04-12</announced>
-  <revised>2005-04-12: 01</revised>
+  <revised count="01">2005-04-12</revised>
   <bug>88264</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-10.xml b/metadata/glsa/glsa-200504-10.xml
index d2bee6b52443..6e1491a563b8 100644
--- a/metadata/glsa/glsa-200504-10.xml
+++ b/metadata/glsa/glsa-200504-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Gld</product>
   <announced>2005-04-13</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>88904</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-11.xml b/metadata/glsa/glsa-200504-11.xml
index a817d9956a7a..091991335e07 100644
--- a/metadata/glsa/glsa-200504-11.xml
+++ b/metadata/glsa/glsa-200504-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">junkbuster</product>
   <announced>2005-04-13</announced>
-  <revised>2005-04-21: 02</revised>
+  <revised count="02">2005-04-21</revised>
   <bug>88537</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-12.xml b/metadata/glsa/glsa-200504-12.xml
index a77b58d395de..74299b05a7a7 100644
--- a/metadata/glsa/glsa-200504-12.xml
+++ b/metadata/glsa/glsa-200504-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rsnapshot</product>
   <announced>2005-04-13</announced>
-  <revised>2007-12-30: 05</revised>
+  <revised count="05">2007-12-30</revised>
   <bug>88681</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-13.xml b/metadata/glsa/glsa-200504-13.xml
index f27573498fb4..758d70320df1 100644
--- a/metadata/glsa/glsa-200504-13.xml
+++ b/metadata/glsa/glsa-200504-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">OpenOffice</product>
   <announced>2005-04-15</announced>
-  <revised>2005-05-08: 02</revised>
+  <revised count="02">2005-05-08</revised>
   <bug>88863</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-14.xml b/metadata/glsa/glsa-200504-14.xml
index b810714a454b..0130922ceca5 100644
--- a/metadata/glsa/glsa-200504-14.xml
+++ b/metadata/glsa/glsa-200504-14.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">monkeyd</product>
   <announced>2005-04-15</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>87916</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-15.xml b/metadata/glsa/glsa-200504-15.xml
index 53dcbad2c5d1..2b53f64b15d2 100644
--- a/metadata/glsa/glsa-200504-15.xml
+++ b/metadata/glsa/glsa-200504-15.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">PHP</product>
   <announced>2005-04-18</announced>
-  <revised>2005-04-18: 01</revised>
+  <revised count="01">2005-04-18</revised>
   <bug>87517</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-16.xml b/metadata/glsa/glsa-200504-16.xml
index 467fb7082c96..1ad1e59429b7 100644
--- a/metadata/glsa/glsa-200504-16.xml
+++ b/metadata/glsa/glsa-200504-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">CVS</product>
   <announced>2005-04-18</announced>
-  <revised>2005-04-22: 03</revised>
+  <revised count="03">2005-04-22</revised>
   <bug>86476</bug>
   <bug>89579</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200504-17.xml b/metadata/glsa/glsa-200504-17.xml
index 134a2c49bb45..95f8cf2ea629 100644
--- a/metadata/glsa/glsa-200504-17.xml
+++ b/metadata/glsa/glsa-200504-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xv</product>
   <announced>2005-04-19</announced>
-  <revised>2005-04-19: 01</revised>
+  <revised count="01">2005-04-19</revised>
   <bug>88742</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-18.xml b/metadata/glsa/glsa-200504-18.xml
index 7f3dc36760e3..4f6c4b11a339 100644
--- a/metadata/glsa/glsa-200504-18.xml
+++ b/metadata/glsa/glsa-200504-18.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Mozilla</product>
   <announced>2005-04-19</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>89303</bug>
   <bug>89305</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200504-19.xml b/metadata/glsa/glsa-200504-19.xml
index ccd8f4481ff3..f9cddb9daedc 100644
--- a/metadata/glsa/glsa-200504-19.xml
+++ b/metadata/glsa/glsa-200504-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">MPlayer</product>
   <announced>2005-04-20</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>89277</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-20.xml b/metadata/glsa/glsa-200504-20.xml
index 1faa03c34621..90f7171d12cd 100644
--- a/metadata/glsa/glsa-200504-20.xml
+++ b/metadata/glsa/glsa-200504-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openMosixview</product>
   <announced>2005-04-21</announced>
-  <revised>2005-04-21: 01</revised>
+  <revised count="01">2005-04-21</revised>
   <bug>86686</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-21.xml b/metadata/glsa/glsa-200504-21.xml
index 69de79016007..bd758ba248f2 100644
--- a/metadata/glsa/glsa-200504-21.xml
+++ b/metadata/glsa/glsa-200504-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">RealPlayer</product>
   <announced>2005-04-22</announced>
-  <revised>2005-04-22: 01</revised>
+  <revised count="01">2005-04-22</revised>
   <bug>89862</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-22.xml b/metadata/glsa/glsa-200504-22.xml
index 378954c1747e..16d71c14373b 100644
--- a/metadata/glsa/glsa-200504-22.xml
+++ b/metadata/glsa/glsa-200504-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">KDE</product>
   <announced>2005-04-22</announced>
-  <revised>2005-04-22: 01</revised>
+  <revised count="01">2005-04-22</revised>
   <bug>88862</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-23.xml b/metadata/glsa/glsa-200504-23.xml
index 451ef6602f1b..2474fb163b0f 100644
--- a/metadata/glsa/glsa-200504-23.xml
+++ b/metadata/glsa/glsa-200504-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Kommander</product>
   <announced>2005-04-22</announced>
-  <revised>2005-05-20: 02</revised>
+  <revised count="02">2005-05-20</revised>
   <bug>89092</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-24.xml b/metadata/glsa/glsa-200504-24.xml
index e7bd5d80cef0..94a7d200c6fd 100644
--- a/metadata/glsa/glsa-200504-24.xml
+++ b/metadata/glsa/glsa-200504-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">eGroupWare</product>
   <announced>2005-04-25</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>89517</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-25.xml b/metadata/glsa/glsa-200504-25.xml
index 80a6f316ac52..ba4434a7a433 100644
--- a/metadata/glsa/glsa-200504-25.xml
+++ b/metadata/glsa/glsa-200504-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rkhunter</product>
   <announced>2005-04-26</announced>
-  <revised>2005-04-26: 01</revised>
+  <revised count="01">2005-04-26</revised>
   <bug>90007</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-26.xml b/metadata/glsa/glsa-200504-26.xml
index e1417c439116..d2184a903019 100644
--- a/metadata/glsa/glsa-200504-26.xml
+++ b/metadata/glsa/glsa-200504-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Convert-UUlib</product>
   <announced>2005-04-26</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>89501</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-27.xml b/metadata/glsa/glsa-200504-27.xml
index d42f17215866..a242ed5e0b3e 100644
--- a/metadata/glsa/glsa-200504-27.xml
+++ b/metadata/glsa/glsa-200504-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-lib</product>
   <announced>2005-04-26</announced>
-  <revised>2005-04-26: 01</revised>
+  <revised count="01">2005-04-26</revised>
   <bug>89976</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-28.xml b/metadata/glsa/glsa-200504-28.xml
index 6b7deab6e7f3..43ca32d1b16d 100644
--- a/metadata/glsa/glsa-200504-28.xml
+++ b/metadata/glsa/glsa-200504-28.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Heimdal</product>
   <announced>2005-04-28</announced>
-  <revised>2005-04-28: 01</revised>
+  <revised count="01">2005-04-28</revised>
   <bug>89861</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-29.xml b/metadata/glsa/glsa-200504-29.xml
index 4ca8cd27650f..b4c1d2646c51 100644
--- a/metadata/glsa/glsa-200504-29.xml
+++ b/metadata/glsa/glsa-200504-29.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Pound</product>
   <announced>2005-04-30</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>90851</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200504-30.xml b/metadata/glsa/glsa-200504-30.xml
index 22aa6ae9c7fc..0deb5fc6f63a 100644
--- a/metadata/glsa/glsa-200504-30.xml
+++ b/metadata/glsa/glsa-200504-30.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpmyadmin</product>
   <announced>2005-04-30</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>88831</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-01.xml b/metadata/glsa/glsa-200505-01.xml
index a6ed7a6a087f..947ee1d48ee1 100644
--- a/metadata/glsa/glsa-200505-01.xml
+++ b/metadata/glsa/glsa-200505-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Horde</product>
   <announced>2005-05-01</announced>
-  <revised>2005-05-01: 01</revised>
+  <revised count="01">2005-05-01</revised>
   <bug>90365</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-02.xml b/metadata/glsa/glsa-200505-02.xml
index 2c0cb1145a60..299108d2d6ef 100644
--- a/metadata/glsa/glsa-200505-02.xml
+++ b/metadata/glsa/glsa-200505-02.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">oops</product>
   <announced>2005-05-05</announced>
-  <revised>2005-05-05: 02</revised>
+  <revised count="02">2005-05-05</revised>
   <bug>91303</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-03.xml b/metadata/glsa/glsa-200505-03.xml
index 61e7b9c67543..e1d9671a1fbe 100644
--- a/metadata/glsa/glsa-200505-03.xml
+++ b/metadata/glsa/glsa-200505-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Ethereal</product>
   <announced>2005-05-06</announced>
-  <revised>2005-05-06: 01</revised>
+  <revised count="01">2005-05-06</revised>
   <bug>90539</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-04.xml b/metadata/glsa/glsa-200505-04.xml
index 68bd0df3eda1..d4d5b9165b90 100644
--- a/metadata/glsa/glsa-200505-04.xml
+++ b/metadata/glsa/glsa-200505-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">GnuTLS</product>
   <announced>2005-05-09</announced>
-  <revised>2005-05-09: 01</revised>
+  <revised count="01">2005-05-09</revised>
   <bug>90726</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-05.xml b/metadata/glsa/glsa-200505-05.xml
index eb08e9bc8d9d..550b78fb9410 100644
--- a/metadata/glsa/glsa-200505-05.xml
+++ b/metadata/glsa/glsa-200505-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gzip</product>
   <announced>2005-05-09</announced>
-  <revised>2005-05-09: 01</revised>
+  <revised count="01">2005-05-09</revised>
   <bug>89946</bug>
   <bug>90626</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-200505-06.xml b/metadata/glsa/glsa-200505-06.xml
index dbbb7c14ffe0..3a1f6a6d8565 100644
--- a/metadata/glsa/glsa-200505-06.xml
+++ b/metadata/glsa/glsa-200505-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tcpdump</product>
   <announced>2005-05-09</announced>
-  <revised>2005-06-12: 02</revised>
+  <revised count="02">2005-06-12</revised>
   <bug>90541</bug>
   <bug>95349</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200505-07.xml b/metadata/glsa/glsa-200505-07.xml
index 2a98ed3e9f22..ec4f3f2ebf53 100644
--- a/metadata/glsa/glsa-200505-07.xml
+++ b/metadata/glsa/glsa-200505-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tiff</product>
   <announced>2005-05-10</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>91584</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-08.xml b/metadata/glsa/glsa-200505-08.xml
index 61cbd1b8bc9e..28bf53fa1a72 100644
--- a/metadata/glsa/glsa-200505-08.xml
+++ b/metadata/glsa/glsa-200505-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">hteditor</product>
   <announced>2005-05-10</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>91569</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-09.xml b/metadata/glsa/glsa-200505-09.xml
index b59b136f1813..fc9b0e78fc7b 100644
--- a/metadata/glsa/glsa-200505-09.xml
+++ b/metadata/glsa/glsa-200505-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gaim</product>
   <announced>2005-05-12</announced>
-  <revised>2005-05-12: 01</revised>
+  <revised count="01">2005-05-12</revised>
   <bug>91862</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-10.xml b/metadata/glsa/glsa-200505-10.xml
index 4dfee5493733..c8600157d9d1 100644
--- a/metadata/glsa/glsa-200505-10.xml
+++ b/metadata/glsa/glsa-200505-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpBB</product>
   <announced>2005-05-14</announced>
-  <revised>2005-05-14: 01</revised>
+  <revised count="01">2005-05-14</revised>
   <bug>90213</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-11.xml b/metadata/glsa/glsa-200505-11.xml
index ab29551f8eb8..fd8e48d54be6 100644
--- a/metadata/glsa/glsa-200505-11.xml
+++ b/metadata/glsa/glsa-200505-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mozilla</product>
   <announced>2005-05-15</announced>
-  <revised>2005-05-15: 01</revised>
+  <revised count="01">2005-05-15</revised>
   <bug>91859</bug>
   <bug>92393</bug>
   <bug>92394</bug>
diff --git a/metadata/glsa/glsa-200505-12.xml b/metadata/glsa/glsa-200505-12.xml
index 91c7fbe16b03..455cf21cbd64 100644
--- a/metadata/glsa/glsa-200505-12.xml
+++ b/metadata/glsa/glsa-200505-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">postgresql</product>
   <announced>2005-05-15</announced>
-  <revised>2007-06-26: 04</revised>
+  <revised count="04">2007-06-26</revised>
   <bug>91231</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-13.xml b/metadata/glsa/glsa-200505-13.xml
index 9d5733e884a9..8685df95feff 100644
--- a/metadata/glsa/glsa-200505-13.xml
+++ b/metadata/glsa/glsa-200505-13.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">freeradius</product>
   <announced>2005-05-17</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>91736</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-14.xml b/metadata/glsa/glsa-200505-14.xml
index 0f94421136e8..7e4b6b7574b5 100644
--- a/metadata/glsa/glsa-200505-14.xml
+++ b/metadata/glsa/glsa-200505-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Cheetah</product>
   <announced>2005-05-19</announced>
-  <revised>2006-05-17: 02</revised>
+  <revised count="02">2006-05-17</revised>
   <bug>92926</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-15.xml b/metadata/glsa/glsa-200505-15.xml
index 14bea9a7ee90..1f850c0ae636 100644
--- a/metadata/glsa/glsa-200505-15.xml
+++ b/metadata/glsa/glsa-200505-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gdb</product>
   <announced>2005-05-20</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>88398</bug>
   <bug>91398</bug>
   <bug>91654</bug>
diff --git a/metadata/glsa/glsa-200505-16.xml b/metadata/glsa/glsa-200505-16.xml
index 8275d5352169..d33862347600 100644
--- a/metadata/glsa/glsa-200505-16.xml
+++ b/metadata/glsa/glsa-200505-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ImageMagick</product>
   <announced>2005-05-21</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>90423</bug>
   <bug>90595</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200505-17.xml b/metadata/glsa/glsa-200505-17.xml
index 81cbb9fda366..535eefe03917 100644
--- a/metadata/glsa/glsa-200505-17.xml
+++ b/metadata/glsa/glsa-200505-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">qpopper</product>
   <announced>2005-05-23</announced>
-  <revised>2005-05-23: 01</revised>
+  <revised count="01">2005-05-23</revised>
   <bug>90622</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-18.xml b/metadata/glsa/glsa-200505-18.xml
index 293a82c188d7..24f533800354 100644
--- a/metadata/glsa/glsa-200505-18.xml
+++ b/metadata/glsa/glsa-200505-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">net-snmp</product>
   <announced>2005-05-23</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>91792</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-19.xml b/metadata/glsa/glsa-200505-19.xml
index 401b23b4f302..ae282bf25139 100644
--- a/metadata/glsa/glsa-200505-19.xml
+++ b/metadata/glsa/glsa-200505-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gxine</product>
   <announced>2005-05-26</announced>
-  <revised>2005-05-26: 01</revised>
+  <revised count="01">2005-05-26</revised>
   <bug>93532</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200505-20.xml b/metadata/glsa/glsa-200505-20.xml
index c5ac4079ac5e..38a69063e0c1 100644
--- a/metadata/glsa/glsa-200505-20.xml
+++ b/metadata/glsa/glsa-200505-20.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">mailutils</product>
   <announced>2005-05-27</announced>
-  <revised>2005-05-27: 01</revised>
+  <revised count="01">2005-05-27</revised>
   <bug>94053</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-01.xml b/metadata/glsa/glsa-200506-01.xml
index d6cad10e5ea6..37c88d8b6e1b 100644
--- a/metadata/glsa/glsa-200506-01.xml
+++ b/metadata/glsa/glsa-200506-01.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">binutils</product>
   <announced>2005-06-01</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>91398</bug>
   <bug>91817</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200506-02.xml b/metadata/glsa/glsa-200506-02.xml
index 2a01aca0d3d4..ba680e92ba5e 100644
--- a/metadata/glsa/glsa-200506-02.xml
+++ b/metadata/glsa/glsa-200506-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mailutils</product>
   <announced>2005-06-06</announced>
-  <revised>2005-06-06: 01</revised>
+  <revised count="01">2005-06-06</revised>
   <bug>94824</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-03.xml b/metadata/glsa/glsa-200506-03.xml
index 3a571124f348..0e20dfea885f 100644
--- a/metadata/glsa/glsa-200506-03.xml
+++ b/metadata/glsa/glsa-200506-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dzip</product>
   <announced>2005-06-06</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>93079</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-04.xml b/metadata/glsa/glsa-200506-04.xml
index 2d4f938e28cd..c1530d6d4c75 100644
--- a/metadata/glsa/glsa-200506-04.xml
+++ b/metadata/glsa/glsa-200506-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Wordpress</product>
   <announced>2005-06-06</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>88926</bug>
   <bug>94512</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200506-05.xml b/metadata/glsa/glsa-200506-05.xml
index 1899fbfaa58a..1d2c44747385 100644
--- a/metadata/glsa/glsa-200506-05.xml
+++ b/metadata/glsa/glsa-200506-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">silvercity</product>
   <announced>2005-06-08</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>93558</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-06.xml b/metadata/glsa/glsa-200506-06.xml
index 571b3df853ec..868a06af752c 100644
--- a/metadata/glsa/glsa-200506-06.xml
+++ b/metadata/glsa/glsa-200506-06.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">libextractor</product>
   <announced>2005-06-09</announced>
-  <revised>2005-06-09: 01</revised>
+  <revised count="01">2005-06-09</revised>
   <bug>79704</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-07.xml b/metadata/glsa/glsa-200506-07.xml
index b13e0f38d5b4..6b6501e75c70 100644
--- a/metadata/glsa/glsa-200506-07.xml
+++ b/metadata/glsa/glsa-200506-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ettercap</product>
   <announced>2005-06-11</announced>
-  <revised>2005-06-11: 01</revised>
+  <revised count="01">2005-06-11</revised>
   <bug>94474</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-08.xml b/metadata/glsa/glsa-200506-08.xml
index db6d5a8b39e3..2a48f2de7166 100644
--- a/metadata/glsa/glsa-200506-08.xml
+++ b/metadata/glsa/glsa-200506-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">GNU shtool</product>
   <announced>2005-06-11</announced>
-  <revised>2005-06-11: 01</revised>
+  <revised count="01">2005-06-11</revised>
   <bug>93782</bug>
   <bug>93784</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-200506-09.xml b/metadata/glsa/glsa-200506-09.xml
index 4a3e39910bd9..578f0db61657 100644
--- a/metadata/glsa/glsa-200506-09.xml
+++ b/metadata/glsa/glsa-200506-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gedit</product>
   <announced>2005-06-11</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>93352</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-10.xml b/metadata/glsa/glsa-200506-10.xml
index 17f422ad8da5..7b38316d5007 100644
--- a/metadata/glsa/glsa-200506-10.xml
+++ b/metadata/glsa/glsa-200506-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">LutelWall</product>
   <announced>2005-06-11</announced>
-  <revised>2005-06-11: 01</revised>
+  <revised count="01">2005-06-11</revised>
   <bug>95378</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-11.xml b/metadata/glsa/glsa-200506-11.xml
index 519b821fcb09..f4396733276b 100644
--- a/metadata/glsa/glsa-200506-11.xml
+++ b/metadata/glsa/glsa-200506-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gaim</product>
   <announced>2005-06-12</announced>
-  <revised>2005-06-12: 01</revised>
+  <revised count="01">2005-06-12</revised>
   <bug>95347</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-12.xml b/metadata/glsa/glsa-200506-12.xml
index 101daac723e3..5a52991e4e08 100644
--- a/metadata/glsa/glsa-200506-12.xml
+++ b/metadata/glsa/glsa-200506-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mediawiki</product>
   <announced>2005-06-13</announced>
-  <revised>2005-06-13: 01</revised>
+  <revised count="01">2005-06-13</revised>
   <bug>95255</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-13.xml b/metadata/glsa/glsa-200506-13.xml
index 51f1cdcdc5ce..7fc5f21dd647 100644
--- a/metadata/glsa/glsa-200506-13.xml
+++ b/metadata/glsa/glsa-200506-13.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">webapp-config</product>
   <announced>2005-06-17</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>91785</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-14.xml b/metadata/glsa/glsa-200506-14.xml
index fda4b5bdbdc2..b6c50f21fc92 100644
--- a/metadata/glsa/glsa-200506-14.xml
+++ b/metadata/glsa/glsa-200506-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sun-jdk sun-jre-bin blackdown-jre blackdown-jdk</product>
   <announced>2005-06-19</announced>
-  <revised>2005-06-19: 01</revised>
+  <revised count="01">2005-06-19</revised>
   <bug>96092</bug>
   <bug>96229</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200506-15.xml b/metadata/glsa/glsa-200506-15.xml
index a0d187bd4bba..433b322a7ad2 100644
--- a/metadata/glsa/glsa-200506-15.xml
+++ b/metadata/glsa/glsa-200506-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">peercast</product>
   <announced>2005-06-19</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>96199</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-16.xml b/metadata/glsa/glsa-200506-16.xml
index 63ade67a14c3..03e17a7727d2 100644
--- a/metadata/glsa/glsa-200506-16.xml
+++ b/metadata/glsa/glsa-200506-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cpio</product>
   <announced>2005-06-20</announced>
-  <revised>2005-06-20: 01</revised>
+  <revised count="01">2005-06-20</revised>
   <bug>90619</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-17.xml b/metadata/glsa/glsa-200506-17.xml
index 7658fd3a4ed7..ed54002184d5 100644
--- a/metadata/glsa/glsa-200506-17.xml
+++ b/metadata/glsa/glsa-200506-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">SpamAssassin, Vipul's Razor</product>
   <announced>2005-06-21</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>94722</bug>
   <bug>95492</bug>
   <bug>96776</bug>
diff --git a/metadata/glsa/glsa-200506-18.xml b/metadata/glsa/glsa-200506-18.xml
index f376b99ad371..3d82ca5ba702 100644
--- a/metadata/glsa/glsa-200506-18.xml
+++ b/metadata/glsa/glsa-200506-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tor</product>
   <announced>2005-06-21</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>96320</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-19.xml b/metadata/glsa/glsa-200506-19.xml
index a8ca7c387c27..3f7298a67ac4 100644
--- a/metadata/glsa/glsa-200506-19.xml
+++ b/metadata/glsa/glsa-200506-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">SquirrelMail</product>
   <announced>2005-06-21</announced>
-  <revised>2005-06-21: 01</revised>
+  <revised count="01">2005-06-21</revised>
   <bug>95937</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-20.xml b/metadata/glsa/glsa-200506-20.xml
index 9ba37993645b..baf81a4bcc17 100644
--- a/metadata/glsa/glsa-200506-20.xml
+++ b/metadata/glsa/glsa-200506-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cacti</product>
   <announced>2005-06-22</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>96243</bug>
   <bug>97475</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200506-21.xml b/metadata/glsa/glsa-200506-21.xml
index 9925e20b875d..79f198fbdcca 100644
--- a/metadata/glsa/glsa-200506-21.xml
+++ b/metadata/glsa/glsa-200506-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">trac</product>
   <announced>2005-06-22</announced>
-  <revised>2005-06-22: 01</revised>
+  <revised count="01">2005-06-22</revised>
   <bug>96572</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-22.xml b/metadata/glsa/glsa-200506-22.xml
index 14944b05a140..691c3d2183e5 100644
--- a/metadata/glsa/glsa-200506-22.xml
+++ b/metadata/glsa/glsa-200506-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sudo</product>
   <announced>2005-06-23</announced>
-  <revised>2005-06-23: 01</revised>
+  <revised count="01">2005-06-23</revised>
   <bug>96618</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-23.xml b/metadata/glsa/glsa-200506-23.xml
index 2fe85ff872bd..15fd2f2f2261 100644
--- a/metadata/glsa/glsa-200506-23.xml
+++ b/metadata/glsa/glsa-200506-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2005-06-27</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>96960</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200506-24.xml b/metadata/glsa/glsa-200506-24.xml
index 302129270a5b..07b6592f6166 100644
--- a/metadata/glsa/glsa-200506-24.xml
+++ b/metadata/glsa/glsa-200506-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">heimdal</product>
   <announced>2005-06-29</announced>
-  <revised>2005-06-29: 01</revised>
+  <revised count="01">2005-06-29</revised>
   <bug>96727</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-01.xml b/metadata/glsa/glsa-200507-01.xml
index 23ddc8772c6b..794deeb0a8b0 100644
--- a/metadata/glsa/glsa-200507-01.xml
+++ b/metadata/glsa/glsa-200507-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pear-xml_rpc phpxmlrpc</product>
   <announced>2005-07-03</announced>
-  <revised>2005-07-03: 01</revised>
+  <revised count="01">2005-07-03</revised>
   <bug>97399</bug>
   <bug>97629</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200507-02.xml b/metadata/glsa/glsa-200507-02.xml
index 7dd9d42b5b01..d851376ec485 100644
--- a/metadata/glsa/glsa-200507-02.xml
+++ b/metadata/glsa/glsa-200507-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wordpress</product>
   <announced>2005-07-04</announced>
-  <revised>2005-07-04: 01</revised>
+  <revised count="01">2005-07-04</revised>
   <bug>97374</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-03.xml b/metadata/glsa/glsa-200507-03.xml
index 8bf0eaea0ec9..dcf192c013b3 100644
--- a/metadata/glsa/glsa-200507-03.xml
+++ b/metadata/glsa/glsa-200507-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpBB</product>
   <announced>2005-07-04</announced>
-  <revised>2005-09-03: 03</revised>
+  <revised count="03">2005-09-03</revised>
   <bug>97278</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-04.xml b/metadata/glsa/glsa-200507-04.xml
index 5d9f5e780737..e90a783c2bd9 100644
--- a/metadata/glsa/glsa-200507-04.xml
+++ b/metadata/glsa/glsa-200507-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">realplayer</product>
   <announced>2005-07-06</announced>
-  <revised>2005-07-06: 01</revised>
+  <revised count="01">2005-07-06</revised>
   <bug>96923</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-05.xml b/metadata/glsa/glsa-200507-05.xml
index feae444815c7..cdcee2db105b 100644
--- a/metadata/glsa/glsa-200507-05.xml
+++ b/metadata/glsa/glsa-200507-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">zlib</product>
   <announced>2005-07-06</announced>
-  <revised>2005-07-06: 01</revised>
+  <revised count="01">2005-07-06</revised>
   <bug>98121</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-06.xml b/metadata/glsa/glsa-200507-06.xml
index 39fe1e472584..7e0741ff685e 100644
--- a/metadata/glsa/glsa-200507-06.xml
+++ b/metadata/glsa/glsa-200507-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Tikiwiki</product>
   <announced>2005-07-06</announced>
-  <revised>2005-07-06: 01</revised>
+  <revised count="01">2005-07-06</revised>
   <bug>97648</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-07.xml b/metadata/glsa/glsa-200507-07.xml
index 91fd88e0be4b..e07d5c2eed03 100644
--- a/metadata/glsa/glsa-200507-07.xml
+++ b/metadata/glsa/glsa-200507-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpwebsite</product>
   <announced>2005-07-10</announced>
-  <revised>2005-07-10: 01</revised>
+  <revised count="01">2005-07-10</revised>
   <bug>97461</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-08.xml b/metadata/glsa/glsa-200507-08.xml
index 306a9a7bdcc2..897f1b3bdddb 100644
--- a/metadata/glsa/glsa-200507-08.xml
+++ b/metadata/glsa/glsa-200507-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpgroupware egroupware</product>
   <announced>2005-07-10</announced>
-  <revised>2005-07-10: 01</revised>
+  <revised count="01">2005-07-10</revised>
   <bug>97460</bug>
   <bug>97651</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200507-09.xml b/metadata/glsa/glsa-200507-09.xml
index b7c20e3283c3..1937a781be2e 100644
--- a/metadata/glsa/glsa-200507-09.xml
+++ b/metadata/glsa/glsa-200507-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2005-07-11</announced>
-  <revised>2005-07-11: 01</revised>
+  <revised count="01">2005-07-11</revised>
   <bug>98101</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-10.xml b/metadata/glsa/glsa-200507-10.xml
index 6e935fb87d83..bf58b6ef9753 100644
--- a/metadata/glsa/glsa-200507-10.xml
+++ b/metadata/glsa/glsa-200507-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ruby</product>
   <announced>2005-07-11</announced>
-  <revised>2005-07-11: 01</revised>
+  <revised count="01">2005-07-11</revised>
   <bug>96784</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-11.xml b/metadata/glsa/glsa-200507-11.xml
index 260e28ce1add..c60fe3558f01 100644
--- a/metadata/glsa/glsa-200507-11.xml
+++ b/metadata/glsa/glsa-200507-11.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2005-07-12</announced>
-  <revised>2005-07-12: 01</revised>
+  <revised count="01">2005-07-12</revised>
   <bug>98799</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-12.xml b/metadata/glsa/glsa-200507-12.xml
index 307a15a4054f..c7886bba68b3 100644
--- a/metadata/glsa/glsa-200507-12.xml
+++ b/metadata/glsa/glsa-200507-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bugzilla</product>
   <announced>2005-07-13</announced>
-  <revised>2005-07-13: 01</revised>
+  <revised count="01">2005-07-13</revised>
   <bug>98348</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-13.xml b/metadata/glsa/glsa-200507-13.xml
index 4af0b16cd1ab..8fc01d1bd59d 100644
--- a/metadata/glsa/glsa-200507-13.xml
+++ b/metadata/glsa/glsa-200507-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pam_ldap nss_ldap</product>
   <announced>2005-07-14</announced>
-  <revised>2005-07-14: 01</revised>
+  <revised count="01">2005-07-14</revised>
   <bug>96767</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-14.xml b/metadata/glsa/glsa-200507-14.xml
index 91ad0e29d3f5..5bd7686b8e3f 100644
--- a/metadata/glsa/glsa-200507-14.xml
+++ b/metadata/glsa/glsa-200507-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mozilla</product>
   <announced>2005-07-15</announced>
-  <revised>2005-07-15: 01</revised>
+  <revised count="01">2005-07-15</revised>
   <bug>95199</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-15.xml b/metadata/glsa/glsa-200507-15.xml
index 6ecf41ed9349..82e76a29c4f5 100644
--- a/metadata/glsa/glsa-200507-15.xml
+++ b/metadata/glsa/glsa-200507-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">PHP</product>
   <announced>2005-07-15</announced>
-  <revised>2005-07-15: 01</revised>
+  <revised count="01">2005-07-15</revised>
   <bug>97655</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-16.xml b/metadata/glsa/glsa-200507-16.xml
index 1afb85c8637d..411cddb69f61 100644
--- a/metadata/glsa/glsa-200507-16.xml
+++ b/metadata/glsa/glsa-200507-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dhcpcd</product>
   <announced>2005-07-15</announced>
-  <revised>2005-07-15: 01</revised>
+  <revised count="01">2005-07-15</revised>
   <bug>98394</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-17.xml b/metadata/glsa/glsa-200507-17.xml
index c70fba53b060..b62bd7ed6733 100644
--- a/metadata/glsa/glsa-200507-17.xml
+++ b/metadata/glsa/glsa-200507-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">thunderbird</product>
   <announced>2005-07-18</announced>
-  <revised>2005-07-18: 01</revised>
+  <revised count="01">2005-07-18</revised>
   <bug>98855</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-18.xml b/metadata/glsa/glsa-200507-18.xml
index 6df084ce7518..c312e1fd45a8 100644
--- a/metadata/glsa/glsa-200507-18.xml
+++ b/metadata/glsa/glsa-200507-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mediawiki</product>
   <announced>2005-07-20</announced>
-  <revised>2005-08-11: 03</revised>
+  <revised count="03">2005-08-11</revised>
   <bug>99132</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-19.xml b/metadata/glsa/glsa-200507-19.xml
index 7d2255ead02e..bc3d589b1361 100644
--- a/metadata/glsa/glsa-200507-19.xml
+++ b/metadata/glsa/glsa-200507-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">zlib</product>
   <announced>2005-07-22</announced>
-  <revised>2005-07-22: 01</revised>
+  <revised count="01">2005-07-22</revised>
   <bug>99751</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-20.xml b/metadata/glsa/glsa-200507-20.xml
index d04e7614d190..b6b9a92aa2cf 100644
--- a/metadata/glsa/glsa-200507-20.xml
+++ b/metadata/glsa/glsa-200507-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">shorewall</product>
   <announced>2005-07-22</announced>
-  <revised>2005-09-14: 02</revised>
+  <revised count="02">2005-09-14</revised>
   <bug>99398</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-21.xml b/metadata/glsa/glsa-200507-21.xml
index c8eb1c7d34ae..5ef8eb0800c5 100644
--- a/metadata/glsa/glsa-200507-21.xml
+++ b/metadata/glsa/glsa-200507-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">fetchmail</product>
   <announced>2005-07-25</announced>
-  <revised>2005-07-25: 01</revised>
+  <revised count="01">2005-07-25</revised>
   <bug>99865</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-22.xml b/metadata/glsa/glsa-200507-22.xml
index ecf509f004f3..d305075cff4a 100644
--- a/metadata/glsa/glsa-200507-22.xml
+++ b/metadata/glsa/glsa-200507-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sandbox</product>
   <announced>2005-07-25</announced>
-  <revised>2005-08-11: 02</revised>
+  <revised count="02">2005-08-11</revised>
   <bug>96782</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-23.xml b/metadata/glsa/glsa-200507-23.xml
index 661ac4683dfe..1fd6d4ea5f81 100644
--- a/metadata/glsa/glsa-200507-23.xml
+++ b/metadata/glsa/glsa-200507-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kopete</product>
   <announced>2005-07-25</announced>
-  <revised>2005-07-25: 01</revised>
+  <revised count="01">2005-07-25</revised>
   <bug>99754</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-24.xml b/metadata/glsa/glsa-200507-24.xml
index 27fc0f52d765..2927dda27764 100644
--- a/metadata/glsa/glsa-200507-24.xml
+++ b/metadata/glsa/glsa-200507-24.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">mozilla</product>
   <announced>2005-07-26</announced>
-  <revised>2005-07-26: 01</revised>
+  <revised count="01">2005-07-26</revised>
   <bug>98846</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-25.xml b/metadata/glsa/glsa-200507-25.xml
index d720a31c2754..a50cebb9ea4e 100644
--- a/metadata/glsa/glsa-200507-25.xml
+++ b/metadata/glsa/glsa-200507-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2005-07-26</announced>
-  <revised>2005-08-11: 02</revised>
+  <revised count="02">2005-08-11</revised>
   <bug>100178</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-26.xml b/metadata/glsa/glsa-200507-26.xml
index 6b382fec63c6..3b5149f5265b 100644
--- a/metadata/glsa/glsa-200507-26.xml
+++ b/metadata/glsa/glsa-200507-26.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">gnugadu centericq kadu ekg libgadu</product>
   <announced>2005-07-27</announced>
-  <revised>2007-02-26: 02</revised>
+  <revised count="02">2007-02-26</revised>
   <bug>99816</bug>
   <bug>99890</bug>
   <bug>99583</bug>
diff --git a/metadata/glsa/glsa-200507-27.xml b/metadata/glsa/glsa-200507-27.xml
index 5f3ab415e47f..2fd5480707f5 100644
--- a/metadata/glsa/glsa-200507-27.xml
+++ b/metadata/glsa/glsa-200507-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Ethereal</product>
   <announced>2005-07-28</announced>
-  <revised>2005-07-28: 01</revised>
+  <revised count="01">2005-07-28</revised>
   <bug>100316</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-28.xml b/metadata/glsa/glsa-200507-28.xml
index d66e6520e4ae..3b12ec9974fd 100644
--- a/metadata/glsa/glsa-200507-28.xml
+++ b/metadata/glsa/glsa-200507-28.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">emul-linux-x86-baselibs</product>
   <announced>2005-07-30</announced>
-  <revised>2005-08-02: 02</revised>
+  <revised count="02">2005-08-02</revised>
   <bug>100686</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200507-29.xml b/metadata/glsa/glsa-200507-29.xml
index 3d16cf152749..c1441b239738 100644
--- a/metadata/glsa/glsa-200507-29.xml
+++ b/metadata/glsa/glsa-200507-29.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pstotext</product>
   <announced>2005-07-31</announced>
-  <revised>2005-08-11: 02</revised>
+  <revised count="02">2005-08-11</revised>
   <bug>100245</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-01.xml b/metadata/glsa/glsa-200508-01.xml
index 39aade58e3c8..bb991ee0df5f 100644
--- a/metadata/glsa/glsa-200508-01.xml
+++ b/metadata/glsa/glsa-200508-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Compress-Zlib</product>
   <announced>2005-08-01</announced>
-  <revised>2009-05-28: 02</revised>
+  <revised count="02">2009-05-28</revised>
   <bug>100540</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-02.xml b/metadata/glsa/glsa-200508-02.xml
index 9965ca5f33ff..6ef9ea8da17f 100644
--- a/metadata/glsa/glsa-200508-02.xml
+++ b/metadata/glsa/glsa-200508-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">proftpd</product>
   <announced>2005-08-01</announced>
-  <revised>2005-08-01: 01</revised>
+  <revised count="01">2005-08-01</revised>
   <bug>100364</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-03.xml b/metadata/glsa/glsa-200508-03.xml
index 0be0f65ba9f4..1bd082aa4a8f 100644
--- a/metadata/glsa/glsa-200508-03.xml
+++ b/metadata/glsa/glsa-200508-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nbsmtp</product>
   <announced>2005-08-02</announced>
-  <revised>2005-08-11: 02</revised>
+  <revised count="02">2005-08-11</revised>
   <bug>100274</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-04.xml b/metadata/glsa/glsa-200508-04.xml
index 9ad88245b36d..a93ab9fe9828 100644
--- a/metadata/glsa/glsa-200508-04.xml
+++ b/metadata/glsa/glsa-200508-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Netpbm</product>
   <announced>2005-08-05</announced>
-  <revised>2009-05-28: 06</revised>
+  <revised count="06">2009-05-28</revised>
   <bug>100398</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-05.xml b/metadata/glsa/glsa-200508-05.xml
index 44fdd5a36ec6..b20175694980 100644
--- a/metadata/glsa/glsa-200508-05.xml
+++ b/metadata/glsa/glsa-200508-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Heartbeat</product>
   <announced>2005-08-07</announced>
-  <revised>2005-08-07: 01</revised>
+  <revised count="01">2005-08-07</revised>
   <bug>97175</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-06.xml b/metadata/glsa/glsa-200508-06.xml
index ceb685f5684e..ba56d7813db8 100644
--- a/metadata/glsa/glsa-200508-06.xml
+++ b/metadata/glsa/glsa-200508-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Gaim</product>
   <announced>2005-08-15</announced>
-  <revised>2005-08-15: 01</revised>
+  <revised count="01">2005-08-15</revised>
   <bug>102000</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-07.xml b/metadata/glsa/glsa-200508-07.xml
index 4b16fc7e3cbc..bf2510583d55 100644
--- a/metadata/glsa/glsa-200508-07.xml
+++ b/metadata/glsa/glsa-200508-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">awstats</product>
   <announced>2005-08-16</announced>
-  <revised>2009-05-28: 02</revised>
+  <revised count="02">2009-05-28</revised>
   <bug>102145</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-08.xml b/metadata/glsa/glsa-200508-08.xml
index 34e50eb19d69..291765b07757 100644
--- a/metadata/glsa/glsa-200508-08.xml
+++ b/metadata/glsa/glsa-200508-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xpdf kpdf gpdf</product>
   <announced>2005-08-16</announced>
-  <revised>2005-08-16: 01</revised>
+  <revised count="01">2005-08-16</revised>
   <bug>99769</bug>
   <bug>100263</bug>
   <bug>100265</bug>
diff --git a/metadata/glsa/glsa-200508-09.xml b/metadata/glsa/glsa-200508-09.xml
index 3dbfc021a83a..6eeb956e2d90 100644
--- a/metadata/glsa/glsa-200508-09.xml
+++ b/metadata/glsa/glsa-200508-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bluez-utils</product>
   <announced>2005-08-17</announced>
-  <revised>2005-08-17: 01</revised>
+  <revised count="01">2005-08-17</revised>
   <bug>101557</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-10.xml b/metadata/glsa/glsa-200508-10.xml
index 0b97e67d1bb0..1b4391662545 100644
--- a/metadata/glsa/glsa-200508-10.xml
+++ b/metadata/glsa/glsa-200508-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Kismet</product>
   <announced>2005-08-19</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>102702</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-11.xml b/metadata/glsa/glsa-200508-11.xml
index 8ad1984257c6..b2b96ed83686 100644
--- a/metadata/glsa/glsa-200508-11.xml
+++ b/metadata/glsa/glsa-200508-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2005-08-19</announced>
-  <revised>2005-08-19: 01</revised>
+  <revised count="01">2005-08-19</revised>
   <bug>102730</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-12.xml b/metadata/glsa/glsa-200508-12.xml
index 8700302e39dd..c29f810dee23 100644
--- a/metadata/glsa/glsa-200508-12.xml
+++ b/metadata/glsa/glsa-200508-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">evolution</product>
   <announced>2005-08-23</announced>
-  <revised>2005-08-23: 01</revised>
+  <revised count="01">2005-08-23</revised>
   <bug>102051</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-13.xml b/metadata/glsa/glsa-200508-13.xml
index 422f574eb778..74787d637b1c 100644
--- a/metadata/glsa/glsa-200508-13.xml
+++ b/metadata/glsa/glsa-200508-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pear-xml_rpc phpxmlrpc</product>
   <announced>2005-08-24</announced>
-  <revised>2005-08-24: 01</revised>
+  <revised count="01">2005-08-24</revised>
   <bug>102378</bug>
   <bug>102576</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200508-14.xml b/metadata/glsa/glsa-200508-14.xml
index abd586e7ca40..6597d691f0ee 100644
--- a/metadata/glsa/glsa-200508-14.xml
+++ b/metadata/glsa/glsa-200508-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tikiwiki egroupware</product>
   <announced>2005-08-24</announced>
-  <revised>2005-08-24: 01</revised>
+  <revised count="01">2005-08-24</revised>
   <bug>102374</bug>
   <bug>102377</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200508-15.xml b/metadata/glsa/glsa-200508-15.xml
index 41a6dfec4d2e..8f7fe6fd769c 100644
--- a/metadata/glsa/glsa-200508-15.xml
+++ b/metadata/glsa/glsa-200508-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">apache</product>
   <announced>2005-08-25</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>102991</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-16.xml b/metadata/glsa/glsa-200508-16.xml
index 05edeabaeaf5..c7162804b4bf 100644
--- a/metadata/glsa/glsa-200508-16.xml
+++ b/metadata/glsa/glsa-200508-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tor</product>
   <announced>2005-08-25</announced>
-  <revised>2005-08-25: 01</revised>
+  <revised count="01">2005-08-25</revised>
   <bug>102245</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-17.xml b/metadata/glsa/glsa-200508-17.xml
index da525d575263..94e90b42016b 100644
--- a/metadata/glsa/glsa-200508-17.xml
+++ b/metadata/glsa/glsa-200508-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libpcre</product>
   <announced>2005-08-25</announced>
-  <revised>2005-08-25: 01</revised>
+  <revised count="01">2005-08-25</revised>
   <bug>103337</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-18.xml b/metadata/glsa/glsa-200508-18.xml
index be0fbbf797a3..020f7a4e5eff 100644
--- a/metadata/glsa/glsa-200508-18.xml
+++ b/metadata/glsa/glsa-200508-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpwiki</product>
   <announced>2005-08-26</announced>
-  <revised>2005-08-26: 01</revised>
+  <revised count="01">2005-08-26</revised>
   <bug>102380</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-19.xml b/metadata/glsa/glsa-200508-19.xml
index 6d949660f631..394591c6e5ba 100644
--- a/metadata/glsa/glsa-200508-19.xml
+++ b/metadata/glsa/glsa-200508-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lm_sensors</product>
   <announced>2005-08-30</announced>
-  <revised>2005-08-30: 01</revised>
+  <revised count="01">2005-08-30</revised>
   <bug>103568</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-20.xml b/metadata/glsa/glsa-200508-20.xml
index 3d0d6d92cc47..7dcab81383d0 100644
--- a/metadata/glsa/glsa-200508-20.xml
+++ b/metadata/glsa/glsa-200508-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpgroupware</product>
   <announced>2005-08-30</announced>
-  <revised>2005-08-30: 01</revised>
+  <revised count="01">2005-08-30</revised>
   <bug>102379</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-21.xml b/metadata/glsa/glsa-200508-21.xml
index d654cf9f5b2f..5d33b8b72b66 100644
--- a/metadata/glsa/glsa-200508-21.xml
+++ b/metadata/glsa/glsa-200508-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpwebsite</product>
   <announced>2005-08-31</announced>
-  <revised>2005-08-31: 01</revised>
+  <revised count="01">2005-08-31</revised>
   <bug>102785</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200508-22.xml b/metadata/glsa/glsa-200508-22.xml
index 8d72fe784214..6374d5deb121 100644
--- a/metadata/glsa/glsa-200508-22.xml
+++ b/metadata/glsa/glsa-200508-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pam_ldap</product>
   <announced>2005-08-31</announced>
-  <revised>2005-08-31: 01</revised>
+  <revised count="01">2005-08-31</revised>
   <bug>103659</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-01.xml b/metadata/glsa/glsa-200509-01.xml
index c0210eac851d..cb5fae42a29d 100644
--- a/metadata/glsa/glsa-200509-01.xml
+++ b/metadata/glsa/glsa-200509-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">MPlayer</product>
   <announced>2005-09-01</announced>
-  <revised>2005-09-01: 01</revised>
+  <revised count="01">2005-09-01</revised>
   <bug>103555</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-02.xml b/metadata/glsa/glsa-200509-02.xml
index 61c7524f4891..ca89466fca32 100644
--- a/metadata/glsa/glsa-200509-02.xml
+++ b/metadata/glsa/glsa-200509-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Gnumeric</product>
   <announced>2005-09-03</announced>
-  <revised>2005-09-03: 01</revised>
+  <revised count="01">2005-09-03</revised>
   <bug>104010</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-03.xml b/metadata/glsa/glsa-200509-03.xml
index 12a72e130765..db37c50b77e0 100644
--- a/metadata/glsa/glsa-200509-03.xml
+++ b/metadata/glsa/glsa-200509-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openttd</product>
   <announced>2005-09-05</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>102631</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-04.xml b/metadata/glsa/glsa-200509-04.xml
index 6e96d06b780f..d8b4d4ef760a 100644
--- a/metadata/glsa/glsa-200509-04.xml
+++ b/metadata/glsa/glsa-200509-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpLDAPadmin</product>
   <announced>2005-09-06</announced>
-  <revised>2005-09-06: 01</revised>
+  <revised count="01">2005-09-06</revised>
   <bug>104293</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-05.xml b/metadata/glsa/glsa-200509-05.xml
index a072ab57f71c..21fbed08c2b6 100644
--- a/metadata/glsa/glsa-200509-05.xml
+++ b/metadata/glsa/glsa-200509-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">net-snmp</product>
   <announced>2005-09-06</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>103776</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-06.xml b/metadata/glsa/glsa-200509-06.xml
index 847d94eb5804..d5619535bdac 100644
--- a/metadata/glsa/glsa-200509-06.xml
+++ b/metadata/glsa/glsa-200509-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Squid</product>
   <announced>2005-09-07</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>104603</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-07.xml b/metadata/glsa/glsa-200509-07.xml
index 1586543cd526..1a04fbac0ea3 100644
--- a/metadata/glsa/glsa-200509-07.xml
+++ b/metadata/glsa/glsa-200509-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">X.Org</product>
   <announced>2005-09-12</announced>
-  <revised>2005-09-12: 01</revised>
+  <revised count="01">2005-09-12</revised>
   <bug>105688</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-08.xml b/metadata/glsa/glsa-200509-08.xml
index c960d6d16595..53e1efd477a7 100644
--- a/metadata/glsa/glsa-200509-08.xml
+++ b/metadata/glsa/glsa-200509-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Python</product>
   <announced>2005-09-12</announced>
-  <revised>2005-09-12: 01</revised>
+  <revised count="01">2005-09-12</revised>
   <bug>104009</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-09.xml b/metadata/glsa/glsa-200509-09.xml
index 8cfd2f4b7f70..b401f158be0a 100644
--- a/metadata/glsa/glsa-200509-09.xml
+++ b/metadata/glsa/glsa-200509-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">py2play</product>
   <announced>2005-09-17</announced>
-  <revised>2006-09-05: 02</revised>
+  <revised count="02">2006-09-05</revised>
   <bug>103524</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-10.xml b/metadata/glsa/glsa-200509-10.xml
index 6fe31b2dfa83..af00e2ff2271 100644
--- a/metadata/glsa/glsa-200509-10.xml
+++ b/metadata/glsa/glsa-200509-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mailutils</product>
   <announced>2005-09-17</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>105458</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-11.xml b/metadata/glsa/glsa-200509-11.xml
index c7248b601b3f..5d98285aa5f6 100644
--- a/metadata/glsa/glsa-200509-11.xml
+++ b/metadata/glsa/glsa-200509-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mozilla</product>
   <announced>2005-09-18</announced>
-  <revised>2005-09-29: 02</revised>
+  <revised count="02">2005-09-29</revised>
   <bug>105396</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-12.xml b/metadata/glsa/glsa-200509-12.xml
index 2e1fc0e3cfb0..a821df2a8b99 100644
--- a/metadata/glsa/glsa-200509-12.xml
+++ b/metadata/glsa/glsa-200509-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Apache</product>
   <announced>2005-09-19</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>103554</bug>
   <bug>104807</bug>
   <access>remote and local</access>
diff --git a/metadata/glsa/glsa-200509-13.xml b/metadata/glsa/glsa-200509-13.xml
index 4592d8943a12..6d0205565d98 100644
--- a/metadata/glsa/glsa-200509-13.xml
+++ b/metadata/glsa/glsa-200509-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2005-09-19</announced>
-  <revised>2005-09-19: 01</revised>
+  <revised count="01">2005-09-19</revised>
   <bug>106279</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-14.xml b/metadata/glsa/glsa-200509-14.xml
index 3aac45f54120..95c17a02d25d 100644
--- a/metadata/glsa/glsa-200509-14.xml
+++ b/metadata/glsa/glsa-200509-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">zebedee</product>
   <announced>2005-09-20</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>105115</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-15.xml b/metadata/glsa/glsa-200509-15.xml
index 762d958c3103..c1b06ae3a37c 100644
--- a/metadata/glsa/glsa-200509-15.xml
+++ b/metadata/glsa/glsa-200509-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">util-linux</product>
   <announced>2005-09-20</announced>
-  <revised>2005-09-20: 01</revised>
+  <revised count="01">2005-09-20</revised>
   <bug>105805</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-16.xml b/metadata/glsa/glsa-200509-16.xml
index 6d6dbb200194..f8884c8284f8 100644
--- a/metadata/glsa/glsa-200509-16.xml
+++ b/metadata/glsa/glsa-200509-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Mantis</product>
   <announced>2005-09-24</announced>
-  <revised>2005-09-24: 01</revised>
+  <revised count="01">2005-09-24</revised>
   <bug>103308</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-17.xml b/metadata/glsa/glsa-200509-17.xml
index 084bb564fa60..e7794f7f3c54 100644
--- a/metadata/glsa/glsa-200509-17.xml
+++ b/metadata/glsa/glsa-200509-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Webmin Usermin</product>
   <announced>2005-09-24</announced>
-  <revised>2005-09-24: 01</revised>
+  <revised count="01">2005-09-24</revised>
   <bug>106705</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-18.xml b/metadata/glsa/glsa-200509-18.xml
index 0b611e57d058..36b4f31dbddf 100644
--- a/metadata/glsa/glsa-200509-18.xml
+++ b/metadata/glsa/glsa-200509-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">qt</product>
   <announced>2005-09-26</announced>
-  <revised>2005-09-26: 02</revised>
+  <revised count="02">2005-09-26</revised>
   <bug>105695</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-19.xml b/metadata/glsa/glsa-200509-19.xml
index 30274bbd2ab4..ab7cd8001246 100644
--- a/metadata/glsa/glsa-200509-19.xml
+++ b/metadata/glsa/glsa-200509-19.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">PHP</product>
   <announced>2005-09-27</announced>
-  <revised>2005-09-27: 01</revised>
+  <revised count="01">2005-09-27</revised>
   <bug>102373</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-20.xml b/metadata/glsa/glsa-200509-20.xml
index 3f8b5898ea12..77428e87b8f3 100644
--- a/metadata/glsa/glsa-200509-20.xml
+++ b/metadata/glsa/glsa-200509-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">AbiWord</product>
   <announced>2005-09-30</announced>
-  <revised>2005-09-30: 01</revised>
+  <revised count="01">2005-09-30</revised>
   <bug>107351</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200509-21.xml b/metadata/glsa/glsa-200509-21.xml
index 8d46ac80cb8f..01f3d5f2ccd1 100644
--- a/metadata/glsa/glsa-200509-21.xml
+++ b/metadata/glsa/glsa-200509-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">hylafax</product>
   <announced>2005-09-30</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>106882</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-01.xml b/metadata/glsa/glsa-200510-01.xml
index a62831d27b59..b66a820f7239 100644
--- a/metadata/glsa/glsa-200510-01.xml
+++ b/metadata/glsa/glsa-200510-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gtkdiskfree</product>
   <announced>2005-10-03</announced>
-  <revised>2005-10-03: 01</revised>
+  <revised count="01">2005-10-03</revised>
   <bug>104565</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-02.xml b/metadata/glsa/glsa-200510-02.xml
index 5f5f9047e743..f6a2418b1487 100644
--- a/metadata/glsa/glsa-200510-02.xml
+++ b/metadata/glsa/glsa-200510-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">MPEG Tools</product>
   <announced>2005-10-03</announced>
-  <revised>2005-10-03: 01</revised>
+  <revised count="01">2005-10-03</revised>
   <bug>107344</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-03.xml b/metadata/glsa/glsa-200510-03.xml
index e6d13be7a84b..17a1eb000cf6 100644
--- a/metadata/glsa/glsa-200510-03.xml
+++ b/metadata/glsa/glsa-200510-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">uim</product>
   <announced>2005-10-04</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>107748</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-04.xml b/metadata/glsa/glsa-200510-04.xml
index 82731dcae8d9..a274a3866d18 100644
--- a/metadata/glsa/glsa-200510-04.xml
+++ b/metadata/glsa/glsa-200510-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Texinfo</product>
   <announced>2005-10-05</announced>
-  <revised>2005-10-05: 01</revised>
+  <revised count="01">2005-10-05</revised>
   <bug>106105</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-05.xml b/metadata/glsa/glsa-200510-05.xml
index ec1951db967e..5b8748c0dd2f 100644
--- a/metadata/glsa/glsa-200510-05.xml
+++ b/metadata/glsa/glsa-200510-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ruby</product>
   <announced>2005-10-06</announced>
-  <revised>2005-10-06: 01</revised>
+  <revised count="01">2005-10-06</revised>
   <bug>106996</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-06.xml b/metadata/glsa/glsa-200510-06.xml
index a27d285ffd87..235d6a99e09f 100644
--- a/metadata/glsa/glsa-200510-06.xml
+++ b/metadata/glsa/glsa-200510-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dia</product>
   <announced>2005-10-06</announced>
-  <revised>2005-10-06: 01</revised>
+  <revised count="01">2005-10-06</revised>
   <bug>107916</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-07.xml b/metadata/glsa/glsa-200510-07.xml
index 880eb3b49dc1..70b7e483c47a 100644
--- a/metadata/glsa/glsa-200510-07.xml
+++ b/metadata/glsa/glsa-200510-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">realplayer helixplayer</product>
   <announced>2005-10-07</announced>
-  <revised>2005-11-22: 02</revised>
+  <revised count="02">2005-11-22</revised>
   <bug>107309</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-08.xml b/metadata/glsa/glsa-200510-08.xml
index c2f19abad692..939e64a2d1c1 100644
--- a/metadata/glsa/glsa-200510-08.xml
+++ b/metadata/glsa/glsa-200510-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-lib</product>
   <announced>2005-10-08</announced>
-  <revised>2005-10-08: 01</revised>
+  <revised count="01">2005-10-08</revised>
   <bug>107854</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-09.xml b/metadata/glsa/glsa-200510-09.xml
index 78272be21426..79bdef7c9400 100644
--- a/metadata/glsa/glsa-200510-09.xml
+++ b/metadata/glsa/glsa-200510-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Weex</product>
   <announced>2005-10-08</announced>
-  <revised>2005-10-08: 01</revised>
+  <revised count="01">2005-10-08</revised>
   <bug>107849</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-10.xml b/metadata/glsa/glsa-200510-10.xml
index 34fd03a94f2e..f18b18737242 100644
--- a/metadata/glsa/glsa-200510-10.xml
+++ b/metadata/glsa/glsa-200510-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">uw-imap</product>
   <announced>2005-10-11</announced>
-  <revised>2005-10-11: 01</revised>
+  <revised count="01">2005-10-11</revised>
   <bug>108206</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-11.xml b/metadata/glsa/glsa-200510-11.xml
index bab0ad1e4c9f..8e87ee78db09 100644
--- a/metadata/glsa/glsa-200510-11.xml
+++ b/metadata/glsa/glsa-200510-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">OpenSSL</product>
   <announced>2005-10-12</announced>
-  <revised>2005-11-07: 02</revised>
+  <revised count="02">2005-11-07</revised>
   <bug>108852</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-12.xml b/metadata/glsa/glsa-200510-12.xml
index 0a818ea43d45..fcef449d9737 100644
--- a/metadata/glsa/glsa-200510-12.xml
+++ b/metadata/glsa/glsa-200510-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">koffice, kword</product>
   <announced>2005-10-14</announced>
-  <revised>2005-10-14: 01</revised>
+  <revised count="01">2005-10-14</revised>
   <bug>108411</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-13.xml b/metadata/glsa/glsa-200510-13.xml
index c187155a596a..82fa933b1642 100644
--- a/metadata/glsa/glsa-200510-13.xml
+++ b/metadata/glsa/glsa-200510-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">spe</product>
   <announced>2005-10-15</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>108538</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-14.xml b/metadata/glsa/glsa-200510-14.xml
index 62112839d7a1..deebe28af1c9 100644
--- a/metadata/glsa/glsa-200510-14.xml
+++ b/metadata/glsa/glsa-200510-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Perl Qt-UnixODBC CMake</product>
   <announced>2005-10-17</announced>
-  <revised>2006-05-22: 03</revised>
+  <revised count="03">2006-05-22</revised>
   <bug>105719</bug>
   <bug>105721</bug>
   <bug>106678</bug>
diff --git a/metadata/glsa/glsa-200510-15.xml b/metadata/glsa/glsa-200510-15.xml
index 191ef6e2656d..6c7708a2a011 100644
--- a/metadata/glsa/glsa-200510-15.xml
+++ b/metadata/glsa/glsa-200510-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Lynx</product>
   <announced>2005-10-17</announced>
-  <revised>2005-10-17: 01</revised>
+  <revised count="01">2005-10-17</revised>
   <bug>108451</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-16.xml b/metadata/glsa/glsa-200510-16.xml
index 7395ab24957c..935c786fe0c0 100644
--- a/metadata/glsa/glsa-200510-16.xml
+++ b/metadata/glsa/glsa-200510-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpmyadmin</product>
   <announced>2005-10-17</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>108939</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-17.xml b/metadata/glsa/glsa-200510-17.xml
index 87f82b36d60b..91053fc1eb78 100644
--- a/metadata/glsa/glsa-200510-17.xml
+++ b/metadata/glsa/glsa-200510-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">AbiWord</product>
   <announced>2005-10-20</announced>
-  <revised>2005-10-20: 01</revised>
+  <revised count="01">2005-10-20</revised>
   <bug>109157</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-18.xml b/metadata/glsa/glsa-200510-18.xml
index 31402e773086..83e77708e3ae 100644
--- a/metadata/glsa/glsa-200510-18.xml
+++ b/metadata/glsa/glsa-200510-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Netpbm</product>
   <announced>2005-10-20</announced>
-  <revised>2009-05-28: 06</revised>
+  <revised count="06">2009-05-28</revised>
   <bug>109705</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-19.xml b/metadata/glsa/glsa-200510-19.xml
index 5919447d83bd..a9ea6bb2c62c 100644
--- a/metadata/glsa/glsa-200510-19.xml
+++ b/metadata/glsa/glsa-200510-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cURL</product>
   <announced>2005-10-22</announced>
-  <revised>2005-10-22: 01</revised>
+  <revised count="01">2005-10-22</revised>
   <bug>109097</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-20.xml b/metadata/glsa/glsa-200510-20.xml
index c15fda05fa38..9825f95ca314 100644
--- a/metadata/glsa/glsa-200510-20.xml
+++ b/metadata/glsa/glsa-200510-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Zope</product>
   <announced>2005-10-25</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>109087</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-21.xml b/metadata/glsa/glsa-200510-21.xml
index f835c9db1c66..4791d403907c 100644
--- a/metadata/glsa/glsa-200510-21.xml
+++ b/metadata/glsa/glsa-200510-21.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">phpmyadmin</product>
   <announced>2005-10-25</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>110146</bug>
   <access>local and remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-22.xml b/metadata/glsa/glsa-200510-22.xml
index 9a6e12117d49..66d1fb35e43b 100644
--- a/metadata/glsa/glsa-200510-22.xml
+++ b/metadata/glsa/glsa-200510-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">PAM</product>
   <announced>2005-10-28</announced>
-  <revised>2005-10-28: 01</revised>
+  <revised count="01">2005-10-28</revised>
   <bug>109485</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-23.xml b/metadata/glsa/glsa-200510-23.xml
index e811987afca2..dc33206fcdcf 100644
--- a/metadata/glsa/glsa-200510-23.xml
+++ b/metadata/glsa/glsa-200510-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tikiwiki</product>
   <announced>2005-10-28</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>109858</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-24.xml b/metadata/glsa/glsa-200510-24.xml
index 6ba2621d6dfd..91624cd6127f 100644
--- a/metadata/glsa/glsa-200510-24.xml
+++ b/metadata/glsa/glsa-200510-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Mantis</product>
   <announced>2005-10-28</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>110326</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-25.xml b/metadata/glsa/glsa-200510-25.xml
index d8724e94e2c3..2b7c90d97781 100644
--- a/metadata/glsa/glsa-200510-25.xml
+++ b/metadata/glsa/glsa-200510-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Ethereal</product>
   <announced>2005-10-30</announced>
-  <revised>2005-10-30: 01</revised>
+  <revised count="01">2005-10-30</revised>
   <bug>109348</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200510-26.xml b/metadata/glsa/glsa-200510-26.xml
index fe2e85f38f19..a5cffb6b15d1 100644
--- a/metadata/glsa/glsa-200510-26.xml
+++ b/metadata/glsa/glsa-200510-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xli xloadimage</product>
   <announced>2005-10-30</announced>
-  <revised>2005-10-30: 01</revised>
+  <revised count="01">2005-10-30</revised>
   <bug>108365</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-01.xml b/metadata/glsa/glsa-200511-01.xml
index 6a4846ee1b16..086b6e02f139 100644
--- a/metadata/glsa/glsa-200511-01.xml
+++ b/metadata/glsa/glsa-200511-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libgda</product>
   <announced>2005-11-02</announced>
-  <revised>2005-11-02: 01</revised>
+  <revised count="01">2005-11-02</revised>
   <bug>110467</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-02.xml b/metadata/glsa/glsa-200511-02.xml
index cf3ab8def8c5..8beaf24ec8a2 100644
--- a/metadata/glsa/glsa-200511-02.xml
+++ b/metadata/glsa/glsa-200511-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">QDBM ImageMagick GDAL</product>
   <announced>2005-11-02</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>105717</bug>
   <bug>105760</bug>
   <bug>108534</bug>
diff --git a/metadata/glsa/glsa-200511-03.xml b/metadata/glsa/glsa-200511-03.xml
index 045c52c628c7..135f7232c5be 100644
--- a/metadata/glsa/glsa-200511-03.xml
+++ b/metadata/glsa/glsa-200511-03.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">giflib</product>
   <announced>2005-11-04</announced>
-  <revised>2005-11-04: 01</revised>
+  <revised count="01">2005-11-04</revised>
   <bug>109997</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-04.xml b/metadata/glsa/glsa-200511-04.xml
index f68bcdb74978..d94381f86ee1 100644
--- a/metadata/glsa/glsa-200511-04.xml
+++ b/metadata/glsa/glsa-200511-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2005-11-06</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>109213</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-05.xml b/metadata/glsa/glsa-200511-05.xml
index 70581a635a79..ffa96dac9fce 100644
--- a/metadata/glsa/glsa-200511-05.xml
+++ b/metadata/glsa/glsa-200511-05.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">gnump3d</product>
   <announced>2005-11-06</announced>
-  <revised>2007-08-21: 02</revised>
+  <revised count="02">2007-08-21</revised>
   <bug>109667</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-06.xml b/metadata/glsa/glsa-200511-06.xml
index 11c6f49fd9d8..226cd8806d06 100644
--- a/metadata/glsa/glsa-200511-06.xml
+++ b/metadata/glsa/glsa-200511-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">fetchmail</product>
   <announced>2005-11-06</announced>
-  <revised>2005-11-06: 01</revised>
+  <revised count="01">2005-11-06</revised>
   <bug>110366</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-07.xml b/metadata/glsa/glsa-200511-07.xml
index 74c8cfa30767..7d85fef74549 100644
--- a/metadata/glsa/glsa-200511-07.xml
+++ b/metadata/glsa/glsa-200511-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">OpenVPN</product>
   <announced>2005-11-06</announced>
-  <revised>2005-11-06: 01</revised>
+  <revised count="01">2005-11-06</revised>
   <bug>111116</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-08.xml b/metadata/glsa/glsa-200511-08.xml
index de2f94d4663d..689a78939214 100644
--- a/metadata/glsa/glsa-200511-08.xml
+++ b/metadata/glsa/glsa-200511-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">PHP</product>
   <announced>2005-11-13</announced>
-  <revised>2005-11-13: 01</revised>
+  <revised count="01">2005-11-13</revised>
   <bug>107602</bug>
   <bug>111032</bug>
   <access>remote and local</access>
diff --git a/metadata/glsa/glsa-200511-09.xml b/metadata/glsa/glsa-200511-09.xml
index 85f88657872e..21bb2f60c30b 100644
--- a/metadata/glsa/glsa-200511-09.xml
+++ b/metadata/glsa/glsa-200511-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lynx</product>
   <announced>2005-11-13</announced>
-  <revised>2005-11-13: 01</revised>
+  <revised count="01">2005-11-13</revised>
   <bug>112213</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-10.xml b/metadata/glsa/glsa-200511-10.xml
index a53a563608cd..ca53698c3911 100644
--- a/metadata/glsa/glsa-200511-10.xml
+++ b/metadata/glsa/glsa-200511-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rar</product>
   <announced>2005-11-13</announced>
-  <revised>2005-11-13: 01</revised>
+  <revised count="01">2005-11-13</revised>
   <bug>111926</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-11.xml b/metadata/glsa/glsa-200511-11.xml
index d65cb2600beb..ac15194870da 100644
--- a/metadata/glsa/glsa-200511-11.xml
+++ b/metadata/glsa/glsa-200511-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">linux-ftpd-ssl</product>
   <announced>2005-11-13</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>111573</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-12.xml b/metadata/glsa/glsa-200511-12.xml
index 716ebb669236..8423aa2816bf 100644
--- a/metadata/glsa/glsa-200511-12.xml
+++ b/metadata/glsa/glsa-200511-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">scorched3d</product>
   <announced>2005-11-15</announced>
-  <revised>2006-08-10: 03</revised>
+  <revised count="03">2006-08-10</revised>
   <bug>111421</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-13.xml b/metadata/glsa/glsa-200511-13.xml
index 479d57c416b6..ec0416daf914 100644
--- a/metadata/glsa/glsa-200511-13.xml
+++ b/metadata/glsa/glsa-200511-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sylpheed sylpheed-claws</product>
   <announced>2005-11-15</announced>
-  <revised>2005-11-15: 01</revised>
+  <revised count="01">2005-11-15</revised>
   <bug>111853</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-14.xml b/metadata/glsa/glsa-200511-14.xml
index be9da5f06b42..68c4067fd3fa 100644
--- a/metadata/glsa/glsa-200511-14.xml
+++ b/metadata/glsa/glsa-200511-14.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">gtk+</product>
   <announced>2005-11-16</announced>
-  <revised>2005-11-16: 01</revised>
+  <revised count="01">2005-11-16</revised>
   <bug>112608</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-15.xml b/metadata/glsa/glsa-200511-15.xml
index e490aae6e3d4..f17ace66fb0c 100644
--- a/metadata/glsa/glsa-200511-15.xml
+++ b/metadata/glsa/glsa-200511-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Smb4k</product>
   <announced>2005-11-18</announced>
-  <revised>2005-11-18: 01</revised>
+  <revised count="01">2005-11-18</revised>
   <bug>111089</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-16.xml b/metadata/glsa/glsa-200511-16.xml
index 921370bff5cf..b2975e89330c 100644
--- a/metadata/glsa/glsa-200511-16.xml
+++ b/metadata/glsa/glsa-200511-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">GNUMP3d</product>
   <announced>2005-11-21</announced>
-  <revised>2007-08-21: 02</revised>
+  <revised count="02">2007-08-21</revised>
   <bug>111990</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-17.xml b/metadata/glsa/glsa-200511-17.xml
index bf5b088e5072..d99af133df54 100644
--- a/metadata/glsa/glsa-200511-17.xml
+++ b/metadata/glsa/glsa-200511-17.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">FUSE</product>
   <announced>2005-11-22</announced>
-  <revised>2005-11-22: 01</revised>
+  <revised count="01">2005-11-22</revised>
   <bug>112902</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-18.xml b/metadata/glsa/glsa-200511-18.xml
index 420e82a0acd6..aacc8813aad1 100644
--- a/metadata/glsa/glsa-200511-18.xml
+++ b/metadata/glsa/glsa-200511-18.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">phpsysinfo</product>
   <announced>2005-11-22</announced>
-  <revised>2005-11-22: 01</revised>
+  <revised count="01">2005-11-22</revised>
   <bug>112482</bug>
   <access>local and remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-19.xml b/metadata/glsa/glsa-200511-19.xml
index 6354dd45a804..d27129cfb23a 100644
--- a/metadata/glsa/glsa-200511-19.xml
+++ b/metadata/glsa/glsa-200511-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">eix</product>
   <announced>2005-11-22</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>112061</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-20.xml b/metadata/glsa/glsa-200511-20.xml
index baebb98345e2..66b5aadc0c91 100644
--- a/metadata/glsa/glsa-200511-20.xml
+++ b/metadata/glsa/glsa-200511-20.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">horde</product>
   <announced>2005-11-22</announced>
-  <revised>2005-11-22: 01</revised>
+  <revised count="01">2005-11-22</revised>
   <bug>112491</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-21.xml b/metadata/glsa/glsa-200511-21.xml
index 9e52ac8dc9af..49d049df89bc 100644
--- a/metadata/glsa/glsa-200511-21.xml
+++ b/metadata/glsa/glsa-200511-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Flash</product>
   <announced>2005-11-25</announced>
-  <revised>2009-05-28: 02</revised>
+  <revised count="02">2009-05-28</revised>
   <bug>112251</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-22.xml b/metadata/glsa/glsa-200511-22.xml
index 15413622c9fc..f608246b3688 100644
--- a/metadata/glsa/glsa-200511-22.xml
+++ b/metadata/glsa/glsa-200511-22.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Inkscape</product>
   <announced>2005-11-28</announced>
-  <revised>2005-11-28: 01</revised>
+  <revised count="01">2005-11-28</revised>
   <bug>109993</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200511-23.xml b/metadata/glsa/glsa-200511-23.xml
index 367b52f41137..0b6152d7fd26 100644
--- a/metadata/glsa/glsa-200511-23.xml
+++ b/metadata/glsa/glsa-200511-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">chmlib kchmviewer</product>
   <announced>2005-11-28</announced>
-  <revised>2009-05-28: 03</revised>
+  <revised count="03">2009-05-28</revised>
   <bug>110557</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200512-01.xml b/metadata/glsa/glsa-200512-01.xml
index e595beca30ef..1586458545c4 100644
--- a/metadata/glsa/glsa-200512-01.xml
+++ b/metadata/glsa/glsa-200512-01.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Perl</product>
   <announced>2005-12-07</announced>
-  <revised>2005-12-07: 01</revised>
+  <revised count="01">2005-12-07</revised>
   <bug>114113</bug>
   <access>remote and local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200512-02.xml b/metadata/glsa/glsa-200512-02.xml
index feb883b0acc7..bfbdcd1bf6fd 100644
--- a/metadata/glsa/glsa-200512-02.xml
+++ b/metadata/glsa/glsa-200512-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">webmin usermin</product>
   <announced>2005-12-07</announced>
-  <revised>2005-12-07: 01</revised>
+  <revised count="01">2005-12-07</revised>
   <bug>113888</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200512-03.xml b/metadata/glsa/glsa-200512-03.xml
index cf22b93f5224..0761a75d00b7 100644
--- a/metadata/glsa/glsa-200512-03.xml
+++ b/metadata/glsa/glsa-200512-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpmyadmin</product>
   <announced>2005-12-11</announced>
-  <revised>2005-12-11: 01</revised>
+  <revised count="01">2005-12-11</revised>
   <bug>114662</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200512-04.xml b/metadata/glsa/glsa-200512-04.xml
index 0d7b0a463112..2f6c865dcbd3 100644
--- a/metadata/glsa/glsa-200512-04.xml
+++ b/metadata/glsa/glsa-200512-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openswan ipsec-tools</product>
   <announced>2005-12-12</announced>
-  <revised>2005-12-14: 02</revised>
+  <revised count="02">2005-12-14</revised>
   <bug>112568</bug>
   <bug>113201</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200512-05.xml b/metadata/glsa/glsa-200512-05.xml
index 9c033f7866ba..355f1365803e 100644
--- a/metadata/glsa/glsa-200512-05.xml
+++ b/metadata/glsa/glsa-200512-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xmail</product>
   <announced>2005-12-14</announced>
-  <revised>2005-12-14: 01</revised>
+  <revised count="01">2005-12-14</revised>
   <bug>109381</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200512-06.xml b/metadata/glsa/glsa-200512-06.xml
index bcc94721e9e5..62ced5afba88 100644
--- a/metadata/glsa/glsa-200512-06.xml
+++ b/metadata/glsa/glsa-200512-06.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Ethereal</product>
   <announced>2005-12-14</announced>
-  <revised>2005-12-14: 01</revised>
+  <revised count="01">2005-12-14</revised>
   <bug>115030</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200512-07.xml b/metadata/glsa/glsa-200512-07.xml
index e0374281775f..cd9d4232cd28 100644
--- a/metadata/glsa/glsa-200512-07.xml
+++ b/metadata/glsa/glsa-200512-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">OpenLDAP Gauche</product>
   <announced>2005-12-15</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>105380</bug>
   <bug>112577</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-200512-08.xml b/metadata/glsa/glsa-200512-08.xml
index 8ffe8e962395..80c8e744a956 100644
--- a/metadata/glsa/glsa-200512-08.xml
+++ b/metadata/glsa/glsa-200512-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xpdf, gpdf, poppler,cups</product>
   <announced>2005-12-16</announced>
-  <revised>2005-12-17: 02</revised>
+  <revised count="02">2005-12-17</revised>
   <bug>114428</bug>
   <bug>115286</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200512-09.xml b/metadata/glsa/glsa-200512-09.xml
index e277cec83c5a..881ce48c14d0 100644
--- a/metadata/glsa/glsa-200512-09.xml
+++ b/metadata/glsa/glsa-200512-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cURL</product>
   <announced>2005-12-16</announced>
-  <revised>2005-12-16: 01</revised>
+  <revised count="01">2005-12-16</revised>
   <bug>114710</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200512-10.xml b/metadata/glsa/glsa-200512-10.xml
index 22eba8929359..bcac81620401 100644
--- a/metadata/glsa/glsa-200512-10.xml
+++ b/metadata/glsa/glsa-200512-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2005-12-18</announced>
-  <revised>2005-12-18: 01</revised>
+  <revised count="01">2005-12-18</revised>
   <bug>113239</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200512-11.xml b/metadata/glsa/glsa-200512-11.xml
index 3355ac85d89c..9ed225fe095e 100644
--- a/metadata/glsa/glsa-200512-11.xml
+++ b/metadata/glsa/glsa-200512-11.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">CenterICQ</product>
   <announced>2005-12-20</announced>
-  <revised>2005-12-20: 01</revised>
+  <revised count="01">2005-12-20</revised>
   <bug>100519</bug>
   <bug>114038</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200512-12.xml b/metadata/glsa/glsa-200512-12.xml
index e5ec620717fa..d408a4829559 100644
--- a/metadata/glsa/glsa-200512-12.xml
+++ b/metadata/glsa/glsa-200512-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Mantis</product>
   <announced>2005-12-22</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>116036</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200512-13.xml b/metadata/glsa/glsa-200512-13.xml
index 6b9bf55b1019..8e391aa43642 100644
--- a/metadata/glsa/glsa-200512-13.xml
+++ b/metadata/glsa/glsa-200512-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dropbear</product>
   <announced>2005-12-23</announced>
-  <revised>2005-12-23: 01</revised>
+  <revised count="01">2005-12-23</revised>
   <bug>116006</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200512-14.xml b/metadata/glsa/glsa-200512-14.xml
index 7d6c0af7b31f..8ff71fa807bc 100644
--- a/metadata/glsa/glsa-200512-14.xml
+++ b/metadata/glsa/glsa-200512-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">NBD</product>
   <announced>2005-12-23</announced>
-  <revised>2005-12-23: 01</revised>
+  <revised count="01">2005-12-23</revised>
   <bug>116314</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200512-15.xml b/metadata/glsa/glsa-200512-15.xml
index 6500cdd2ada4..87bcd5cce0dc 100644
--- a/metadata/glsa/glsa-200512-15.xml
+++ b/metadata/glsa/glsa-200512-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rssh</product>
   <announced>2005-12-27</announced>
-  <revised>2005-12-27: 01</revised>
+  <revised count="01">2005-12-27</revised>
   <bug>115082</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200512-16.xml b/metadata/glsa/glsa-200512-16.xml
index ed6871abef91..c9628ab9364d 100644
--- a/metadata/glsa/glsa-200512-16.xml
+++ b/metadata/glsa/glsa-200512-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openmotif</product>
   <announced>2005-12-28</announced>
-  <revised>2006-01-29: 03</revised>
+  <revised count="03">2006-01-29</revised>
   <bug>114234</bug>
   <bug>116481</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200512-17.xml b/metadata/glsa/glsa-200512-17.xml
index 13e53784914b..cc49503bd515 100644
--- a/metadata/glsa/glsa-200512-17.xml
+++ b/metadata/glsa/glsa-200512-17.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">scponly</product>
   <announced>2005-12-29</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>116526</bug>
   <access>local and remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200512-18.xml b/metadata/glsa/glsa-200512-18.xml
index 541430020241..fea62ab62728 100644
--- a/metadata/glsa/glsa-200512-18.xml
+++ b/metadata/glsa/glsa-200512-18.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">xnview</product>
   <announced>2005-12-30</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>117063</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-01.xml b/metadata/glsa/glsa-200601-01.xml
index 63c4d3af5ddc..53e6fc35f81e 100644
--- a/metadata/glsa/glsa-200601-01.xml
+++ b/metadata/glsa/glsa-200601-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pinentry</product>
   <announced>2006-01-03</announced>
-  <revised>2006-01-03: 01</revised>
+  <revised count="01">2006-01-03</revised>
   <bug>116822</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-02.xml b/metadata/glsa/glsa-200601-02.xml
index ec7d8df6a76f..ec576f68eec4 100644
--- a/metadata/glsa/glsa-200601-02.xml
+++ b/metadata/glsa/glsa-200601-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kdegraphics, kpdf, koffice, kword</product>
   <announced>2006-01-04</announced>
-  <revised>2006-01-07: 03</revised>
+  <revised count="03">2006-01-07</revised>
   <bug>114429</bug>
   <bug>115851</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200601-03.xml b/metadata/glsa/glsa-200601-03.xml
index e10e72021625..a0c326254c55 100644
--- a/metadata/glsa/glsa-200601-03.xml
+++ b/metadata/glsa/glsa-200601-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">hylafax</product>
   <announced>2006-01-06</announced>
-  <revised>2006-01-06: 01</revised>
+  <revised count="01">2006-01-06</revised>
   <bug>116389</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-04.xml b/metadata/glsa/glsa-200601-04.xml
index 2b1c0855df7c..e7374eccfbb1 100644
--- a/metadata/glsa/glsa-200601-04.xml
+++ b/metadata/glsa/glsa-200601-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">VMware</product>
   <announced>2006-01-07</announced>
-  <revised>2006-05-25: 02</revised>
+  <revised count="02">2006-05-25</revised>
   <bug>116238</bug>
   <access>remote and local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-05.xml b/metadata/glsa/glsa-200601-05.xml
index 7484eceaddf7..44cd9c9b3afe 100644
--- a/metadata/glsa/glsa-200601-05.xml
+++ b/metadata/glsa/glsa-200601-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mod_auth_pgsql</product>
   <announced>2006-01-10</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>118096</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-06.xml b/metadata/glsa/glsa-200601-06.xml
index f779a5d710ae..4fcb4a00c9fc 100644
--- a/metadata/glsa/glsa-200601-06.xml
+++ b/metadata/glsa/glsa-200601-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-lib ffmpeg</product>
   <announced>2006-01-10</announced>
-  <revised>2006-01-10: 01</revised>
+  <revised count="01">2006-01-10</revised>
   <bug>115849</bug>
   <bug>116181</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200601-07.xml b/metadata/glsa/glsa-200601-07.xml
index 7f371087cdb9..a4e38f87eb58 100644
--- a/metadata/glsa/glsa-200601-07.xml
+++ b/metadata/glsa/glsa-200601-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2006-01-13</announced>
-  <revised>2006-01-13: 01</revised>
+  <revised count="01">2006-01-13</revised>
   <bug>118459</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-08.xml b/metadata/glsa/glsa-200601-08.xml
index 4ffb6b91adf0..a5c8993a79bd 100644
--- a/metadata/glsa/glsa-200601-08.xml
+++ b/metadata/glsa/glsa-200601-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">blender</product>
   <announced>2006-01-13</announced>
-  <revised>2006-01-13: 01</revised>
+  <revised count="01">2006-01-13</revised>
   <bug>118163</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-09.xml b/metadata/glsa/glsa-200601-09.xml
index 3ae02dc0549e..e53c6d9a907e 100644
--- a/metadata/glsa/glsa-200601-09.xml
+++ b/metadata/glsa/glsa-200601-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wine</product>
   <announced>2006-01-13</announced>
-  <revised>2007-02-26: 03</revised>
+  <revised count="03">2007-02-26</revised>
   <bug>118101</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-10.xml b/metadata/glsa/glsa-200601-10.xml
index 68a4d4eb7748..3ae17e79f91d 100644
--- a/metadata/glsa/glsa-200601-10.xml
+++ b/metadata/glsa/glsa-200601-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sun-jdk sun-jre-bin blackdown-jre blackdown-jdk</product>
   <announced>2006-01-16</announced>
-  <revised>2006-01-16: 01</revised>
+  <revised count="01">2006-01-16</revised>
   <bug>118114</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-11.xml b/metadata/glsa/glsa-200601-11.xml
index afb9e6b5c12f..9fec84ec7a38 100644
--- a/metadata/glsa/glsa-200601-11.xml
+++ b/metadata/glsa/glsa-200601-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">KDE</product>
   <announced>2006-01-22</announced>
-  <revised>2006-01-22: 01</revised>
+  <revised count="01">2006-01-22</revised>
   <bug>118550</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-12.xml b/metadata/glsa/glsa-200601-12.xml
index f4da02e86517..d3061b25e336 100644
--- a/metadata/glsa/glsa-200601-12.xml
+++ b/metadata/glsa/glsa-200601-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">trac</product>
   <announced>2006-01-26</announced>
-  <revised>2006-01-26: 01</revised>
+  <revised count="01">2006-01-26</revised>
   <bug>118302</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-13.xml b/metadata/glsa/glsa-200601-13.xml
index d394557a5466..ecb26cf2c36c 100644
--- a/metadata/glsa/glsa-200601-13.xml
+++ b/metadata/glsa/glsa-200601-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gallery</product>
   <announced>2006-01-26</announced>
-  <revised>2006-01-26: 01</revised>
+  <revised count="01">2006-01-26</revised>
   <bug>119590</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-14.xml b/metadata/glsa/glsa-200601-14.xml
index 25e33fdb34d0..b92682897147 100644
--- a/metadata/glsa/glsa-200601-14.xml
+++ b/metadata/glsa/glsa-200601-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">LibAST</product>
   <announced>2006-01-29</announced>
-  <revised>2006-01-29: 02</revised>
+  <revised count="02">2006-01-29</revised>
   <bug>120106</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-15.xml b/metadata/glsa/glsa-200601-15.xml
index 8240f3e9aa71..d7b030aef9de 100644
--- a/metadata/glsa/glsa-200601-15.xml
+++ b/metadata/glsa/glsa-200601-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Paros</product>
   <announced>2006-01-29</announced>
-  <revised>2006-01-29: 01</revised>
+  <revised count="01">2006-01-29</revised>
   <bug>120352</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-16.xml b/metadata/glsa/glsa-200601-16.xml
index 093625d0d86f..ac2bc802e3ac 100644
--- a/metadata/glsa/glsa-200601-16.xml
+++ b/metadata/glsa/glsa-200601-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">MyDNS</product>
   <announced>2006-01-30</announced>
-  <revised>2006-01-30: 01</revised>
+  <revised count="01">2006-01-30</revised>
   <bug>119548</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200601-17.xml b/metadata/glsa/glsa-200601-17.xml
index 0734dbb89f98..79a52bba1541 100644
--- a/metadata/glsa/glsa-200601-17.xml
+++ b/metadata/glsa/glsa-200601-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xpdf poppler gpdf libextractor pdftohtml</product>
   <announced>2006-01-30</announced>
-  <revised>2006-01-30: 01</revised>
+  <revised count="01">2006-01-30</revised>
   <bug>117481</bug>
   <bug>117494</bug>
   <bug>117495</bug>
diff --git a/metadata/glsa/glsa-200602-01.xml b/metadata/glsa/glsa-200602-01.xml
index b20d64829c26..55989f5648c3 100644
--- a/metadata/glsa/glsa-200602-01.xml
+++ b/metadata/glsa/glsa-200602-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gst-plugins-ffmpeg</product>
   <announced>2006-02-05</announced>
-  <revised>2006-02-05: 01</revised>
+  <revised count="01">2006-02-05</revised>
   <bug>119512</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200602-02.xml b/metadata/glsa/glsa-200602-02.xml
index 175729f6a375..8cd24c11a72a 100644
--- a/metadata/glsa/glsa-200602-02.xml
+++ b/metadata/glsa/glsa-200602-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ADOdb</product>
   <announced>2006-02-06</announced>
-  <revised>2006-02-06: 01</revised>
+  <revised count="01">2006-02-06</revised>
   <bug>120215</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200602-03.xml b/metadata/glsa/glsa-200602-03.xml
index b7139a9e0f76..0ca40392a1f2 100644
--- a/metadata/glsa/glsa-200602-03.xml
+++ b/metadata/glsa/glsa-200602-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Apache</product>
   <announced>2006-02-06</announced>
-  <revised>2007-12-30: 03</revised>
+  <revised count="03">2007-12-30</revised>
   <bug>115324</bug>
   <bug>118875</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200602-04.xml b/metadata/glsa/glsa-200602-04.xml
index e0b99be398ea..325c058e181e 100644
--- a/metadata/glsa/glsa-200602-04.xml
+++ b/metadata/glsa/glsa-200602-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xpdf poppler</product>
   <announced>2006-02-12</announced>
-  <revised>2006-02-12: 01</revised>
+  <revised count="01">2006-02-12</revised>
   <bug>120985</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200602-05.xml b/metadata/glsa/glsa-200602-05.xml
index cee3c4142764..28206778f059 100644
--- a/metadata/glsa/glsa-200602-05.xml
+++ b/metadata/glsa/glsa-200602-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kdegraphics, kpdf</product>
   <announced>2006-02-12</announced>
-  <revised>2006-02-12: 01</revised>
+  <revised count="01">2006-02-12</revised>
   <bug>121375</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200602-06.xml b/metadata/glsa/glsa-200602-06.xml
index db1a2920e223..428cc6f7af05 100644
--- a/metadata/glsa/glsa-200602-06.xml
+++ b/metadata/glsa/glsa-200602-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ImageMagick</product>
   <announced>2006-02-13</announced>
-  <revised>2006-02-13: 01</revised>
+  <revised count="01">2006-02-13</revised>
   <bug>83542</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200602-07.xml b/metadata/glsa/glsa-200602-07.xml
index a9720b747813..1800b84f1a91 100644
--- a/metadata/glsa/glsa-200602-07.xml
+++ b/metadata/glsa/glsa-200602-07.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Sun JDK, applet</product>
   <announced>2006-02-15</announced>
-  <revised>2006-02-15: 01</revised>
+  <revised count="01">2006-02-15</revised>
   <bug>122156</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200602-08.xml b/metadata/glsa/glsa-200602-08.xml
index 7b3c4d942d93..3c8e86e37db6 100644
--- a/metadata/glsa/glsa-200602-08.xml
+++ b/metadata/glsa/glsa-200602-08.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">libtasn1</product>
   <announced>2006-02-16</announced>
-  <revised>2006-02-16: 01</revised>
+  <revised count="01">2006-02-16</revised>
   <bug>122307</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200602-09.xml b/metadata/glsa/glsa-200602-09.xml
index 9b226cf5acd3..79f00057b96d 100644
--- a/metadata/glsa/glsa-200602-09.xml
+++ b/metadata/glsa/glsa-200602-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">games-action/bomberclone</product>
   <announced>2006-02-16</announced>
-  <revised>2006-02-16: 01</revised>
+  <revised count="01">2006-02-16</revised>
   <bug>121605</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200602-10.xml b/metadata/glsa/glsa-200602-10.xml
index 588867e4830d..4ed673463680 100644
--- a/metadata/glsa/glsa-200602-10.xml
+++ b/metadata/glsa/glsa-200602-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gnupg</product>
   <announced>2006-02-18</announced>
-  <revised>2006-02-18: 01</revised>
+  <revised count="01">2006-02-18</revised>
   <bug>122721</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200602-11.xml b/metadata/glsa/glsa-200602-11.xml
index 2c7685683e07..6b4da07cdac1 100644
--- a/metadata/glsa/glsa-200602-11.xml
+++ b/metadata/glsa/glsa-200602-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">OpenSSH</product>
   <announced>2006-02-20</announced>
-  <revised>2006-02-20: 01</revised>
+  <revised count="01">2006-02-20</revised>
   <bug>119232</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200602-12.xml b/metadata/glsa/glsa-200602-12.xml
index 1bc991bd2449..cb9e2fe45a1f 100644
--- a/metadata/glsa/glsa-200602-12.xml
+++ b/metadata/glsa/glsa-200602-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gpdf</product>
   <announced>2006-02-21</announced>
-  <revised>2006-02-21: 01</revised>
+  <revised count="01">2006-02-21</revised>
   <bug>121511</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200602-13.xml b/metadata/glsa/glsa-200602-13.xml
index c5876b15a36a..904fba411003 100644
--- a/metadata/glsa/glsa-200602-13.xml
+++ b/metadata/glsa/glsa-200602-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">graphicsmagick</product>
   <announced>2006-02-26</announced>
-  <revised>2006-02-26: 01</revised>
+  <revised count="01">2006-02-26</revised>
   <bug>119476</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200602-14.xml b/metadata/glsa/glsa-200602-14.xml
index e074a8efe5cd..8f035e731a2b 100644
--- a/metadata/glsa/glsa-200602-14.xml
+++ b/metadata/glsa/glsa-200602-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">noweb</product>
   <announced>2006-02-26</announced>
-  <revised>2006-02-26: 01</revised>
+  <revised count="01">2006-02-26</revised>
   <bug>122705</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-01.xml b/metadata/glsa/glsa-200603-01.xml
index 42d28bd54cd6..3298aae4f2ae 100644
--- a/metadata/glsa/glsa-200603-01.xml
+++ b/metadata/glsa/glsa-200603-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">WordPress</product>
   <announced>2006-03-04</announced>
-  <revised>2006-03-04: 01</revised>
+  <revised count="01">2006-03-04</revised>
   <bug>121661</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-02.xml b/metadata/glsa/glsa-200603-02.xml
index 731ae8b8dfbb..c9e47e382d36 100644
--- a/metadata/glsa/glsa-200603-02.xml
+++ b/metadata/glsa/glsa-200603-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tetex</product>
   <announced>2006-03-04</announced>
-  <revised>2006-03-04: 01</revised>
+  <revised count="01">2006-03-04</revised>
   <bug>115775</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-03.xml b/metadata/glsa/glsa-200603-03.xml
index 8bd6b3beb398..bb275e96d682 100644
--- a/metadata/glsa/glsa-200603-03.xml
+++ b/metadata/glsa/glsa-200603-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">MPlayer</product>
   <announced>2006-03-04</announced>
-  <revised>2006-06-21: 02</revised>
+  <revised count="02">2006-06-21</revised>
   <bug>115760</bug>
   <bug>122029</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200603-04.xml b/metadata/glsa/glsa-200603-04.xml
index 264a26cf3138..6576ee60cd8f 100644
--- a/metadata/glsa/glsa-200603-04.xml
+++ b/metadata/glsa/glsa-200603-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">up-imapproxy</product>
   <announced>2006-03-06</announced>
-  <revised>2006-03-06: 01</revised>
+  <revised count="01">2006-03-06</revised>
   <bug>107679</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-05.xml b/metadata/glsa/glsa-200603-05.xml
index 89cdeb575c38..d95e3099d933 100644
--- a/metadata/glsa/glsa-200603-05.xml
+++ b/metadata/glsa/glsa-200603-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">zoo</product>
   <announced>2006-03-06</announced>
-  <revised>2006-03-06: 01</revised>
+  <revised count="01">2006-03-06</revised>
   <bug>123782</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-06.xml b/metadata/glsa/glsa-200603-06.xml
index 743fd062f786..d3b6cc635c63 100644
--- a/metadata/glsa/glsa-200603-06.xml
+++ b/metadata/glsa/glsa-200603-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tar</product>
   <announced>2006-03-10</announced>
-  <revised>2006-03-10: 01</revised>
+  <revised count="01">2006-03-10</revised>
   <bug>123038</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-07.xml b/metadata/glsa/glsa-200603-07.xml
index 13d9fd534e93..79002b55429e 100644
--- a/metadata/glsa/glsa-200603-07.xml
+++ b/metadata/glsa/glsa-200603-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">flex</product>
   <announced>2006-03-10</announced>
-  <revised>2006-03-10: 01</revised>
+  <revised count="01">2006-03-10</revised>
   <bug>122940</bug>
   <access>remote and local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-08.xml b/metadata/glsa/glsa-200603-08.xml
index 912f171fbcda..f42c53a1ab20 100644
--- a/metadata/glsa/glsa-200603-08.xml
+++ b/metadata/glsa/glsa-200603-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gnupg</product>
   <announced>2006-03-10</announced>
-  <revised>2006-03-10: 01</revised>
+  <revised count="01">2006-03-10</revised>
   <bug>125217</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-09.xml b/metadata/glsa/glsa-200603-09.xml
index 47832c444d04..393397679807 100644
--- a/metadata/glsa/glsa-200603-09.xml
+++ b/metadata/glsa/glsa-200603-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">squirrelmail</product>
   <announced>2006-03-12</announced>
-  <revised>2006-03-12: 01</revised>
+  <revised count="01">2006-03-12</revised>
   <bug>123781</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-10.xml b/metadata/glsa/glsa-200603-10.xml
index 3c71d00a0c26..825a3389ea1a 100644
--- a/metadata/glsa/glsa-200603-10.xml
+++ b/metadata/glsa/glsa-200603-10.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">cube</product>
   <announced>2006-03-13</announced>
-  <revised>2006-03-13: 01</revised>
+  <revised count="01">2006-03-13</revised>
   <bug>125289</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-11.xml b/metadata/glsa/glsa-200603-11.xml
index 60f0625d882c..90b33f414faf 100644
--- a/metadata/glsa/glsa-200603-11.xml
+++ b/metadata/glsa/glsa-200603-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">freeciv</product>
   <announced>2006-03-16</announced>
-  <revised>2006-03-16: 01</revised>
+  <revised count="01">2006-03-16</revised>
   <bug>125304</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-12.xml b/metadata/glsa/glsa-200603-12.xml
index ad1e4ff1b720..e119c1ccd0e4 100644
--- a/metadata/glsa/glsa-200603-12.xml
+++ b/metadata/glsa/glsa-200603-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">zoo</product>
   <announced>2006-03-16</announced>
-  <revised>2006-03-16: 01</revised>
+  <revised count="01">2006-03-16</revised>
   <bug>125622</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-13.xml b/metadata/glsa/glsa-200603-13.xml
index 3941eaba673d..b97d64703bbd 100644
--- a/metadata/glsa/glsa-200603-13.xml
+++ b/metadata/glsa/glsa-200603-13.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">pear-auth</product>
   <announced>2006-03-17</announced>
-  <revised>2006-03-17: 01</revised>
+  <revised count="01">2006-03-17</revised>
   <bug>123832</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-14.xml b/metadata/glsa/glsa-200603-14.xml
index 3cb729f21645..6a355355868f 100644
--- a/metadata/glsa/glsa-200603-14.xml
+++ b/metadata/glsa/glsa-200603-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">heimdal</product>
   <announced>2006-03-17</announced>
-  <revised>2006-03-17: 01</revised>
+  <revised count="01">2006-03-17</revised>
   <bug>121839</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-15.xml b/metadata/glsa/glsa-200603-15.xml
index 527a2e31ee61..afe97fd66b13 100644
--- a/metadata/glsa/glsa-200603-15.xml
+++ b/metadata/glsa/glsa-200603-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">crypt-cbc</product>
   <announced>2006-03-17</announced>
-  <revised>2006-03-17: 01</revised>
+  <revised count="01">2006-03-17</revised>
   <bug>126048</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-16.xml b/metadata/glsa/glsa-200603-16.xml
index 81d232e2daf1..e878aad39d61 100644
--- a/metadata/glsa/glsa-200603-16.xml
+++ b/metadata/glsa/glsa-200603-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">metamail</product>
   <announced>2006-03-17</announced>
-  <revised>2006-03-17: 01</revised>
+  <revised count="01">2006-03-17</revised>
   <bug>126052</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-17.xml b/metadata/glsa/glsa-200603-17.xml
index b3430d458139..c914d759cb9e 100644
--- a/metadata/glsa/glsa-200603-17.xml
+++ b/metadata/glsa/glsa-200603-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">peercast</product>
   <announced>2006-03-21</announced>
-  <revised>2006-03-21: 01</revised>
+  <revised count="01">2006-03-21</revised>
   <bug>123432</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-18.xml b/metadata/glsa/glsa-200603-18.xml
index f3f048ec5e1d..5ed5c25ec55d 100644
--- a/metadata/glsa/glsa-200603-18.xml
+++ b/metadata/glsa/glsa-200603-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pngcrush</product>
   <announced>2006-03-21</announced>
-  <revised>2006-03-21: 01</revised>
+  <revised count="01">2006-03-21</revised>
   <bug>123286</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-19.xml b/metadata/glsa/glsa-200603-19.xml
index b4e20d34aaf7..dcf72c7582cc 100644
--- a/metadata/glsa/glsa-200603-19.xml
+++ b/metadata/glsa/glsa-200603-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">curl</product>
   <announced>2006-03-21</announced>
-  <revised>2006-03-21: 01</revised>
+  <revised count="01">2006-03-21</revised>
   <bug>125766</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-20.xml b/metadata/glsa/glsa-200603-20.xml
index dc97c0d81e87..a63eae02f4a4 100644
--- a/metadata/glsa/glsa-200603-20.xml
+++ b/metadata/glsa/glsa-200603-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Flash</product>
   <announced>2006-03-21</announced>
-  <revised>2009-05-28: 02</revised>
+  <revised count="02">2009-05-28</revised>
   <bug>102777</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-21.xml b/metadata/glsa/glsa-200603-21.xml
index a06f19bc47d9..ed8637b19294 100644
--- a/metadata/glsa/glsa-200603-21.xml
+++ b/metadata/glsa/glsa-200603-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sendmail</product>
   <announced>2006-03-22</announced>
-  <revised>2006-03-22: 01</revised>
+  <revised count="01">2006-03-22</revised>
   <bug>125623</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-22.xml b/metadata/glsa/glsa-200603-22.xml
index 50492253cb7c..91b80e7aeea1 100644
--- a/metadata/glsa/glsa-200603-22.xml
+++ b/metadata/glsa/glsa-200603-22.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2006-03-22</announced>
-  <revised>2006-03-22: 01</revised>
+  <revised count="01">2006-03-22</revised>
   <bug>125878</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-23.xml b/metadata/glsa/glsa-200603-23.xml
index bcbbd9d7dc84..5dac985c6db7 100644
--- a/metadata/glsa/glsa-200603-23.xml
+++ b/metadata/glsa/glsa-200603-23.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">nethack slashem falconseye</product>
   <announced>2006-03-23</announced>
-  <revised>2006-03-30: 01</revised>
+  <revised count="01">2006-03-30</revised>
   <bug>125902</bug>
   <bug>122376</bug>
   <bug>127167</bug>
diff --git a/metadata/glsa/glsa-200603-24.xml b/metadata/glsa/glsa-200603-24.xml
index 4b72fb3b722e..69f5ebbe8bc4 100644
--- a/metadata/glsa/glsa-200603-24.xml
+++ b/metadata/glsa/glsa-200603-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">RealPlayer</product>
   <announced>2006-03-26</announced>
-  <revised>2006-03-26: 01</revised>
+  <revised count="01">2006-03-26</revised>
   <bug>127352</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-25.xml b/metadata/glsa/glsa-200603-25.xml
index aede63ba33f8..f2fa976e41c0 100644
--- a/metadata/glsa/glsa-200603-25.xml
+++ b/metadata/glsa/glsa-200603-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openoffice openoffice-bin</product>
   <announced>2006-03-27</announced>
-  <revised>2006-03-27: 01</revised>
+  <revised count="01">2006-03-27</revised>
   <bug>126433</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200603-26.xml b/metadata/glsa/glsa-200603-26.xml
index 843ef457b183..4f0bacb011e1 100644
--- a/metadata/glsa/glsa-200603-26.xml
+++ b/metadata/glsa/glsa-200603-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bsd-games</product>
   <announced>2006-03-29</announced>
-  <revised>2006-05-22: 02</revised>
+  <revised count="02">2006-05-22</revised>
   <bug>122399</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-01.xml b/metadata/glsa/glsa-200604-01.xml
index d62bef575cb9..6b53569e7778 100644
--- a/metadata/glsa/glsa-200604-01.xml
+++ b/metadata/glsa/glsa-200604-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mediawiki</product>
   <announced>2006-04-04</announced>
-  <revised>2006-04-04: 01</revised>
+  <revised count="01">2006-04-04</revised>
   <bug>127971</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-02.xml b/metadata/glsa/glsa-200604-02.xml
index 1ddcc665f43a..fc8889f07fc8 100644
--- a/metadata/glsa/glsa-200604-02.xml
+++ b/metadata/glsa/glsa-200604-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">horde</product>
   <announced>2006-04-04</announced>
-  <revised>2006-04-04: 01</revised>
+  <revised count="01">2006-04-04</revised>
   <bug>127889</bug>
   <bug>126435</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200604-03.xml b/metadata/glsa/glsa-200604-03.xml
index ac289f721ac6..94feb4d077a2 100644
--- a/metadata/glsa/glsa-200604-03.xml
+++ b/metadata/glsa/glsa-200604-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">freeradius</product>
   <announced>2006-04-04</announced>
-  <revised>2006-04-04: 01</revised>
+  <revised count="01">2006-04-04</revised>
   <bug>127229</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-04.xml b/metadata/glsa/glsa-200604-04.xml
index f01bd4ae0990..89ecc6a0bd71 100644
--- a/metadata/glsa/glsa-200604-04.xml
+++ b/metadata/glsa/glsa-200604-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kaffeine</product>
   <announced>2006-04-05</announced>
-  <revised>2006-04-05: 01</revised>
+  <revised count="01">2006-04-05</revised>
   <bug>127326</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-05.xml b/metadata/glsa/glsa-200604-05.xml
index c5c9db5bf7b4..97c8feb1a02e 100644
--- a/metadata/glsa/glsa-200604-05.xml
+++ b/metadata/glsa/glsa-200604-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">doomsday</product>
   <announced>2006-04-06</announced>
-  <revised>2006-06-15: 02</revised>
+  <revised count="02">2006-06-15</revised>
   <bug>128690</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-06.xml b/metadata/glsa/glsa-200604-06.xml
index 2fc08104e9ba..cd96cf897b36 100644
--- a/metadata/glsa/glsa-200604-06.xml
+++ b/metadata/glsa/glsa-200604-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2006-04-07</announced>
-  <revised>2006-04-07: 01</revised>
+  <revised count="01">2006-04-07</revised>
   <bug>128963</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-07.xml b/metadata/glsa/glsa-200604-07.xml
index 38f4823baff8..522822a1ce35 100644
--- a/metadata/glsa/glsa-200604-07.xml
+++ b/metadata/glsa/glsa-200604-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Cacti</product>
   <announced>2006-04-14</announced>
-  <revised>2006-04-14: 01</revised>
+  <revised count="01">2006-04-14</revised>
   <bug>129284</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-08.xml b/metadata/glsa/glsa-200604-08.xml
index 4b87ad53314d..5ce55538a05f 100644
--- a/metadata/glsa/glsa-200604-08.xml
+++ b/metadata/glsa/glsa-200604-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libapreq2</product>
   <announced>2006-04-17</announced>
-  <revised>2006-04-17: 01</revised>
+  <revised count="01">2006-04-17</revised>
   <bug>128610</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-09.xml b/metadata/glsa/glsa-200604-09.xml
index 45e0c9d3bfc0..e680ddc0e89a 100644
--- a/metadata/glsa/glsa-200604-09.xml
+++ b/metadata/glsa/glsa-200604-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cyrus-sasl</product>
   <announced>2006-04-21</announced>
-  <revised>2006-04-21: 01</revised>
+  <revised count="01">2006-04-21</revised>
   <bug>129523</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-10.xml b/metadata/glsa/glsa-200604-10.xml
index 0044ea740670..11897aec8d78 100644
--- a/metadata/glsa/glsa-200604-10.xml
+++ b/metadata/glsa/glsa-200604-10.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">xzgv</product>
   <announced>2006-04-21</announced>
-  <revised>2006-06-10: 02</revised>
+  <revised count="02">2006-06-10</revised>
   <bug>127008</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-11.xml b/metadata/glsa/glsa-200604-11.xml
index a64b6b2bb1ed..0b9d274ef500 100644
--- a/metadata/glsa/glsa-200604-11.xml
+++ b/metadata/glsa/glsa-200604-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Crossfire</product>
   <announced>2006-04-22</announced>
-  <revised>2006-04-22: 01</revised>
+  <revised count="01">2006-04-22</revised>
   <bug>126169</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-12.xml b/metadata/glsa/glsa-200604-12.xml
index 07099540cad2..e15da902e83e 100644
--- a/metadata/glsa/glsa-200604-12.xml
+++ b/metadata/glsa/glsa-200604-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mozilla-firefox</product>
   <announced>2006-04-23</announced>
-  <revised>2006-04-23: 01</revised>
+  <revised count="01">2006-04-23</revised>
   <bug>129924</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-13.xml b/metadata/glsa/glsa-200604-13.xml
index 2c19e27cfa46..fc3ce19eae60 100644
--- a/metadata/glsa/glsa-200604-13.xml
+++ b/metadata/glsa/glsa-200604-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">fbida</product>
   <announced>2006-04-23</announced>
-  <revised>2006-04-23: 01</revised>
+  <revised count="01">2006-04-23</revised>
   <bug>129470</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-14.xml b/metadata/glsa/glsa-200604-14.xml
index 91152592373b..59eef2db37f3 100644
--- a/metadata/glsa/glsa-200604-14.xml
+++ b/metadata/glsa/glsa-200604-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dia</product>
   <announced>2006-04-23</announced>
-  <revised>2006-04-23: 01</revised>
+  <revised count="01">2006-04-23</revised>
   <bug>128107</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-15.xml b/metadata/glsa/glsa-200604-15.xml
index 8fda099f2735..9f9ef3ee6902 100644
--- a/metadata/glsa/glsa-200604-15.xml
+++ b/metadata/glsa/glsa-200604-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-ui</product>
   <announced>2006-04-26</announced>
-  <revised>2006-04-26: 01</revised>
+  <revised count="01">2006-04-26</revised>
   <bug>130801</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-16.xml b/metadata/glsa/glsa-200604-16.xml
index 61331ef59229..c02b5ff536de 100644
--- a/metadata/glsa/glsa-200604-16.xml
+++ b/metadata/glsa/glsa-200604-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-lib</product>
   <announced>2006-04-26</announced>
-  <revised>2006-04-26: 01</revised>
+  <revised count="01">2006-04-26</revised>
   <bug>128838</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-17.xml b/metadata/glsa/glsa-200604-17.xml
index a94cd090b128..8cd04dd4f0e7 100644
--- a/metadata/glsa/glsa-200604-17.xml
+++ b/metadata/glsa/glsa-200604-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Ethereal</product>
   <announced>2006-04-27</announced>
-  <revised>2006-04-27: 01</revised>
+  <revised count="01">2006-04-27</revised>
   <bug>130505</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200604-18.xml b/metadata/glsa/glsa-200604-18.xml
index 44eb4025cf3b..5aec77fc9779 100644
--- a/metadata/glsa/glsa-200604-18.xml
+++ b/metadata/glsa/glsa-200604-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mozilla</product>
   <announced>2006-04-28</announced>
-  <revised>2006-04-28: 01</revised>
+  <revised count="01">2006-04-28</revised>
   <bug>130887</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-01.xml b/metadata/glsa/glsa-200605-01.xml
index f4bfaec1a6a1..24c4506df1c3 100644
--- a/metadata/glsa/glsa-200605-01.xml
+++ b/metadata/glsa/glsa-200605-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mplayer mplayer-bin</product>
   <announced>2006-05-01</announced>
-  <revised>2006-06-21: 02</revised>
+  <revised count="02">2006-06-21</revised>
   <bug>127969</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-02.xml b/metadata/glsa/glsa-200605-02.xml
index 6276f85c7b1f..4d0052697750 100644
--- a/metadata/glsa/glsa-200605-02.xml
+++ b/metadata/glsa/glsa-200605-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">X.Org</product>
   <announced>2006-05-02</announced>
-  <revised>2006-05-02: 01</revised>
+  <revised count="01">2006-05-02</revised>
   <bug>130979</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-03.xml b/metadata/glsa/glsa-200605-03.xml
index b0404cc39a60..a2433d6a5e1a 100644
--- a/metadata/glsa/glsa-200605-03.xml
+++ b/metadata/glsa/glsa-200605-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2006-05-02</announced>
-  <revised>2006-05-02: 01</revised>
+  <revised count="01">2006-05-02</revised>
   <bug>131791</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-04.xml b/metadata/glsa/glsa-200605-04.xml
index 86afe2bb11de..83e2b8213065 100644
--- a/metadata/glsa/glsa-200605-04.xml
+++ b/metadata/glsa/glsa-200605-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpwebsite</product>
   <announced>2006-05-02</announced>
-  <revised>2006-05-02: 01</revised>
+  <revised count="01">2006-05-02</revised>
   <bug>130295</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-05.xml b/metadata/glsa/glsa-200605-05.xml
index 5440f6639d7e..6c3a99f0f010 100644
--- a/metadata/glsa/glsa-200605-05.xml
+++ b/metadata/glsa/glsa-200605-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rsync</product>
   <announced>2006-05-06</announced>
-  <revised>2006-05-06: 01</revised>
+  <revised count="01">2006-05-06</revised>
   <bug>131631</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-06.xml b/metadata/glsa/glsa-200605-06.xml
index ac9abe50ac44..a6ca0d4ab50f 100644
--- a/metadata/glsa/glsa-200605-06.xml
+++ b/metadata/glsa/glsa-200605-06.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">mozilla-firefox</product>
   <announced>2006-05-06</announced>
-  <revised>2006-05-06: 01</revised>
+  <revised count="01">2006-05-06</revised>
   <bug>131138</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-07.xml b/metadata/glsa/glsa-200605-07.xml
index 19b481f461a2..2b97274333af 100644
--- a/metadata/glsa/glsa-200605-07.xml
+++ b/metadata/glsa/glsa-200605-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nagios</product>
   <announced>2006-05-07</announced>
-  <revised>2006-05-25: 03</revised>
+  <revised count="03">2006-05-25</revised>
   <bug>132159</bug>
   <bug>133487</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200605-08.xml b/metadata/glsa/glsa-200605-08.xml
index 49a8f321fb50..777b9d1e32e1 100644
--- a/metadata/glsa/glsa-200605-08.xml
+++ b/metadata/glsa/glsa-200605-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2006-05-08</announced>
-  <revised>2007-05-15: 09</revised>
+  <revised count="09">2007-05-15</revised>
   <bug>127939</bug>
   <bug>128883</bug>
   <bug>131135</bug>
diff --git a/metadata/glsa/glsa-200605-09.xml b/metadata/glsa/glsa-200605-09.xml
index 7d20d13e9061..9b1482270c98 100644
--- a/metadata/glsa/glsa-200605-09.xml
+++ b/metadata/glsa/glsa-200605-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mozilla-thunderbird</product>
   <announced>2006-05-08</announced>
-  <revised>2006-05-08: 01</revised>
+  <revised count="01">2006-05-08</revised>
   <bug>130888</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-10.xml b/metadata/glsa/glsa-200605-10.xml
index 05dedaeb3347..eb4e2659f376 100644
--- a/metadata/glsa/glsa-200605-10.xml
+++ b/metadata/glsa/glsa-200605-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pdnsd</product>
   <announced>2006-05-10</announced>
-  <revised>2006-05-10: 01</revised>
+  <revised count="01">2006-05-10</revised>
   <bug>131341</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-11.xml b/metadata/glsa/glsa-200605-11.xml
index b47d2d57cf41..62de66a80b05 100644
--- a/metadata/glsa/glsa-200605-11.xml
+++ b/metadata/glsa/glsa-200605-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ruby</product>
   <announced>2006-05-10</announced>
-  <revised>2006-05-10: 01</revised>
+  <revised count="01">2006-05-10</revised>
   <bug>130657</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-12.xml b/metadata/glsa/glsa-200605-12.xml
index b8553ce99f9d..5ed103981e14 100644
--- a/metadata/glsa/glsa-200605-12.xml
+++ b/metadata/glsa/glsa-200605-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">quake</product>
   <announced>2006-05-10</announced>
-  <revised>2006-05-10: 01</revised>
+  <revised count="01">2006-05-10</revised>
   <bug>132377</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-13.xml b/metadata/glsa/glsa-200605-13.xml
index 7c9e318f0972..1327f8345441 100644
--- a/metadata/glsa/glsa-200605-13.xml
+++ b/metadata/glsa/glsa-200605-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">MySQL</product>
   <announced>2006-05-11</announced>
-  <revised>2006-05-15: 04</revised>
+  <revised count="04">2006-05-15</revised>
   <bug>132146</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-14.xml b/metadata/glsa/glsa-200605-14.xml
index 81086457b2d8..45f2e4f08441 100644
--- a/metadata/glsa/glsa-200605-14.xml
+++ b/metadata/glsa/glsa-200605-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libextractor</product>
   <announced>2006-05-21</announced>
-  <revised>2006-05-21: 01</revised>
+  <revised count="01">2006-05-21</revised>
   <bug>133570</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-15.xml b/metadata/glsa/glsa-200605-15.xml
index f8eb63f9c6b0..04a0a8989661 100644
--- a/metadata/glsa/glsa-200605-15.xml
+++ b/metadata/glsa/glsa-200605-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">quagga</product>
   <announced>2006-05-21</announced>
-  <revised>2006-05-21: 01</revised>
+  <revised count="01">2006-05-21</revised>
   <bug>132353</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-16.xml b/metadata/glsa/glsa-200605-16.xml
index 8fa37684c932..86b9ef255195 100644
--- a/metadata/glsa/glsa-200605-16.xml
+++ b/metadata/glsa/glsa-200605-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cherrypy</product>
   <announced>2006-05-30</announced>
-  <revised>2006-05-30: 01</revised>
+  <revised count="01">2006-05-30</revised>
   <bug>134273</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200605-17.xml b/metadata/glsa/glsa-200605-17.xml
index 33b4034c3aa6..9b937b48dcac 100644
--- a/metadata/glsa/glsa-200605-17.xml
+++ b/metadata/glsa/glsa-200605-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libtiff</product>
   <announced>2006-05-30</announced>
-  <revised>2006-05-30: 01</revised>
+  <revised count="01">2006-05-30</revised>
   <bug>129675</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-01.xml b/metadata/glsa/glsa-200606-01.xml
index c307b9102d34..130624b70afb 100644
--- a/metadata/glsa/glsa-200606-01.xml
+++ b/metadata/glsa/glsa-200606-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2006-06-07</announced>
-  <revised>2006-06-07: 01</revised>
+  <revised count="01">2006-06-07</revised>
   <bug>129800</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-02.xml b/metadata/glsa/glsa-200606-02.xml
index 6433ac14d788..e947b5cc70fa 100644
--- a/metadata/glsa/glsa-200606-02.xml
+++ b/metadata/glsa/glsa-200606-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">shadow</product>
   <announced>2006-06-07</announced>
-  <revised>2006-06-07: 01</revised>
+  <revised count="01">2006-06-07</revised>
   <bug>133615</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-03.xml b/metadata/glsa/glsa-200606-03.xml
index 4342182733e9..496ba8cab84a 100644
--- a/metadata/glsa/glsa-200606-03.xml
+++ b/metadata/glsa/glsa-200606-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dia</product>
   <announced>2006-06-07</announced>
-  <revised>2006-06-07: 01</revised>
+  <revised count="01">2006-06-07</revised>
   <bug>133699</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-04.xml b/metadata/glsa/glsa-200606-04.xml
index c373740a37c3..61ccc8d7a0f5 100644
--- a/metadata/glsa/glsa-200606-04.xml
+++ b/metadata/glsa/glsa-200606-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tor</product>
   <announced>2006-06-07</announced>
-  <revised>2006-09-05: 02</revised>
+  <revised count="02">2006-09-05</revised>
   <bug>134329</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-05.xml b/metadata/glsa/glsa-200606-05.xml
index 35e2cec19fe0..e0d160baa430 100644
--- a/metadata/glsa/glsa-200606-05.xml
+++ b/metadata/glsa/glsa-200606-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pound</product>
   <announced>2006-06-07</announced>
-  <revised>2006-11-24: 03</revised>
+  <revised count="03">2006-11-24</revised>
   <bug>118541</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-06.xml b/metadata/glsa/glsa-200606-06.xml
index 7a362ab28c56..6a90ef116ca3 100644
--- a/metadata/glsa/glsa-200606-06.xml
+++ b/metadata/glsa/glsa-200606-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">awstats</product>
   <announced>2006-06-07</announced>
-  <revised>2009-05-28: 02</revised>
+  <revised count="02">2009-05-28</revised>
   <bug>130487</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-07.xml b/metadata/glsa/glsa-200606-07.xml
index 885de7a2cc60..c39da2dd6b61 100644
--- a/metadata/glsa/glsa-200606-07.xml
+++ b/metadata/glsa/glsa-200606-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">vixie-cron</product>
   <announced>2006-06-09</announced>
-  <revised>2006-06-09: 01</revised>
+  <revised count="01">2006-06-09</revised>
   <bug>134194</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-08.xml b/metadata/glsa/glsa-200606-08.xml
index 250245f35741..c86768d33ca2 100644
--- a/metadata/glsa/glsa-200606-08.xml
+++ b/metadata/glsa/glsa-200606-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wordpress</product>
   <announced>2006-06-09</announced>
-  <revised>2006-06-10: 02</revised>
+  <revised count="02">2006-06-10</revised>
   <bug>134397</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-09.xml b/metadata/glsa/glsa-200606-09.xml
index 6cbf4d0e211d..927c5f6f940e 100644
--- a/metadata/glsa/glsa-200606-09.xml
+++ b/metadata/glsa/glsa-200606-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Spamassassin</product>
   <announced>2006-06-11</announced>
-  <revised>2006-06-11: 01</revised>
+  <revised count="01">2006-06-11</revised>
   <bug>135746</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-10.xml b/metadata/glsa/glsa-200606-10.xml
index d6a6e7f3a650..65e4753f4df5 100644
--- a/metadata/glsa/glsa-200606-10.xml
+++ b/metadata/glsa/glsa-200606-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Cscope</product>
   <announced>2006-06-11</announced>
-  <revised>2006-06-11: 01</revised>
+  <revised count="01">2006-06-11</revised>
   <bug>133829</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-11.xml b/metadata/glsa/glsa-200606-11.xml
index 88ec11bbd922..a58e8de97308 100644
--- a/metadata/glsa/glsa-200606-11.xml
+++ b/metadata/glsa/glsa-200606-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">jpeg</product>
   <announced>2006-06-11</announced>
-  <revised>2006-07-29: 02</revised>
+  <revised count="02">2006-07-29</revised>
   <bug>130889</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-12.xml b/metadata/glsa/glsa-200606-12.xml
index 5bf0648b6a41..599752f1e090 100644
--- a/metadata/glsa/glsa-200606-12.xml
+++ b/metadata/glsa/glsa-200606-12.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">mozilla-firefox</product>
   <announced>2006-06-11</announced>
-  <revised>2006-06-11: 01</revised>
+  <revised count="01">2006-06-11</revised>
   <bug>135254</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-13.xml b/metadata/glsa/glsa-200606-13.xml
index 24268e0ebbd2..8519f8d3cd43 100644
--- a/metadata/glsa/glsa-200606-13.xml
+++ b/metadata/glsa/glsa-200606-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">MySQL</product>
   <announced>2006-06-11</announced>
-  <revised>2006-12-13: 04</revised>
+  <revised count="04">2006-12-13</revised>
   <bug>135076</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-14.xml b/metadata/glsa/glsa-200606-14.xml
index 510a684ce373..8b0c3e126db7 100644
--- a/metadata/glsa/glsa-200606-14.xml
+++ b/metadata/glsa/glsa-200606-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gdm</product>
   <announced>2006-06-12</announced>
-  <revised>2006-06-19: 02</revised>
+  <revised count="02">2006-06-19</revised>
   <bug>135027</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-15.xml b/metadata/glsa/glsa-200606-15.xml
index b6f8ed35a2d6..19a6bd381597 100644
--- a/metadata/glsa/glsa-200606-15.xml
+++ b/metadata/glsa/glsa-200606-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2006-06-14</announced>
-  <revised>2006-06-14: 01</revised>
+  <revised count="01">2006-06-14</revised>
   <bug>135680</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-16.xml b/metadata/glsa/glsa-200606-16.xml
index 889e470a4e38..4f66e704afcb 100644
--- a/metadata/glsa/glsa-200606-16.xml
+++ b/metadata/glsa/glsa-200606-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">DokuWiki</product>
   <announced>2006-06-14</announced>
-  <revised>2006-06-14: 01</revised>
+  <revised count="01">2006-06-14</revised>
   <bug>135623</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-17.xml b/metadata/glsa/glsa-200606-17.xml
index 05211e04f43e..e005880aea8d 100644
--- a/metadata/glsa/glsa-200606-17.xml
+++ b/metadata/glsa/glsa-200606-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">net-nds/openldap</product>
   <announced>2006-06-15</announced>
-  <revised>2006-06-15: 01</revised>
+  <revised count="01">2006-06-15</revised>
   <bug>134010</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-18.xml b/metadata/glsa/glsa-200606-18.xml
index ed7974d5314d..de7eb9085411 100644
--- a/metadata/glsa/glsa-200606-18.xml
+++ b/metadata/glsa/glsa-200606-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pam_mysql</product>
   <announced>2006-06-15</announced>
-  <revised>2006-07-29: 02</revised>
+  <revised count="02">2006-07-29</revised>
   <bug>120842</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-19.xml b/metadata/glsa/glsa-200606-19.xml
index e15d3dec61ca..c0fec98a63a9 100644
--- a/metadata/glsa/glsa-200606-19.xml
+++ b/metadata/glsa/glsa-200606-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sendmail</product>
   <announced>2006-06-15</announced>
-  <revised>2006-06-15: 01</revised>
+  <revised count="01">2006-06-15</revised>
   <bug>135141</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-20.xml b/metadata/glsa/glsa-200606-20.xml
index a86fd85096f3..2a799106b3a2 100644
--- a/metadata/glsa/glsa-200606-20.xml
+++ b/metadata/glsa/glsa-200606-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">typespeed</product>
   <announced>2006-06-19</announced>
-  <revised>2006-06-19: 01</revised>
+  <revised count="01">2006-06-19</revised>
   <bug>135071</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-21.xml b/metadata/glsa/glsa-200606-21.xml
index 1282924dc171..addc13905277 100644
--- a/metadata/glsa/glsa-200606-21.xml
+++ b/metadata/glsa/glsa-200606-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mozilla-thunderbird</product>
   <announced>2006-06-19</announced>
-  <revised>2006-06-19: 01</revised>
+  <revised count="01">2006-06-19</revised>
   <bug>135256</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-22.xml b/metadata/glsa/glsa-200606-22.xml
index 153742e9ee5b..cd62d48ae354 100644
--- a/metadata/glsa/glsa-200606-22.xml
+++ b/metadata/glsa/glsa-200606-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">aRts</product>
   <announced>2006-06-22</announced>
-  <revised>2006-06-22: 01</revised>
+  <revised count="01">2006-06-22</revised>
   <bug>135970</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-23.xml b/metadata/glsa/glsa-200606-23.xml
index d56bca98422b..b66fe1d2a020 100644
--- a/metadata/glsa/glsa-200606-23.xml
+++ b/metadata/glsa/glsa-200606-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kdebase, KDM</product>
   <announced>2006-06-22</announced>
-  <revised>2006-06-24: 02</revised>
+  <revised count="02">2006-06-24</revised>
   <bug>136201</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-24.xml b/metadata/glsa/glsa-200606-24.xml
index 8f198c051da5..27ba7e5f8c09 100644
--- a/metadata/glsa/glsa-200606-24.xml
+++ b/metadata/glsa/glsa-200606-24.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wv2</product>
   <announced>2006-06-23</announced>
-  <revised>2006-06-23: 01</revised>
+  <revised count="01">2006-06-23</revised>
   <bug>136759</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-25.xml b/metadata/glsa/glsa-200606-25.xml
index 31d60fbd5af5..0316421b3729 100644
--- a/metadata/glsa/glsa-200606-25.xml
+++ b/metadata/glsa/glsa-200606-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">hashcash</product>
   <announced>2006-06-26</announced>
-  <revised>2006-07-29: 02</revised>
+  <revised count="02">2006-07-29</revised>
   <bug>134960</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-26.xml b/metadata/glsa/glsa-200606-26.xml
index 412cb6664120..22e4caf92ed8 100644
--- a/metadata/glsa/glsa-200606-26.xml
+++ b/metadata/glsa/glsa-200606-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">emech</product>
   <announced>2006-06-26</announced>
-  <revised>2006-07-29: 02</revised>
+  <revised count="02">2006-07-29</revised>
   <bug>132749</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-27.xml b/metadata/glsa/glsa-200606-27.xml
index 8f3d273793be..1343f110701d 100644
--- a/metadata/glsa/glsa-200606-27.xml
+++ b/metadata/glsa/glsa-200606-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mutt</product>
   <announced>2006-06-28</announced>
-  <revised>2006-06-28: 01</revised>
+  <revised count="01">2006-06-28</revised>
   <bug>138125</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-28.xml b/metadata/glsa/glsa-200606-28.xml
index 529bef066c1e..59ccf99b54bb 100644
--- a/metadata/glsa/glsa-200606-28.xml
+++ b/metadata/glsa/glsa-200606-28.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">horde</product>
   <announced>2006-06-29</announced>
-  <revised>2006-06-29: 01</revised>
+  <revised count="01">2006-06-29</revised>
   <bug>136830</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200606-29.xml b/metadata/glsa/glsa-200606-29.xml
index 745a7b68d035..6e30795159bb 100644
--- a/metadata/glsa/glsa-200606-29.xml
+++ b/metadata/glsa/glsa-200606-29.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tikiwiki</product>
   <announced>2006-06-29</announced>
-  <revised>2006-06-29: 01</revised>
+  <revised count="01">2006-06-29</revised>
   <bug>136723</bug>
   <bug>134483</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200606-30.xml b/metadata/glsa/glsa-200606-30.xml
index ec195a1f4857..c7a11d445aeb 100644
--- a/metadata/glsa/glsa-200606-30.xml
+++ b/metadata/glsa/glsa-200606-30.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kiax</product>
   <announced>2006-06-30</announced>
-  <revised>2006-06-30: 01</revised>
+  <revised count="01">2006-06-30</revised>
   <bug>136099</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200607-01.xml b/metadata/glsa/glsa-200607-01.xml
index eb804a0ccbb1..dec28a834494 100644
--- a/metadata/glsa/glsa-200607-01.xml
+++ b/metadata/glsa/glsa-200607-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mpg123</product>
   <announced>2006-07-03</announced>
-  <revised>2006-07-29: 02</revised>
+  <revised count="02">2006-07-29</revised>
   <bug>133988</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200607-02.xml b/metadata/glsa/glsa-200607-02.xml
index fd7d3e743409..2597c615a564 100644
--- a/metadata/glsa/glsa-200607-02.xml
+++ b/metadata/glsa/glsa-200607-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">FreeType</product>
   <announced>2006-07-09</announced>
-  <revised>2006-09-03: 02</revised>
+  <revised count="02">2006-09-03</revised>
   <bug>124828</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200607-03.xml b/metadata/glsa/glsa-200607-03.xml
index 427376828c85..880ebd92749e 100644
--- a/metadata/glsa/glsa-200607-03.xml
+++ b/metadata/glsa/glsa-200607-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tiff</product>
   <announced>2006-07-09</announced>
-  <revised>2006-07-09: 01</revised>
+  <revised count="01">2006-07-09</revised>
   <bug>135881</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200607-04.xml b/metadata/glsa/glsa-200607-04.xml
index 057de87bb0c6..d843912b175f 100644
--- a/metadata/glsa/glsa-200607-04.xml
+++ b/metadata/glsa/glsa-200607-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">postgresql</product>
   <announced>2006-07-09</announced>
-  <revised>2007-06-26: 03</revised>
+  <revised count="03">2007-06-26</revised>
   <bug>134168</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200607-05.xml b/metadata/glsa/glsa-200607-05.xml
index 10f3baef9cf4..d6820c89fe66 100644
--- a/metadata/glsa/glsa-200607-05.xml
+++ b/metadata/glsa/glsa-200607-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">shoutcast</product>
   <announced>2006-07-09</announced>
-  <revised>2006-07-29: 03</revised>
+  <revised count="03">2006-07-29</revised>
   <bug>136721</bug>
   <bug>136221</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200607-06.xml b/metadata/glsa/glsa-200607-06.xml
index 81f482aae4e2..ebe84a30e159 100644
--- a/metadata/glsa/glsa-200607-06.xml
+++ b/metadata/glsa/glsa-200607-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2006-07-19</announced>
-  <revised>2006-07-19: 01</revised>
+  <revised count="01">2006-07-19</revised>
   <bug>138433</bug>
   <bug>138672</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200607-07.xml b/metadata/glsa/glsa-200607-07.xml
index 0ec8207fa737..7f1768f593f4 100644
--- a/metadata/glsa/glsa-200607-07.xml
+++ b/metadata/glsa/glsa-200607-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-lib</product>
   <announced>2006-07-20</announced>
-  <revised>2006-07-20: 01</revised>
+  <revised count="01">2006-07-20</revised>
   <bug>139319</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200607-08.xml b/metadata/glsa/glsa-200607-08.xml
index 03bd68550926..6fb3fcb8e1b9 100644
--- a/metadata/glsa/glsa-200607-08.xml
+++ b/metadata/glsa/glsa-200607-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gimp</product>
   <announced>2006-07-23</announced>
-  <revised>2006-07-24: 02</revised>
+  <revised count="02">2006-07-24</revised>
   <bug>139524</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200607-09.xml b/metadata/glsa/glsa-200607-09.xml
index 3f88d98e6867..c02a2631bcf0 100644
--- a/metadata/glsa/glsa-200607-09.xml
+++ b/metadata/glsa/glsa-200607-09.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">wireshark ethereal</product>
   <announced>2006-07-25</announced>
-  <revised>2006-07-25: 01</revised>
+  <revised count="01">2006-07-25</revised>
   <bug>140856</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200607-10.xml b/metadata/glsa/glsa-200607-10.xml
index 9c16decd0622..c49412763872 100644
--- a/metadata/glsa/glsa-200607-10.xml
+++ b/metadata/glsa/glsa-200607-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">samba</product>
   <announced>2006-07-25</announced>
-  <revised>2006-07-25: 01</revised>
+  <revised count="01">2006-07-25</revised>
   <bug>139369</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200607-11.xml b/metadata/glsa/glsa-200607-11.xml
index f50ea62db474..26ced1409b2f 100644
--- a/metadata/glsa/glsa-200607-11.xml
+++ b/metadata/glsa/glsa-200607-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Tunepimp</product>
   <announced>2006-07-28</announced>
-  <revised>2007-06-01: 02</revised>
+  <revised count="02">2007-06-01</revised>
   <bug>140184</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200607-12.xml b/metadata/glsa/glsa-200607-12.xml
index 02c9a7c7bf20..252a1cd7417d 100644
--- a/metadata/glsa/glsa-200607-12.xml
+++ b/metadata/glsa/glsa-200607-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">OpenOffice.org</product>
   <announced>2006-07-28</announced>
-  <revised>2006-07-28: 01</revised>
+  <revised count="01">2006-07-28</revised>
   <bug>138545</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200607-13.xml b/metadata/glsa/glsa-200607-13.xml
index df53c617b584..c2aec45f25bb 100644
--- a/metadata/glsa/glsa-200607-13.xml
+++ b/metadata/glsa/glsa-200607-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">audacious</product>
   <announced>2006-07-29</announced>
-  <revised>2006-07-29: 01</revised>
+  <revised count="01">2006-07-29</revised>
   <bug>139957</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-01.xml b/metadata/glsa/glsa-200608-01.xml
index 2dc16c92dece..a60de21feb87 100644
--- a/metadata/glsa/glsa-200608-01.xml
+++ b/metadata/glsa/glsa-200608-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">apache</product>
   <announced>2006-08-01</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>141986</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-02.xml b/metadata/glsa/glsa-200608-02.xml
index 269887667096..6a061657f76c 100644
--- a/metadata/glsa/glsa-200608-02.xml
+++ b/metadata/glsa/glsa-200608-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">SeaMonkey</product>
   <announced>2006-08-03</announced>
-  <revised>2006-08-03: 01</revised>
+  <revised count="01">2006-08-03</revised>
   <bug>141842</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-03.xml b/metadata/glsa/glsa-200608-03.xml
index 2269e2a5ff3b..d648c37ebe11 100644
--- a/metadata/glsa/glsa-200608-03.xml
+++ b/metadata/glsa/glsa-200608-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Firefox</product>
   <announced>2006-08-03</announced>
-  <revised>2006-08-03: 01</revised>
+  <revised count="01">2006-08-03</revised>
   <bug>141842</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-04.xml b/metadata/glsa/glsa-200608-04.xml
index 0ff603d7def8..0ab648f6d8d2 100644
--- a/metadata/glsa/glsa-200608-04.xml
+++ b/metadata/glsa/glsa-200608-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Thunderbird</product>
   <announced>2006-08-03</announced>
-  <revised>2006-08-03: 01</revised>
+  <revised count="01">2006-08-03</revised>
   <bug>141842</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-05.xml b/metadata/glsa/glsa-200608-05.xml
index 1330cc4a004f..b6406fc1bd2d 100644
--- a/metadata/glsa/glsa-200608-05.xml
+++ b/metadata/glsa/glsa-200608-05.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">libvncserver</product>
   <announced>2006-08-04</announced>
-  <revised>2006-08-04: 01</revised>
+  <revised count="01">2006-08-04</revised>
   <bug>136916</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-06.xml b/metadata/glsa/glsa-200608-06.xml
index 7f2d9feafb43..d91d1447931f 100644
--- a/metadata/glsa/glsa-200608-06.xml
+++ b/metadata/glsa/glsa-200608-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Courier</product>
   <announced>2006-08-04</announced>
-  <revised>2006-08-04: 01</revised>
+  <revised count="01">2006-08-04</revised>
   <bug>135005</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-07.xml b/metadata/glsa/glsa-200608-07.xml
index 3659b2569e3f..54970a0ccc62 100644
--- a/metadata/glsa/glsa-200608-07.xml
+++ b/metadata/glsa/glsa-200608-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tiff</product>
   <announced>2006-08-04</announced>
-  <revised>2006-08-04: 01</revised>
+  <revised count="01">2006-08-04</revised>
   <bug>142383</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-08.xml b/metadata/glsa/glsa-200608-08.xml
index ae93f5a44a02..fa592cdd8224 100644
--- a/metadata/glsa/glsa-200608-08.xml
+++ b/metadata/glsa/glsa-200608-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gnupg</product>
   <announced>2006-08-05</announced>
-  <revised>2006-08-08: 02</revised>
+  <revised count="02">2006-08-08</revised>
   <bug>142248</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-09.xml b/metadata/glsa/glsa-200608-09.xml
index c4dcd6c45c26..ba8779a96cad 100644
--- a/metadata/glsa/glsa-200608-09.xml
+++ b/metadata/glsa/glsa-200608-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mysql</product>
   <announced>2006-08-06</announced>
-  <revised>2006-08-07: 02</revised>
+  <revised count="02">2006-08-07</revised>
   <bug>142429</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-10.xml b/metadata/glsa/glsa-200608-10.xml
index 9def5bac20cf..e3c9dc2d802b 100644
--- a/metadata/glsa/glsa-200608-10.xml
+++ b/metadata/glsa/glsa-200608-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pike</product>
   <announced>2006-08-06</announced>
-  <revised>2006-12-13: 02</revised>
+  <revised count="02">2006-12-13</revised>
   <bug>136065</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-11.xml b/metadata/glsa/glsa-200608-11.xml
index 54d14393cb7e..04bedb746823 100644
--- a/metadata/glsa/glsa-200608-11.xml
+++ b/metadata/glsa/glsa-200608-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">webmin/usermin</product>
   <announced>2006-08-06</announced>
-  <revised>2006-08-06: 01</revised>
+  <revised count="01">2006-08-06</revised>
   <bug>138552</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-12.xml b/metadata/glsa/glsa-200608-12.xml
index 94059ca9f8cb..9cd2069f9216 100644
--- a/metadata/glsa/glsa-200608-12.xml
+++ b/metadata/glsa/glsa-200608-12.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">x11vnc</product>
   <announced>2006-08-07</announced>
-  <revised>2006-08-07: 01</revised>
+  <revised count="01">2006-08-07</revised>
   <bug>142559</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-13.xml b/metadata/glsa/glsa-200608-13.xml
index b1907022022c..cd6e5def3dfa 100644
--- a/metadata/glsa/glsa-200608-13.xml
+++ b/metadata/glsa/glsa-200608-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2006-08-08</announced>
-  <revised>2006-08-08: 02</revised>
+  <revised count="02">2006-08-08</revised>
   <bug>143093</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-14.xml b/metadata/glsa/glsa-200608-14.xml
index 5951151b528b..d774fb8fdebe 100644
--- a/metadata/glsa/glsa-200608-14.xml
+++ b/metadata/glsa/glsa-200608-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dumb</product>
   <announced>2006-08-08</announced>
-  <revised>2006-08-08: 01</revised>
+  <revised count="01">2006-08-08</revised>
   <bug>142387</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-15.xml b/metadata/glsa/glsa-200608-15.xml
index fb37c135a160..1f1ce9d0279b 100644
--- a/metadata/glsa/glsa-200608-15.xml
+++ b/metadata/glsa/glsa-200608-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">MIT Kerberos 5</product>
   <announced>2006-08-10</announced>
-  <revised>2006-08-10: 01</revised>
+  <revised count="01">2006-08-10</revised>
   <bug>143240</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-16.xml b/metadata/glsa/glsa-200608-16.xml
index 9ea872ddaccb..1026578764b2 100644
--- a/metadata/glsa/glsa-200608-16.xml
+++ b/metadata/glsa/glsa-200608-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">warzone2100</product>
   <announced>2006-08-10</announced>
-  <revised>2006-09-04: 02</revised>
+  <revised count="02">2006-09-04</revised>
   <bug>142389</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-17.xml b/metadata/glsa/glsa-200608-17.xml
index b3ae32b6bffb..6c4f4ceb9229 100644
--- a/metadata/glsa/glsa-200608-17.xml
+++ b/metadata/glsa/glsa-200608-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libwmf</product>
   <announced>2006-08-10</announced>
-  <revised>2006-08-10: 01</revised>
+  <revised count="01">2006-08-10</revised>
   <bug>139325</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-18.xml b/metadata/glsa/glsa-200608-18.xml
index 8e2f529343d0..1de32877dd8f 100644
--- a/metadata/glsa/glsa-200608-18.xml
+++ b/metadata/glsa/glsa-200608-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">net-server</product>
   <announced>2006-08-10</announced>
-  <revised>2006-08-10: 01</revised>
+  <revised count="01">2006-08-10</revised>
   <bug>142386</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-19.xml b/metadata/glsa/glsa-200608-19.xml
index ed6af07e6532..55cb5d90bd90 100644
--- a/metadata/glsa/glsa-200608-19.xml
+++ b/metadata/glsa/glsa-200608-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wordpress</product>
   <announced>2006-08-10</announced>
-  <revised>2006-12-13: 02</revised>
+  <revised count="02">2006-12-13</revised>
   <bug>142142</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-20.xml b/metadata/glsa/glsa-200608-20.xml
index 33a92fa5f887..5d7c5baf9479 100644
--- a/metadata/glsa/glsa-200608-20.xml
+++ b/metadata/glsa/glsa-200608-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rails</product>
   <announced>2006-08-14</announced>
-  <revised>2006-12-13: 02</revised>
+  <revised count="02">2006-12-13</revised>
   <bug>143369</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-21.xml b/metadata/glsa/glsa-200608-21.xml
index f3c87d99e24c..6de472e046dd 100644
--- a/metadata/glsa/glsa-200608-21.xml
+++ b/metadata/glsa/glsa-200608-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Heimdal</product>
   <announced>2006-08-23</announced>
-  <revised>2006-08-23: 01</revised>
+  <revised count="01">2006-08-23</revised>
   <bug>143371</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-22.xml b/metadata/glsa/glsa-200608-22.xml
index 2f9b5885e645..8401a1a7f393 100644
--- a/metadata/glsa/glsa-200608-22.xml
+++ b/metadata/glsa/glsa-200608-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">fbida</product>
   <announced>2006-08-23</announced>
-  <revised>2006-08-23: 01</revised>
+  <revised count="01">2006-08-23</revised>
   <bug>141684</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-23.xml b/metadata/glsa/glsa-200608-23.xml
index 831691e91648..a93902eb2ecf 100644
--- a/metadata/glsa/glsa-200608-23.xml
+++ b/metadata/glsa/glsa-200608-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">heartbeat</product>
   <announced>2006-08-24</announced>
-  <revised>2006-09-22: 02</revised>
+  <revised count="02">2006-09-22</revised>
   <bug>141894</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-24.xml b/metadata/glsa/glsa-200608-24.xml
index cb2edc921844..0f22b8f66246 100644
--- a/metadata/glsa/glsa-200608-24.xml
+++ b/metadata/glsa/glsa-200608-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">AlsaPlayer</product>
   <announced>2006-08-26</announced>
-  <revised>2006-08-26: 01</revised>
+  <revised count="01">2006-08-26</revised>
   <bug>143402</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-25.xml b/metadata/glsa/glsa-200608-25.xml
index e6f55b023cee..c55cf93497f5 100644
--- a/metadata/glsa/glsa-200608-25.xml
+++ b/metadata/glsa/glsa-200608-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xorg-x11,xorg-server,xtrans,xload,xinit,xterm,xf86dga,xdm,libX11</product>
   <announced>2006-08-28</announced>
-  <revised>2006-12-13: 02</revised>
+  <revised count="02">2006-12-13</revised>
   <bug>135974</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-26.xml b/metadata/glsa/glsa-200608-26.xml
index 1cfa393cc73c..3d604a70a73f 100644
--- a/metadata/glsa/glsa-200608-26.xml
+++ b/metadata/glsa/glsa-200608-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2006-08-29</announced>
-  <revised>2006-08-29: 01</revised>
+  <revised count="01">2006-08-29</revised>
   <bug>144946</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-27.xml b/metadata/glsa/glsa-200608-27.xml
index aef71728418c..c4b1e5edb59e 100644
--- a/metadata/glsa/glsa-200608-27.xml
+++ b/metadata/glsa/glsa-200608-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">motor</product>
   <announced>2006-08-29</announced>
-  <revised>2006-08-29: 01</revised>
+  <revised count="01">2006-08-29</revised>
   <bug>135020</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200608-28.xml b/metadata/glsa/glsa-200608-28.xml
index 9eb1d58c2da8..50401bf89410 100644
--- a/metadata/glsa/glsa-200608-28.xml
+++ b/metadata/glsa/glsa-200608-28.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2006-08-29</announced>
-  <revised>2008-03-29: 05</revised>
+  <revised count="05">2008-03-29</revised>
   <bug>143126</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-01.xml b/metadata/glsa/glsa-200609-01.xml
index 4d0a585dfb46..83fc8dfd5948 100644
--- a/metadata/glsa/glsa-200609-01.xml
+++ b/metadata/glsa/glsa-200609-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">streamripper</product>
   <announced>2006-09-06</announced>
-  <revised>2006-09-06: 01</revised>
+  <revised count="01">2006-09-06</revised>
   <bug>144861</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-02.xml b/metadata/glsa/glsa-200609-02.xml
index e69a2c50c56d..33581dc5b24d 100644
--- a/metadata/glsa/glsa-200609-02.xml
+++ b/metadata/glsa/glsa-200609-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">GTetrinet</product>
   <announced>2006-09-06</announced>
-  <revised>2006-09-07: 02</revised>
+  <revised count="02">2006-09-07</revised>
   <bug>144867</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-03.xml b/metadata/glsa/glsa-200609-03.xml
index ada2fa478067..bfc902174321 100644
--- a/metadata/glsa/glsa-200609-03.xml
+++ b/metadata/glsa/glsa-200609-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openttd</product>
   <announced>2006-09-06</announced>
-  <revised>2006-09-06: 01</revised>
+  <revised count="01">2006-09-06</revised>
   <bug>131010</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-04.xml b/metadata/glsa/glsa-200609-04.xml
index 973e327fdd12..da86cf42f58b 100644
--- a/metadata/glsa/glsa-200609-04.xml
+++ b/metadata/glsa/glsa-200609-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">LibXfont</product>
   <announced>2006-09-06</announced>
-  <revised>2006-09-06: 01</revised>
+  <revised count="01">2006-09-06</revised>
   <bug>144092</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-05.xml b/metadata/glsa/glsa-200609-05.xml
index 53029814d3d4..ebfb7d8d13e4 100644
--- a/metadata/glsa/glsa-200609-05.xml
+++ b/metadata/glsa/glsa-200609-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2006-09-07</announced>
-  <revised>2006-09-08: 02</revised>
+  <revised count="02">2006-09-08</revised>
   <bug>146375</bug>
   <bug>146438</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200609-06.xml b/metadata/glsa/glsa-200609-06.xml
index f6da06612e78..63ee689dd5b2 100644
--- a/metadata/glsa/glsa-200609-06.xml
+++ b/metadata/glsa/glsa-200609-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adplug</product>
   <announced>2006-09-12</announced>
-  <revised>2006-09-12: 01</revised>
+  <revised count="01">2006-09-12</revised>
   <bug>139593</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-07.xml b/metadata/glsa/glsa-200609-07.xml
index ecaa11fb4e76..3ed4b70358df 100644
--- a/metadata/glsa/glsa-200609-07.xml
+++ b/metadata/glsa/glsa-200609-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libxfont</product>
   <announced>2006-09-13</announced>
-  <revised>2006-09-13: 01</revised>
+  <revised count="01">2006-09-13</revised>
   <bug>145513</bug>
   <access>local and remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-08.xml b/metadata/glsa/glsa-200609-08.xml
index 8a9e043e4514..78853ba70616 100644
--- a/metadata/glsa/glsa-200609-08.xml
+++ b/metadata/glsa/glsa-200609-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-lib</product>
   <announced>2006-09-13</announced>
-  <revised>2006-09-13: 01</revised>
+  <revised count="01">2006-09-13</revised>
   <bug>133520</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-09.xml b/metadata/glsa/glsa-200609-09.xml
index bdf8364b5e7b..8d203adb91ca 100644
--- a/metadata/glsa/glsa-200609-09.xml
+++ b/metadata/glsa/glsa-200609-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ffmpeg</product>
   <announced>2006-09-13</announced>
-  <revised>2006-12-13: 02</revised>
+  <revised count="02">2006-12-13</revised>
   <bug>133520</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-10.xml b/metadata/glsa/glsa-200609-10.xml
index f1f3f822690f..3fba9c96032f 100644
--- a/metadata/glsa/glsa-200609-10.xml
+++ b/metadata/glsa/glsa-200609-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dokuwiki</product>
   <announced>2006-09-14</announced>
-  <revised>2006-09-14: 01</revised>
+  <revised count="01">2006-09-14</revised>
   <bug>146800</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-11.xml b/metadata/glsa/glsa-200609-11.xml
index ae0f276f1cb3..2ac89d018fbd 100644
--- a/metadata/glsa/glsa-200609-11.xml
+++ b/metadata/glsa/glsa-200609-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bind</product>
   <announced>2006-09-15</announced>
-  <revised>2006-09-15: 01</revised>
+  <revised count="01">2006-09-15</revised>
   <bug>146486</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-12.xml b/metadata/glsa/glsa-200609-12.xml
index 4cd84cebaf46..a057c3f7ccf1 100644
--- a/metadata/glsa/glsa-200609-12.xml
+++ b/metadata/glsa/glsa-200609-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mailman</product>
   <announced>2006-09-19</announced>
-  <revised>2006-09-19: 01</revised>
+  <revised count="01">2006-09-19</revised>
   <bug>139976</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-13.xml b/metadata/glsa/glsa-200609-13.xml
index 0b3c073c2014..c82aa8ebe66f 100644
--- a/metadata/glsa/glsa-200609-13.xml
+++ b/metadata/glsa/glsa-200609-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gzip</product>
   <announced>2006-09-23</announced>
-  <revised>2006-09-23: 01</revised>
+  <revised count="01">2006-09-23</revised>
   <bug>145511</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-14.xml b/metadata/glsa/glsa-200609-14.xml
index 18b4d8e81e53..813122b124b9 100644
--- a/metadata/glsa/glsa-200609-14.xml
+++ b/metadata/glsa/glsa-200609-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Imagemagick</product>
   <announced>2006-09-26</announced>
-  <revised>2006-09-26: 01</revised>
+  <revised count="01">2006-09-26</revised>
   <bug>144091</bug>
   <bug>143533</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200609-15.xml b/metadata/glsa/glsa-200609-15.xml
index db3d289fb559..306e4ba70b0e 100644
--- a/metadata/glsa/glsa-200609-15.xml
+++ b/metadata/glsa/glsa-200609-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gnutls</product>
   <announced>2006-09-26</announced>
-  <revised>2006-09-26: 01</revised>
+  <revised count="01">2006-09-26</revised>
   <bug>147682</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-16.xml b/metadata/glsa/glsa-200609-16.xml
index 844f0afbd5c1..bc06bb518c42 100644
--- a/metadata/glsa/glsa-200609-16.xml
+++ b/metadata/glsa/glsa-200609-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tikiwiki</product>
   <announced>2006-09-26</announced>
-  <revised>2006-09-26: 01</revised>
+  <revised count="01">2006-09-26</revised>
   <bug>145714</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-17.xml b/metadata/glsa/glsa-200609-17.xml
index 05e909909dea..7533659d3e1f 100644
--- a/metadata/glsa/glsa-200609-17.xml
+++ b/metadata/glsa/glsa-200609-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openssh</product>
   <announced>2006-09-27</announced>
-  <revised>2006-09-27: 02</revised>
+  <revised count="02">2006-09-27</revised>
   <bug>148228</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-18.xml b/metadata/glsa/glsa-200609-18.xml
index dcd3f742947e..c925679e8070 100644
--- a/metadata/glsa/glsa-200609-18.xml
+++ b/metadata/glsa/glsa-200609-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2006-09-28</announced>
-  <revised>2006-09-28: 02</revised>
+  <revised count="02">2006-09-28</revised>
   <bug>147838</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-19.xml b/metadata/glsa/glsa-200609-19.xml
index eae4a136e8ce..66bf206fff01 100644
--- a/metadata/glsa/glsa-200609-19.xml
+++ b/metadata/glsa/glsa-200609-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Firefox</product>
   <announced>2006-09-28</announced>
-  <revised>2006-09-28: 01</revised>
+  <revised count="01">2006-09-28</revised>
   <bug>147652</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200609-20.xml b/metadata/glsa/glsa-200609-20.xml
index 867de26fb206..2764e38d940c 100644
--- a/metadata/glsa/glsa-200609-20.xml
+++ b/metadata/glsa/glsa-200609-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dokuwiki</product>
   <announced>2006-09-28</announced>
-  <revised>2006-12-13: 02</revised>
+  <revised count="02">2006-12-13</revised>
   <bug>149266</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-01.xml b/metadata/glsa/glsa-200610-01.xml
index 83855adedf0e..5fbad39c54bb 100644
--- a/metadata/glsa/glsa-200610-01.xml
+++ b/metadata/glsa/glsa-200610-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">thunderbird</product>
   <announced>2006-10-04</announced>
-  <revised>2006-10-04: 01</revised>
+  <revised count="01">2006-10-04</revised>
   <bug>147653</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-02.xml b/metadata/glsa/glsa-200610-02.xml
index 7a16b9e1c1b6..1bfa11dbf70f 100644
--- a/metadata/glsa/glsa-200610-02.xml
+++ b/metadata/glsa/glsa-200610-02.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">Flash</product>
   <announced>2006-10-04</announced>
-  <revised>2009-05-28: 02</revised>
+  <revised count="02">2009-05-28</revised>
   <bug>147421</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-03.xml b/metadata/glsa/glsa-200610-03.xml
index 316a62e8c7aa..f7566bf69cb8 100644
--- a/metadata/glsa/glsa-200610-03.xml
+++ b/metadata/glsa/glsa-200610-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ncompress</product>
   <announced>2006-10-06</announced>
-  <revised>2006-10-06: 01</revised>
+  <revised count="01">2006-10-06</revised>
   <bug>141728</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-04.xml b/metadata/glsa/glsa-200610-04.xml
index e4225d496de2..82a1c1c555dd 100644
--- a/metadata/glsa/glsa-200610-04.xml
+++ b/metadata/glsa/glsa-200610-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">seamonkey</product>
   <announced>2006-10-16</announced>
-  <revised>2006-10-16: 01</revised>
+  <revised count="01">2006-10-16</revised>
   <bug>147651</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-05.xml b/metadata/glsa/glsa-200610-05.xml
index 535fd0f761e9..c3fc74d79abb 100644
--- a/metadata/glsa/glsa-200610-05.xml
+++ b/metadata/glsa/glsa-200610-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">capi4hylafax</product>
   <announced>2006-10-17</announced>
-  <revised>2006-10-17: 01</revised>
+  <revised count="01">2006-10-17</revised>
   <bug>145982</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-06.xml b/metadata/glsa/glsa-200610-06.xml
index b6b18e37d5ee..22ff2d28f42c 100644
--- a/metadata/glsa/glsa-200610-06.xml
+++ b/metadata/glsa/glsa-200610-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nss</product>
   <announced>2006-10-17</announced>
-  <revised>2006-10-17: 01</revised>
+  <revised count="01">2006-10-17</revised>
   <bug>148283</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-07.xml b/metadata/glsa/glsa-200610-07.xml
index 2b090f8049d9..638ef506865c 100644
--- a/metadata/glsa/glsa-200610-07.xml
+++ b/metadata/glsa/glsa-200610-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">python</product>
   <announced>2006-10-17</announced>
-  <revised>2007-02-26: 03</revised>
+  <revised count="03">2007-02-26</revised>
   <bug>149065</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-08.xml b/metadata/glsa/glsa-200610-08.xml
index 590dcae490bd..15758e92437e 100644
--- a/metadata/glsa/glsa-200610-08.xml
+++ b/metadata/glsa/glsa-200610-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cscope</product>
   <announced>2006-10-20</announced>
-  <revised>2006-10-20: 01</revised>
+  <revised count="01">2006-10-20</revised>
   <bug>144869</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-09.xml b/metadata/glsa/glsa-200610-09.xml
index 39527b9c52ad..fa74b1c678cc 100644
--- a/metadata/glsa/glsa-200610-09.xml
+++ b/metadata/glsa/glsa-200610-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libmusicbrainz</product>
   <announced>2006-10-22</announced>
-  <revised>2006-10-22: 01</revised>
+  <revised count="01">2006-10-22</revised>
   <bug>144089</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-10.xml b/metadata/glsa/glsa-200610-10.xml
index 9d8c8d7f1e36..4bcd8bd6e04f 100644
--- a/metadata/glsa/glsa-200610-10.xml
+++ b/metadata/glsa/glsa-200610-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2006-10-24</announced>
-  <revised>2006-10-24: 01</revised>
+  <revised count="01">2006-10-24</revised>
   <bug>151561</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-11.xml b/metadata/glsa/glsa-200610-11.xml
index 8f001e3e553a..4cedffb8c1de 100644
--- a/metadata/glsa/glsa-200610-11.xml
+++ b/metadata/glsa/glsa-200610-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2006-10-24</announced>
-  <revised>2006-10-24: 01</revised>
+  <revised count="01">2006-10-24</revised>
   <bug>145510</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-12.xml b/metadata/glsa/glsa-200610-12.xml
index 8f89b31d658d..ff940103258a 100644
--- a/metadata/glsa/glsa-200610-12.xml
+++ b/metadata/glsa/glsa-200610-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mod_tcl</product>
   <announced>2006-10-24</announced>
-  <revised>2006-10-24: 01</revised>
+  <revised count="01">2006-10-24</revised>
   <bug>151359</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-13.xml b/metadata/glsa/glsa-200610-13.xml
index 26d6682a654b..0f744f153afc 100644
--- a/metadata/glsa/glsa-200610-13.xml
+++ b/metadata/glsa/glsa-200610-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cheesetracker</product>
   <announced>2006-10-26</announced>
-  <revised>2006-10-26: 01</revised>
+  <revised count="01">2006-10-26</revised>
   <bug>142391</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-14.xml b/metadata/glsa/glsa-200610-14.xml
index 7d677577d802..9d2228b58a55 100644
--- a/metadata/glsa/glsa-200610-14.xml
+++ b/metadata/glsa/glsa-200610-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2006-10-30</announced>
-  <revised>2008-03-29: 04</revised>
+  <revised count="04">2008-03-29</revised>
   <bug>150261</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200610-15.xml b/metadata/glsa/glsa-200610-15.xml
index 557a11649071..53c6726857a1 100644
--- a/metadata/glsa/glsa-200610-15.xml
+++ b/metadata/glsa/glsa-200610-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2006-10-30</announced>
-  <revised>2007-01-30: 02</revised>
+  <revised count="02">2007-01-30</revised>
   <bug>144941</bug>
   <bug>151881</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200611-01.xml b/metadata/glsa/glsa-200611-01.xml
index 0e37a8e40c24..73837c8f8fc8 100644
--- a/metadata/glsa/glsa-200611-01.xml
+++ b/metadata/glsa/glsa-200611-01.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">screen</product>
   <announced>2006-11-03</announced>
-  <revised>2006-11-03: 01</revised>
+  <revised count="01">2006-11-03</revised>
   <bug>152770</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-02.xml b/metadata/glsa/glsa-200611-02.xml
index 682d524e44d7..52ae018b0462 100644
--- a/metadata/glsa/glsa-200611-02.xml
+++ b/metadata/glsa/glsa-200611-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">qt</product>
   <announced>2006-11-06</announced>
-  <revised>2009-01-09: 03</revised>
+  <revised count="03">2009-01-09</revised>
   <bug>151838</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-03.xml b/metadata/glsa/glsa-200611-03.xml
index ceb5f254dbbc..44186fd585b7 100644
--- a/metadata/glsa/glsa-200611-03.xml
+++ b/metadata/glsa/glsa-200611-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nvidia-drivers</product>
   <announced>2006-11-07</announced>
-  <revised>2006-11-10: 02</revised>
+  <revised count="02">2006-11-10</revised>
   <bug>151635</bug>
   <access>remote, local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-04.xml b/metadata/glsa/glsa-200611-04.xml
index 7a5152db33eb..f9202e75d2a3 100644
--- a/metadata/glsa/glsa-200611-04.xml
+++ b/metadata/glsa/glsa-200611-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bugzilla</product>
   <announced>2006-11-09</announced>
-  <revised>2006-11-09: 01</revised>
+  <revised count="01">2006-11-09</revised>
   <bug>151563</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-05.xml b/metadata/glsa/glsa-200611-05.xml
index 524e60de6188..7666ae1469b5 100644
--- a/metadata/glsa/glsa-200611-05.xml
+++ b/metadata/glsa/glsa-200611-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ftpd</product>
   <announced>2006-11-10</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>150292</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-06.xml b/metadata/glsa/glsa-200611-06.xml
index 932720004462..5f95569213bd 100644
--- a/metadata/glsa/glsa-200611-06.xml
+++ b/metadata/glsa/glsa-200611-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openssh</product>
   <announced>2006-11-13</announced>
-  <revised>2006-11-13: 01</revised>
+  <revised count="01">2006-11-13</revised>
   <bug>149502</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-07.xml b/metadata/glsa/glsa-200611-07.xml
index 57ad9c35fe4f..833f8fba6a7d 100644
--- a/metadata/glsa/glsa-200611-07.xml
+++ b/metadata/glsa/glsa-200611-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">graphicsmagick</product>
   <announced>2006-11-13</announced>
-  <revised>2006-11-13: 01</revised>
+  <revised count="01">2006-11-13</revised>
   <bug>152668</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-08.xml b/metadata/glsa/glsa-200611-08.xml
index 0e059de926e2..4605d582b05d 100644
--- a/metadata/glsa/glsa-200611-08.xml
+++ b/metadata/glsa/glsa-200611-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rpm</product>
   <announced>2006-11-13</announced>
-  <revised>2006-11-13: 01</revised>
+  <revised count="01">2006-11-13</revised>
   <bug>154218</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-09.xml b/metadata/glsa/glsa-200611-09.xml
index 3908071ab21c..e92010198547 100644
--- a/metadata/glsa/glsa-200611-09.xml
+++ b/metadata/glsa/glsa-200611-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2006-11-17</announced>
-  <revised>2006-11-17: 01</revised>
+  <revised count="01">2006-11-17</revised>
   <bug>154380</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-10.xml b/metadata/glsa/glsa-200611-10.xml
index 4f31d6c9f22c..3053329381a2 100644
--- a/metadata/glsa/glsa-200611-10.xml
+++ b/metadata/glsa/glsa-200611-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wordpress</product>
   <announced>2006-11-17</announced>
-  <revised>2006-11-17: 01</revised>
+  <revised count="01">2006-11-17</revised>
   <bug>153303</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-11.xml b/metadata/glsa/glsa-200611-11.xml
index 1e700fa4bd3a..4bf80d2947c1 100644
--- a/metadata/glsa/glsa-200611-11.xml
+++ b/metadata/glsa/glsa-200611-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tikiwiki</product>
   <announced>2006-11-20</announced>
-  <revised>2006-11-20: 01</revised>
+  <revised count="01">2006-11-20</revised>
   <bug>153820</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-12.xml b/metadata/glsa/glsa-200611-12.xml
index d1fe6d22d0cb..716fbb593a36 100644
--- a/metadata/glsa/glsa-200611-12.xml
+++ b/metadata/glsa/glsa-200611-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ruby</product>
   <announced>2006-11-20</announced>
-  <revised>2009-06-11: 02</revised>
+  <revised count="02">2009-06-11</revised>
   <bug>153497</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-13.xml b/metadata/glsa/glsa-200611-13.xml
index 302a5bc7b1cc..41370ec5889e 100644
--- a/metadata/glsa/glsa-200611-13.xml
+++ b/metadata/glsa/glsa-200611-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">avahi</product>
   <announced>2006-11-20</announced>
-  <revised>2006-11-20: 01</revised>
+  <revised count="01">2006-11-20</revised>
   <bug>154322</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-14.xml b/metadata/glsa/glsa-200611-14.xml
index 4c48d8de82be..657a82a6e588 100644
--- a/metadata/glsa/glsa-200611-14.xml
+++ b/metadata/glsa/glsa-200611-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">torque</product>
   <announced>2006-11-20</announced>
-  <revised>2006-11-24: 03</revised>
+  <revised count="03">2006-11-24</revised>
   <bug>152104</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-15.xml b/metadata/glsa/glsa-200611-15.xml
index deb58d8d38da..8c9e724b4fcb 100644
--- a/metadata/glsa/glsa-200611-15.xml
+++ b/metadata/glsa/glsa-200611-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">qmailadmin</product>
   <announced>2006-11-21</announced>
-  <revised>2006-11-21: 01</revised>
+  <revised count="01">2006-11-21</revised>
   <bug>153896</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-16.xml b/metadata/glsa/glsa-200611-16.xml
index 68fbb1089ce2..5468c5dc2e69 100644
--- a/metadata/glsa/glsa-200611-16.xml
+++ b/metadata/glsa/glsa-200611-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">texinfo</product>
   <announced>2006-11-21</announced>
-  <revised>2006-11-21: 01</revised>
+  <revised count="01">2006-11-21</revised>
   <bug>154316</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-17.xml b/metadata/glsa/glsa-200611-17.xml
index cdf7771230c9..d2c310d382f6 100644
--- a/metadata/glsa/glsa-200611-17.xml
+++ b/metadata/glsa/glsa-200611-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">fvwm</product>
   <announced>2006-11-23</announced>
-  <revised>2006-11-23: 01</revised>
+  <revised count="01">2006-11-23</revised>
   <bug>155078</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-18.xml b/metadata/glsa/glsa-200611-18.xml
index 9b335b95577d..7024399647fb 100644
--- a/metadata/glsa/glsa-200611-18.xml
+++ b/metadata/glsa/glsa-200611-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tin</product>
   <announced>2006-11-24</announced>
-  <revised>2006-11-24: 01</revised>
+  <revised count="01">2006-11-24</revised>
   <bug>150229</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-19.xml b/metadata/glsa/glsa-200611-19.xml
index e22b7e151fd5..14cde616d4cc 100644
--- a/metadata/glsa/glsa-200611-19.xml
+++ b/metadata/glsa/glsa-200611-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">imagemagick</product>
   <announced>2006-11-24</announced>
-  <revised>2006-11-24: 01</revised>
+  <revised count="01">2006-11-24</revised>
   <bug>152672</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-20.xml b/metadata/glsa/glsa-200611-20.xml
index 177b571f7371..8608e9e0bd03 100644
--- a/metadata/glsa/glsa-200611-20.xml
+++ b/metadata/glsa/glsa-200611-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gv</product>
   <announced>2006-11-24</announced>
-  <revised>2006-11-24: 01</revised>
+  <revised count="01">2006-11-24</revised>
   <bug>154573</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-21.xml b/metadata/glsa/glsa-200611-21.xml
index d968f2a7ec35..e7301ff126db 100644
--- a/metadata/glsa/glsa-200611-21.xml
+++ b/metadata/glsa/glsa-200611-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kile</product>
   <announced>2006-11-27</announced>
-  <revised>2006-11-27: 01</revised>
+  <revised count="01">2006-11-27</revised>
   <bug>155613</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-22.xml b/metadata/glsa/glsa-200611-22.xml
index fa4a42fdcee1..90fcf2bb2b71 100644
--- a/metadata/glsa/glsa-200611-22.xml
+++ b/metadata/glsa/glsa-200611-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">horde-ingo</product>
   <announced>2006-11-27</announced>
-  <revised>2006-11-27: 01</revised>
+  <revised count="01">2006-11-27</revised>
   <bug>153927</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-23.xml b/metadata/glsa/glsa-200611-23.xml
index ec614e53dd11..3cdb3c7705da 100644
--- a/metadata/glsa/glsa-200611-23.xml
+++ b/metadata/glsa/glsa-200611-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mono</product>
   <announced>2006-11-28</announced>
-  <revised>2006-11-28: 01</revised>
+  <revised count="01">2006-11-28</revised>
   <bug>150264</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-24.xml b/metadata/glsa/glsa-200611-24.xml
index e16a421ee623..7bca1ae33ab6 100644
--- a/metadata/glsa/glsa-200611-24.xml
+++ b/metadata/glsa/glsa-200611-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lha</product>
   <announced>2006-11-28</announced>
-  <revised>2006-11-28: 01</revised>
+  <revised count="01">2006-11-28</revised>
   <bug>151252</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-25.xml b/metadata/glsa/glsa-200611-25.xml
index d483e8ddb23a..e21bc91784f8 100644
--- a/metadata/glsa/glsa-200611-25.xml
+++ b/metadata/glsa/glsa-200611-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openldap</product>
   <announced>2006-11-28</announced>
-  <revised>2006-11-28: 01</revised>
+  <revised count="01">2006-11-28</revised>
   <bug>154349</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200611-26.xml b/metadata/glsa/glsa-200611-26.xml
index 4c65ce0a7238..047527372740 100644
--- a/metadata/glsa/glsa-200611-26.xml
+++ b/metadata/glsa/glsa-200611-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">proftpd</product>
   <announced>2006-11-30</announced>
-  <revised>2006-11-30: 01</revised>
+  <revised count="01">2006-11-30</revised>
   <bug>154650</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-01.xml b/metadata/glsa/glsa-200612-01.xml
index c0e11a0fd705..fe8bf5c37517 100644
--- a/metadata/glsa/glsa-200612-01.xml
+++ b/metadata/glsa/glsa-200612-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wv library</product>
   <announced>2006-12-07</announced>
-  <revised>2006-12-07: 01</revised>
+  <revised count="01">2006-12-07</revised>
   <bug>153800</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-02.xml b/metadata/glsa/glsa-200612-02.xml
index 731290740d5f..fd956d6aa690 100644
--- a/metadata/glsa/glsa-200612-02.xml
+++ b/metadata/glsa/glsa-200612-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-lib</product>
   <announced>2006-12-09</announced>
-  <revised>2006-12-09: 01</revised>
+  <revised count="01">2006-12-09</revised>
   <bug>156645</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-03.xml b/metadata/glsa/glsa-200612-03.xml
index 1044fae490d4..cbae18e200cd 100644
--- a/metadata/glsa/glsa-200612-03.xml
+++ b/metadata/glsa/glsa-200612-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gnupg</product>
   <announced>2006-12-10</announced>
-  <revised>2006-12-10: 02</revised>
+  <revised count="02">2006-12-10</revised>
   <bug>156476</bug>
   <bug>156947</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200612-04.xml b/metadata/glsa/glsa-200612-04.xml
index 60253388ed42..37dd894034c2 100644
--- a/metadata/glsa/glsa-200612-04.xml
+++ b/metadata/glsa/glsa-200612-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libmodplug</product>
   <announced>2006-12-10</announced>
-  <revised>2006-12-10: 01</revised>
+  <revised count="01">2006-12-10</revised>
   <bug>143404</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-05.xml b/metadata/glsa/glsa-200612-05.xml
index a0c406954c09..011b529fea76 100644
--- a/metadata/glsa/glsa-200612-05.xml
+++ b/metadata/glsa/glsa-200612-05.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">koffice-libs</product>
   <announced>2006-12-10</announced>
-  <revised>2006-12-10: 01</revised>
+  <revised count="01">2006-12-10</revised>
   <bug>155914</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-06.xml b/metadata/glsa/glsa-200612-06.xml
index 2e3c64170014..512f5e6a1e86 100644
--- a/metadata/glsa/glsa-200612-06.xml
+++ b/metadata/glsa/glsa-200612-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mozilla-thunderbird</product>
   <announced>2006-12-10</announced>
-  <revised>2006-12-10: 01</revised>
+  <revised count="01">2006-12-10</revised>
   <bug>154448</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-07.xml b/metadata/glsa/glsa-200612-07.xml
index b0fcc3d08e01..2c4311d7e2fe 100644
--- a/metadata/glsa/glsa-200612-07.xml
+++ b/metadata/glsa/glsa-200612-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mozilla-firefox</product>
   <announced>2006-12-10</announced>
-  <revised>2006-12-10: 01</revised>
+  <revised count="01">2006-12-10</revised>
   <bug>154434</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-08.xml b/metadata/glsa/glsa-200612-08.xml
index 42798f51437d..b7faa865535c 100644
--- a/metadata/glsa/glsa-200612-08.xml
+++ b/metadata/glsa/glsa-200612-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">seamonkey</product>
   <announced>2006-12-10</announced>
-  <revised>2006-12-10: 01</revised>
+  <revised count="01">2006-12-10</revised>
   <bug>154449</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-09.xml b/metadata/glsa/glsa-200612-09.xml
index 58a7b9667149..5431c0049ef2 100644
--- a/metadata/glsa/glsa-200612-09.xml
+++ b/metadata/glsa/glsa-200612-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">madwifi-ng</product>
   <announced>2006-12-10</announced>
-  <revised>2006-12-10: 01</revised>
+  <revised count="01">2006-12-10</revised>
   <bug>157449</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-10.xml b/metadata/glsa/glsa-200612-10.xml
index 990be3b2c6b5..1f46e427a3d4 100644
--- a/metadata/glsa/glsa-200612-10.xml
+++ b/metadata/glsa/glsa-200612-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tar</product>
   <announced>2006-12-11</announced>
-  <revised>2006-12-11: 01</revised>
+  <revised count="01">2006-12-11</revised>
   <bug>155901</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-11.xml b/metadata/glsa/glsa-200612-11.xml
index dd92fcdf6690..621333922a16 100644
--- a/metadata/glsa/glsa-200612-11.xml
+++ b/metadata/glsa/glsa-200612-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">emul-linux-x86-baselibs</product>
   <announced>2006-12-11</announced>
-  <revised>2006-12-11: 01</revised>
+  <revised count="01">2006-12-11</revised>
   <bug>152640</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-12.xml b/metadata/glsa/glsa-200612-12.xml
index c63e5eba7614..869a9631740d 100644
--- a/metadata/glsa/glsa-200612-12.xml
+++ b/metadata/glsa/glsa-200612-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">f-prot</product>
   <announced>2006-12-12</announced>
-  <revised>2006-12-12: 01</revised>
+  <revised count="01">2006-12-12</revised>
   <bug>157612</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-13.xml b/metadata/glsa/glsa-200612-13.xml
index 16b8e8e63ad6..20fc22478cda 100644
--- a/metadata/glsa/glsa-200612-13.xml
+++ b/metadata/glsa/glsa-200612-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libgsf</product>
   <announced>2006-12-12</announced>
-  <revised>2006-12-12: 01</revised>
+  <revised count="01">2006-12-12</revised>
   <bug>156693</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-14.xml b/metadata/glsa/glsa-200612-14.xml
index ef449fe4c3e3..07f08c83be0e 100644
--- a/metadata/glsa/glsa-200612-14.xml
+++ b/metadata/glsa/glsa-200612-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">trac</product>
   <announced>2006-12-12</announced>
-  <revised>2006-12-12: 01</revised>
+  <revised count="01">2006-12-12</revised>
   <bug>154574</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-15.xml b/metadata/glsa/glsa-200612-15.xml
index 0c81a77ef276..a7acf9409a81 100644
--- a/metadata/glsa/glsa-200612-15.xml
+++ b/metadata/glsa/glsa-200612-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">vlnx</product>
   <announced>2006-12-14</announced>
-  <revised>2006-12-14: 01</revised>
+  <revised count="01">2006-12-14</revised>
   <bug>156989</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-16.xml b/metadata/glsa/glsa-200612-16.xml
index d025708b6f42..9c7a98540a33 100644
--- a/metadata/glsa/glsa-200612-16.xml
+++ b/metadata/glsa/glsa-200612-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">links</product>
   <announced>2006-12-14</announced>
-  <revised>2006-12-14: 01</revised>
+  <revised count="01">2006-12-14</revised>
   <bug>157028</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-17.xml b/metadata/glsa/glsa-200612-17.xml
index c3ed1104ebbd..51128a8e5df0 100644
--- a/metadata/glsa/glsa-200612-17.xml
+++ b/metadata/glsa/glsa-200612-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gnuradius</product>
   <announced>2006-12-14</announced>
-  <revised>2006-12-14: 01</revised>
+  <revised count="01">2006-12-14</revised>
   <bug>156376</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-18.xml b/metadata/glsa/glsa-200612-18.xml
index 1d59280d55c0..1a43445064da 100644
--- a/metadata/glsa/glsa-200612-18.xml
+++ b/metadata/glsa/glsa-200612-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2006-12-18</announced>
-  <revised>2006-12-18: 01</revised>
+  <revised count="01">2006-12-18</revised>
   <bug>157698</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-19.xml b/metadata/glsa/glsa-200612-19.xml
index 523319126b1c..b7ae18ae2f92 100644
--- a/metadata/glsa/glsa-200612-19.xml
+++ b/metadata/glsa/glsa-200612-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pam_ldap</product>
   <announced>2006-12-20</announced>
-  <revised>2006-12-20: 01</revised>
+  <revised count="01">2006-12-20</revised>
   <bug>153916</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-20.xml b/metadata/glsa/glsa-200612-20.xml
index ca43fdf9e804..d64edb5742ee 100644
--- a/metadata/glsa/glsa-200612-20.xml
+++ b/metadata/glsa/glsa-200612-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">imlib2</product>
   <announced>2006-12-20</announced>
-  <revised>2006-12-20: 01</revised>
+  <revised count="01">2006-12-20</revised>
   <bug>154216</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200612-21.xml b/metadata/glsa/glsa-200612-21.xml
index 56d596a05cb1..4f6c5a997d6f 100644
--- a/metadata/glsa/glsa-200612-21.xml
+++ b/metadata/glsa/glsa-200612-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ruby</product>
   <announced>2006-12-20</announced>
-  <revised>2006-12-20: 01</revised>
+  <revised count="01">2006-12-20</revised>
   <bug>157048</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-01.xml b/metadata/glsa/glsa-200701-01.xml
index f521f99fbe33..7f9efc3a29ae 100644
--- a/metadata/glsa/glsa-200701-01.xml
+++ b/metadata/glsa/glsa-200701-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">denyhosts</product>
   <announced>2007-01-03</announced>
-  <revised>2007-01-03: 01</revised>
+  <revised count="01">2007-01-03</revised>
   <bug>157163</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-02.xml b/metadata/glsa/glsa-200701-02.xml
index e77eb83cea62..f9cfc8e010b9 100644
--- a/metadata/glsa/glsa-200701-02.xml
+++ b/metadata/glsa/glsa-200701-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mozilla-firefox</product>
   <announced>2007-01-04</announced>
-  <revised>2007-01-04: 01</revised>
+  <revised count="01">2007-01-04</revised>
   <bug>156023</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-03.xml b/metadata/glsa/glsa-200701-03.xml
index eccfceaf5111..4655c01d49a4 100644
--- a/metadata/glsa/glsa-200701-03.xml
+++ b/metadata/glsa/glsa-200701-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mozilla-thunderbird</product>
   <announced>2007-01-04</announced>
-  <revised>2007-01-04: 01</revised>
+  <revised count="01">2007-01-04</revised>
   <bug>158571</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-04.xml b/metadata/glsa/glsa-200701-04.xml
index 53c7a2a2800b..956a384ea05a 100644
--- a/metadata/glsa/glsa-200701-04.xml
+++ b/metadata/glsa/glsa-200701-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">seamonkey</product>
   <announced>2007-01-10</announced>
-  <revised>2007-01-10: 01</revised>
+  <revised count="01">2007-01-10</revised>
   <bug>158576</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-05.xml b/metadata/glsa/glsa-200701-05.xml
index ee0047058bd9..48768ef29606 100644
--- a/metadata/glsa/glsa-200701-05.xml
+++ b/metadata/glsa/glsa-200701-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kdegraphics-kfile-plugins</product>
   <announced>2007-01-12</announced>
-  <revised>2007-01-12: 01</revised>
+  <revised count="01">2007-01-12</revised>
   <bug>155949</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-06.xml b/metadata/glsa/glsa-200701-06.xml
index a9c6b335bcb6..0cc6e9d0786f 100644
--- a/metadata/glsa/glsa-200701-06.xml
+++ b/metadata/glsa/glsa-200701-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">w3m</product>
   <announced>2007-01-12</announced>
-  <revised>2007-01-12: 01</revised>
+  <revised count="01">2007-01-12</revised>
   <bug>159145</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-07.xml b/metadata/glsa/glsa-200701-07.xml
index b4ac7a1f2f9d..9b8e955d8e41 100644
--- a/metadata/glsa/glsa-200701-07.xml
+++ b/metadata/glsa/glsa-200701-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openoffice</product>
   <announced>2007-01-12</announced>
-  <revised>2007-01-12: 01</revised>
+  <revised count="01">2007-01-12</revised>
   <bug>159951</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-08.xml b/metadata/glsa/glsa-200701-08.xml
index ea77310b75f1..e9141c4501eb 100644
--- a/metadata/glsa/glsa-200701-08.xml
+++ b/metadata/glsa/glsa-200701-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2007-01-12</announced>
-  <revised>2007-01-12: 01</revised>
+  <revised count="01">2007-01-12</revised>
   <bug>160369</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-09.xml b/metadata/glsa/glsa-200701-09.xml
index 8d8b0cb07ff4..35197acf508b 100644
--- a/metadata/glsa/glsa-200701-09.xml
+++ b/metadata/glsa/glsa-200701-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">oftpd</product>
   <announced>2007-01-15</announced>
-  <revised>2007-01-15: 01</revised>
+  <revised count="01">2007-01-15</revised>
   <bug>159178</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-10.xml b/metadata/glsa/glsa-200701-10.xml
index 354f12b29fdd..d62e603d20f7 100644
--- a/metadata/glsa/glsa-200701-10.xml
+++ b/metadata/glsa/glsa-200701-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wordpress</product>
   <announced>2007-01-15</announced>
-  <revised>2007-01-15: 01</revised>
+  <revised count="01">2007-01-15</revised>
   <bug>159229</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-11.xml b/metadata/glsa/glsa-200701-11.xml
index f28a03cd3dd6..dd07261bb187 100644
--- a/metadata/glsa/glsa-200701-11.xml
+++ b/metadata/glsa/glsa-200701-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">horde-kronolith</product>
   <announced>2007-01-16</announced>
-  <revised>2007-01-16: 01</revised>
+  <revised count="01">2007-01-16</revised>
   <bug>156627</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-12.xml b/metadata/glsa/glsa-200701-12.xml
index fdc6502dad3d..c817a168cb36 100644
--- a/metadata/glsa/glsa-200701-12.xml
+++ b/metadata/glsa/glsa-200701-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mono</product>
   <announced>2007-01-16</announced>
-  <revised>2007-01-17: 02</revised>
+  <revised count="02">2007-01-17</revised>
   <bug>159886</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-13.xml b/metadata/glsa/glsa-200701-13.xml
index c32954ef75c9..780cab1e1024 100644
--- a/metadata/glsa/glsa-200701-13.xml
+++ b/metadata/glsa/glsa-200701-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">fetchmail</product>
   <announced>2007-01-22</announced>
-  <revised>2007-01-22: 01</revised>
+  <revised count="01">2007-01-22</revised>
   <bug>160463</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-14.xml b/metadata/glsa/glsa-200701-14.xml
index 017dd140b1cd..f3dff2ebb727 100644
--- a/metadata/glsa/glsa-200701-14.xml
+++ b/metadata/glsa/glsa-200701-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mod_auth_kerb</product>
   <announced>2007-01-22</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>155782</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-15.xml b/metadata/glsa/glsa-200701-15.xml
index 44f33ea7b12f..10849847af74 100644
--- a/metadata/glsa/glsa-200701-15.xml
+++ b/metadata/glsa/glsa-200701-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">java</product>
   <announced>2007-01-22</announced>
-  <revised>2008-07-16: 04</revised>
+  <revised count="04">2008-07-16</revised>
   <bug>158659</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-16.xml b/metadata/glsa/glsa-200701-16.xml
index 7fff3d344c69..afc0c10c66dc 100644
--- a/metadata/glsa/glsa-200701-16.xml
+++ b/metadata/glsa/glsa-200701-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2007-01-22</announced>
-  <revised>2007-01-22: 01</revised>
+  <revised count="01">2007-01-22</revised>
   <bug>159874</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-17.xml b/metadata/glsa/glsa-200701-17.xml
index c7ae6740d054..42f6ec785885 100644
--- a/metadata/glsa/glsa-200701-17.xml
+++ b/metadata/glsa/glsa-200701-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libgtop</product>
   <announced>2007-01-23</announced>
-  <revised>2007-01-23: 01</revised>
+  <revised count="01">2007-01-23</revised>
   <bug>162169</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-18.xml b/metadata/glsa/glsa-200701-18.xml
index e0e50f2136ea..2107b30cd2d8 100644
--- a/metadata/glsa/glsa-200701-18.xml
+++ b/metadata/glsa/glsa-200701-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-ui</product>
   <announced>2007-01-23</announced>
-  <revised>2007-01-23: 01</revised>
+  <revised count="01">2007-01-23</revised>
   <bug>161558</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-19.xml b/metadata/glsa/glsa-200701-19.xml
index ad4c79db6af3..3d187f1d3062 100644
--- a/metadata/glsa/glsa-200701-19.xml
+++ b/metadata/glsa/glsa-200701-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openldap</product>
   <announced>2007-01-23</announced>
-  <revised>2007-03-11: 02</revised>
+  <revised count="02">2007-03-11</revised>
   <bug>159508</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-20.xml b/metadata/glsa/glsa-200701-20.xml
index 913cffa440b4..d928f5a64803 100644
--- a/metadata/glsa/glsa-200701-20.xml
+++ b/metadata/glsa/glsa-200701-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">centericq</product>
   <announced>2007-01-24</announced>
-  <revised>2007-01-24: 01</revised>
+  <revised count="01">2007-01-24</revised>
   <bug>160793</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-21.xml b/metadata/glsa/glsa-200701-21.xml
index 43352a711fde..07a486a4cba3 100644
--- a/metadata/glsa/glsa-200701-21.xml
+++ b/metadata/glsa/glsa-200701-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2007-01-24</announced>
-  <revised>2007-01-24: 01</revised>
+  <revised count="01">2007-01-24</revised>
   <bug>158810</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-22.xml b/metadata/glsa/glsa-200701-22.xml
index 3c51d5579174..4cb7a6579d35 100644
--- a/metadata/glsa/glsa-200701-22.xml
+++ b/metadata/glsa/glsa-200701-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">squid</product>
   <announced>2007-01-25</announced>
-  <revised>2007-01-25: 01</revised>
+  <revised count="01">2007-01-25</revised>
   <bug>162364</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-23.xml b/metadata/glsa/glsa-200701-23.xml
index 6f9f4c8b4b37..2c776a4cd8bf 100644
--- a/metadata/glsa/glsa-200701-23.xml
+++ b/metadata/glsa/glsa-200701-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cacti</product>
   <announced>2007-01-26</announced>
-  <revised>2007-01-26: 01</revised>
+  <revised count="01">2007-01-26</revised>
   <bug>159278</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-24.xml b/metadata/glsa/glsa-200701-24.xml
index 7c38a55c5058..ea23aed3170a 100644
--- a/metadata/glsa/glsa-200701-24.xml
+++ b/metadata/glsa/glsa-200701-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">vlc</product>
   <announced>2007-01-26</announced>
-  <revised>2007-01-26: 01</revised>
+  <revised count="01">2007-01-26</revised>
   <bug>159845</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-25.xml b/metadata/glsa/glsa-200701-25.xml
index 007176707707..4a39a49f7efe 100644
--- a/metadata/glsa/glsa-200701-25.xml
+++ b/metadata/glsa/glsa-200701-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">X.Org</product>
   <announced>2007-01-27</announced>
-  <revised>2007-02-26: 02</revised>
+  <revised count="02">2007-02-26</revised>
   <bug>157421</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-26.xml b/metadata/glsa/glsa-200701-26.xml
index 54784396200e..57dd80f4cdb3 100644
--- a/metadata/glsa/glsa-200701-26.xml
+++ b/metadata/glsa/glsa-200701-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ksirc</product>
   <announced>2007-01-29</announced>
-  <revised>2007-01-30: 01</revised>
+  <revised count="01">2007-01-30</revised>
   <bug>159658</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-27.xml b/metadata/glsa/glsa-200701-27.xml
index e4ecbad1a837..f973d0777a66 100644
--- a/metadata/glsa/glsa-200701-27.xml
+++ b/metadata/glsa/glsa-200701-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">elinks</product>
   <announced>2007-01-30</announced>
-  <revised>2007-01-30: 01</revised>
+  <revised count="01">2007-01-30</revised>
   <bug>155358</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200701-28.xml b/metadata/glsa/glsa-200701-28.xml
index e984df569b1e..f68fd6a741e2 100644
--- a/metadata/glsa/glsa-200701-28.xml
+++ b/metadata/glsa/glsa-200701-28.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">thttpd</product>
   <announced>2007-01-31</announced>
-  <revised>2007-03-11: 02</revised>
+  <revised count="02">2007-03-11</revised>
   <bug>142047</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200702-01.xml b/metadata/glsa/glsa-200702-01.xml
index c187c534f5d7..97a84e2102b0 100644
--- a/metadata/glsa/glsa-200702-01.xml
+++ b/metadata/glsa/glsa-200702-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">samba</product>
   <announced>2007-02-13</announced>
-  <revised>2007-02-13: 01</revised>
+  <revised count="01">2007-02-13</revised>
   <bug>165549</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200702-02.xml b/metadata/glsa/glsa-200702-02.xml
index 0912b906dce4..f773406fc57e 100644
--- a/metadata/glsa/glsa-200702-02.xml
+++ b/metadata/glsa/glsa-200702-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">proftpd</product>
   <announced>2007-02-13</announced>
-  <revised>2007-02-13: 01</revised>
+  <revised count="01">2007-02-13</revised>
   <bug>158122</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200702-03.xml b/metadata/glsa/glsa-200702-03.xml
index d6f91c8e5f22..22952e849340 100644
--- a/metadata/glsa/glsa-200702-03.xml
+++ b/metadata/glsa/glsa-200702-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">snort</product>
   <announced>2007-02-13</announced>
-  <revised>2007-02-13: 01</revised>
+  <revised count="01">2007-02-13</revised>
   <bug>161632</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200702-04.xml b/metadata/glsa/glsa-200702-04.xml
index cab68045b11c..fd81245e0d8e 100644
--- a/metadata/glsa/glsa-200702-04.xml
+++ b/metadata/glsa/glsa-200702-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rar, unrar</product>
   <announced>2007-02-13</announced>
-  <revised>2007-02-14: 02</revised>
+  <revised count="02">2007-02-14</revised>
   <bug>166440</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200702-05.xml b/metadata/glsa/glsa-200702-05.xml
index a9602cfbc0c6..0f8a14baba3d 100644
--- a/metadata/glsa/glsa-200702-05.xml
+++ b/metadata/glsa/glsa-200702-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">fail2ban</product>
   <announced>2007-02-16</announced>
-  <revised>2007-02-16: 01</revised>
+  <revised count="01">2007-02-16</revised>
   <bug>157166</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200702-06.xml b/metadata/glsa/glsa-200702-06.xml
index bd540b8978a2..3e3f503e4e3a 100644
--- a/metadata/glsa/glsa-200702-06.xml
+++ b/metadata/glsa/glsa-200702-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bind</product>
   <announced>2007-02-17</announced>
-  <revised>2007-02-17: 01</revised>
+  <revised count="01">2007-02-17</revised>
   <bug>163692</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200702-07.xml b/metadata/glsa/glsa-200702-07.xml
index 2833264636c5..8d800eba2a7a 100644
--- a/metadata/glsa/glsa-200702-07.xml
+++ b/metadata/glsa/glsa-200702-07.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">java</product>
   <announced>2007-02-17</announced>
-  <revised>2008-07-16: 05</revised>
+  <revised count="05">2008-07-16</revised>
   <bug>162511</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200702-08.xml b/metadata/glsa/glsa-200702-08.xml
index 02320aca96f3..00fbceb0e429 100644
--- a/metadata/glsa/glsa-200702-08.xml
+++ b/metadata/glsa/glsa-200702-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">java</product>
   <announced>2007-02-17</announced>
-  <revised>2009-05-28: 02</revised>
+  <revised count="02">2009-05-28</revised>
   <bug>159547</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200702-09.xml b/metadata/glsa/glsa-200702-09.xml
index dbf7e9207da6..cbaeb473789b 100644
--- a/metadata/glsa/glsa-200702-09.xml
+++ b/metadata/glsa/glsa-200702-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nexuiz</product>
   <announced>2007-02-25</announced>
-  <revised>2007-02-25: 01</revised>
+  <revised count="01">2007-02-25</revised>
   <bug>166044</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200702-10.xml b/metadata/glsa/glsa-200702-10.xml
index bd3707a0a308..46c2bca6d951 100644
--- a/metadata/glsa/glsa-200702-10.xml
+++ b/metadata/glsa/glsa-200702-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ufo2000</product>
   <announced>2007-02-25</announced>
-  <revised>2007-02-25: 01</revised>
+  <revised count="01">2007-02-25</revised>
   <bug>142392</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200702-11.xml b/metadata/glsa/glsa-200702-11.xml
index 48be9669ed25..8811f90d62e1 100644
--- a/metadata/glsa/glsa-200702-11.xml
+++ b/metadata/glsa/glsa-200702-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">MPlayer</product>
   <announced>2007-02-27</announced>
-  <revised>2007-02-27: 01</revised>
+  <revised count="01">2007-02-27</revised>
   <bug>159727</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200702-12.xml b/metadata/glsa/glsa-200702-12.xml
index 577026d4d861..17a1a2a3f45a 100644
--- a/metadata/glsa/glsa-200702-12.xml
+++ b/metadata/glsa/glsa-200702-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">CHMlib</product>
   <announced>2007-02-27</announced>
-  <revised>2008-05-20: 02</revised>
+  <revised count="02">2008-05-20</revised>
   <bug>163989</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-01.xml b/metadata/glsa/glsa-200703-01.xml
index 716db1004815..26bc2e24a717 100644
--- a/metadata/glsa/glsa-200703-01.xml
+++ b/metadata/glsa/glsa-200703-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">snort</product>
   <announced>2007-02-23</announced>
-  <revised>2007-03-02: 02</revised>
+  <revised count="02">2007-03-02</revised>
   <bug>167730</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-02.xml b/metadata/glsa/glsa-200703-02.xml
index 4cc3b9da301e..9785ebf3dc25 100644
--- a/metadata/glsa/glsa-200703-02.xml
+++ b/metadata/glsa/glsa-200703-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">spamassassin</product>
   <announced>2007-03-02</announced>
-  <revised>2007-03-02: 01</revised>
+  <revised count="01">2007-03-02</revised>
   <bug>166969</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-03.xml b/metadata/glsa/glsa-200703-03.xml
index f28cd464af75..8a543ec90f9d 100644
--- a/metadata/glsa/glsa-200703-03.xml
+++ b/metadata/glsa/glsa-200703-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2007-03-02</announced>
-  <revised>2007-03-02: 01</revised>
+  <revised count="01">2007-03-02</revised>
   <bug>167201</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-04.xml b/metadata/glsa/glsa-200703-04.xml
index 886397187f0e..86ded2230ec7 100644
--- a/metadata/glsa/glsa-200703-04.xml
+++ b/metadata/glsa/glsa-200703-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mozilla-firefox</product>
   <announced>2007-03-02</announced>
-  <revised>2007-03-02: 01</revised>
+  <revised count="01">2007-03-02</revised>
   <bug>165555</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-05.xml b/metadata/glsa/glsa-200703-05.xml
index 4a8f4aa90e28..5ca7d95b6a8e 100644
--- a/metadata/glsa/glsa-200703-05.xml
+++ b/metadata/glsa/glsa-200703-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mozilla</product>
   <announced>2007-03-03</announced>
-  <revised>2007-03-03: 01</revised>
+  <revised count="01">2007-03-03</revised>
   <bug>135257</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-06.xml b/metadata/glsa/glsa-200703-06.xml
index f3bc5dd9281e..646f40548c54 100644
--- a/metadata/glsa/glsa-200703-06.xml
+++ b/metadata/glsa/glsa-200703-06.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">emul-linux-x86-qtlibs</product>
   <announced>2007-03-04</announced>
-  <revised>2007-03-04: 01</revised>
+  <revised count="01">2007-03-04</revised>
   <bug>153704</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-07.xml b/metadata/glsa/glsa-200703-07.xml
index 4be5fbfdaae1..349ae1f570f9 100644
--- a/metadata/glsa/glsa-200703-07.xml
+++ b/metadata/glsa/glsa-200703-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">STLport</product>
   <announced>2007-03-06</announced>
-  <revised>2007-03-06: 01</revised>
+  <revised count="01">2007-03-06</revised>
   <bug>165837</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-08.xml b/metadata/glsa/glsa-200703-08.xml
index 2ad5cd13c7b8..36f4353f3709 100644
--- a/metadata/glsa/glsa-200703-08.xml
+++ b/metadata/glsa/glsa-200703-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">seamonkey</product>
   <announced>2007-03-09</announced>
-  <revised>2007-03-09: 01</revised>
+  <revised count="01">2007-03-09</revised>
   <bug>165555</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-09.xml b/metadata/glsa/glsa-200703-09.xml
index aa51e1a3be68..2ae01345f9a5 100644
--- a/metadata/glsa/glsa-200703-09.xml
+++ b/metadata/glsa/glsa-200703-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">smb4k</product>
   <announced>2007-03-09</announced>
-  <revised>2007-03-09: 01</revised>
+  <revised count="01">2007-03-09</revised>
   <bug>156152</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-10.xml b/metadata/glsa/glsa-200703-10.xml
index 16cccd0bc31a..bb23537e5cb3 100644
--- a/metadata/glsa/glsa-200703-10.xml
+++ b/metadata/glsa/glsa-200703-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kdelibs</product>
   <announced>2007-03-10</announced>
-  <revised>2007-03-10: 01</revised>
+  <revised count="01">2007-03-10</revised>
   <bug>165606</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-11.xml b/metadata/glsa/glsa-200703-11.xml
index 546265714a88..a2819eb1d418 100644
--- a/metadata/glsa/glsa-200703-11.xml
+++ b/metadata/glsa/glsa-200703-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">amarok</product>
   <announced>2007-03-13</announced>
-  <revised>2007-03-13: 01</revised>
+  <revised count="01">2007-03-13</revised>
   <bug>166901</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-12.xml b/metadata/glsa/glsa-200703-12.xml
index 74d14bbf38e6..be1d5010c77b 100644
--- a/metadata/glsa/glsa-200703-12.xml
+++ b/metadata/glsa/glsa-200703-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">silc-server</product>
   <announced>2007-03-14</announced>
-  <revised>2007-03-14: 01</revised>
+  <revised count="01">2007-03-14</revised>
   <bug>169599</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-13.xml b/metadata/glsa/glsa-200703-13.xml
index c384ed34f406..2a6a3a8c0109 100644
--- a/metadata/glsa/glsa-200703-13.xml
+++ b/metadata/glsa/glsa-200703-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">net-misc/ssh</product>
   <announced>2007-03-14</announced>
-  <revised>2007-03-14: 01</revised>
+  <revised count="01">2007-03-14</revised>
   <bug>168584</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-14.xml b/metadata/glsa/glsa-200703-14.xml
index 2f5003cb546c..b2fcc2b2d9e4 100644
--- a/metadata/glsa/glsa-200703-14.xml
+++ b/metadata/glsa/glsa-200703-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2007-03-16</announced>
-  <revised>2007-03-16: 01</revised>
+  <revised count="01">2007-03-16</revised>
   <bug>169616</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-15.xml b/metadata/glsa/glsa-200703-15.xml
index 10fb39664c6f..7b34f98ba02c 100644
--- a/metadata/glsa/glsa-200703-15.xml
+++ b/metadata/glsa/glsa-200703-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">postgresql</product>
   <announced>2007-03-16</announced>
-  <revised>2009-05-28: 04</revised>
+  <revised count="04">2009-05-28</revised>
   <bug>165482</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-16.xml b/metadata/glsa/glsa-200703-16.xml
index 90f127121f3c..cc45d9918e33 100644
--- a/metadata/glsa/glsa-200703-16.xml
+++ b/metadata/glsa/glsa-200703-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mod_jk</product>
   <announced>2007-03-16</announced>
-  <revised>2007-03-16: 01</revised>
+  <revised count="01">2007-03-16</revised>
   <bug>169433</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-17.xml b/metadata/glsa/glsa-200703-17.xml
index ee75cc87d5c4..2c29d1972a50 100644
--- a/metadata/glsa/glsa-200703-17.xml
+++ b/metadata/glsa/glsa-200703-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ulogd</product>
   <announced>2007-03-18</announced>
-  <revised>2007-03-18: 01</revised>
+  <revised count="01">2007-03-18</revised>
   <bug>161882</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-18.xml b/metadata/glsa/glsa-200703-18.xml
index bbf45760d634..f8d3fb700295 100644
--- a/metadata/glsa/glsa-200703-18.xml
+++ b/metadata/glsa/glsa-200703-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mozilla-thunderbird</product>
   <announced>2007-03-18</announced>
-  <revised>2007-03-18: 01</revised>
+  <revised count="01">2007-03-18</revised>
   <bug>165555</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-19.xml b/metadata/glsa/glsa-200703-19.xml
index 085b8f738df8..2b69f7a4f44b 100644
--- a/metadata/glsa/glsa-200703-19.xml
+++ b/metadata/glsa/glsa-200703-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ltsp</product>
   <announced>2007-03-18</announced>
-  <revised>2007-03-18: 01</revised>
+  <revised count="01">2007-03-18</revised>
   <bug>142661</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-20.xml b/metadata/glsa/glsa-200703-20.xml
index c6524b804911..23e59d5b878a 100644
--- a/metadata/glsa/glsa-200703-20.xml
+++ b/metadata/glsa/glsa-200703-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lsat</product>
   <announced>2007-03-18</announced>
-  <revised>2007-05-11: 02</revised>
+  <revised count="02">2007-05-11</revised>
   <bug>159542</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-21.xml b/metadata/glsa/glsa-200703-21.xml
index 1606a448ff68..e924f9b84f01 100644
--- a/metadata/glsa/glsa-200703-21.xml
+++ b/metadata/glsa/glsa-200703-21.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2007-03-20</announced>
-  <revised>2008-03-29: 03</revised>
+  <revised count="03">2008-03-29</revised>
   <bug>153911</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-22.xml b/metadata/glsa/glsa-200703-22.xml
index 4ce282f0379d..ec19c2a69a16 100644
--- a/metadata/glsa/glsa-200703-22.xml
+++ b/metadata/glsa/glsa-200703-22.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">nss</product>
   <announced>2007-03-20</announced>
-  <revised>2007-03-20: 01</revised>
+  <revised count="01">2007-03-20</revised>
   <bug>165555</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-23.xml b/metadata/glsa/glsa-200703-23.xml
index 652fa154c0ff..e409fce1c03e 100644
--- a/metadata/glsa/glsa-200703-23.xml
+++ b/metadata/glsa/glsa-200703-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wordpress</product>
   <announced>2007-03-20</announced>
-  <revised>2007-03-20: 01</revised>
+  <revised count="01">2007-03-20</revised>
   <bug>168529</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-24.xml b/metadata/glsa/glsa-200703-24.xml
index 5f7ebd9cca4d..bd49a9fc43e4 100644
--- a/metadata/glsa/glsa-200703-24.xml
+++ b/metadata/glsa/glsa-200703-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mgv</product>
   <announced>2007-03-26</announced>
-  <revised>2007-03-26: 01</revised>
+  <revised count="01">2007-03-26</revised>
   <bug>154645</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-25.xml b/metadata/glsa/glsa-200703-25.xml
index c19079e89794..dc526fe8b872 100644
--- a/metadata/glsa/glsa-200703-25.xml
+++ b/metadata/glsa/glsa-200703-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ekiga</product>
   <announced>2007-03-29</announced>
-  <revised>2009-05-28: 02</revised>
+  <revised count="02">2009-05-28</revised>
   <bug>167643</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-26.xml b/metadata/glsa/glsa-200703-26.xml
index 64ef7c6c2307..762595033c05 100644
--- a/metadata/glsa/glsa-200703-26.xml
+++ b/metadata/glsa/glsa-200703-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">file</product>
   <announced>2007-03-30</announced>
-  <revised>2007-03-30: 01</revised>
+  <revised count="01">2007-03-30</revised>
   <bug>171452</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-27.xml b/metadata/glsa/glsa-200703-27.xml
index 29a63ba5860d..4f7898a76ee2 100644
--- a/metadata/glsa/glsa-200703-27.xml
+++ b/metadata/glsa/glsa-200703-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">squid</product>
   <announced>2007-03-31</announced>
-  <revised>2007-03-31: 01</revised>
+  <revised count="01">2007-03-31</revised>
   <bug>171681</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200703-28.xml b/metadata/glsa/glsa-200703-28.xml
index 294e479ce7e6..1004180daada 100644
--- a/metadata/glsa/glsa-200703-28.xml
+++ b/metadata/glsa/glsa-200703-28.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cups</product>
   <announced>2007-03-31</announced>
-  <revised>2007-03-31: 01</revised>
+  <revised count="01">2007-03-31</revised>
   <bug>170881</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-01.xml b/metadata/glsa/glsa-200704-01.xml
index dc760c76bb19..0221de69081a 100644
--- a/metadata/glsa/glsa-200704-01.xml
+++ b/metadata/glsa/glsa-200704-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2007-04-02</announced>
-  <revised>2007-04-02: 01</revised>
+  <revised count="01">2007-04-02</revised>
   <bug>171467</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-02.xml b/metadata/glsa/glsa-200704-02.xml
index 0b70272bed81..27573438818b 100644
--- a/metadata/glsa/glsa-200704-02.xml
+++ b/metadata/glsa/glsa-200704-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2007-04-03</announced>
-  <revised>2007-04-03: 01</revised>
+  <revised count="01">2007-04-03</revised>
   <bug>171889</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-03.xml b/metadata/glsa/glsa-200704-03.xml
index 3e9c54442569..c554c15d364c 100644
--- a/metadata/glsa/glsa-200704-03.xml
+++ b/metadata/glsa/glsa-200704-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openafs</product>
   <announced>2007-04-03</announced>
-  <revised>2007-04-03: 01</revised>
+  <revised count="01">2007-04-03</revised>
   <bug>171662</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-04.xml b/metadata/glsa/glsa-200704-04.xml
index 09b4e9750ae7..9d7093b796f7 100644
--- a/metadata/glsa/glsa-200704-04.xml
+++ b/metadata/glsa/glsa-200704-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openpbs</product>
   <announced>2007-04-03</announced>
-  <revised>2007-04-03: 01</revised>
+  <revised count="01">2007-04-03</revised>
   <bug>153495</bug>
   <access>remote, local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-05.xml b/metadata/glsa/glsa-200704-05.xml
index 669d5508663e..6cf527fb1137 100644
--- a/metadata/glsa/glsa-200704-05.xml
+++ b/metadata/glsa/glsa-200704-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">zziplib</product>
   <announced>2007-04-03</announced>
-  <revised>2007-04-03: 01</revised>
+  <revised count="01">2007-04-03</revised>
   <bug>171441</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-06.xml b/metadata/glsa/glsa-200704-06.xml
index 7bcd0c98f19a..6395c66c53c9 100644
--- a/metadata/glsa/glsa-200704-06.xml
+++ b/metadata/glsa/glsa-200704-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">evince</product>
   <announced>2007-04-06</announced>
-  <revised>2007-04-06: 01</revised>
+  <revised count="01">2007-04-06</revised>
   <bug>156573</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-07.xml b/metadata/glsa/glsa-200704-07.xml
index 7158351f3048..d709571c3b3e 100644
--- a/metadata/glsa/glsa-200704-07.xml
+++ b/metadata/glsa/glsa-200704-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libwpd</product>
   <announced>2007-04-06</announced>
-  <revised>2007-04-06: 01</revised>
+  <revised count="01">2007-04-06</revised>
   <bug>169675</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-08.xml b/metadata/glsa/glsa-200704-08.xml
index 7bac7e3291d0..522267322a04 100644
--- a/metadata/glsa/glsa-200704-08.xml
+++ b/metadata/glsa/glsa-200704-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dokuwiki</product>
   <announced>2007-04-12</announced>
-  <revised>2007-04-12: 01</revised>
+  <revised count="01">2007-04-12</revised>
   <bug>163781</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-09.xml b/metadata/glsa/glsa-200704-09.xml
index 5dd4f558614e..91fc2913f30f 100644
--- a/metadata/glsa/glsa-200704-09.xml
+++ b/metadata/glsa/glsa-200704-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xine-lib</product>
   <announced>2007-04-14</announced>
-  <revised>2007-04-14: 01</revised>
+  <revised count="01">2007-04-14</revised>
   <bug>170208</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-10.xml b/metadata/glsa/glsa-200704-10.xml
index 3cde7d7e15df..df1f53ba6c04 100644
--- a/metadata/glsa/glsa-200704-10.xml
+++ b/metadata/glsa/glsa-200704-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Inkscape</product>
   <announced>2007-04-16</announced>
-  <revised>2007-04-16: 01</revised>
+  <revised count="01">2007-04-16</revised>
   <bug>171799</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-11.xml b/metadata/glsa/glsa-200704-11.xml
index 04041cbcf594..3f9ab070a191 100644
--- a/metadata/glsa/glsa-200704-11.xml
+++ b/metadata/glsa/glsa-200704-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">vixie-cron</product>
   <announced>2007-04-16</announced>
-  <revised>2007-04-16: 01</revised>
+  <revised count="01">2007-04-16</revised>
   <bug>164466</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-12.xml b/metadata/glsa/glsa-200704-12.xml
index ef0765161b8e..08a7ca0691dd 100644
--- a/metadata/glsa/glsa-200704-12.xml
+++ b/metadata/glsa/glsa-200704-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">OpenOffice.org</product>
   <announced>2007-04-16</announced>
-  <revised>2007-04-16: 01</revised>
+  <revised count="01">2007-04-16</revised>
   <bug>170828</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-13.xml b/metadata/glsa/glsa-200704-13.xml
index 4e5ed22fe847..e41f921b22eb 100644
--- a/metadata/glsa/glsa-200704-13.xml
+++ b/metadata/glsa/glsa-200704-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">file</product>
   <announced>2007-04-17</announced>
-  <revised>2007-09-17: 02</revised>
+  <revised count="02">2007-09-17</revised>
   <bug>174217</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-14.xml b/metadata/glsa/glsa-200704-14.xml
index 7f7df84634ae..e4e6fe5c7030 100644
--- a/metadata/glsa/glsa-200704-14.xml
+++ b/metadata/glsa/glsa-200704-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">FreeRADIUS</product>
   <announced>2007-04-17</announced>
-  <revised>2007-04-17: 01</revised>
+  <revised count="01">2007-04-17</revised>
   <bug>174292</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-15.xml b/metadata/glsa/glsa-200704-15.xml
index 0e527567502a..6fbde33a8dcd 100644
--- a/metadata/glsa/glsa-200704-15.xml
+++ b/metadata/glsa/glsa-200704-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Madwifi-ng</product>
   <announced>2007-04-17</announced>
-  <revised>2007-04-21: 02</revised>
+  <revised count="02">2007-04-21</revised>
   <bug>173434</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-16.xml b/metadata/glsa/glsa-200704-16.xml
index 182829abfc21..777d784c5f0a 100644
--- a/metadata/glsa/glsa-200704-16.xml
+++ b/metadata/glsa/glsa-200704-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">aircrack-ng</product>
   <announced>2007-04-22</announced>
-  <revised>2007-04-22: 01</revised>
+  <revised count="01">2007-04-22</revised>
   <bug>174340</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-17.xml b/metadata/glsa/glsa-200704-17.xml
index 5325bef71662..3e014bc3b683 100644
--- a/metadata/glsa/glsa-200704-17.xml
+++ b/metadata/glsa/glsa-200704-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">3proxy</product>
   <announced>2007-04-22</announced>
-  <revised>2007-04-22: 01</revised>
+  <revised count="01">2007-04-22</revised>
   <bug>174429</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-18.xml b/metadata/glsa/glsa-200704-18.xml
index b202998063c8..fb169036c4bd 100644
--- a/metadata/glsa/glsa-200704-18.xml
+++ b/metadata/glsa/glsa-200704-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">courier-imap</product>
   <announced>2007-04-22</announced>
-  <revised>2007-04-23: 02</revised>
+  <revised count="02">2007-04-23</revised>
   <bug>168196</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-19.xml b/metadata/glsa/glsa-200704-19.xml
index fcbed73523c9..a853e05000bb 100644
--- a/metadata/glsa/glsa-200704-19.xml
+++ b/metadata/glsa/glsa-200704-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Blender</product>
   <announced>2007-04-23</announced>
-  <revised>2007-04-23: 01</revised>
+  <revised count="01">2007-04-23</revised>
   <bug>168907</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-20.xml b/metadata/glsa/glsa-200704-20.xml
index 13279a7d410c..9f4e701302f6 100644
--- a/metadata/glsa/glsa-200704-20.xml
+++ b/metadata/glsa/glsa-200704-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">NAS</product>
   <announced>2007-04-23</announced>
-  <revised>2007-04-23: 01</revised>
+  <revised count="01">2007-04-23</revised>
   <bug>171428</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-21.xml b/metadata/glsa/glsa-200704-21.xml
index d9f785f1e9cc..d65b5436eae4 100644
--- a/metadata/glsa/glsa-200704-21.xml
+++ b/metadata/glsa/glsa-200704-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ClamAV</product>
   <announced>2007-04-24</announced>
-  <revised>2007-04-24: 01</revised>
+  <revised count="01">2007-04-24</revised>
   <bug>174375</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-22.xml b/metadata/glsa/glsa-200704-22.xml
index e3aed7f84153..d8e3e96f325c 100644
--- a/metadata/glsa/glsa-200704-22.xml
+++ b/metadata/glsa/glsa-200704-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">BEAST</product>
   <announced>2007-04-27</announced>
-  <revised>2007-04-27: 01</revised>
+  <revised count="01">2007-04-27</revised>
   <bug>163146</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200704-23.xml b/metadata/glsa/glsa-200704-23.xml
index ab3d35bc7ed9..f0f233f5a336 100644
--- a/metadata/glsa/glsa-200704-23.xml
+++ b/metadata/glsa/glsa-200704-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">capi4k-utils</product>
   <announced>2007-04-27</announced>
-  <revised>2007-04-27: 01</revised>
+  <revised count="01">2007-04-27</revised>
   <bug>170870</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-01.xml b/metadata/glsa/glsa-200705-01.xml
index 4d6e1fa9076b..f2880c2b9649 100644
--- a/metadata/glsa/glsa-200705-01.xml
+++ b/metadata/glsa/glsa-200705-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ktorrent</product>
   <announced>2007-05-01</announced>
-  <revised>2007-05-01: 01</revised>
+  <revised count="01">2007-05-01</revised>
   <bug>170303</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-02.xml b/metadata/glsa/glsa-200705-02.xml
index 3b7a3b62e7cf..dcc4fe6c9c40 100644
--- a/metadata/glsa/glsa-200705-02.xml
+++ b/metadata/glsa/glsa-200705-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">freetype</product>
   <announced>2007-05-01</announced>
-  <revised>2007-05-27: 02</revised>
+  <revised count="02">2007-05-27</revised>
   <bug>172577</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-03.xml b/metadata/glsa/glsa-200705-03.xml
index 27cbc5974a07..a788f86a2b40 100644
--- a/metadata/glsa/glsa-200705-03.xml
+++ b/metadata/glsa/glsa-200705-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tomcat</product>
   <announced>2007-05-01</announced>
-  <revised>2007-05-01: 01</revised>
+  <revised count="01">2007-05-01</revised>
   <bug>173122</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-04.xml b/metadata/glsa/glsa-200705-04.xml
index b8b56d038662..5978092a4c61 100644
--- a/metadata/glsa/glsa-200705-04.xml
+++ b/metadata/glsa/glsa-200705-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mod_perl</product>
   <announced>2007-05-02</announced>
-  <revised>2007-05-02: 02</revised>
+  <revised count="02">2007-05-02</revised>
   <bug>172676</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-05.xml b/metadata/glsa/glsa-200705-05.xml
index da10f99470ee..6d950b3cfef8 100644
--- a/metadata/glsa/glsa-200705-05.xml
+++ b/metadata/glsa/glsa-200705-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">quagga</product>
   <announced>2007-05-02</announced>
-  <revised>2007-05-02: 01</revised>
+  <revised count="01">2007-05-02</revised>
   <bug>174206</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-06.xml b/metadata/glsa/glsa-200705-06.xml
index c9a5ac483141..76ced2a3d6cd 100644
--- a/metadata/glsa/glsa-200705-06.xml
+++ b/metadata/glsa/glsa-200705-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libx11</product>
   <announced>2007-05-05</announced>
-  <revised>2007-05-05: 01</revised>
+  <revised count="01">2007-05-05</revised>
   <bug>172752</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-07.xml b/metadata/glsa/glsa-200705-07.xml
index 399f7bbfb69e..09239968960c 100644
--- a/metadata/glsa/glsa-200705-07.xml
+++ b/metadata/glsa/glsa-200705-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lighttpd</product>
   <announced>2007-05-07</announced>
-  <revised>2007-05-07: 01</revised>
+  <revised count="01">2007-05-07</revised>
   <bug>174043</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-08.xml b/metadata/glsa/glsa-200705-08.xml
index 8ded2ad6ab35..9384c97d5c94 100644
--- a/metadata/glsa/glsa-200705-08.xml
+++ b/metadata/glsa/glsa-200705-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gimp</product>
   <announced>2007-05-07</announced>
-  <revised>2007-05-07: 01</revised>
+  <revised count="01">2007-05-07</revised>
   <bug>176226</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-09.xml b/metadata/glsa/glsa-200705-09.xml
index 1326aeb3d767..577098b4b9ee 100644
--- a/metadata/glsa/glsa-200705-09.xml
+++ b/metadata/glsa/glsa-200705-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ipsec-tools</product>
   <announced>2007-05-08</announced>
-  <revised>2007-05-08: 01</revised>
+  <revised count="01">2007-05-08</revised>
   <bug>173219</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-10.xml b/metadata/glsa/glsa-200705-10.xml
index 00af732aafae..fd421d9c8821 100644
--- a/metadata/glsa/glsa-200705-10.xml
+++ b/metadata/glsa/glsa-200705-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tightvnc, libxfont</product>
   <announced>2007-05-08</announced>
-  <revised>2007-05-08: 01</revised>
+  <revised count="01">2007-05-08</revised>
   <bug>172575</bug>
   <bug>174200</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-200705-11.xml b/metadata/glsa/glsa-200705-11.xml
index d033d533b664..7afbc763b1d0 100644
--- a/metadata/glsa/glsa-200705-11.xml
+++ b/metadata/glsa/glsa-200705-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">MySQL</product>
   <announced>2007-05-08</announced>
-  <revised>2007-05-08: 01</revised>
+  <revised count="01">2007-05-08</revised>
   <bug>170126</bug>
   <bug>171934</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200705-12.xml b/metadata/glsa/glsa-200705-12.xml
index 52569e61a166..921589883beb 100644
--- a/metadata/glsa/glsa-200705-12.xml
+++ b/metadata/glsa/glsa-200705-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">postgresql</product>
   <announced>2007-05-10</announced>
-  <revised>2009-05-28: 02</revised>
+  <revised count="02">2009-05-28</revised>
   <bug>175791</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-13.xml b/metadata/glsa/glsa-200705-13.xml
index fbfc8bdebb36..95f1a64fa4c6 100644
--- a/metadata/glsa/glsa-200705-13.xml
+++ b/metadata/glsa/glsa-200705-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">imagemagick</product>
   <announced>2007-05-10</announced>
-  <revised>2007-06-07: 02</revised>
+  <revised count="02">2007-06-07</revised>
   <bug>152672</bug>
   <bug>159567</bug>
   <bug>173186</bug>
diff --git a/metadata/glsa/glsa-200705-14.xml b/metadata/glsa/glsa-200705-14.xml
index 21c942576d2b..4cc3b446211b 100644
--- a/metadata/glsa/glsa-200705-14.xml
+++ b/metadata/glsa/glsa-200705-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xscreensaver</product>
   <announced>2007-05-13</announced>
-  <revised>2007-05-13: 01</revised>
+  <revised count="01">2007-05-13</revised>
   <bug>176584</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-15.xml b/metadata/glsa/glsa-200705-15.xml
index 28d1c44c214a..dfff4bfec1ee 100644
--- a/metadata/glsa/glsa-200705-15.xml
+++ b/metadata/glsa/glsa-200705-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">samba</product>
   <announced>2007-05-15</announced>
-  <revised>2007-05-15: 01</revised>
+  <revised count="01">2007-05-15</revised>
   <bug>177029</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-16.xml b/metadata/glsa/glsa-200705-16.xml
index e8a82aefad42..c5b0c8ffed07 100644
--- a/metadata/glsa/glsa-200705-16.xml
+++ b/metadata/glsa/glsa-200705-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpwiki</product>
   <announced>2007-05-17</announced>
-  <revised>2007-05-17: 01</revised>
+  <revised count="01">2007-05-17</revised>
   <bug>174451</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-17.xml b/metadata/glsa/glsa-200705-17.xml
index 82c7b4b66430..e600c5a0877b 100644
--- a/metadata/glsa/glsa-200705-17.xml
+++ b/metadata/glsa/glsa-200705-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mod_security</product>
   <announced>2007-05-17</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>169778</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-18.xml b/metadata/glsa/glsa-200705-18.xml
index 8b7b4547db7f..f9d4751caa0c 100644
--- a/metadata/glsa/glsa-200705-18.xml
+++ b/metadata/glsa/glsa-200705-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pptpd</product>
   <announced>2007-05-20</announced>
-  <revised>2007-05-20: 01</revised>
+  <revised count="01">2007-05-20</revised>
   <bug>176936</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-19.xml b/metadata/glsa/glsa-200705-19.xml
index 9ff9f0d80bf1..a3229ab50396 100644
--- a/metadata/glsa/glsa-200705-19.xml
+++ b/metadata/glsa/glsa-200705-19.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2007-05-26</announced>
-  <revised>2008-03-29: 02</revised>
+  <revised count="02">2008-03-29</revised>
   <bug>169372</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-20.xml b/metadata/glsa/glsa-200705-20.xml
index 5a391a0b317b..7a53667d3b2b 100644
--- a/metadata/glsa/glsa-200705-20.xml
+++ b/metadata/glsa/glsa-200705-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">blackdown-jdk,blackdown-jre</product>
   <announced>2007-05-26</announced>
-  <revised>2007-05-26: 01</revised>
+  <revised count="01">2007-05-26</revised>
   <bug>161835</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-21.xml b/metadata/glsa/glsa-200705-21.xml
index b80e792f6167..147cc8dde0fb 100644
--- a/metadata/glsa/glsa-200705-21.xml
+++ b/metadata/glsa/glsa-200705-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mplayer</product>
   <announced>2007-05-30</announced>
-  <revised>2007-10-12: 02</revised>
+  <revised count="02">2007-10-12</revised>
   <bug>168917</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-22.xml b/metadata/glsa/glsa-200705-22.xml
index 5c387b6d33fb..d530d1e9101a 100644
--- a/metadata/glsa/glsa-200705-22.xml
+++ b/metadata/glsa/glsa-200705-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">freetype</product>
   <announced>2007-05-30</announced>
-  <revised>2007-05-30: 01</revised>
+  <revised count="01">2007-05-30</revised>
   <bug>179161</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-23.xml b/metadata/glsa/glsa-200705-23.xml
index f55e3cecadc0..043dfcd10e2d 100644
--- a/metadata/glsa/glsa-200705-23.xml
+++ b/metadata/glsa/glsa-200705-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sun-jdk,sun-jre-bin</product>
   <announced>2007-05-31</announced>
-  <revised>2009-05-28: 05</revised>
+  <revised count="05">2009-05-28</revised>
   <bug>176675</bug>
   <bug>178851</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200705-24.xml b/metadata/glsa/glsa-200705-24.xml
index e3fb4a02b39a..6479d816edf4 100644
--- a/metadata/glsa/glsa-200705-24.xml
+++ b/metadata/glsa/glsa-200705-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2007-05-31</announced>
-  <revised>2007-05-31: 01</revised>
+  <revised count="01">2007-05-31</revised>
   <bug>178004</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200705-25.xml b/metadata/glsa/glsa-200705-25.xml
index aff71cbc199a..8ea29f453793 100644
--- a/metadata/glsa/glsa-200705-25.xml
+++ b/metadata/glsa/glsa-200705-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">file</product>
   <announced>2007-05-31</announced>
-  <revised>2007-06-01: 02</revised>
+  <revised count="02">2007-06-01</revised>
   <bug>179583</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200706-01.xml b/metadata/glsa/glsa-200706-01.xml
index 74a7a1912845..815eae70d1cd 100644
--- a/metadata/glsa/glsa-200706-01.xml
+++ b/metadata/glsa/glsa-200706-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libexif</product>
   <announced>2007-06-05</announced>
-  <revised>2007-06-05: 01</revised>
+  <revised count="01">2007-06-05</revised>
   <bug>178081</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200706-02.xml b/metadata/glsa/glsa-200706-02.xml
index 7a3d987d61f4..2d5a1419cfcc 100644
--- a/metadata/glsa/glsa-200706-02.xml
+++ b/metadata/glsa/glsa-200706-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">evolution</product>
   <announced>2007-06-06</announced>
-  <revised>2007-06-06: 01</revised>
+  <revised count="01">2007-06-06</revised>
   <bug>170879</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200706-03.xml b/metadata/glsa/glsa-200706-03.xml
index f9bbf0342903..5ca58ca29cc3 100644
--- a/metadata/glsa/glsa-200706-03.xml
+++ b/metadata/glsa/glsa-200706-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">elinks</product>
   <announced>2007-06-06</announced>
-  <revised>2007-06-06: 01</revised>
+  <revised count="01">2007-06-06</revised>
   <bug>177512</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200706-04.xml b/metadata/glsa/glsa-200706-04.xml
index d24dae8507c1..7a60d7192bad 100644
--- a/metadata/glsa/glsa-200706-04.xml
+++ b/metadata/glsa/glsa-200706-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">madwifi-ng</product>
   <announced>2007-06-11</announced>
-  <revised>2007-06-11: 01</revised>
+  <revised count="01">2007-06-11</revised>
   <bug>179532</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200706-05.xml b/metadata/glsa/glsa-200706-05.xml
index acfab327ce5c..37bfbe68112a 100644
--- a/metadata/glsa/glsa-200706-05.xml
+++ b/metadata/glsa/glsa-200706-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2007-06-15</announced>
-  <revised>2007-06-15: 01</revised>
+  <revised count="01">2007-06-15</revised>
   <bug>178082</bug>
   <access>remote, local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200706-06.xml b/metadata/glsa/glsa-200706-06.xml
index 331852103c5c..ae0606e8ce51 100644
--- a/metadata/glsa/glsa-200706-06.xml
+++ b/metadata/glsa/glsa-200706-06.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">mozilla-firefox,mozilla-thunderbird,mozilla-firefox-bin,mozilla-thunderbird-bin,seamonkey,seamonkey-bin,xulrunner</product>
   <announced>2007-06-19</announced>
-  <revised>2007-06-19: 01</revised>
+  <revised count="01">2007-06-19</revised>
   <bug>180436</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200706-07.xml b/metadata/glsa/glsa-200706-07.xml
index 7612d4199844..6dc31ff6a2f2 100644
--- a/metadata/glsa/glsa-200706-07.xml
+++ b/metadata/glsa/glsa-200706-07.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">phprojekt</product>
   <announced>2007-06-19</announced>
-  <revised>2007-06-19: 01</revised>
+  <revised count="01">2007-06-19</revised>
   <bug>170905</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200706-08.xml b/metadata/glsa/glsa-200706-08.xml
index b7e916ba530c..ebc98ba52a44 100644
--- a/metadata/glsa/glsa-200706-08.xml
+++ b/metadata/glsa/glsa-200706-08.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">emul-linux-x86-java</product>
   <announced>2007-06-26</announced>
-  <revised>2009-05-28: 03</revised>
+  <revised count="03">2009-05-28</revised>
   <bug>178962</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200706-09.xml b/metadata/glsa/glsa-200706-09.xml
index 13d5ad92700a..e2a2b0864d52 100644
--- a/metadata/glsa/glsa-200706-09.xml
+++ b/metadata/glsa/glsa-200706-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libexif</product>
   <announced>2007-06-26</announced>
-  <revised>2007-06-26: 01</revised>
+  <revised count="01">2007-06-26</revised>
   <bug>181922</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200707-01.xml b/metadata/glsa/glsa-200707-01.xml
index 3238443f5f46..61537f6a52dc 100644
--- a/metadata/glsa/glsa-200707-01.xml
+++ b/metadata/glsa/glsa-200707-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">firebird</product>
   <announced>2007-07-01</announced>
-  <revised>2007-07-01: 01</revised>
+  <revised count="01">2007-07-01</revised>
   <bug>181811</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200707-02.xml b/metadata/glsa/glsa-200707-02.xml
index 6b01d8fc4f5a..d079b21efa27 100644
--- a/metadata/glsa/glsa-200707-02.xml
+++ b/metadata/glsa/glsa-200707-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openoffice</product>
   <announced>2007-07-02</announced>
-  <revised>2007-07-02: 01</revised>
+  <revised count="01">2007-07-02</revised>
   <bug>181773</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200707-03.xml b/metadata/glsa/glsa-200707-03.xml
index ac115842f0ae..22d8b3409471 100644
--- a/metadata/glsa/glsa-200707-03.xml
+++ b/metadata/glsa/glsa-200707-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">evolution-data-server</product>
   <announced>2007-07-02</announced>
-  <revised>2007-07-02: 01</revised>
+  <revised count="01">2007-07-02</revised>
   <bug>182011</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200707-04.xml b/metadata/glsa/glsa-200707-04.xml
index 15fe45bb33b3..c8f4d116dae0 100644
--- a/metadata/glsa/glsa-200707-04.xml
+++ b/metadata/glsa/glsa-200707-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">glibc</product>
   <announced>2007-07-03</announced>
-  <revised>2007-07-03: 01</revised>
+  <revised count="01">2007-07-03</revised>
   <bug>183844</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200707-05.xml b/metadata/glsa/glsa-200707-05.xml
index 49cb6cb7768f..313b0c56d494 100644
--- a/metadata/glsa/glsa-200707-05.xml
+++ b/metadata/glsa/glsa-200707-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">webmin/usermin</product>
   <announced>2007-07-05</announced>
-  <revised>2007-07-05: 01</revised>
+  <revised count="01">2007-07-05</revised>
   <bug>181385</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200707-06.xml b/metadata/glsa/glsa-200707-06.xml
index 6d719a370ea0..18bb38e8f8f6 100644
--- a/metadata/glsa/glsa-200707-06.xml
+++ b/metadata/glsa/glsa-200707-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xnview</product>
   <announced>2007-07-11</announced>
-  <revised>2007-07-11: 01</revised>
+  <revised count="01">2007-07-11</revised>
   <bug>175670</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200707-07.xml b/metadata/glsa/glsa-200707-07.xml
index 57e12748cf96..75a959ca9f2c 100644
--- a/metadata/glsa/glsa-200707-07.xml
+++ b/metadata/glsa/glsa-200707-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mplayer</product>
   <announced>2007-07-24</announced>
-  <revised>2007-10-12: 03</revised>
+  <revised count="03">2007-10-12</revised>
   <bug>181097</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200707-08.xml b/metadata/glsa/glsa-200707-08.xml
index ac2f8bf23b4b..adcf4097617e 100644
--- a/metadata/glsa/glsa-200707-08.xml
+++ b/metadata/glsa/glsa-200707-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nvclock</product>
   <announced>2007-07-24</announced>
-  <revised>2007-07-24: 01</revised>
+  <revised count="01">2007-07-24</revised>
   <bug>184071</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200707-09.xml b/metadata/glsa/glsa-200707-09.xml
index b443d7641fe5..6d1dde724211 100644
--- a/metadata/glsa/glsa-200707-09.xml
+++ b/metadata/glsa/glsa-200707-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gimp</product>
   <announced>2007-07-25</announced>
-  <revised>2007-07-25: 01</revised>
+  <revised count="01">2007-07-25</revised>
   <bug>182047</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200707-10.xml b/metadata/glsa/glsa-200707-10.xml
index ea61a987d54d..b75ad9446c7d 100644
--- a/metadata/glsa/glsa-200707-10.xml
+++ b/metadata/glsa/glsa-200707-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">festival</product>
   <announced>2007-07-25</announced>
-  <revised>2007-07-25: 01</revised>
+  <revised count="01">2007-07-25</revised>
   <bug>170477</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200707-11.xml b/metadata/glsa/glsa-200707-11.xml
index b14c18479396..fc4c263429fc 100644
--- a/metadata/glsa/glsa-200707-11.xml
+++ b/metadata/glsa/glsa-200707-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2007-07-25</announced>
-  <revised>2007-07-25: 01</revised>
+  <revised count="01">2007-07-25</revised>
   <bug>183338</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200707-12.xml b/metadata/glsa/glsa-200707-12.xml
index 2addc1b559ae..3efa35a823e1 100644
--- a/metadata/glsa/glsa-200707-12.xml
+++ b/metadata/glsa/glsa-200707-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">vlc</product>
   <announced>2007-07-28</announced>
-  <revised>2007-07-28: 01</revised>
+  <revised count="01">2007-07-28</revised>
   <bug>182389</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200707-13.xml b/metadata/glsa/glsa-200707-13.xml
index 1b15653e1e7c..ce5738fe4381 100644
--- a/metadata/glsa/glsa-200707-13.xml
+++ b/metadata/glsa/glsa-200707-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">fail2ban</product>
   <announced>2007-07-28</announced>
-  <revised>2008-01-09: 02</revised>
+  <revised count="02">2008-01-09</revised>
   <bug>181214</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200707-14.xml b/metadata/glsa/glsa-200707-14.xml
index f016916f3072..63a44c72fc4e 100644
--- a/metadata/glsa/glsa-200707-14.xml
+++ b/metadata/glsa/glsa-200707-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tcpdump</product>
   <announced>2007-07-28</announced>
-  <revised>2007-07-28: 01</revised>
+  <revised count="01">2007-07-28</revised>
   <bug>184815</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-01.xml b/metadata/glsa/glsa-200708-01.xml
index 9851391f1a20..4a54d45567b3 100644
--- a/metadata/glsa/glsa-200708-01.xml
+++ b/metadata/glsa/glsa-200708-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2007-08-08</announced>
-  <revised>2009-05-28: 02</revised>
+  <revised count="02">2009-05-28</revised>
   <bug>185141</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-02.xml b/metadata/glsa/glsa-200708-02.xml
index 7223f8132053..59381bd4cf24 100644
--- a/metadata/glsa/glsa-200708-02.xml
+++ b/metadata/glsa/glsa-200708-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xvid</product>
   <announced>2007-08-08</announced>
-  <revised>2007-08-08: 01</revised>
+  <revised count="01">2007-08-08</revised>
   <bug>183145</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-03.xml b/metadata/glsa/glsa-200708-03.xml
index e30733ef5d03..fd7efb7f0b4c 100644
--- a/metadata/glsa/glsa-200708-03.xml
+++ b/metadata/glsa/glsa-200708-03.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">libarchive</product>
   <announced>2007-08-08</announced>
-  <revised>2007-08-08: 02</revised>
+  <revised count="02">2007-08-08</revised>
   <bug>184984</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-04.xml b/metadata/glsa/glsa-200708-04.xml
index 1a8af2e719f3..6a40c425140e 100644
--- a/metadata/glsa/glsa-200708-04.xml
+++ b/metadata/glsa/glsa-200708-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2007-08-09</announced>
-  <revised>2007-08-09: 01</revised>
+  <revised count="01">2007-08-09</revised>
   <bug>185013</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-05.xml b/metadata/glsa/glsa-200708-05.xml
index 90fd6adbe57d..e758ed8d60ee 100644
--- a/metadata/glsa/glsa-200708-05.xml
+++ b/metadata/glsa/glsa-200708-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gd</product>
   <announced>2007-08-09</announced>
-  <revised>2007-08-09: 01</revised>
+  <revised count="01">2007-08-09</revised>
   <bug>179154</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-06.xml b/metadata/glsa/glsa-200708-06.xml
index bd7265304316..73f83d218aa4 100644
--- a/metadata/glsa/glsa-200708-06.xml
+++ b/metadata/glsa/glsa-200708-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">net-dns</product>
   <announced>2007-08-11</announced>
-  <revised>2007-08-11: 01</revised>
+  <revised count="01">2007-08-11</revised>
   <bug>184029</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-07.xml b/metadata/glsa/glsa-200708-07.xml
index a41391f4a506..a33d5abea1b7 100644
--- a/metadata/glsa/glsa-200708-07.xml
+++ b/metadata/glsa/glsa-200708-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">terminal</product>
   <announced>2007-08-11</announced>
-  <revised>2008-07-12: 02</revised>
+  <revised count="02">2008-07-12</revised>
   <bug>184886</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-08.xml b/metadata/glsa/glsa-200708-08.xml
index c61e3f3540ad..484601c41241 100644
--- a/metadata/glsa/glsa-200708-08.xml
+++ b/metadata/glsa/glsa-200708-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">squirrelmail</product>
   <announced>2007-08-11</announced>
-  <revised>2007-08-11: 01</revised>
+  <revised count="01">2007-08-11</revised>
   <bug>185010</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-09.xml b/metadata/glsa/glsa-200708-09.xml
index 1d6587f586fc..37b4fcf456d9 100644
--- a/metadata/glsa/glsa-200708-09.xml
+++ b/metadata/glsa/glsa-200708-09.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">mozilla-firefox,mozilla-firefox-bin,seamonkey,seamonkey-bin,mozilla-thunderbird,mozilla-thunderbird-bin,xulrunner</product>
   <announced>2007-08-14</announced>
-  <revised>2007-08-14: 01</revised>
+  <revised count="01">2007-08-14</revised>
   <bug>185737</bug>
   <bug>187205</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200708-10.xml b/metadata/glsa/glsa-200708-10.xml
index cae5aac23b26..20c300f7613e 100644
--- a/metadata/glsa/glsa-200708-10.xml
+++ b/metadata/glsa/glsa-200708-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mysql</product>
   <announced>2007-08-16</announced>
-  <revised>2007-08-16: 01</revised>
+  <revised count="01">2007-08-16</revised>
   <bug>185333</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-11.xml b/metadata/glsa/glsa-200708-11.xml
index d20f4a3fedb5..323c7d49d0a0 100644
--- a/metadata/glsa/glsa-200708-11.xml
+++ b/metadata/glsa/glsa-200708-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lighttpd</product>
   <announced>2007-08-16</announced>
-  <revised>2007-08-16: 01</revised>
+  <revised count="01">2007-08-16</revised>
   <bug>185442</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-12.xml b/metadata/glsa/glsa-200708-12.xml
index 173f5ec01251..3d315ad80184 100644
--- a/metadata/glsa/glsa-200708-12.xml
+++ b/metadata/glsa/glsa-200708-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2007-08-16</announced>
-  <revised>2007-08-16: 01</revised>
+  <revised count="01">2007-08-16</revised>
   <bug>183520</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-13.xml b/metadata/glsa/glsa-200708-13.xml
index 200dd821ca2e..58dea67083cd 100644
--- a/metadata/glsa/glsa-200708-13.xml
+++ b/metadata/glsa/glsa-200708-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bind</product>
   <announced>2007-08-18</announced>
-  <revised>2007-08-18: 01</revised>
+  <revised count="01">2007-08-18</revised>
   <bug>186556</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-14.xml b/metadata/glsa/glsa-200708-14.xml
index 642ce2cea776..c508dda3b743 100644
--- a/metadata/glsa/glsa-200708-14.xml
+++ b/metadata/glsa/glsa-200708-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nvidia-drivers</product>
   <announced>2007-08-19</announced>
-  <revised>2007-10-11: 03</revised>
+  <revised count="03">2007-10-11</revised>
   <bug>183567</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-15.xml b/metadata/glsa/glsa-200708-15.xml
index 2cde52f3477f..fbea03cc130e 100644
--- a/metadata/glsa/glsa-200708-15.xml
+++ b/metadata/glsa/glsa-200708-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mod_jk</product>
   <announced>2007-08-19</announced>
-  <revised>2007-08-19: 01</revised>
+  <revised count="01">2007-08-19</revised>
   <bug>186218</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-16.xml b/metadata/glsa/glsa-200708-16.xml
index 97b6013a58c8..a3b9a35bea1e 100644
--- a/metadata/glsa/glsa-200708-16.xml
+++ b/metadata/glsa/glsa-200708-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">qt</product>
   <announced>2007-08-22</announced>
-  <revised>2007-08-22: 01</revised>
+  <revised count="01">2007-08-22</revised>
   <bug>185446</bug>
   <access>remote, local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200708-17.xml b/metadata/glsa/glsa-200708-17.xml
index d277f1069506..2a78c7a69a8a 100644
--- a/metadata/glsa/glsa-200708-17.xml
+++ b/metadata/glsa/glsa-200708-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2007-08-22</announced>
-  <revised>2007-08-22: 01</revised>
+  <revised count="01">2007-08-22</revised>
   <bug>185497</bug>
   <bug>188987</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200709-01.xml b/metadata/glsa/glsa-200709-01.xml
index e0c14818035a..ad5c9a2aad37 100644
--- a/metadata/glsa/glsa-200709-01.xml
+++ b/metadata/glsa/glsa-200709-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2007-09-11</announced>
-  <revised>2007-09-11: 01</revised>
+  <revised count="01">2007-09-11</revised>
   <bug>191301</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-02.xml b/metadata/glsa/glsa-200709-02.xml
index 298877802cf0..a19c79e8dad2 100644
--- a/metadata/glsa/glsa-200709-02.xml
+++ b/metadata/glsa/glsa-200709-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kvirc</product>
   <announced>2007-09-13</announced>
-  <revised>2007-09-13: 01</revised>
+  <revised count="01">2007-09-13</revised>
   <bug>183174</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-03.xml b/metadata/glsa/glsa-200709-03.xml
index a5c627d9edd7..9c49e3ef2843 100644
--- a/metadata/glsa/glsa-200709-03.xml
+++ b/metadata/glsa/glsa-200709-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">streamripper</product>
   <announced>2007-09-13</announced>
-  <revised>2007-09-13: 01</revised>
+  <revised count="01">2007-09-13</revised>
   <bug>188698</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-04.xml b/metadata/glsa/glsa-200709-04.xml
index 7d7725a17fc6..dddd6ead8ad8 100644
--- a/metadata/glsa/glsa-200709-04.xml
+++ b/metadata/glsa/glsa-200709-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">po4a</product>
   <announced>2007-09-13</announced>
-  <revised>2007-09-13: 01</revised>
+  <revised count="01">2007-09-13</revised>
   <bug>189440</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-05.xml b/metadata/glsa/glsa-200709-05.xml
index a43e61c73a48..e86526cd4926 100644
--- a/metadata/glsa/glsa-200709-05.xml
+++ b/metadata/glsa/glsa-200709-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">realplayer</product>
   <announced>2007-09-14</announced>
-  <revised>2007-09-14: 01</revised>
+  <revised count="01">2007-09-14</revised>
   <bug>183421</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-06.xml b/metadata/glsa/glsa-200709-06.xml
index 0d1afd51ec3d..ffcb8678160e 100644
--- a/metadata/glsa/glsa-200709-06.xml
+++ b/metadata/glsa/glsa-200709-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">flac123</product>
   <announced>2007-09-14</announced>
-  <revised>2007-09-14: 01</revised>
+  <revised count="01">2007-09-14</revised>
   <bug>186220</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-07.xml b/metadata/glsa/glsa-200709-07.xml
index 20582a6df7eb..1915eeb42437 100644
--- a/metadata/glsa/glsa-200709-07.xml
+++ b/metadata/glsa/glsa-200709-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">eggdrop</product>
   <announced>2007-09-15</announced>
-  <revised>2007-09-26: 02</revised>
+  <revised count="02">2007-09-26</revised>
   <bug>179354</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-08.xml b/metadata/glsa/glsa-200709-08.xml
index bdb954f17bb4..d5ce42bb1aad 100644
--- a/metadata/glsa/glsa-200709-08.xml
+++ b/metadata/glsa/glsa-200709-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">id3lib</product>
   <announced>2007-09-15</announced>
-  <revised>2007-09-15: 01</revised>
+  <revised count="01">2007-09-15</revised>
   <bug>189610</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-09.xml b/metadata/glsa/glsa-200709-09.xml
index 8c6732c78d49..5900b3a0ec34 100644
--- a/metadata/glsa/glsa-200709-09.xml
+++ b/metadata/glsa/glsa-200709-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tar</product>
   <announced>2007-09-15</announced>
-  <revised>2007-09-15: 01</revised>
+  <revised count="01">2007-09-15</revised>
   <bug>189682</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-10.xml b/metadata/glsa/glsa-200709-10.xml
index e89ed3ee5806..25ae6a755eeb 100644
--- a/metadata/glsa/glsa-200709-10.xml
+++ b/metadata/glsa/glsa-200709-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">phpwiki</product>
   <announced>2007-09-18</announced>
-  <revised>2007-09-18: 01</revised>
+  <revised count="01">2007-09-18</revised>
   <bug>181692</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-11.xml b/metadata/glsa/glsa-200709-11.xml
index dfd7650301ca..08bd14227daa 100644
--- a/metadata/glsa/glsa-200709-11.xml
+++ b/metadata/glsa/glsa-200709-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gdm</product>
   <announced>2007-09-18</announced>
-  <revised>2007-09-18: 01</revised>
+  <revised count="01">2007-09-18</revised>
   <bug>187919</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-12.xml b/metadata/glsa/glsa-200709-12.xml
index 867b4a2c7a06..0afdfaea0874 100644
--- a/metadata/glsa/glsa-200709-12.xml
+++ b/metadata/glsa/glsa-200709-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">poppler</product>
   <announced>2007-09-19</announced>
-  <revised>2007-09-19: 01</revised>
+  <revised count="01">2007-09-19</revised>
   <bug>188863</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-13.xml b/metadata/glsa/glsa-200709-13.xml
index c7a04a379db0..bfc5a7c462a5 100644
--- a/metadata/glsa/glsa-200709-13.xml
+++ b/metadata/glsa/glsa-200709-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rsync</product>
   <announced>2007-09-20</announced>
-  <revised>2007-09-20: 01</revised>
+  <revised count="01">2007-09-20</revised>
   <bug>189132</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-14.xml b/metadata/glsa/glsa-200709-14.xml
index 0c3cd426cdb9..dace12ffa451 100644
--- a/metadata/glsa/glsa-200709-14.xml
+++ b/metadata/glsa/glsa-200709-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2007-09-20</announced>
-  <revised>2007-09-20: 01</revised>
+  <revised count="01">2007-09-20</revised>
   <bug>189912</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-15.xml b/metadata/glsa/glsa-200709-15.xml
index c4cb541cd475..959a6cf7d044 100644
--- a/metadata/glsa/glsa-200709-15.xml
+++ b/metadata/glsa/glsa-200709-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">jrockit-jdk-bin</product>
   <announced>2007-09-23</announced>
-  <revised>2007-09-23: 01</revised>
+  <revised count="01">2007-09-23</revised>
   <bug>190686</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-16.xml b/metadata/glsa/glsa-200709-16.xml
index 18755bc09b9e..50649b3f95eb 100644
--- a/metadata/glsa/glsa-200709-16.xml
+++ b/metadata/glsa/glsa-200709-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">lighttpd</product>
   <announced>2007-09-27</announced>
-  <revised>2007-09-27: 01</revised>
+  <revised count="01">2007-09-27</revised>
   <bug>191912</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200709-17.xml b/metadata/glsa/glsa-200709-17.xml
index 4a5cc13f2869..15782e5d7ab7 100644
--- a/metadata/glsa/glsa-200709-17.xml
+++ b/metadata/glsa/glsa-200709-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tetex</product>
   <announced>2007-09-27</announced>
-  <revised>2007-09-27: 01</revised>
+  <revised count="01">2007-09-27</revised>
   <bug>170861</bug>
   <bug>182055</bug>
   <bug>188172</bug>
diff --git a/metadata/glsa/glsa-200709-18.xml b/metadata/glsa/glsa-200709-18.xml
index 3817c89f6eac..96399958d878 100644
--- a/metadata/glsa/glsa-200709-18.xml
+++ b/metadata/glsa/glsa-200709-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bugzilla</product>
   <announced>2007-09-30</announced>
-  <revised>2009-05-28: 03</revised>
+  <revised count="03">2009-05-28</revised>
   <bug>190112</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-01.xml b/metadata/glsa/glsa-200710-01.xml
index c646111cdcdb..df1554a5569a 100644
--- a/metadata/glsa/glsa-200710-01.xml
+++ b/metadata/glsa/glsa-200710-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">librcpsecgss</product>
   <announced>2007-10-04</announced>
-  <revised>2007-10-04: 01</revised>
+  <revised count="01">2007-10-04</revised>
   <bug>191479</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-02.xml b/metadata/glsa/glsa-200710-02.xml
index 78050bdd1ce3..f69bc75137e1 100644
--- a/metadata/glsa/glsa-200710-02.xml
+++ b/metadata/glsa/glsa-200710-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2007-10-07</announced>
-  <revised>2007-10-07: 01</revised>
+  <revised count="01">2007-10-07</revised>
   <bug>179158</bug>
   <bug>180556</bug>
   <bug>191034</bug>
diff --git a/metadata/glsa/glsa-200710-03.xml b/metadata/glsa/glsa-200710-03.xml
index 3f1bf7160a99..551985836d71 100644
--- a/metadata/glsa/glsa-200710-03.xml
+++ b/metadata/glsa/glsa-200710-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libvorbis</product>
   <announced>2007-10-07</announced>
-  <revised>2007-10-07: 01</revised>
+  <revised count="01">2007-10-07</revised>
   <bug>186716</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-04.xml b/metadata/glsa/glsa-200710-04.xml
index 0453780a6242..9594bf8b90ff 100644
--- a/metadata/glsa/glsa-200710-04.xml
+++ b/metadata/glsa/glsa-200710-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libsndfile</product>
   <announced>2007-10-07</announced>
-  <revised>2007-10-07: 01</revised>
+  <revised count="01">2007-10-07</revised>
   <bug>192834</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-05.xml b/metadata/glsa/glsa-200710-05.xml
index 5b064f1fed4c..362b57b6ad22 100644
--- a/metadata/glsa/glsa-200710-05.xml
+++ b/metadata/glsa/glsa-200710-05.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">qgit</product>
   <announced>2007-10-07</announced>
-  <revised>2007-10-07: 01</revised>
+  <revised count="01">2007-10-07</revised>
   <bug>190697</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-06.xml b/metadata/glsa/glsa-200710-06.xml
index 5e7089f3a39b..8ccebac8652e 100644
--- a/metadata/glsa/glsa-200710-06.xml
+++ b/metadata/glsa/glsa-200710-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2007-10-07</announced>
-  <revised>2007-10-07: 01</revised>
+  <revised count="01">2007-10-07</revised>
   <bug>188799</bug>
   <bug>194039</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-200710-07.xml b/metadata/glsa/glsa-200710-07.xml
index e56484f84c18..68b89f3396c2 100644
--- a/metadata/glsa/glsa-200710-07.xml
+++ b/metadata/glsa/glsa-200710-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tk</product>
   <announced>2007-10-07</announced>
-  <revised>2007-10-07: 01</revised>
+  <revised count="01">2007-10-07</revised>
   <bug>192539</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-08.xml b/metadata/glsa/glsa-200710-08.xml
index 9e4ebc3fd793..aee47e37a3cb 100644
--- a/metadata/glsa/glsa-200710-08.xml
+++ b/metadata/glsa/glsa-200710-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">koffice, kword, kdegraphics, kpdf</product>
   <announced>2007-10-09</announced>
-  <revised>2007-10-09: 01</revised>
+  <revised count="01">2007-10-09</revised>
   <bug>187139</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-09.xml b/metadata/glsa/glsa-200710-09.xml
index 4f586ba1c9d9..e47ad9db4a2b 100644
--- a/metadata/glsa/glsa-200710-09.xml
+++ b/metadata/glsa/glsa-200710-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nx, nxnode</product>
   <announced>2007-10-09</announced>
-  <revised>2007-10-09: 01</revised>
+  <revised count="01">2007-10-09</revised>
   <bug>192712</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-10.xml b/metadata/glsa/glsa-200710-10.xml
index ab94373e8e3e..c2b81298e6bb 100644
--- a/metadata/glsa/glsa-200710-10.xml
+++ b/metadata/glsa/glsa-200710-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">skktools</product>
   <announced>2007-10-12</announced>
-  <revised>2007-10-12: 01</revised>
+  <revised count="01">2007-10-12</revised>
   <bug>193121</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-11.xml b/metadata/glsa/glsa-200710-11.xml
index f90d7fc615b7..372be97a23e4 100644
--- a/metadata/glsa/glsa-200710-11.xml
+++ b/metadata/glsa/glsa-200710-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xfs</product>
   <announced>2007-10-12</announced>
-  <revised>2007-10-12: 01</revised>
+  <revised count="01">2007-10-12</revised>
   <bug>185660</bug>
   <bug>194606</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-200710-12.xml b/metadata/glsa/glsa-200710-12.xml
index 7b6de0940df3..0f19076b59d9 100644
--- a/metadata/glsa/glsa-200710-12.xml
+++ b/metadata/glsa/glsa-200710-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">t1lib</product>
   <announced>2007-10-12</announced>
-  <revised>2007-10-12: 01</revised>
+  <revised count="01">2007-10-12</revised>
   <bug>193437</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-13.xml b/metadata/glsa/glsa-200710-13.xml
index c963a9adc1f6..de63e3eb08d9 100644
--- a/metadata/glsa/glsa-200710-13.xml
+++ b/metadata/glsa/glsa-200710-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ampache</product>
   <announced>2007-10-13</announced>
-  <revised>2007-10-13: 01</revised>
+  <revised count="01">2007-10-13</revised>
   <bug>189607</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-14.xml b/metadata/glsa/glsa-200710-14.xml
index 5d8e8b51a425..43b9e66728ca 100644
--- a/metadata/glsa/glsa-200710-14.xml
+++ b/metadata/glsa/glsa-200710-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">denyhosts</product>
   <announced>2007-10-13</announced>
-  <revised>2007-10-13: 01</revised>
+  <revised count="01">2007-10-13</revised>
   <bug>181213</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-15.xml b/metadata/glsa/glsa-200710-15.xml
index ced0e1c0f7ac..335f812968c3 100644
--- a/metadata/glsa/glsa-200710-15.xml
+++ b/metadata/glsa/glsa-200710-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">KDM</product>
   <announced>2007-10-14</announced>
-  <revised>2007-10-14: 01</revised>
+  <revised count="01">2007-10-14</revised>
   <bug>192373</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-16.xml b/metadata/glsa/glsa-200710-16.xml
index 1697772274ba..27b709c45aa5 100644
--- a/metadata/glsa/glsa-200710-16.xml
+++ b/metadata/glsa/glsa-200710-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">X.Org</product>
   <announced>2007-10-14</announced>
-  <revised>2007-10-14: 01</revised>
+  <revised count="01">2007-10-14</revised>
   <bug>191964</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-17.xml b/metadata/glsa/glsa-200710-17.xml
index c57635af64e5..9bf2c7812aa2 100644
--- a/metadata/glsa/glsa-200710-17.xml
+++ b/metadata/glsa/glsa-200710-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">balsa</product>
   <announced>2007-10-16</announced>
-  <revised>2007-10-16: 01</revised>
+  <revised count="01">2007-10-16</revised>
   <bug>193179</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-18.xml b/metadata/glsa/glsa-200710-18.xml
index 3680908eb02b..b01d644d7040 100644
--- a/metadata/glsa/glsa-200710-18.xml
+++ b/metadata/glsa/glsa-200710-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">util-linux</product>
   <announced>2007-10-18</announced>
-  <revised>2007-10-18: 01</revised>
+  <revised count="01">2007-10-18</revised>
   <bug>195390</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-19.xml b/metadata/glsa/glsa-200710-19.xml
index 9230e126c745..7d9b1514eac8 100644
--- a/metadata/glsa/glsa-200710-19.xml
+++ b/metadata/glsa/glsa-200710-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sleuthkit</product>
   <announced>2007-10-18</announced>
-  <revised>2007-10-18: 01</revised>
+  <revised count="01">2007-10-18</revised>
   <bug>181977</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-20.xml b/metadata/glsa/glsa-200710-20.xml
index 9dbe48f0f7f8..bc8879cdf0b0 100644
--- a/metadata/glsa/glsa-200710-20.xml
+++ b/metadata/glsa/glsa-200710-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pdfkit imagekits</product>
   <announced>2007-10-18</announced>
-  <revised>2007-10-18: 01</revised>
+  <revised count="01">2007-10-18</revised>
   <bug>188185</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-21.xml b/metadata/glsa/glsa-200710-21.xml
index 3101f1bdcd00..78a21e3e07c5 100644
--- a/metadata/glsa/glsa-200710-21.xml
+++ b/metadata/glsa/glsa-200710-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tikiwiki</product>
   <announced>2007-10-20</announced>
-  <revised>2007-10-20: 01</revised>
+  <revised count="01">2007-10-20</revised>
   <bug>195503</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-22.xml b/metadata/glsa/glsa-200710-22.xml
index b669a0bbd68e..f396e1de1c7c 100644
--- a/metadata/glsa/glsa-200710-22.xml
+++ b/metadata/glsa/glsa-200710-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tramp</product>
   <announced>2007-10-20</announced>
-  <revised>2007-12-30: 02</revised>
+  <revised count="02">2007-12-30</revised>
   <bug>194713</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-23.xml b/metadata/glsa/glsa-200710-23.xml
index 6bf8cd24dd71..7d60cc4874cc 100644
--- a/metadata/glsa/glsa-200710-23.xml
+++ b/metadata/glsa/glsa-200710-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">star</product>
   <announced>2007-10-22</announced>
-  <revised>2007-10-22: 01</revised>
+  <revised count="01">2007-10-22</revised>
   <bug>189690</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-24.xml b/metadata/glsa/glsa-200710-24.xml
index d9e0115dd177..5857f2bde7b0 100644
--- a/metadata/glsa/glsa-200710-24.xml
+++ b/metadata/glsa/glsa-200710-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openoffice</product>
   <announced>2007-10-23</announced>
-  <revised>2007-10-23: 01</revised>
+  <revised count="01">2007-10-23</revised>
   <bug>192818</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-25.xml b/metadata/glsa/glsa-200710-25.xml
index b0ea948e7551..6933f26471e5 100644
--- a/metadata/glsa/glsa-200710-25.xml
+++ b/metadata/glsa/glsa-200710-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mldonkey</product>
   <announced>2007-10-24</announced>
-  <revised>2007-11-07: 02</revised>
+  <revised count="02">2007-11-07</revised>
   <bug>189412</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-26.xml b/metadata/glsa/glsa-200710-26.xml
index 52bf650036bb..6e07e2f0cf25 100644
--- a/metadata/glsa/glsa-200710-26.xml
+++ b/metadata/glsa/glsa-200710-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">hplip</product>
   <announced>2007-10-24</announced>
-  <revised>2007-10-24: 01</revised>
+  <revised count="01">2007-10-24</revised>
   <bug>195565</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-27.xml b/metadata/glsa/glsa-200710-27.xml
index 6f145e37fca5..d01ded7c37c4 100644
--- a/metadata/glsa/glsa-200710-27.xml
+++ b/metadata/glsa/glsa-200710-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">imagemagick</product>
   <announced>2007-10-24</announced>
-  <revised>2007-10-24: 01</revised>
+  <revised count="01">2007-10-24</revised>
   <bug>186030</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-28.xml b/metadata/glsa/glsa-200710-28.xml
index 60ed75fa5889..ba6d9f305bf1 100644
--- a/metadata/glsa/glsa-200710-28.xml
+++ b/metadata/glsa/glsa-200710-28.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">qt</product>
   <announced>2007-10-25</announced>
-  <revised>2007-10-25: 01</revised>
+  <revised count="01">2007-10-25</revised>
   <bug>192472</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-29.xml b/metadata/glsa/glsa-200710-29.xml
index e79ef52121fc..32d1d58c33b1 100644
--- a/metadata/glsa/glsa-200710-29.xml
+++ b/metadata/glsa/glsa-200710-29.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sylpheed claws-mail</product>
   <announced>2007-10-25</announced>
-  <revised>2007-10-25: 01</revised>
+  <revised count="01">2007-10-25</revised>
   <bug>190104</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-30.xml b/metadata/glsa/glsa-200710-30.xml
index 4b2092e0e58e..c223f2e5b22c 100644
--- a/metadata/glsa/glsa-200710-30.xml
+++ b/metadata/glsa/glsa-200710-30.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2007-10-27</announced>
-  <revised>2007-10-30: 03</revised>
+  <revised count="03">2007-10-30</revised>
   <bug>195634</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200710-31.xml b/metadata/glsa/glsa-200710-31.xml
index 497e9755b69e..2703d56d1d96 100644
--- a/metadata/glsa/glsa-200710-31.xml
+++ b/metadata/glsa/glsa-200710-31.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2007-10-30</announced>
-  <revised>2007-10-30: 01</revised>
+  <revised count="01">2007-10-30</revised>
   <bug>196164</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-01.xml b/metadata/glsa/glsa-200711-01.xml
index dcbcb1f89b60..0e5123c2fa86 100644
--- a/metadata/glsa/glsa-200711-01.xml
+++ b/metadata/glsa/glsa-200711-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gftp</product>
   <announced>2007-11-01</announced>
-  <revised>2007-11-01: 01</revised>
+  <revised count="01">2007-11-01</revised>
   <bug>188252</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-02.xml b/metadata/glsa/glsa-200711-02.xml
index 708892c06c22..a5f797e500f7 100644
--- a/metadata/glsa/glsa-200711-02.xml
+++ b/metadata/glsa/glsa-200711-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openssh</product>
   <announced>2007-11-01</announced>
-  <revised>2007-11-01: 01</revised>
+  <revised count="01">2007-11-01</revised>
   <bug>191321</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-03.xml b/metadata/glsa/glsa-200711-03.xml
index 751ba2ec58d2..9940b5111117 100644
--- a/metadata/glsa/glsa-200711-03.xml
+++ b/metadata/glsa/glsa-200711-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gallery</product>
   <announced>2007-11-01</announced>
-  <revised>2007-11-11: 02</revised>
+  <revised count="02">2007-11-11</revised>
   <bug>191587</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-04.xml b/metadata/glsa/glsa-200711-04.xml
index 493f62ff36b1..5dcd5eadb454 100644
--- a/metadata/glsa/glsa-200711-04.xml
+++ b/metadata/glsa/glsa-200711-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">evolution-data-server</product>
   <announced>2007-11-06</announced>
-  <revised>2007-11-06: 01</revised>
+  <revised count="01">2007-11-06</revised>
   <bug>190861</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-05.xml b/metadata/glsa/glsa-200711-05.xml
index 15e05638b52d..9605bbf70590 100644
--- a/metadata/glsa/glsa-200711-05.xml
+++ b/metadata/glsa/glsa-200711-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sitebar</product>
   <announced>2007-11-06</announced>
-  <revised>2007-11-06: 01</revised>
+  <revised count="01">2007-11-06</revised>
   <bug>195810</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-06.xml b/metadata/glsa/glsa-200711-06.xml
index 44391d2eedcd..680fc9c2665c 100644
--- a/metadata/glsa/glsa-200711-06.xml
+++ b/metadata/glsa/glsa-200711-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">apache</product>
   <announced>2007-11-07</announced>
-  <revised>2007-11-07: 01</revised>
+  <revised count="01">2007-11-07</revised>
   <bug>186219</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-07.xml b/metadata/glsa/glsa-200711-07.xml
index b27acc47f043..9c910e4372fc 100644
--- a/metadata/glsa/glsa-200711-07.xml
+++ b/metadata/glsa/glsa-200711-07.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">python</product>
   <announced>2007-11-07</announced>
-  <revised>2007-11-07: 01</revised>
+  <revised count="01">2007-11-07</revised>
   <bug>192876</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-08.xml b/metadata/glsa/glsa-200711-08.xml
index 40402dc1585d..b4490cc23642 100644
--- a/metadata/glsa/glsa-200711-08.xml
+++ b/metadata/glsa/glsa-200711-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2007-11-07</announced>
-  <revised>2007-11-07: 01</revised>
+  <revised count="01">2007-11-07</revised>
   <bug>195261</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-09.xml b/metadata/glsa/glsa-200711-09.xml
index 32d7cd6631af..74f22b4a6197 100644
--- a/metadata/glsa/glsa-200711-09.xml
+++ b/metadata/glsa/glsa-200711-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">madwifi-ng</product>
   <announced>2007-11-07</announced>
-  <revised>2007-11-07: 01</revised>
+  <revised count="01">2007-11-07</revised>
   <bug>195705</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-10.xml b/metadata/glsa/glsa-200711-10.xml
index a5242575644c..24e74be3008d 100644
--- a/metadata/glsa/glsa-200711-10.xml
+++ b/metadata/glsa/glsa-200711-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mono</product>
   <announced>2007-11-07</announced>
-  <revised>2007-11-07: 01</revised>
+  <revised count="01">2007-11-07</revised>
   <bug>197067</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-11.xml b/metadata/glsa/glsa-200711-11.xml
index 3f5c86e29152..3eb03387be56 100644
--- a/metadata/glsa/glsa-200711-11.xml
+++ b/metadata/glsa/glsa-200711-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nagios-plugins</product>
   <announced>2007-11-08</announced>
-  <revised>2007-11-08: 01</revised>
+  <revised count="01">2007-11-08</revised>
   <bug>196308</bug>
   <bug>194178</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200711-12.xml b/metadata/glsa/glsa-200711-12.xml
index b59d548e5fc3..65d0aadaf7d0 100644
--- a/metadata/glsa/glsa-200711-12.xml
+++ b/metadata/glsa/glsa-200711-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tomboy</product>
   <announced>2007-11-08</announced>
-  <revised>2007-11-08: 01</revised>
+  <revised count="01">2007-11-08</revised>
   <bug>189249</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-13.xml b/metadata/glsa/glsa-200711-13.xml
index 8775276a9e03..173e6eee7242 100644
--- a/metadata/glsa/glsa-200711-13.xml
+++ b/metadata/glsa/glsa-200711-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">3proxy</product>
   <announced>2007-11-08</announced>
-  <revised>2007-11-08: 01</revised>
+  <revised count="01">2007-11-08</revised>
   <bug>196772</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-14.xml b/metadata/glsa/glsa-200711-14.xml
index e14ec867571f..8fb053eb848d 100644
--- a/metadata/glsa/glsa-200711-14.xml
+++ b/metadata/glsa/glsa-200711-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">firefox seamonkey xulrunner</product>
   <announced>2007-11-12</announced>
-  <revised>2007-11-12: 01</revised>
+  <revised count="01">2007-11-12</revised>
   <bug>196480</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-15.xml b/metadata/glsa/glsa-200711-15.xml
index 1ea49e530d7d..47257a62fc53 100644
--- a/metadata/glsa/glsa-200711-15.xml
+++ b/metadata/glsa/glsa-200711-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">flac</product>
   <announced>2007-11-12</announced>
-  <revised>2007-11-12: 01</revised>
+  <revised count="01">2007-11-12</revised>
   <bug>195700</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-16.xml b/metadata/glsa/glsa-200711-16.xml
index 2a310047399e..1a89986ff2f2 100644
--- a/metadata/glsa/glsa-200711-16.xml
+++ b/metadata/glsa/glsa-200711-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cups</product>
   <announced>2007-11-12</announced>
-  <revised>2007-11-12: 01</revised>
+  <revised count="01">2007-11-12</revised>
   <bug>196736</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-17.xml b/metadata/glsa/glsa-200711-17.xml
index 966522c8a18a..a1ec82798000 100644
--- a/metadata/glsa/glsa-200711-17.xml
+++ b/metadata/glsa/glsa-200711-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rails</product>
   <announced>2007-11-14</announced>
-  <revised>2007-11-14: 01</revised>
+  <revised count="01">2007-11-14</revised>
   <bug>195315</bug>
   <bug>182223</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200711-18.xml b/metadata/glsa/glsa-200711-18.xml
index 11385fb40cef..74a11d10a1fc 100644
--- a/metadata/glsa/glsa-200711-18.xml
+++ b/metadata/glsa/glsa-200711-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cpio</product>
   <announced>2007-11-14</announced>
-  <revised>2007-11-14: 01</revised>
+  <revised count="01">2007-11-14</revised>
   <bug>196978</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-19.xml b/metadata/glsa/glsa-200711-19.xml
index 684f4bc42fec..8ee792bea83a 100644
--- a/metadata/glsa/glsa-200711-19.xml
+++ b/metadata/glsa/glsa-200711-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tikiwiki</product>
   <announced>2007-11-14</announced>
-  <revised>2007-11-14: 01</revised>
+  <revised count="01">2007-11-14</revised>
   <bug>195503</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-20.xml b/metadata/glsa/glsa-200711-20.xml
index 372ad78f2692..b9fd27361e14 100644
--- a/metadata/glsa/glsa-200711-20.xml
+++ b/metadata/glsa/glsa-200711-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pioneers</product>
   <announced>2007-11-14</announced>
-  <revised>2007-11-29: 04</revised>
+  <revised count="04">2007-11-29</revised>
   <bug>198807</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-21.xml b/metadata/glsa/glsa-200711-21.xml
index a5c7fe4f3a9c..f036800147a4 100644
--- a/metadata/glsa/glsa-200711-21.xml
+++ b/metadata/glsa/glsa-200711-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bochs</product>
   <announced>2007-11-17</announced>
-  <revised>2007-11-17: 01</revised>
+  <revised count="01">2007-11-17</revised>
   <bug>188148</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-22.xml b/metadata/glsa/glsa-200711-22.xml
index c75f42fa008b..cfc0cc1cc153 100644
--- a/metadata/glsa/glsa-200711-22.xml
+++ b/metadata/glsa/glsa-200711-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">poppler koffice kword kdegraphics kpdf</product>
   <announced>2007-11-18</announced>
-  <revised>2007-11-18: 01</revised>
+  <revised count="01">2007-11-18</revised>
   <bug>196735</bug>
   <bug>198409</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200711-23.xml b/metadata/glsa/glsa-200711-23.xml
index 9317f246ef7e..25c9cd40e1da 100644
--- a/metadata/glsa/glsa-200711-23.xml
+++ b/metadata/glsa/glsa-200711-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">vmware-workstation vmware-player</product>
   <announced>2007-11-18</announced>
-  <revised>2008-04-16: 03</revised>
+  <revised count="03">2008-04-16</revised>
   <bug>193196</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-24.xml b/metadata/glsa/glsa-200711-24.xml
index e426cb253481..9f2575cc9c8b 100644
--- a/metadata/glsa/glsa-200711-24.xml
+++ b/metadata/glsa/glsa-200711-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mozilla-thunderbird mozilla-thunderbird-bin</product>
   <announced>2007-11-18</announced>
-  <revised>2007-11-18: 01</revised>
+  <revised count="01">2007-11-18</revised>
   <bug>196481</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-25.xml b/metadata/glsa/glsa-200711-25.xml
index e7784034cb53..76d1de6e64af 100644
--- a/metadata/glsa/glsa-200711-25.xml
+++ b/metadata/glsa/glsa-200711-25.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mysql</product>
   <announced>2007-11-18</announced>
-  <revised>2007-11-18: 01</revised>
+  <revised count="01">2007-11-18</revised>
   <bug>198988</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-26.xml b/metadata/glsa/glsa-200711-26.xml
index b16e125c64be..d728cd8be0aa 100644
--- a/metadata/glsa/glsa-200711-26.xml
+++ b/metadata/glsa/glsa-200711-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tetex</product>
   <announced>2007-11-18</announced>
-  <revised>2007-11-18: 01</revised>
+  <revised count="01">2007-11-18</revised>
   <bug>198238</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-27.xml b/metadata/glsa/glsa-200711-27.xml
index 6e90d53e5273..9adf9be3f1b4 100644
--- a/metadata/glsa/glsa-200711-27.xml
+++ b/metadata/glsa/glsa-200711-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">link-grammar</product>
   <announced>2007-11-18</announced>
-  <revised>2007-11-18: 01</revised>
+  <revised count="01">2007-11-18</revised>
   <bug>196803</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-28.xml b/metadata/glsa/glsa-200711-28.xml
index 4644c748dbad..448450818e62 100644
--- a/metadata/glsa/glsa-200711-28.xml
+++ b/metadata/glsa/glsa-200711-28.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">perl</product>
   <announced>2007-11-19</announced>
-  <revised>2007-11-19: 01</revised>
+  <revised count="01">2007-11-19</revised>
   <bug>198196</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-29.xml b/metadata/glsa/glsa-200711-29.xml
index 4f918b802e44..f2023c0a5824 100644
--- a/metadata/glsa/glsa-200711-29.xml
+++ b/metadata/glsa/glsa-200711-29.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">samba</product>
   <announced>2007-11-20</announced>
-  <revised>2007-12-05: 03</revised>
+  <revised count="03">2007-12-05</revised>
   <bug>197519</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-30.xml b/metadata/glsa/glsa-200711-30.xml
index 5a39d34d1a88..8bcbfe2e7250 100644
--- a/metadata/glsa/glsa-200711-30.xml
+++ b/metadata/glsa/glsa-200711-30.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libpcre</product>
   <announced>2007-11-20</announced>
-  <revised>2007-11-20: 01</revised>
+  <revised count="01">2007-11-20</revised>
   <bug>198198</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-31.xml b/metadata/glsa/glsa-200711-31.xml
index 45602831567f..648863f135b3 100644
--- a/metadata/glsa/glsa-200711-31.xml
+++ b/metadata/glsa/glsa-200711-31.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">net-snmp</product>
   <announced>2007-11-20</announced>
-  <revised>2007-11-20: 01</revised>
+  <revised count="01">2007-11-20</revised>
   <bug>198346</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-32.xml b/metadata/glsa/glsa-200711-32.xml
index 2bd897163119..57ee03352076 100644
--- a/metadata/glsa/glsa-200711-32.xml
+++ b/metadata/glsa/glsa-200711-32.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">feynmf</product>
   <announced>2007-11-20</announced>
-  <revised>2007-11-20: 01</revised>
+  <revised count="01">2007-11-20</revised>
   <bug>198231</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-33.xml b/metadata/glsa/glsa-200711-33.xml
index beacfb3eeff5..119a1d48e7a6 100644
--- a/metadata/glsa/glsa-200711-33.xml
+++ b/metadata/glsa/glsa-200711-33.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nss_ldap</product>
   <announced>2007-11-25</announced>
-  <revised>2007-11-25: 01</revised>
+  <revised count="01">2007-11-25</revised>
   <bug>198390</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200711-34.xml b/metadata/glsa/glsa-200711-34.xml
index 9eaec70c2dd9..5ca601571135 100644
--- a/metadata/glsa/glsa-200711-34.xml
+++ b/metadata/glsa/glsa-200711-34.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cstetex</product>
   <announced>2007-11-25</announced>
-  <revised>2007-11-25: 01</revised>
+  <revised count="01">2007-11-25</revised>
   <bug>196673</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-01.xml b/metadata/glsa/glsa-200712-01.xml
index 2ba28a2fd323..6317b212e6d8 100644
--- a/metadata/glsa/glsa-200712-01.xml
+++ b/metadata/glsa/glsa-200712-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">hugin</product>
   <announced>2007-12-05</announced>
-  <revised>2007-12-05: 01</revised>
+  <revised count="01">2007-12-05</revised>
   <bug>195996</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-02.xml b/metadata/glsa/glsa-200712-02.xml
index ea93f2c6eee9..cb41d6a52651 100644
--- a/metadata/glsa/glsa-200712-02.xml
+++ b/metadata/glsa/glsa-200712-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cacti</product>
   <announced>2007-12-05</announced>
-  <revised>2007-12-05: 02</revised>
+  <revised count="02">2007-12-05</revised>
   <bug>199509</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-03.xml b/metadata/glsa/glsa-200712-03.xml
index 931dca8a4299..361378e8ab70 100644
--- a/metadata/glsa/glsa-200712-03.xml
+++ b/metadata/glsa/glsa-200712-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">emacs</product>
   <announced>2007-12-09</announced>
-  <revised>2007-12-09: 01</revised>
+  <revised count="01">2007-12-09</revised>
   <bug>197958</bug>
   <bug>200297</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200712-04.xml b/metadata/glsa/glsa-200712-04.xml
index 21b6e7793ab0..41bb42776fea 100644
--- a/metadata/glsa/glsa-200712-04.xml
+++ b/metadata/glsa/glsa-200712-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cairo</product>
   <announced>2007-12-09</announced>
-  <revised>2007-12-09: 01</revised>
+  <revised count="01">2007-12-09</revised>
   <bug>200350</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-05.xml b/metadata/glsa/glsa-200712-05.xml
index 83366ba329f0..3bf90b8df141 100644
--- a/metadata/glsa/glsa-200712-05.xml
+++ b/metadata/glsa/glsa-200712-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">PEAR-MDB2</product>
   <announced>2007-12-09</announced>
-  <revised>2007-12-09: 01</revised>
+  <revised count="01">2007-12-09</revised>
   <bug>198446</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-06.xml b/metadata/glsa/glsa-200712-06.xml
index b9f40514eb15..c4c8674417f3 100644
--- a/metadata/glsa/glsa-200712-06.xml
+++ b/metadata/glsa/glsa-200712-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">firebird</product>
   <announced>2007-12-09</announced>
-  <revised>2007-12-09: 01</revised>
+  <revised count="01">2007-12-09</revised>
   <bug>195569</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-07.xml b/metadata/glsa/glsa-200712-07.xml
index 4e6c6fd8573c..beafd41bbdd7 100644
--- a/metadata/glsa/glsa-200712-07.xml
+++ b/metadata/glsa/glsa-200712-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lookup</product>
   <announced>2007-12-09</announced>
-  <revised>2007-12-09: 01</revised>
+  <revised count="01">2007-12-09</revised>
   <bug>197306</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-08.xml b/metadata/glsa/glsa-200712-08.xml
index b062d045c6e1..a6be9f30e736 100644
--- a/metadata/glsa/glsa-200712-08.xml
+++ b/metadata/glsa/glsa-200712-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">emul-linux-x86-qtlibs</product>
   <announced>2007-12-09</announced>
-  <revised>2007-12-09: 01</revised>
+  <revised count="01">2007-12-09</revised>
   <bug>189536</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-09.xml b/metadata/glsa/glsa-200712-09.xml
index 947a7c1c24a1..073f99e4ef8b 100644
--- a/metadata/glsa/glsa-200712-09.xml
+++ b/metadata/glsa/glsa-200712-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ruby-gtk2</product>
   <announced>2007-12-09</announced>
-  <revised>2007-12-09: 01</revised>
+  <revised count="01">2007-12-09</revised>
   <bug>200623</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-10.xml b/metadata/glsa/glsa-200712-10.xml
index 9d27f172ec57..dc403bd7252e 100644
--- a/metadata/glsa/glsa-200712-10.xml
+++ b/metadata/glsa/glsa-200712-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">samba</product>
   <announced>2007-12-10</announced>
-  <revised>2007-12-10: 01</revised>
+  <revised count="01">2007-12-10</revised>
   <bug>200773</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-11.xml b/metadata/glsa/glsa-200712-11.xml
index e5a9f5a20480..26840f5c4f0f 100644
--- a/metadata/glsa/glsa-200712-11.xml
+++ b/metadata/glsa/glsa-200712-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">portage</product>
   <announced>2007-12-13</announced>
-  <revised>2007-12-13: 01</revised>
+  <revised count="01">2007-12-13</revised>
   <bug>193589</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-12.xml b/metadata/glsa/glsa-200712-12.xml
index 479c4d425746..7c3efd5ec3d3 100644
--- a/metadata/glsa/glsa-200712-12.xml
+++ b/metadata/glsa/glsa-200712-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ircservices</product>
   <announced>2007-12-13</announced>
-  <revised>2007-12-13: 01</revised>
+  <revised count="01">2007-12-13</revised>
   <bug>199897</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-13.xml b/metadata/glsa/glsa-200712-13.xml
index 99b1328af5c6..ac6bec724d08 100644
--- a/metadata/glsa/glsa-200712-13.xml
+++ b/metadata/glsa/glsa-200712-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">e2fsprogs</product>
   <announced>2007-12-18</announced>
-  <revised>2007-12-18: 01</revised>
+  <revised count="01">2007-12-18</revised>
   <bug>201546</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-14.xml b/metadata/glsa/glsa-200712-14.xml
index 7f8e612d068b..1aa798a2bac0 100644
--- a/metadata/glsa/glsa-200712-14.xml
+++ b/metadata/glsa/glsa-200712-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cups</product>
   <announced>2007-12-18</announced>
-  <revised>2007-12-18: 01</revised>
+  <revised count="01">2007-12-18</revised>
   <bug>199195</bug>
   <bug>201042</bug>
   <bug>201570</bug>
diff --git a/metadata/glsa/glsa-200712-15.xml b/metadata/glsa/glsa-200712-15.xml
index 79c4b4e45138..70f7c68ca8e0 100644
--- a/metadata/glsa/glsa-200712-15.xml
+++ b/metadata/glsa/glsa-200712-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libexif</product>
   <announced>2007-12-29</announced>
-  <revised>2007-12-29: 01</revised>
+  <revised count="01">2007-12-29</revised>
   <bug>202350</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-16.xml b/metadata/glsa/glsa-200712-16.xml
index ca0087aaa177..b7f370e430d8 100644
--- a/metadata/glsa/glsa-200712-16.xml
+++ b/metadata/glsa/glsa-200712-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">exiv2</product>
   <announced>2007-12-29</announced>
-  <revised>2007-12-29: 01</revised>
+  <revised count="01">2007-12-29</revised>
   <bug>202351</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-17.xml b/metadata/glsa/glsa-200712-17.xml
index 567c336768fd..73b2ce57a4b9 100644
--- a/metadata/glsa/glsa-200712-17.xml
+++ b/metadata/glsa/glsa-200712-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">exiftags</product>
   <announced>2007-12-29</announced>
-  <revised>2007-12-29: 01</revised>
+  <revised count="01">2007-12-29</revised>
   <bug>202354</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-18.xml b/metadata/glsa/glsa-200712-18.xml
index 148579fb3118..ac3821eddadb 100644
--- a/metadata/glsa/glsa-200712-18.xml
+++ b/metadata/glsa/glsa-200712-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mt-daapd</product>
   <announced>2007-12-29</announced>
-  <revised>2007-12-29: 01</revised>
+  <revised count="01">2007-12-29</revised>
   <bug>200110</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-19.xml b/metadata/glsa/glsa-200712-19.xml
index b41e8f7974a1..0f6a2b97d9db 100644
--- a/metadata/glsa/glsa-200712-19.xml
+++ b/metadata/glsa/glsa-200712-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">syslog-ng</product>
   <announced>2007-12-29</announced>
-  <revised>2007-12-29: 01</revised>
+  <revised count="01">2007-12-29</revised>
   <bug>202718</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-20.xml b/metadata/glsa/glsa-200712-20.xml
index e9c72125e8dc..9b396a2ed74e 100644
--- a/metadata/glsa/glsa-200712-20.xml
+++ b/metadata/glsa/glsa-200712-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2007-12-29</announced>
-  <revised>2007-12-29: 01</revised>
+  <revised count="01">2007-12-29</revised>
   <bug>202762</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-21.xml b/metadata/glsa/glsa-200712-21.xml
index 2385f2bbd1ba..2e58bfa2ecaa 100644
--- a/metadata/glsa/glsa-200712-21.xml
+++ b/metadata/glsa/glsa-200712-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">firefox seamonkey</product>
   <announced>2007-12-29</announced>
-  <revised>2007-12-29: 01</revised>
+  <revised count="01">2007-12-29</revised>
   <bug>198965</bug>
   <bug>200909</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200712-22.xml b/metadata/glsa/glsa-200712-22.xml
index 095edc0b214b..c849768bf8cf 100644
--- a/metadata/glsa/glsa-200712-22.xml
+++ b/metadata/glsa/glsa-200712-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2007-12-30</announced>
-  <revised>2007-12-30: 01</revised>
+  <revised count="01">2007-12-30</revised>
   <bug>202770</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-23.xml b/metadata/glsa/glsa-200712-23.xml
index 5b80997ed4bd..b2ad14da0ecb 100644
--- a/metadata/glsa/glsa-200712-23.xml
+++ b/metadata/glsa/glsa-200712-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2007-12-30</announced>
-  <revised>2007-12-30: 01</revised>
+  <revised count="01">2007-12-30</revised>
   <bug>199958</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-24.xml b/metadata/glsa/glsa-200712-24.xml
index cb656f357662..769ae5535fc8 100644
--- a/metadata/glsa/glsa-200712-24.xml
+++ b/metadata/glsa/glsa-200712-24.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">emul-linux-x86-gtklibs</product>
   <announced>2007-12-30</announced>
-  <revised>2007-12-30: 01</revised>
+  <revised count="01">2007-12-30</revised>
   <bug>201860</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200712-25.xml b/metadata/glsa/glsa-200712-25.xml
index 3895f3200471..aacc273dd97f 100644
--- a/metadata/glsa/glsa-200712-25.xml
+++ b/metadata/glsa/glsa-200712-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openoffice openoffice-bin hsqldb</product>
   <announced>2007-12-30</announced>
-  <revised>2007-12-30: 01</revised>
+  <revised count="01">2007-12-30</revised>
   <bug>200771</bug>
   <bug>201799</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200801-01.xml b/metadata/glsa/glsa-200801-01.xml
index a152e89fd0d1..a891028431cb 100644
--- a/metadata/glsa/glsa-200801-01.xml
+++ b/metadata/glsa/glsa-200801-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">remote</product>
   <announced>2008-01-09</announced>
-  <revised>2008-01-09: 01</revised>
+  <revised count="01">2008-01-09</revised>
   <bug>203106</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-02.xml b/metadata/glsa/glsa-200801-02.xml
index ffbe0c707322..09c78084825f 100644
--- a/metadata/glsa/glsa-200801-02.xml
+++ b/metadata/glsa/glsa-200801-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">R</product>
   <announced>2008-01-09</announced>
-  <revised>2008-01-09: 02</revised>
+  <revised count="02">2008-01-09</revised>
   <bug>198976</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-03.xml b/metadata/glsa/glsa-200801-03.xml
index e3ccde8cbef7..cc007b9ee937 100644
--- a/metadata/glsa/glsa-200801-03.xml
+++ b/metadata/glsa/glsa-200801-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">claws-mail</product>
   <announced>2008-01-09</announced>
-  <revised>2008-01-09: 01</revised>
+  <revised count="01">2008-01-09</revised>
   <bug>201244</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-04.xml b/metadata/glsa/glsa-200801-04.xml
index 057c050ffd4a..d3e4a272fcae 100644
--- a/metadata/glsa/glsa-200801-04.xml
+++ b/metadata/glsa/glsa-200801-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openafs</product>
   <announced>2008-01-09</announced>
-  <revised>2008-01-09: 01</revised>
+  <revised count="01">2008-01-09</revised>
   <bug>203573</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-05.xml b/metadata/glsa/glsa-200801-05.xml
index e770143b9b73..b859a1c011ad 100644
--- a/metadata/glsa/glsa-200801-05.xml
+++ b/metadata/glsa/glsa-200801-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">squid</product>
   <announced>2008-01-09</announced>
-  <revised>2008-01-09: 01</revised>
+  <revised count="01">2008-01-09</revised>
   <bug>201209</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-06.xml b/metadata/glsa/glsa-200801-06.xml
index ffa97092786b..dc34ce521577 100644
--- a/metadata/glsa/glsa-200801-06.xml
+++ b/metadata/glsa/glsa-200801-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xfce4-panel libxfcegui4</product>
   <announced>2008-01-09</announced>
-  <revised>2008-01-10: 03</revised>
+  <revised count="03">2008-01-10</revised>
   <bug>201292</bug>
   <bug>201293</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200801-07.xml b/metadata/glsa/glsa-200801-07.xml
index c3512754a727..fe527cd9ed12 100644
--- a/metadata/glsa/glsa-200801-07.xml
+++ b/metadata/glsa/glsa-200801-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2008-01-20</announced>
-  <revised>2009-05-28: 03</revised>
+  <revised count="03">2009-05-28</revised>
   <bug>193519</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-08.xml b/metadata/glsa/glsa-200801-08.xml
index fc8650c0b570..f06822c3728c 100644
--- a/metadata/glsa/glsa-200801-08.xml
+++ b/metadata/glsa/glsa-200801-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libcdio</product>
   <announced>2008-01-20</announced>
-  <revised>2008-01-20: 01</revised>
+  <revised count="01">2008-01-20</revised>
   <bug>203777</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-09.xml b/metadata/glsa/glsa-200801-09.xml
index a0a2e795eb61..ae7322263a34 100644
--- a/metadata/glsa/glsa-200801-09.xml
+++ b/metadata/glsa/glsa-200801-09.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">xorg-server libXfont</product>
   <announced>2008-01-20</announced>
-  <revised>2008-03-05: 03</revised>
+  <revised count="03">2008-03-05</revised>
   <bug>204362</bug>
   <bug>208343</bug>
   <access>remote, local</access>
diff --git a/metadata/glsa/glsa-200801-10.xml b/metadata/glsa/glsa-200801-10.xml
index 7357795d1526..939225a12e78 100644
--- a/metadata/glsa/glsa-200801-10.xml
+++ b/metadata/glsa/glsa-200801-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tikiwiki</product>
   <announced>2008-01-23</announced>
-  <revised>2008-01-23: 01</revised>
+  <revised count="01">2008-01-23</revised>
   <bug>203265</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-11.xml b/metadata/glsa/glsa-200801-11.xml
index a8384662949c..ef8354c6dec7 100644
--- a/metadata/glsa/glsa-200801-11.xml
+++ b/metadata/glsa/glsa-200801-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cherrypy</product>
   <announced>2008-01-27</announced>
-  <revised>2008-01-27: 01</revised>
+  <revised count="01">2008-01-27</revised>
   <bug>204829</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-12.xml b/metadata/glsa/glsa-200801-12.xml
index 534acea733c9..b3f2d5ddeba6 100644
--- a/metadata/glsa/glsa-200801-12.xml
+++ b/metadata/glsa/glsa-200801-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-lib</product>
   <announced>2008-01-27</announced>
-  <revised>2008-01-27: 01</revised>
+  <revised count="01">2008-01-27</revised>
   <bug>205197</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-13.xml b/metadata/glsa/glsa-200801-13.xml
index d5c7141028c4..3ebdb971b514 100644
--- a/metadata/glsa/glsa-200801-13.xml
+++ b/metadata/glsa/glsa-200801-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ngircd</product>
   <announced>2008-01-27</announced>
-  <revised>2008-01-27: 02</revised>
+  <revised count="02">2008-01-27</revised>
   <bug>204834</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-14.xml b/metadata/glsa/glsa-200801-14.xml
index 43fd9a3ff6c0..4f03805f6e6f 100644
--- a/metadata/glsa/glsa-200801-14.xml
+++ b/metadata/glsa/glsa-200801-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">blam</product>
   <announced>2008-01-27</announced>
-  <revised>2008-01-27: 01</revised>
+  <revised count="01">2008-01-27</revised>
   <bug>199841</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-15.xml b/metadata/glsa/glsa-200801-15.xml
index d19d05499bed..c6dc464814fc 100644
--- a/metadata/glsa/glsa-200801-15.xml
+++ b/metadata/glsa/glsa-200801-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">postgresql</product>
   <announced>2008-01-29</announced>
-  <revised>2008-01-29: 01</revised>
+  <revised count="01">2008-01-29</revised>
   <bug>204760</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-16.xml b/metadata/glsa/glsa-200801-16.xml
index 64ff82cbba18..875199ea735d 100644
--- a/metadata/glsa/glsa-200801-16.xml
+++ b/metadata/glsa/glsa-200801-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">maradns</product>
   <announced>2008-01-29</announced>
-  <revised>2008-01-29: 01</revised>
+  <revised count="01">2008-01-29</revised>
   <bug>204351</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-17.xml b/metadata/glsa/glsa-200801-17.xml
index 817f8635994b..9e4f8f009df0 100644
--- a/metadata/glsa/glsa-200801-17.xml
+++ b/metadata/glsa/glsa-200801-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">netkit-ftpd</product>
   <announced>2008-01-29</announced>
-  <revised>2008-01-29: 01</revised>
+  <revised count="01">2008-01-29</revised>
   <bug>199206</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-18.xml b/metadata/glsa/glsa-200801-18.xml
index e15eca31b7d4..1afd68ecbba3 100644
--- a/metadata/glsa/glsa-200801-18.xml
+++ b/metadata/glsa/glsa-200801-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kazehakase</product>
   <announced>2008-01-30</announced>
-  <revised>2008-01-30: 01</revised>
+  <revised count="01">2008-01-30</revised>
   <bug>198983</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-19.xml b/metadata/glsa/glsa-200801-19.xml
index e60d50c02c85..f84fde1e2b72 100644
--- a/metadata/glsa/glsa-200801-19.xml
+++ b/metadata/glsa/glsa-200801-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">goffice</product>
   <announced>2008-01-30</announced>
-  <revised>2008-01-30: 01</revised>
+  <revised count="01">2008-01-30</revised>
   <bug>198385</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-20.xml b/metadata/glsa/glsa-200801-20.xml
index c70a2ab084f8..d46c67897e1a 100644
--- a/metadata/glsa/glsa-200801-20.xml
+++ b/metadata/glsa/glsa-200801-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libxml2</product>
   <announced>2008-01-30</announced>
-  <revised>2008-01-30: 01</revised>
+  <revised count="01">2008-01-30</revised>
   <bug>202628</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-21.xml b/metadata/glsa/glsa-200801-21.xml
index 8642730a70c8..52baaf029c16 100644
--- a/metadata/glsa/glsa-200801-21.xml
+++ b/metadata/glsa/glsa-200801-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xdg-utils</product>
   <announced>2008-01-30</announced>
-  <revised>2008-01-30: 01</revised>
+  <revised count="01">2008-01-30</revised>
   <bug>207331</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200801-22.xml b/metadata/glsa/glsa-200801-22.xml
index ec8b595d123f..9e3d804822c8 100644
--- a/metadata/glsa/glsa-200801-22.xml
+++ b/metadata/glsa/glsa-200801-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">peercast</product>
   <announced>2008-01-30</announced>
-  <revised>2008-01-30: 02</revised>
+  <revised count="02">2008-01-30</revised>
   <bug>202747</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200802-01.xml b/metadata/glsa/glsa-200802-01.xml
index 8d23519f27c7..97c1854d0e2c 100644
--- a/metadata/glsa/glsa-200802-01.xml
+++ b/metadata/glsa/glsa-200802-01.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">sdl-image</product>
   <announced>2008-02-06</announced>
-  <revised>2008-02-06: 01</revised>
+  <revised count="01">2008-02-06</revised>
   <bug>207933</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200802-02.xml b/metadata/glsa/glsa-200802-02.xml
index 936a472daba5..72a5e2032cb5 100644
--- a/metadata/glsa/glsa-200802-02.xml
+++ b/metadata/glsa/glsa-200802-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">doomsday</product>
   <announced>2008-02-06</announced>
-  <revised>2008-02-10: 02</revised>
+  <revised count="02">2008-02-10</revised>
   <bug>190835</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200802-03.xml b/metadata/glsa/glsa-200802-03.xml
index ed501e5bfd01..9d2373b4595e 100644
--- a/metadata/glsa/glsa-200802-03.xml
+++ b/metadata/glsa/glsa-200802-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">horde-imp</product>
   <announced>2008-02-11</announced>
-  <revised>2008-02-11: 01</revised>
+  <revised count="01">2008-02-11</revised>
   <bug>205377</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200802-04.xml b/metadata/glsa/glsa-200802-04.xml
index 2ca7229961b0..2c4a44e51b4c 100644
--- a/metadata/glsa/glsa-200802-04.xml
+++ b/metadata/glsa/glsa-200802-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gallery</product>
   <announced>2008-02-11</announced>
-  <revised>2008-02-11: 01</revised>
+  <revised count="01">2008-02-11</revised>
   <bug>203217</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200802-05.xml b/metadata/glsa/glsa-200802-05.xml
index 064dfc64ba0d..f60069df9fa3 100644
--- a/metadata/glsa/glsa-200802-05.xml
+++ b/metadata/glsa/glsa-200802-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gnumeric</product>
   <announced>2008-02-12</announced>
-  <revised>2008-02-12: 01</revised>
+  <revised count="01">2008-02-12</revised>
   <bug>208356</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200802-06.xml b/metadata/glsa/glsa-200802-06.xml
index 39e78bf18694..a6da2e17ceae 100644
--- a/metadata/glsa/glsa-200802-06.xml
+++ b/metadata/glsa/glsa-200802-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">scponly</product>
   <announced>2008-02-12</announced>
-  <revised>2008-02-13: 02</revised>
+  <revised count="02">2008-02-13</revised>
   <bug>201726</bug>
   <bug>203099</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-200802-07.xml b/metadata/glsa/glsa-200802-07.xml
index b9739c9fa4b7..0124c850b1bf 100644
--- a/metadata/glsa/glsa-200802-07.xml
+++ b/metadata/glsa/glsa-200802-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pulseaudio</product>
   <announced>2008-02-13</announced>
-  <revised>2008-02-13: 01</revised>
+  <revised count="01">2008-02-13</revised>
   <bug>207214</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200802-08.xml b/metadata/glsa/glsa-200802-08.xml
index 90b70c4c02c5..60f2a9054fb0 100644
--- a/metadata/glsa/glsa-200802-08.xml
+++ b/metadata/glsa/glsa-200802-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">boost</product>
   <announced>2008-02-14</announced>
-  <revised>2008-02-14: 01</revised>
+  <revised count="01">2008-02-14</revised>
   <bug>205955</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200802-09.xml b/metadata/glsa/glsa-200802-09.xml
index 363ea4c7c54b..56325c776a3a 100644
--- a/metadata/glsa/glsa-200802-09.xml
+++ b/metadata/glsa/glsa-200802-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2008-02-21</announced>
-  <revised>2008-02-21: 01</revised>
+  <revised count="01">2008-02-21</revised>
   <bug>209915</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200802-10.xml b/metadata/glsa/glsa-200802-10.xml
index 8a45fb51abba..e2c13bcc24fa 100644
--- a/metadata/glsa/glsa-200802-10.xml
+++ b/metadata/glsa/glsa-200802-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">python</product>
   <announced>2008-02-23</announced>
-  <revised>2008-02-23: 01</revised>
+  <revised count="01">2008-02-23</revised>
   <bug>198373</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200802-11.xml b/metadata/glsa/glsa-200802-11.xml
index fe793017cdf5..e8f149f64d2c 100644
--- a/metadata/glsa/glsa-200802-11.xml
+++ b/metadata/glsa/glsa-200802-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2008-02-26</announced>
-  <revised>2008-02-26: 01</revised>
+  <revised count="01">2008-02-26</revised>
   <bug>185713</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200802-12.xml b/metadata/glsa/glsa-200802-12.xml
index 640f80a96ea3..1c4821a05276 100644
--- a/metadata/glsa/glsa-200802-12.xml
+++ b/metadata/glsa/glsa-200802-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-lib</product>
   <announced>2008-02-26</announced>
-  <revised>2008-03-03: 02</revised>
+  <revised count="02">2008-03-03</revised>
   <bug>209106</bug>
   <bug>208100</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200803-01.xml b/metadata/glsa/glsa-200803-01.xml
index 2d2bae4ceb98..8b1a006f7e99 100644
--- a/metadata/glsa/glsa-200803-01.xml
+++ b/metadata/glsa/glsa-200803-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2008-03-02</announced>
-  <revised>2008-03-05: 05</revised>
+  <revised count="05">2008-03-05</revised>
   <bug>170177</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-02.xml b/metadata/glsa/glsa-200803-02.xml
index 42429c040a52..93899153df7a 100644
--- a/metadata/glsa/glsa-200803-02.xml
+++ b/metadata/glsa/glsa-200803-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">firebird</product>
   <announced>2008-03-02</announced>
-  <revised>2008-03-02: 01</revised>
+  <revised count="01">2008-03-02</revised>
   <bug>208034</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-03.xml b/metadata/glsa/glsa-200803-03.xml
index 370cc92e5ee3..09c352f6bcf7 100644
--- a/metadata/glsa/glsa-200803-03.xml
+++ b/metadata/glsa/glsa-200803-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">audacity</product>
   <announced>2008-03-02</announced>
-  <revised>2008-03-02: 01</revised>
+  <revised count="01">2008-03-02</revised>
   <bug>199751</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-04.xml b/metadata/glsa/glsa-200803-04.xml
index 78c85e14b352..c596002c1aab 100644
--- a/metadata/glsa/glsa-200803-04.xml
+++ b/metadata/glsa/glsa-200803-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mantis</product>
   <announced>2008-03-03</announced>
-  <revised>2008-03-03: 01</revised>
+  <revised count="01">2008-03-03</revised>
   <bug>203791</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-05.xml b/metadata/glsa/glsa-200803-05.xml
index 0797e68e52c7..e37ddfa6d13f 100644
--- a/metadata/glsa/glsa-200803-05.xml
+++ b/metadata/glsa/glsa-200803-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">splitvt</product>
   <announced>2008-03-03</announced>
-  <revised>2008-03-03: 01</revised>
+  <revised count="01">2008-03-03</revised>
   <bug>211240</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-06.xml b/metadata/glsa/glsa-200803-06.xml
index 1882e8e0e46a..a0176a928dff 100644
--- a/metadata/glsa/glsa-200803-06.xml
+++ b/metadata/glsa/glsa-200803-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sword</product>
   <announced>2008-03-03</announced>
-  <revised>2008-03-03: 01</revised>
+  <revised count="01">2008-03-03</revised>
   <bug>210754</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-07.xml b/metadata/glsa/glsa-200803-07.xml
index a223e721ca3c..957926590226 100644
--- a/metadata/glsa/glsa-200803-07.xml
+++ b/metadata/glsa/glsa-200803-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">paramiko</product>
   <announced>2008-03-03</announced>
-  <revised>2008-03-03: 01</revised>
+  <revised count="01">2008-03-03</revised>
   <bug>205777</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-08.xml b/metadata/glsa/glsa-200803-08.xml
index 3ff753910790..ec818cd4430b 100644
--- a/metadata/glsa/glsa-200803-08.xml
+++ b/metadata/glsa/glsa-200803-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">win32codecs</product>
   <announced>2008-03-04</announced>
-  <revised>2008-03-04: 01</revised>
+  <revised count="01">2008-03-04</revised>
   <bug>150288</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-09.xml b/metadata/glsa/glsa-200803-09.xml
index 624d95bb4a8b..91225cf364c4 100644
--- a/metadata/glsa/glsa-200803-09.xml
+++ b/metadata/glsa/glsa-200803-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2008-03-04</announced>
-  <revised>2008-03-04: 01</revised>
+  <revised count="01">2008-03-04</revised>
   <bug>210260</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-10.xml b/metadata/glsa/glsa-200803-10.xml
index 4052ba407783..ecf5fddd40a7 100644
--- a/metadata/glsa/glsa-200803-10.xml
+++ b/metadata/glsa/glsa-200803-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">lighttpd</product>
   <announced>2008-03-05</announced>
-  <revised>2008-03-05: 01</revised>
+  <revised count="01">2008-03-05</revised>
   <bug>211230</bug>
   <bug>211956</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200803-11.xml b/metadata/glsa/glsa-200803-11.xml
index efcd9210b555..0337f1670582 100644
--- a/metadata/glsa/glsa-200803-11.xml
+++ b/metadata/glsa/glsa-200803-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">vobcopy</product>
   <announced>2008-03-05</announced>
-  <revised>2008-03-05: 01</revised>
+  <revised count="01">2008-03-05</revised>
   <bug>197578</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-12.xml b/metadata/glsa/glsa-200803-12.xml
index 247efb863702..323453f1b731 100644
--- a/metadata/glsa/glsa-200803-12.xml
+++ b/metadata/glsa/glsa-200803-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">evolution</product>
   <announced>2008-03-05</announced>
-  <revised>2008-03-05: 01</revised>
+  <revised count="01">2008-03-05</revised>
   <bug>212272</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-13.xml b/metadata/glsa/glsa-200803-13.xml
index 747ef86a5a32..843def643895 100644
--- a/metadata/glsa/glsa-200803-13.xml
+++ b/metadata/glsa/glsa-200803-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">vlc</product>
   <announced>2008-03-07</announced>
-  <revised>2008-03-07: 01</revised>
+  <revised count="01">2008-03-07</revised>
   <bug>203345</bug>
   <bug>211575</bug>
   <bug>205299</bug>
diff --git a/metadata/glsa/glsa-200803-14.xml b/metadata/glsa/glsa-200803-14.xml
index c8da6d5caab1..a71fbaf55561 100644
--- a/metadata/glsa/glsa-200803-14.xml
+++ b/metadata/glsa/glsa-200803-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ghostscript</product>
   <announced>2008-03-08</announced>
-  <revised>2008-03-08: 01</revised>
+  <revised count="01">2008-03-08</revised>
   <bug>208999</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-15.xml b/metadata/glsa/glsa-200803-15.xml
index 221c815a5ccf..13654439ef5f 100644
--- a/metadata/glsa/glsa-200803-15.xml
+++ b/metadata/glsa/glsa-200803-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">phpmyadmin</product>
   <announced>2008-03-09</announced>
-  <revised>2008-03-09: 01</revised>
+  <revised count="01">2008-03-09</revised>
   <bug>212000</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-16.xml b/metadata/glsa/glsa-200803-16.xml
index e10529b99ecf..f12e8e0fb3cf 100644
--- a/metadata/glsa/glsa-200803-16.xml
+++ b/metadata/glsa/glsa-200803-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mplayer</product>
   <announced>2008-03-10</announced>
-  <revised>2008-03-10: 01</revised>
+  <revised count="01">2008-03-10</revised>
   <bug>208566</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-17.xml b/metadata/glsa/glsa-200803-17.xml
index aefdbe7834d4..c72faaf356a5 100644
--- a/metadata/glsa/glsa-200803-17.xml
+++ b/metadata/glsa/glsa-200803-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pdflib</product>
   <announced>2008-03-10</announced>
-  <revised>2008-03-10: 01</revised>
+  <revised count="01">2008-03-10</revised>
   <bug>203287</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-18.xml b/metadata/glsa/glsa-200803-18.xml
index 4bbd01636a37..f760c5aed23f 100644
--- a/metadata/glsa/glsa-200803-18.xml
+++ b/metadata/glsa/glsa-200803-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cacti</product>
   <announced>2008-03-10</announced>
-  <revised>2009-05-28: 02</revised>
+  <revised count="02">2009-05-28</revised>
   <bug>209918</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-19.xml b/metadata/glsa/glsa-200803-19.xml
index e046c309cde1..7d2454f9cac3 100644
--- a/metadata/glsa/glsa-200803-19.xml
+++ b/metadata/glsa/glsa-200803-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">apache</product>
   <announced>2008-03-11</announced>
-  <revised>2008-03-12: 02</revised>
+  <revised count="02">2008-03-12</revised>
   <bug>201163</bug>
   <bug>204410</bug>
   <bug>205195</bug>
diff --git a/metadata/glsa/glsa-200803-20.xml b/metadata/glsa/glsa-200803-20.xml
index 0e561379d914..41e16594b4d9 100644
--- a/metadata/glsa/glsa-200803-20.xml
+++ b/metadata/glsa/glsa-200803-20.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">icu</product>
   <announced>2008-03-11</announced>
-  <revised>2009-05-28: 03</revised>
+  <revised count="03">2009-05-28</revised>
   <bug>208001</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-21.xml b/metadata/glsa/glsa-200803-21.xml
index b1c18b59cac9..6883a122fdda 100644
--- a/metadata/glsa/glsa-200803-21.xml
+++ b/metadata/glsa/glsa-200803-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sarg</product>
   <announced>2008-03-12</announced>
-  <revised>2008-03-12: 01</revised>
+  <revised count="01">2008-03-12</revised>
   <bug>212208</bug>
   <bug>212731</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200803-22.xml b/metadata/glsa/glsa-200803-22.xml
index 00cdd46c1522..00c1b30f8e06 100644
--- a/metadata/glsa/glsa-200803-22.xml
+++ b/metadata/glsa/glsa-200803-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">live</product>
   <announced>2008-03-13</announced>
-  <revised>2008-03-13: 01</revised>
+  <revised count="01">2008-03-13</revised>
   <bug>204065</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-23.xml b/metadata/glsa/glsa-200803-23.xml
index ae9908ba0567..14a3ebd482ac 100644
--- a/metadata/glsa/glsa-200803-23.xml
+++ b/metadata/glsa/glsa-200803-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wml</product>
   <announced>2008-03-15</announced>
-  <revised>2008-03-15: 01</revised>
+  <revised count="01">2008-03-15</revised>
   <bug>209927</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-24.xml b/metadata/glsa/glsa-200803-24.xml
index d2b86276d4ee..8c0b5293db4e 100644
--- a/metadata/glsa/glsa-200803-24.xml
+++ b/metadata/glsa/glsa-200803-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libpcre glib</product>
   <announced>2008-03-17</announced>
-  <revised>2008-03-17: 02</revised>
+  <revised count="02">2008-03-17</revised>
   <bug>209067</bug>
   <bug>209293</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200803-25.xml b/metadata/glsa/glsa-200803-25.xml
index 1e0b0e9f7bcf..86bee5f8f31a 100644
--- a/metadata/glsa/glsa-200803-25.xml
+++ b/metadata/glsa/glsa-200803-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dovecot</product>
   <announced>2008-03-18</announced>
-  <revised>2008-03-18: 01</revised>
+  <revised count="01">2008-03-18</revised>
   <bug>212336</bug>
   <bug>213030</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200803-26.xml b/metadata/glsa/glsa-200803-26.xml
index 73196c89e414..f2cf77bb5045 100644
--- a/metadata/glsa/glsa-200803-26.xml
+++ b/metadata/glsa/glsa-200803-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2008-03-18</announced>
-  <revised>2008-03-18: 01</revised>
+  <revised count="01">2008-03-18</revised>
   <bug>212367</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-27.xml b/metadata/glsa/glsa-200803-27.xml
index 850d7b698cf3..4429b4a8111b 100644
--- a/metadata/glsa/glsa-200803-27.xml
+++ b/metadata/glsa/glsa-200803-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">moinmoin</product>
   <announced>2008-03-18</announced>
-  <revised>2008-03-18: 01</revised>
+  <revised count="01">2008-03-18</revised>
   <bug>209133</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-28.xml b/metadata/glsa/glsa-200803-28.xml
index d2224a291d7e..9e6d5a987e5e 100644
--- a/metadata/glsa/glsa-200803-28.xml
+++ b/metadata/glsa/glsa-200803-28.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openldap</product>
   <announced>2008-03-19</announced>
-  <revised>2008-03-19: 01</revised>
+  <revised count="01">2008-03-19</revised>
   <bug>197446</bug>
   <bug>209677</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200803-29.xml b/metadata/glsa/glsa-200803-29.xml
index 5f8c741bb042..8b3ac90f05b0 100644
--- a/metadata/glsa/glsa-200803-29.xml
+++ b/metadata/glsa/glsa-200803-29.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">viewvc</product>
   <announced>2008-03-19</announced>
-  <revised>2009-04-01: 02</revised>
+  <revised count="02">2009-04-01</revised>
   <bug>212288</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-30.xml b/metadata/glsa/glsa-200803-30.xml
index c8ba068e880e..c935e44eeb46 100644
--- a/metadata/glsa/glsa-200803-30.xml
+++ b/metadata/glsa/glsa-200803-30.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ssl-cert.eclass</product>
   <announced>2008-03-20</announced>
-  <revised>2008-03-20: 01</revised>
+  <revised count="01">2008-03-20</revised>
   <bug>174759</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200803-31.xml b/metadata/glsa/glsa-200803-31.xml
index 858924eb0975..bd5aedd20e1c 100644
--- a/metadata/glsa/glsa-200803-31.xml
+++ b/metadata/glsa/glsa-200803-31.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2008-03-24</announced>
-  <revised>2008-03-24: 01</revised>
+  <revised count="01">2008-03-24</revised>
   <bug>199205</bug>
   <bug>212363</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200803-32.xml b/metadata/glsa/glsa-200803-32.xml
index 2bf7296cbbe4..cc5d432c4425 100644
--- a/metadata/glsa/glsa-200803-32.xml
+++ b/metadata/glsa/glsa-200803-32.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2008-03-24</announced>
-  <revised>2008-03-24: 01</revised>
+  <revised count="01">2008-03-24</revised>
   <bug>212149</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-01.xml b/metadata/glsa/glsa-200804-01.xml
index e0685d2ce646..944ad6885eb6 100644
--- a/metadata/glsa/glsa-200804-01.xml
+++ b/metadata/glsa/glsa-200804-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cups</product>
   <announced>2008-04-01</announced>
-  <revised>2008-04-01: 01</revised>
+  <revised count="01">2008-04-01</revised>
   <bug>211449</bug>
   <bug>212364</bug>
   <bug>214068</bug>
diff --git a/metadata/glsa/glsa-200804-02.xml b/metadata/glsa/glsa-200804-02.xml
index b907f9711507..29c40528257a 100644
--- a/metadata/glsa/glsa-200804-02.xml
+++ b/metadata/glsa/glsa-200804-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bzip2</product>
   <announced>2008-04-02</announced>
-  <revised>2008-04-02: 01</revised>
+  <revised count="01">2008-04-02</revised>
   <bug>213820</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-03.xml b/metadata/glsa/glsa-200804-03.xml
index 00dad43b171d..9ecaf1eb1163 100644
--- a/metadata/glsa/glsa-200804-03.xml
+++ b/metadata/glsa/glsa-200804-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openssh</product>
   <announced>2008-04-05</announced>
-  <revised>2008-04-05: 01</revised>
+  <revised count="01">2008-04-05</revised>
   <bug>214985</bug>
   <bug>215702</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-200804-04.xml b/metadata/glsa/glsa-200804-04.xml
index a8b94b8f7d4e..3dd85090c08b 100644
--- a/metadata/glsa/glsa-200804-04.xml
+++ b/metadata/glsa/glsa-200804-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mysql</product>
   <announced>2008-04-06</announced>
-  <revised>2008-04-06: 01</revised>
+  <revised count="01">2008-04-06</revised>
   <bug>201669</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-05.xml b/metadata/glsa/glsa-200804-05.xml
index 4fbf48d3d3c8..0d7ca3e304f1 100644
--- a/metadata/glsa/glsa-200804-05.xml
+++ b/metadata/glsa/glsa-200804-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nx, nxnode</product>
   <announced>2008-04-06</announced>
-  <revised>2008-04-06: 02</revised>
+  <revised count="02">2008-04-06</revised>
   <bug>210317</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-06.xml b/metadata/glsa/glsa-200804-06.xml
index 5b0f24cc468e..1168c2fa1b3e 100644
--- a/metadata/glsa/glsa-200804-06.xml
+++ b/metadata/glsa/glsa-200804-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">unzip</product>
   <announced>2008-04-06</announced>
-  <revised>2008-04-06: 01</revised>
+  <revised count="01">2008-04-06</revised>
   <bug>213761</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-07.xml b/metadata/glsa/glsa-200804-07.xml
index 414799fbdcd2..39b6c25c30ea 100644
--- a/metadata/glsa/glsa-200804-07.xml
+++ b/metadata/glsa/glsa-200804-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pecl-apc</product>
   <announced>2008-04-09</announced>
-  <revised>2008-04-09: 01</revised>
+  <revised count="01">2008-04-09</revised>
   <bug>214576</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-08.xml b/metadata/glsa/glsa-200804-08.xml
index cb9dbf0f3213..eb9cc165152c 100644
--- a/metadata/glsa/glsa-200804-08.xml
+++ b/metadata/glsa/glsa-200804-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lighttpd</product>
   <announced>2008-04-10</announced>
-  <revised>2008-04-10: 01</revised>
+  <revised count="01">2008-04-10</revised>
   <bug>212930</bug>
   <bug>214892</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200804-09.xml b/metadata/glsa/glsa-200804-09.xml
index 9c48b0e2752f..f357c07e2744 100644
--- a/metadata/glsa/glsa-200804-09.xml
+++ b/metadata/glsa/glsa-200804-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">am-utils</product>
   <announced>2008-04-10</announced>
-  <revised>2008-04-10: 01</revised>
+  <revised count="01">2008-04-10</revised>
   <bug>210158</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-10.xml b/metadata/glsa/glsa-200804-10.xml
index 8d189d4264e3..0b03777f127c 100644
--- a/metadata/glsa/glsa-200804-10.xml
+++ b/metadata/glsa/glsa-200804-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tomcat</product>
   <announced>2008-04-10</announced>
-  <revised>2009-05-28: 02</revised>
+  <revised count="02">2009-05-28</revised>
   <bug>196066</bug>
   <bug>203169</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-200804-11.xml b/metadata/glsa/glsa-200804-11.xml
index ae380513763b..6a819a44cde7 100644
--- a/metadata/glsa/glsa-200804-11.xml
+++ b/metadata/glsa/glsa-200804-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">policyd-weight</product>
   <announced>2008-04-11</announced>
-  <revised>2008-04-11: 01</revised>
+  <revised count="01">2008-04-11</revised>
   <bug>214403</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-12.xml b/metadata/glsa/glsa-200804-12.xml
index 7d81cc39f565..78a9adefe150 100644
--- a/metadata/glsa/glsa-200804-12.xml
+++ b/metadata/glsa/glsa-200804-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gnome-screensaver</product>
   <announced>2008-04-11</announced>
-  <revised>2008-04-11: 01</revised>
+  <revised count="01">2008-04-11</revised>
   <bug>213940</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-13.xml b/metadata/glsa/glsa-200804-13.xml
index ba529ccdaab3..c2574c0b7400 100644
--- a/metadata/glsa/glsa-200804-13.xml
+++ b/metadata/glsa/glsa-200804-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2008-04-14</announced>
-  <revised>2008-04-14: 01</revised>
+  <revised count="01">2008-04-14</revised>
   <bug>200792</bug>
   <bug>202733</bug>
   <bug>213883</bug>
diff --git a/metadata/glsa/glsa-200804-14.xml b/metadata/glsa/glsa-200804-14.xml
index d01b4419a443..5bb340eb7301 100644
--- a/metadata/glsa/glsa-200804-14.xml
+++ b/metadata/glsa/glsa-200804-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2008-04-14</announced>
-  <revised>2008-04-14: 01</revised>
+  <revised count="01">2008-04-14</revised>
   <bug>216022</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-15.xml b/metadata/glsa/glsa-200804-15.xml
index cd90ca7bb851..6e0a1281bab2 100644
--- a/metadata/glsa/glsa-200804-15.xml
+++ b/metadata/glsa/glsa-200804-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2008-04-15</announced>
-  <revised>2008-04-15: 01</revised>
+  <revised count="01">2008-04-15</revised>
   <bug>217047</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-16.xml b/metadata/glsa/glsa-200804-16.xml
index 321336210eff..c2bf8e725717 100644
--- a/metadata/glsa/glsa-200804-16.xml
+++ b/metadata/glsa/glsa-200804-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rsync</product>
   <announced>2008-04-17</announced>
-  <revised>2008-04-17: 01</revised>
+  <revised count="01">2008-04-17</revised>
   <bug>216887</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-17.xml b/metadata/glsa/glsa-200804-17.xml
index d4a120717b9c..70665d23d7fe 100644
--- a/metadata/glsa/glsa-200804-17.xml
+++ b/metadata/glsa/glsa-200804-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">speex</product>
   <announced>2008-04-17</announced>
-  <revised>2008-04-17: 01</revised>
+  <revised count="01">2008-04-17</revised>
   <bug>217715</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-18.xml b/metadata/glsa/glsa-200804-18.xml
index ea5b95d9ca65..b84eab008134 100644
--- a/metadata/glsa/glsa-200804-18.xml
+++ b/metadata/glsa/glsa-200804-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">poppler</product>
   <announced>2008-04-17</announced>
-  <revised>2008-04-17: 02</revised>
+  <revised count="02">2008-04-17</revised>
   <bug>216850</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-19.xml b/metadata/glsa/glsa-200804-19.xml
index 12787d2e0806..ec5409c1e7c5 100644
--- a/metadata/glsa/glsa-200804-19.xml
+++ b/metadata/glsa/glsa-200804-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">php-toolkit</product>
   <announced>2008-04-17</announced>
-  <revised>2008-04-17: 01</revised>
+  <revised count="01">2008-04-17</revised>
   <bug>209535</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-20.xml b/metadata/glsa/glsa-200804-20.xml
index bc24b53efbce..c7295f527b9f 100644
--- a/metadata/glsa/glsa-200804-20.xml
+++ b/metadata/glsa/glsa-200804-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sun-jdk, sun-jre-bin, emul-linux-x86-java</product>
   <announced>2008-04-17</announced>
-  <revised>2010-03-05: 06</revised>
+  <revised count="06">2010-03-05</revised>
   <bug>178851</bug>
   <bug>178962</bug>
   <bug>183580</bug>
diff --git a/metadata/glsa/glsa-200804-21.xml b/metadata/glsa/glsa-200804-21.xml
index 099749af902c..20252414ac86 100644
--- a/metadata/glsa/glsa-200804-21.xml
+++ b/metadata/glsa/glsa-200804-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2008-04-18</announced>
-  <revised>2009-05-28: 02</revised>
+  <revised count="02">2009-05-28</revised>
   <bug>204344</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-22.xml b/metadata/glsa/glsa-200804-22.xml
index 8f2768de8e5e..3920f85f40ec 100644
--- a/metadata/glsa/glsa-200804-22.xml
+++ b/metadata/glsa/glsa-200804-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pdns-recursor</product>
   <announced>2008-04-18</announced>
-  <revised>2008-08-21: 03</revised>
+  <revised count="03">2008-08-21</revised>
   <bug>215567</bug>
   <bug>231335</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200804-23.xml b/metadata/glsa/glsa-200804-23.xml
index 716074fdb879..a8aadce80cc8 100644
--- a/metadata/glsa/glsa-200804-23.xml
+++ b/metadata/glsa/glsa-200804-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cups</product>
   <announced>2008-04-18</announced>
-  <revised>2008-04-18: 01</revised>
+  <revised count="01">2008-04-18</revised>
   <bug>217232</bug>
   <access>remote, local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-24.xml b/metadata/glsa/glsa-200804-24.xml
index 29332c779dce..ef3665b1f934 100644
--- a/metadata/glsa/glsa-200804-24.xml
+++ b/metadata/glsa/glsa-200804-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dbmail</product>
   <announced>2008-04-18</announced>
-  <revised>2008-04-18: 01</revised>
+  <revised count="01">2008-04-18</revised>
   <bug>218154</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-25.xml b/metadata/glsa/glsa-200804-25.xml
index 8381df565a4c..0e05665b906a 100644
--- a/metadata/glsa/glsa-200804-25.xml
+++ b/metadata/glsa/glsa-200804-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">vlc</product>
   <announced>2008-04-23</announced>
-  <revised>2008-04-23: 01</revised>
+  <revised count="01">2008-04-23</revised>
   <bug>214277</bug>
   <bug>214627</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200804-26.xml b/metadata/glsa/glsa-200804-26.xml
index 43bb781f3721..152bb1ead851 100644
--- a/metadata/glsa/glsa-200804-26.xml
+++ b/metadata/glsa/glsa-200804-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openfire</product>
   <announced>2008-04-23</announced>
-  <revised>2008-04-23: 01</revised>
+  <revised count="01">2008-04-23</revised>
   <bug>217234</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-27.xml b/metadata/glsa/glsa-200804-27.xml
index 2c841714597a..8a2649dd4c6a 100644
--- a/metadata/glsa/glsa-200804-27.xml
+++ b/metadata/glsa/glsa-200804-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">silc-toolkit silc-client silc-server</product>
   <announced>2008-04-24</announced>
-  <revised>2008-04-24: 01</revised>
+  <revised count="01">2008-04-24</revised>
   <bug>212362</bug>
   <bug>214116</bug>
   <bug>214812</bug>
diff --git a/metadata/glsa/glsa-200804-28.xml b/metadata/glsa/glsa-200804-28.xml
index 61f974913650..9210a2e7d189 100644
--- a/metadata/glsa/glsa-200804-28.xml
+++ b/metadata/glsa/glsa-200804-28.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">jrockit-jdk-bin</product>
   <announced>2008-04-24</announced>
-  <revised>2008-04-24: 01</revised>
+  <revised count="01">2008-04-24</revised>
   <bug>218226</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-29.xml b/metadata/glsa/glsa-200804-29.xml
index f8bf3908883f..635cebd6051f 100644
--- a/metadata/glsa/glsa-200804-29.xml
+++ b/metadata/glsa/glsa-200804-29.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">comix</product>
   <announced>2008-04-25</announced>
-  <revised>2008-04-25: 01</revised>
+  <revised count="01">2008-04-25</revised>
   <bug>215694</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200804-30.xml b/metadata/glsa/glsa-200804-30.xml
index 0035c1564ff0..9d2e907d00e3 100644
--- a/metadata/glsa/glsa-200804-30.xml
+++ b/metadata/glsa/glsa-200804-30.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">kdelibs</product>
   <announced>2008-04-29</announced>
-  <revised>2009-04-08: 02</revised>
+  <revised count="02">2009-04-08</revised>
   <bug>218933</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-01.xml b/metadata/glsa/glsa-200805-01.xml
index c5da8ee8a3f5..3effd5f9be87 100644
--- a/metadata/glsa/glsa-200805-01.xml
+++ b/metadata/glsa/glsa-200805-01.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">horde</product>
   <announced>2008-05-05</announced>
-  <revised>2008-05-05: 01</revised>
+  <revised count="01">2008-05-05</revised>
   <bug>212635</bug>
   <bug>213493</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200805-02.xml b/metadata/glsa/glsa-200805-02.xml
index 63262ae62645..92899ef02337 100644
--- a/metadata/glsa/glsa-200805-02.xml
+++ b/metadata/glsa/glsa-200805-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">phpmyadmin</product>
   <announced>2008-05-05</announced>
-  <revised>2008-05-05: 01</revised>
+  <revised count="01">2008-05-05</revised>
   <bug>219005</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-03.xml b/metadata/glsa/glsa-200805-03.xml
index 9edc2f16b824..e68f304d091e 100644
--- a/metadata/glsa/glsa-200805-03.xml
+++ b/metadata/glsa/glsa-200805-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">aterm eterm rxvt mrxvt multi-aterm wterm rxvt-unicode</product>
   <announced>2008-05-07</announced>
-  <revised>2008-05-10: 02</revised>
+  <revised count="02">2008-05-10</revised>
   <bug>216833</bug>
   <bug>217819</bug>
   <bug>219746</bug>
diff --git a/metadata/glsa/glsa-200805-04.xml b/metadata/glsa/glsa-200805-04.xml
index d91a2213a94b..556a5c8b25a8 100644
--- a/metadata/glsa/glsa-200805-04.xml
+++ b/metadata/glsa/glsa-200805-04.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">egroupware</product>
   <announced>2008-05-07</announced>
-  <revised>2008-05-07: 01</revised>
+  <revised count="01">2008-05-07</revised>
   <bug>214212</bug>
   <bug>218625</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200805-05.xml b/metadata/glsa/glsa-200805-05.xml
index 10ba84cf9893..e10026a9b88b 100644
--- a/metadata/glsa/glsa-200805-05.xml
+++ b/metadata/glsa/glsa-200805-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2008-05-07</announced>
-  <revised>2008-05-07: 01</revised>
+  <revised count="01">2008-05-07</revised>
   <bug>215276</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-06.xml b/metadata/glsa/glsa-200805-06.xml
index f3e5697226f7..dfedbc4dde9d 100644
--- a/metadata/glsa/glsa-200805-06.xml
+++ b/metadata/glsa/glsa-200805-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">firebird</product>
   <announced>2008-05-09</announced>
-  <revised>2008-05-09: 01</revised>
+  <revised count="01">2008-05-09</revised>
   <bug>216158</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-07.xml b/metadata/glsa/glsa-200805-07.xml
index 3dc2a47371e1..545f6c3d8fbf 100644
--- a/metadata/glsa/glsa-200805-07.xml
+++ b/metadata/glsa/glsa-200805-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ltsp</product>
   <announced>2008-05-09</announced>
-  <revised>2008-05-09: 01</revised>
+  <revised count="01">2008-05-09</revised>
   <bug>215699</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-08.xml b/metadata/glsa/glsa-200805-08.xml
index 89054dd522aa..b966afc4e59d 100644
--- a/metadata/glsa/glsa-200805-08.xml
+++ b/metadata/glsa/glsa-200805-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">inspircd</product>
   <announced>2008-05-09</announced>
-  <revised>2008-05-09: 01</revised>
+  <revised count="01">2008-05-09</revised>
   <bug>215704</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-09.xml b/metadata/glsa/glsa-200805-09.xml
index 17d63ae9cfd8..f9288b95feaf 100644
--- a/metadata/glsa/glsa-200805-09.xml
+++ b/metadata/glsa/glsa-200805-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">moinmoin</product>
   <announced>2008-05-11</announced>
-  <revised>2008-05-11: 01</revised>
+  <revised count="01">2008-05-11</revised>
   <bug>218752</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-10.xml b/metadata/glsa/glsa-200805-10.xml
index 2893e0f211b3..6b22cdf1d77b 100644
--- a/metadata/glsa/glsa-200805-10.xml
+++ b/metadata/glsa/glsa-200805-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pngcrush</product>
   <announced>2008-05-11</announced>
-  <revised>2008-05-11: 01</revised>
+  <revised count="01">2008-05-11</revised>
   <bug>219033</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-11.xml b/metadata/glsa/glsa-200805-11.xml
index 9b97568284d3..87c0e120f3f3 100644
--- a/metadata/glsa/glsa-200805-11.xml
+++ b/metadata/glsa/glsa-200805-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">chicken</product>
   <announced>2008-05-12</announced>
-  <revised>2008-05-12: 01</revised>
+  <revised count="01">2008-05-12</revised>
   <bug>198979</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-12.xml b/metadata/glsa/glsa-200805-12.xml
index f20673c4ab21..888173f8302f 100644
--- a/metadata/glsa/glsa-200805-12.xml
+++ b/metadata/glsa/glsa-200805-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">blender</product>
   <announced>2008-05-12</announced>
-  <revised>2008-05-12: 01</revised>
+  <revised count="01">2008-05-12</revised>
   <bug>219008</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-13.xml b/metadata/glsa/glsa-200805-13.xml
index f59408816319..0eaacac5e118 100644
--- a/metadata/glsa/glsa-200805-13.xml
+++ b/metadata/glsa/glsa-200805-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ptex</product>
   <announced>2008-05-12</announced>
-  <revised>2008-05-12: 01</revised>
+  <revised count="01">2008-05-12</revised>
   <bug>196673</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-14.xml b/metadata/glsa/glsa-200805-14.xml
index f04b58f26f0b..d788c4da4a12 100644
--- a/metadata/glsa/glsa-200805-14.xml
+++ b/metadata/glsa/glsa-200805-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cdf</product>
   <announced>2008-05-13</announced>
-  <revised>2008-05-13: 01</revised>
+  <revised count="01">2008-05-13</revised>
   <bug>220391</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-15.xml b/metadata/glsa/glsa-200805-15.xml
index 78a4feb6bb91..8b7c2bfc9fb2 100644
--- a/metadata/glsa/glsa-200805-15.xml
+++ b/metadata/glsa/glsa-200805-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libid3tag</product>
   <announced>2008-05-14</announced>
-  <revised>2008-05-14: 01</revised>
+  <revised count="01">2008-05-14</revised>
   <bug>210564</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-16.xml b/metadata/glsa/glsa-200805-16.xml
index 082257f56b4a..2dfc035ffeec 100644
--- a/metadata/glsa/glsa-200805-16.xml
+++ b/metadata/glsa/glsa-200805-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openoffice openoffice-bin</product>
   <announced>2008-05-14</announced>
-  <revised>2008-05-14: 02</revised>
+  <revised count="02">2008-05-14</revised>
   <bug>218080</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-17.xml b/metadata/glsa/glsa-200805-17.xml
index 82877877f18f..55a2525b2775 100644
--- a/metadata/glsa/glsa-200805-17.xml
+++ b/metadata/glsa/glsa-200805-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">perl libperl</product>
   <announced>2008-05-20</announced>
-  <revised>2008-05-20: 01</revised>
+  <revised count="01">2008-05-20</revised>
   <bug>219203</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-18.xml b/metadata/glsa/glsa-200805-18.xml
index 0a086c92ec05..6f916e6a03c7 100644
--- a/metadata/glsa/glsa-200805-18.xml
+++ b/metadata/glsa/glsa-200805-18.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">mozilla-firefox mozilla-firefox-bin seamonkey seamonkey-bin mozilla-thunderbird mozilla-thunderbird-bin xulrunner</product>
   <announced>2008-05-20</announced>
-  <revised>2008-05-20: 01</revised>
+  <revised count="01">2008-05-20</revised>
   <bug>208128</bug>
   <bug>214816</bug>
   <bug>218065</bug>
diff --git a/metadata/glsa/glsa-200805-19.xml b/metadata/glsa/glsa-200805-19.xml
index ddca127c3237..fc53cddf815a 100644
--- a/metadata/glsa/glsa-200805-19.xml
+++ b/metadata/glsa/glsa-200805-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2008-05-20</announced>
-  <revised>2008-05-20: 01</revised>
+  <revised count="01">2008-05-20</revised>
   <bug>213762</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-20.xml b/metadata/glsa/glsa-200805-20.xml
index be55b851b046..4e4b91b09152 100644
--- a/metadata/glsa/glsa-200805-20.xml
+++ b/metadata/glsa/glsa-200805-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gnutls</product>
   <announced>2008-05-21</announced>
-  <revised>2008-05-21: 01</revised>
+  <revised count="01">2008-05-21</revised>
   <bug>222823</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-21.xml b/metadata/glsa/glsa-200805-21.xml
index 028870835af8..4ad58b27e872 100644
--- a/metadata/glsa/glsa-200805-21.xml
+++ b/metadata/glsa/glsa-200805-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">roundup</product>
   <announced>2008-05-27</announced>
-  <revised>2008-05-27: 01</revised>
+  <revised count="01">2008-05-27</revised>
   <bug>212488</bug>
   <bug>214666</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200805-22.xml b/metadata/glsa/glsa-200805-22.xml
index 23c38fcf644e..8e4101ada2e7 100644
--- a/metadata/glsa/glsa-200805-22.xml
+++ b/metadata/glsa/glsa-200805-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mplayer</product>
   <announced>2008-05-29</announced>
-  <revised>2008-05-29: 01</revised>
+  <revised count="01">2008-05-29</revised>
   <bug>215006</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200805-23.xml b/metadata/glsa/glsa-200805-23.xml
index 2baafe4c03e6..b2b9738f3e5f 100644
--- a/metadata/glsa/glsa-200805-23.xml
+++ b/metadata/glsa/glsa-200805-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">samba</product>
   <announced>2008-05-29</announced>
-  <revised>2008-05-29: 01</revised>
+  <revised count="01">2008-05-29</revised>
   <bug>222299</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200806-01.xml b/metadata/glsa/glsa-200806-01.xml
index 9a7ad511b13d..a37371431d7e 100644
--- a/metadata/glsa/glsa-200806-01.xml
+++ b/metadata/glsa/glsa-200806-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mtr</product>
   <announced>2008-06-03</announced>
-  <revised>2008-06-03: 01</revised>
+  <revised count="01">2008-06-03</revised>
   <bug>223017</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200806-02.xml b/metadata/glsa/glsa-200806-02.xml
index 7704825da705..4e338650288d 100644
--- a/metadata/glsa/glsa-200806-02.xml
+++ b/metadata/glsa/glsa-200806-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libxslt</product>
   <announced>2008-06-03</announced>
-  <revised>2008-06-03: 01</revised>
+  <revised count="01">2008-06-03</revised>
   <bug>222499</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200806-03.xml b/metadata/glsa/glsa-200806-03.xml
index fb690f6cd2c0..0126b257e705 100644
--- a/metadata/glsa/glsa-200806-03.xml
+++ b/metadata/glsa/glsa-200806-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">imlib2</product>
   <announced>2008-06-08</announced>
-  <revised>2008-06-08: 01</revised>
+  <revised count="01">2008-06-08</revised>
   <bug>223965</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200806-04.xml b/metadata/glsa/glsa-200806-04.xml
index 03f028e7320e..8fd3be59be1f 100644
--- a/metadata/glsa/glsa-200806-04.xml
+++ b/metadata/glsa/glsa-200806-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rdesktop</product>
   <announced>2008-06-14</announced>
-  <revised>2008-06-14: 01</revised>
+  <revised count="01">2008-06-14</revised>
   <bug>220911</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200806-05.xml b/metadata/glsa/glsa-200806-05.xml
index 21c9e9b654af..751a5966fe1c 100644
--- a/metadata/glsa/glsa-200806-05.xml
+++ b/metadata/glsa/glsa-200806-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cbrpager</product>
   <announced>2008-06-16</announced>
-  <revised>2008-06-16: 01</revised>
+  <revised count="01">2008-06-16</revised>
   <bug>223657</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200806-06.xml b/metadata/glsa/glsa-200806-06.xml
index d91967ec2ca8..b5dc20a95303 100644
--- a/metadata/glsa/glsa-200806-06.xml
+++ b/metadata/glsa/glsa-200806-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">evolution</product>
   <announced>2008-06-16</announced>
-  <revised>2008-06-16: 01</revised>
+  <revised count="01">2008-06-16</revised>
   <bug>223963</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200806-07.xml b/metadata/glsa/glsa-200806-07.xml
index a2aba493dc86..73d54ceff4d7 100644
--- a/metadata/glsa/glsa-200806-07.xml
+++ b/metadata/glsa/glsa-200806-07.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">xorg-server</product>
   <announced>2008-06-19</announced>
-  <revised>2008-06-19: 01</revised>
+  <revised count="01">2008-06-19</revised>
   <bug>225419</bug>
   <access>remote, local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200806-08.xml b/metadata/glsa/glsa-200806-08.xml
index b347bf8d34bc..07c01edbacde 100644
--- a/metadata/glsa/glsa-200806-08.xml
+++ b/metadata/glsa/glsa-200806-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2008-06-23</announced>
-  <revised>2008-06-23: 01</revised>
+  <revised count="01">2008-06-23</revised>
   <bug>223429</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200806-09.xml b/metadata/glsa/glsa-200806-09.xml
index 2a118102c385..eaa69465c032 100644
--- a/metadata/glsa/glsa-200806-09.xml
+++ b/metadata/glsa/glsa-200806-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libvorbis</product>
   <announced>2008-06-23</announced>
-  <revised>2008-06-23: 02</revised>
+  <revised count="02">2008-06-23</revised>
   <bug>222085</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200806-10.xml b/metadata/glsa/glsa-200806-10.xml
index 7c6fbbe8e26c..170c1658879d 100644
--- a/metadata/glsa/glsa-200806-10.xml
+++ b/metadata/glsa/glsa-200806-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">freetype</product>
   <announced>2008-06-23</announced>
-  <revised>2009-05-28: 03</revised>
+  <revised count="03">2009-05-28</revised>
   <bug>225851</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200806-11.xml b/metadata/glsa/glsa-200806-11.xml
index 50e013ef7add..56996826ab8b 100644
--- a/metadata/glsa/glsa-200806-11.xml
+++ b/metadata/glsa/glsa-200806-11.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">ibm-jdk-bin ibm-jre-bin</product>
   <announced>2008-06-25</announced>
-  <revised>2008-06-25: 01</revised>
+  <revised count="01">2008-06-25</revised>
   <bug>186277</bug>
   <bug>198644</bug>
   <bug>216112</bug>
diff --git a/metadata/glsa/glsa-200807-01.xml b/metadata/glsa/glsa-200807-01.xml
index ca3e11c0d8f9..b81eb7532cb1 100644
--- a/metadata/glsa/glsa-200807-01.xml
+++ b/metadata/glsa/glsa-200807-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">python</product>
   <announced>2008-07-01</announced>
-  <revised>2008-07-01: 01</revised>
+  <revised count="01">2008-07-01</revised>
   <bug>216673</bug>
   <bug>217221</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200807-02.xml b/metadata/glsa/glsa-200807-02.xml
index 36fc1ee5a792..ebada9a91c2c 100644
--- a/metadata/glsa/glsa-200807-02.xml
+++ b/metadata/glsa/glsa-200807-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">motion</product>
   <announced>2008-07-01</announced>
-  <revised>2008-07-01: 01</revised>
+  <revised count="01">2008-07-01</revised>
   <bug>227053</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200807-03.xml b/metadata/glsa/glsa-200807-03.xml
index bdc430ee69a4..146838f45b61 100644
--- a/metadata/glsa/glsa-200807-03.xml
+++ b/metadata/glsa/glsa-200807-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libpcre glib</product>
   <announced>2008-07-07</announced>
-  <revised>2008-07-07: 01</revised>
+  <revised count="01">2008-07-07</revised>
   <bug>228091</bug>
   <bug>230039</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200807-04.xml b/metadata/glsa/glsa-200807-04.xml
index 37656e32c9c5..61adb20afe63 100644
--- a/metadata/glsa/glsa-200807-04.xml
+++ b/metadata/glsa/glsa-200807-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">poppler</product>
   <announced>2008-07-08</announced>
-  <revised>2008-07-08: 01</revised>
+  <revised count="01">2008-07-08</revised>
   <bug>229931</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200807-05.xml b/metadata/glsa/glsa-200807-05.xml
index adb9dd0ecc20..a64743c5340f 100644
--- a/metadata/glsa/glsa-200807-05.xml
+++ b/metadata/glsa/glsa-200807-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openoffice openoffice-bin</product>
   <announced>2008-07-09</announced>
-  <revised>2008-07-09: 01</revised>
+  <revised count="01">2008-07-09</revised>
   <bug>225723</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200807-06.xml b/metadata/glsa/glsa-200807-06.xml
index 7113b0c64c2f..6febbf8e29f7 100644
--- a/metadata/glsa/glsa-200807-06.xml
+++ b/metadata/glsa/glsa-200807-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">apache</product>
   <announced>2008-07-09</announced>
-  <revised>2008-07-09: 01</revised>
+  <revised count="01">2008-07-09</revised>
   <bug>222643</bug>
   <bug>227111</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200807-07.xml b/metadata/glsa/glsa-200807-07.xml
index 4da2d92e8909..746c41746330 100644
--- a/metadata/glsa/glsa-200807-07.xml
+++ b/metadata/glsa/glsa-200807-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nx, nxnode</product>
   <announced>2008-07-09</announced>
-  <revised>2008-07-09: 01</revised>
+  <revised count="01">2008-07-09</revised>
   <bug>230147</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200807-08.xml b/metadata/glsa/glsa-200807-08.xml
index 4c2f321543f5..fed68aba9825 100644
--- a/metadata/glsa/glsa-200807-08.xml
+++ b/metadata/glsa/glsa-200807-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bind</product>
   <announced>2008-07-11</announced>
-  <revised>2008-07-11: 01</revised>
+  <revised count="01">2008-07-11</revised>
   <bug>231201</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200807-09.xml b/metadata/glsa/glsa-200807-09.xml
index ae7898da126b..81f54c0d7fdb 100644
--- a/metadata/glsa/glsa-200807-09.xml
+++ b/metadata/glsa/glsa-200807-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mercurial</product>
   <announced>2008-07-15</announced>
-  <revised>2008-07-15: 01</revised>
+  <revised count="01">2008-07-15</revised>
   <bug>230193</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200807-10.xml b/metadata/glsa/glsa-200807-10.xml
index 110adca0a79a..e9abed406344 100644
--- a/metadata/glsa/glsa-200807-10.xml
+++ b/metadata/glsa/glsa-200807-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bacula</product>
   <announced>2008-07-21</announced>
-  <revised>2008-07-21: 01</revised>
+  <revised count="01">2008-07-21</revised>
   <bug>196834</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200807-11.xml b/metadata/glsa/glsa-200807-11.xml
index 778311a3c116..04326d5dbb3c 100644
--- a/metadata/glsa/glsa-200807-11.xml
+++ b/metadata/glsa/glsa-200807-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">peercast</product>
   <announced>2008-07-21</announced>
-  <revised>2008-07-21: 01</revised>
+  <revised count="01">2008-07-21</revised>
   <bug>220281</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200807-12.xml b/metadata/glsa/glsa-200807-12.xml
index 9e2336e4f656..cfa9395f5591 100644
--- a/metadata/glsa/glsa-200807-12.xml
+++ b/metadata/glsa/glsa-200807-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bitchx</product>
   <announced>2008-07-21</announced>
-  <revised>2008-07-21: 01</revised>
+  <revised count="01">2008-07-21</revised>
   <bug>190667</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200807-13.xml b/metadata/glsa/glsa-200807-13.xml
index 8b9fa00918ba..63c08c0ddd72 100644
--- a/metadata/glsa/glsa-200807-13.xml
+++ b/metadata/glsa/glsa-200807-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">vlc</product>
   <announced>2008-07-31</announced>
-  <revised>2008-07-31: 01</revised>
+  <revised count="01">2008-07-31</revised>
   <bug>221959</bug>
   <bug>230692</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-200807-14.xml b/metadata/glsa/glsa-200807-14.xml
index fd3e521d3a20..8ef39fd5c1c5 100644
--- a/metadata/glsa/glsa-200807-14.xml
+++ b/metadata/glsa/glsa-200807-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">audit</product>
   <announced>2008-07-31</announced>
-  <revised>2008-07-31: 01</revised>
+  <revised count="01">2008-07-31</revised>
   <bug>215705</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200807-15.xml b/metadata/glsa/glsa-200807-15.xml
index 673b3e80e60d..861aa505efd3 100644
--- a/metadata/glsa/glsa-200807-15.xml
+++ b/metadata/glsa/glsa-200807-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pan</product>
   <announced>2008-07-31</announced>
-  <revised>2008-07-31: 01</revised>
+  <revised count="01">2008-07-31</revised>
   <bug>224051</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200807-16.xml b/metadata/glsa/glsa-200807-16.xml
index 3149b0ac7c14..be7851a9b3b3 100644
--- a/metadata/glsa/glsa-200807-16.xml
+++ b/metadata/glsa/glsa-200807-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">python</product>
   <announced>2008-07-31</announced>
-  <revised>2009-07-19: 02</revised>
+  <revised count="02">2009-07-19</revised>
   <bug>230640</bug>
   <bug>232137</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200808-01.xml b/metadata/glsa/glsa-200808-01.xml
index 9c5b823b47dc..792466a12d26 100644
--- a/metadata/glsa/glsa-200808-01.xml
+++ b/metadata/glsa/glsa-200808-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-lib</product>
   <announced>2008-08-06</announced>
-  <revised>2008-08-06: 01</revised>
+  <revised count="01">2008-08-06</revised>
   <bug>213039</bug>
   <bug>214270</bug>
   <bug>218059</bug>
diff --git a/metadata/glsa/glsa-200808-02.xml b/metadata/glsa/glsa-200808-02.xml
index bd4c9453e8c7..95ff4e4749f2 100644
--- a/metadata/glsa/glsa-200808-02.xml
+++ b/metadata/glsa/glsa-200808-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">net-snmp</product>
   <announced>2008-08-06</announced>
-  <revised>2008-08-06: 01</revised>
+  <revised count="01">2008-08-06</revised>
   <bug>222265</bug>
   <bug>225105</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200808-03.xml b/metadata/glsa/glsa-200808-03.xml
index e3b9a5029880..e4bb67d8eeaf 100644
--- a/metadata/glsa/glsa-200808-03.xml
+++ b/metadata/glsa/glsa-200808-03.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">mozilla-firefox mozilla-firefox-bin mozilla-thunderbird mozilla-thunderbird-bin seamonkey seamonkey-bin xulrunner xulrunner-bin</product>
   <announced>2008-08-06</announced>
-  <revised>2008-08-06: 01</revised>
+  <revised count="01">2008-08-06</revised>
   <bug>204337</bug>
   <bug>218065</bug>
   <bug>230567</bug>
diff --git a/metadata/glsa/glsa-200808-04.xml b/metadata/glsa/glsa-200808-04.xml
index 2df5b260f9e1..65dc75fa103e 100644
--- a/metadata/glsa/glsa-200808-04.xml
+++ b/metadata/glsa/glsa-200808-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2008-08-06</announced>
-  <revised>2008-08-06: 01</revised>
+  <revised count="01">2008-08-06</revised>
   <bug>230411</bug>
   <bug>231587</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200808-05.xml b/metadata/glsa/glsa-200808-05.xml
index d8b3ccb7ca33..7ca04ba842bc 100644
--- a/metadata/glsa/glsa-200808-05.xml
+++ b/metadata/glsa/glsa-200808-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dhcp</product>
   <announced>2008-08-06</announced>
-  <revised>2008-08-06: 01</revised>
+  <revised count="01">2008-08-06</revised>
   <bug>227135</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200808-06.xml b/metadata/glsa/glsa-200808-06.xml
index 0ace84d743f4..f8b5a5fb03a7 100644
--- a/metadata/glsa/glsa-200808-06.xml
+++ b/metadata/glsa/glsa-200808-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libxslt</product>
   <announced>2008-08-06</announced>
-  <revised>2008-08-06: 01</revised>
+  <revised count="01">2008-08-06</revised>
   <bug>232172</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200808-07.xml b/metadata/glsa/glsa-200808-07.xml
index e8fb8449740d..2b2c41143118 100644
--- a/metadata/glsa/glsa-200808-07.xml
+++ b/metadata/glsa/glsa-200808-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2008-08-08</announced>
-  <revised>2008-08-08: 01</revised>
+  <revised count="01">2008-08-08</revised>
   <bug>204340</bug>
   <bug>227351</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200808-08.xml b/metadata/glsa/glsa-200808-08.xml
index 99b5f68a7056..9d4f009359e7 100644
--- a/metadata/glsa/glsa-200808-08.xml
+++ b/metadata/glsa/glsa-200808-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">stunnel</product>
   <announced>2008-08-08</announced>
-  <revised>2009-08-09: 02</revised>
+  <revised count="02">2009-08-09</revised>
   <bug>222805</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200808-09.xml b/metadata/glsa/glsa-200808-09.xml
index 8daef47edd29..1512af883d19 100644
--- a/metadata/glsa/glsa-200808-09.xml
+++ b/metadata/glsa/glsa-200808-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openldap</product>
   <announced>2008-08-08</announced>
-  <revised>2008-08-08: 01</revised>
+  <revised count="01">2008-08-08</revised>
   <bug>230269</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200808-10.xml b/metadata/glsa/glsa-200808-10.xml
index c3ec1739b0e3..d92a0acbe0dc 100644
--- a/metadata/glsa/glsa-200808-10.xml
+++ b/metadata/glsa/glsa-200808-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2008-08-09</announced>
-  <revised>2008-08-09: 01</revised>
+  <revised count="01">2008-08-09</revised>
   <bug>233383</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200808-11.xml b/metadata/glsa/glsa-200808-11.xml
index 4a3d222248ea..1af0536e5d0b 100644
--- a/metadata/glsa/glsa-200808-11.xml
+++ b/metadata/glsa/glsa-200808-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nzbget uudeview</product>
   <announced>2008-08-11</announced>
-  <revised>2008-08-11: 01</revised>
+  <revised count="01">2008-08-11</revised>
   <bug>222275</bug>
   <bug>224193</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-200808-12.xml b/metadata/glsa/glsa-200808-12.xml
index 598453bf1640..4811e99d62ab 100644
--- a/metadata/glsa/glsa-200808-12.xml
+++ b/metadata/glsa/glsa-200808-12.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">postfix</product>
   <announced>2008-08-14</announced>
-  <revised>2008-10-23: 02</revised>
+  <revised count="02">2008-10-23</revised>
   <bug>232642</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-01.xml b/metadata/glsa/glsa-200809-01.xml
index aee91aad7137..ca6931d43d5b 100644
--- a/metadata/glsa/glsa-200809-01.xml
+++ b/metadata/glsa/glsa-200809-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">yelp</product>
   <announced>2008-09-04</announced>
-  <revised>2008-09-04: 01</revised>
+  <revised count="01">2008-09-04</revised>
   <bug>234079</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-02.xml b/metadata/glsa/glsa-200809-02.xml
index d3391f0050b0..8abde9a4731a 100644
--- a/metadata/glsa/glsa-200809-02.xml
+++ b/metadata/glsa/glsa-200809-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dnsmasq</product>
   <announced>2008-09-04</announced>
-  <revised>2008-09-04: 01</revised>
+  <revised count="01">2008-09-04</revised>
   <bug>231282</bug>
   <bug>232523</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200809-03.xml b/metadata/glsa/glsa-200809-03.xml
index f3b11638a282..a0ed48b0863e 100644
--- a/metadata/glsa/glsa-200809-03.xml
+++ b/metadata/glsa/glsa-200809-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">realplayer</product>
   <announced>2008-09-04</announced>
-  <revised>2008-09-04: 01</revised>
+  <revised count="01">2008-09-04</revised>
   <bug>232997</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-04.xml b/metadata/glsa/glsa-200809-04.xml
index 79f3c371d1f6..4756dc3bc843 100644
--- a/metadata/glsa/glsa-200809-04.xml
+++ b/metadata/glsa/glsa-200809-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mysql</product>
   <announced>2008-09-04</announced>
-  <revised>2008-09-04: 01</revised>
+  <revised count="01">2008-09-04</revised>
   <bug>220399</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-05.xml b/metadata/glsa/glsa-200809-05.xml
index cf0d6b376845..097a48217df4 100644
--- a/metadata/glsa/glsa-200809-05.xml
+++ b/metadata/glsa/glsa-200809-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">courier-authlib</product>
   <announced>2008-09-05</announced>
-  <revised>2008-09-05: 01</revised>
+  <revised count="01">2008-09-05</revised>
   <bug>225407</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-06.xml b/metadata/glsa/glsa-200809-06.xml
index 4f6675d09c90..a5a5420ff825 100644
--- a/metadata/glsa/glsa-200809-06.xml
+++ b/metadata/glsa/glsa-200809-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">vlc</product>
   <announced>2008-09-07</announced>
-  <revised>2008-09-07: 01</revised>
+  <revised count="01">2008-09-07</revised>
   <bug>235238</bug>
   <bug>235589</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200809-07.xml b/metadata/glsa/glsa-200809-07.xml
index 7b8d32046b69..09772342a90b 100644
--- a/metadata/glsa/glsa-200809-07.xml
+++ b/metadata/glsa/glsa-200809-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tiff</product>
   <announced>2008-09-08</announced>
-  <revised>2008-09-08: 01</revised>
+  <revised count="01">2008-09-08</revised>
   <bug>234080</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-08.xml b/metadata/glsa/glsa-200809-08.xml
index 6506ef699a55..46abb9d60118 100644
--- a/metadata/glsa/glsa-200809-08.xml
+++ b/metadata/glsa/glsa-200809-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">amarok</product>
   <announced>2008-09-08</announced>
-  <revised>2008-09-08: 01</revised>
+  <revised count="01">2008-09-08</revised>
   <bug>234689</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-09.xml b/metadata/glsa/glsa-200809-09.xml
index 84fbff72e26c..86b8b82925b1 100644
--- a/metadata/glsa/glsa-200809-09.xml
+++ b/metadata/glsa/glsa-200809-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">postfix</product>
   <announced>2008-09-19</announced>
-  <revised>2008-09-19: 01</revised>
+  <revised count="01">2008-09-19</revised>
   <bug>236453</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-10.xml b/metadata/glsa/glsa-200809-10.xml
index b5cbca64ce53..0dca9d69f51b 100644
--- a/metadata/glsa/glsa-200809-10.xml
+++ b/metadata/glsa/glsa-200809-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mantisbt</product>
   <announced>2008-09-21</announced>
-  <revised>2008-11-26: 02</revised>
+  <revised count="02">2008-11-26</revised>
   <bug>222649</bug>
   <bug>233336</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200809-11.xml b/metadata/glsa/glsa-200809-11.xml
index f275ea57f1da..d2b3e8b6ed4f 100644
--- a/metadata/glsa/glsa-200809-11.xml
+++ b/metadata/glsa/glsa-200809-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">havp</product>
   <announced>2008-09-21</announced>
-  <revised>2008-09-21: 01</revised>
+  <revised count="01">2008-09-21</revised>
   <bug>234715</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-12.xml b/metadata/glsa/glsa-200809-12.xml
index e415d54bc15b..302a95c8310d 100644
--- a/metadata/glsa/glsa-200809-12.xml
+++ b/metadata/glsa/glsa-200809-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">newsbeuter</product>
   <announced>2008-09-22</announced>
-  <revised>2008-09-22: 01</revised>
+  <revised count="01">2008-09-22</revised>
   <bug>236506</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-13.xml b/metadata/glsa/glsa-200809-13.xml
index 945ccdae46c5..1800f944f95e 100644
--- a/metadata/glsa/glsa-200809-13.xml
+++ b/metadata/glsa/glsa-200809-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">R</product>
   <announced>2008-09-22</announced>
-  <revised>2008-09-22: 01</revised>
+  <revised count="01">2008-09-22</revised>
   <bug>235822</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-14.xml b/metadata/glsa/glsa-200809-14.xml
index 5c3e7093b9b7..bca29ca9f22d 100644
--- a/metadata/glsa/glsa-200809-14.xml
+++ b/metadata/glsa/glsa-200809-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bitlbee</product>
   <announced>2008-09-23</announced>
-  <revised>2008-09-23: 01</revised>
+  <revised count="01">2008-09-23</revised>
   <bug>236160</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-15.xml b/metadata/glsa/glsa-200809-15.xml
index a8f07ca64fc7..d4cb45b92fe4 100644
--- a/metadata/glsa/glsa-200809-15.xml
+++ b/metadata/glsa/glsa-200809-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ed</product>
   <announced>2008-09-23</announced>
-  <revised>2008-09-23: 01</revised>
+  <revised count="01">2008-09-23</revised>
   <bug>236521</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-16.xml b/metadata/glsa/glsa-200809-16.xml
index 4dfd21d30673..b5859c9934af 100644
--- a/metadata/glsa/glsa-200809-16.xml
+++ b/metadata/glsa/glsa-200809-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">git</product>
   <announced>2008-09-25</announced>
-  <revised>2008-09-25: 01</revised>
+  <revised count="01">2008-09-25</revised>
   <bug>234075</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-17.xml b/metadata/glsa/glsa-200809-17.xml
index 3851276e5107..23891f4ab13c 100644
--- a/metadata/glsa/glsa-200809-17.xml
+++ b/metadata/glsa/glsa-200809-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2008-09-25</announced>
-  <revised>2008-09-25: 01</revised>
+  <revised count="01">2008-09-25</revised>
   <bug>236515</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200809-18.xml b/metadata/glsa/glsa-200809-18.xml
index 8e14c429a730..0b7ecb65da35 100644
--- a/metadata/glsa/glsa-200809-18.xml
+++ b/metadata/glsa/glsa-200809-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2008-09-25</announced>
-  <revised>2008-09-25: 01</revised>
+  <revised count="01">2008-09-25</revised>
   <bug>236665</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200810-01.xml b/metadata/glsa/glsa-200810-01.xml
index 7fff8aa748ee..a8998ad6cb8a 100644
--- a/metadata/glsa/glsa-200810-01.xml
+++ b/metadata/glsa/glsa-200810-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wordnet</product>
   <announced>2008-10-07</announced>
-  <revised>2008-10-07: 01</revised>
+  <revised count="01">2008-10-07</revised>
   <bug>211491</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200810-02.xml b/metadata/glsa/glsa-200810-02.xml
index 45a6f8739783..3779ea427d51 100644
--- a/metadata/glsa/glsa-200810-02.xml
+++ b/metadata/glsa/glsa-200810-02.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">portage</product>
   <announced>2008-10-09</announced>
-  <revised>2008-10-09: 01</revised>
+  <revised count="01">2008-10-09</revised>
   <bug>239560</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200810-03.xml b/metadata/glsa/glsa-200810-03.xml
index c5aa40ab5136..78db0dd78f8a 100644
--- a/metadata/glsa/glsa-200810-03.xml
+++ b/metadata/glsa/glsa-200810-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libspf2</product>
   <announced>2008-10-30</announced>
-  <revised>2008-10-30: 01</revised>
+  <revised count="01">2008-10-30</revised>
   <bug>242254</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200811-01.xml b/metadata/glsa/glsa-200811-01.xml
index aeb07e92a4b5..4750703983a3 100644
--- a/metadata/glsa/glsa-200811-01.xml
+++ b/metadata/glsa/glsa-200811-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2008-11-03</announced>
-  <revised>2008-11-03: 01</revised>
+  <revised count="01">2008-11-03</revised>
   <bug>235298</bug>
   <bug>240500</bug>
   <bug>243060</bug>
diff --git a/metadata/glsa/glsa-200811-02.xml b/metadata/glsa/glsa-200811-02.xml
index ddf5f922495e..299ea65e7f1d 100644
--- a/metadata/glsa/glsa-200811-02.xml
+++ b/metadata/glsa/glsa-200811-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gallery</product>
   <announced>2008-11-09</announced>
-  <revised>2009-05-28: 02</revised>
+  <revised count="02">2009-05-28</revised>
   <bug>234137</bug>
   <bug>238113</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200811-03.xml b/metadata/glsa/glsa-200811-03.xml
index 142080d31d98..017eabaa0b76 100644
--- a/metadata/glsa/glsa-200811-03.xml
+++ b/metadata/glsa/glsa-200811-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">faad2</product>
   <announced>2008-11-09</announced>
-  <revised>2008-11-09: 01</revised>
+  <revised count="01">2008-11-09</revised>
   <bug>238445</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200811-04.xml b/metadata/glsa/glsa-200811-04.xml
index 1933c9219ac4..a92aa7253354 100644
--- a/metadata/glsa/glsa-200811-04.xml
+++ b/metadata/glsa/glsa-200811-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">graphviz</product>
   <announced>2008-11-09</announced>
-  <revised>2008-11-09: 01</revised>
+  <revised count="01">2008-11-09</revised>
   <bug>240636</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200811-05.xml b/metadata/glsa/glsa-200811-05.xml
index abedea578bcf..996c6c81ebe6 100644
--- a/metadata/glsa/glsa-200811-05.xml
+++ b/metadata/glsa/glsa-200811-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2008-11-16</announced>
-  <revised>2008-11-16: 01</revised>
+  <revised count="01">2008-11-16</revised>
   <bug>209148</bug>
   <bug>212211</bug>
   <bug>215266</bug>
diff --git a/metadata/glsa/glsa-200812-01.xml b/metadata/glsa/glsa-200812-01.xml
index 502cd0e04f56..206a24f77b81 100644
--- a/metadata/glsa/glsa-200812-01.xml
+++ b/metadata/glsa/glsa-200812-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">optipng</product>
   <announced>2008-12-02</announced>
-  <revised>2008-12-02: 01</revised>
+  <revised count="01">2008-12-02</revised>
   <bug>246522</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-02.xml b/metadata/glsa/glsa-200812-02.xml
index e833310ebce3..df43923d35ef 100644
--- a/metadata/glsa/glsa-200812-02.xml
+++ b/metadata/glsa/glsa-200812-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">enscript</product>
   <announced>2008-12-02</announced>
-  <revised>2008-12-02: 02</revised>
+  <revised count="02">2008-12-02</revised>
   <bug>243228</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-03.xml b/metadata/glsa/glsa-200812-03.xml
index 6486575c554b..64a9b2625c2a 100644
--- a/metadata/glsa/glsa-200812-03.xml
+++ b/metadata/glsa/glsa-200812-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ipsec-tools</product>
   <announced>2008-12-02</announced>
-  <revised>2008-12-02: 01</revised>
+  <revised count="01">2008-12-02</revised>
   <bug>232831</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-04.xml b/metadata/glsa/glsa-200812-04.xml
index 1d1e0185a028..086810f223be 100644
--- a/metadata/glsa/glsa-200812-04.xml
+++ b/metadata/glsa/glsa-200812-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lighttpd</product>
   <announced>2008-12-02</announced>
-  <revised>2008-12-02: 01</revised>
+  <revised count="01">2008-12-02</revised>
   <bug>238180</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-05.xml b/metadata/glsa/glsa-200812-05.xml
index 32dbe98c4b1d..f56d85ebbc08 100644
--- a/metadata/glsa/glsa-200812-05.xml
+++ b/metadata/glsa/glsa-200812-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libsamplerate</product>
   <announced>2008-12-02</announced>
-  <revised>2008-12-02: 01</revised>
+  <revised count="01">2008-12-02</revised>
   <bug>237037</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-06.xml b/metadata/glsa/glsa-200812-06.xml
index da036f1d34c7..f4971e4eae6b 100644
--- a/metadata/glsa/glsa-200812-06.xml
+++ b/metadata/glsa/glsa-200812-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libxml2</product>
   <announced>2008-12-02</announced>
-  <revised>2008-12-02: 01</revised>
+  <revised count="01">2008-12-02</revised>
   <bug>234099</bug>
   <bug>237806</bug>
   <bug>239346</bug>
diff --git a/metadata/glsa/glsa-200812-07.xml b/metadata/glsa/glsa-200812-07.xml
index 1282ce62f4b6..1f4b433cfeab 100644
--- a/metadata/glsa/glsa-200812-07.xml
+++ b/metadata/glsa/glsa-200812-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mantisbt</product>
   <announced>2008-12-02</announced>
-  <revised>2008-12-02: 01</revised>
+  <revised count="01">2008-12-02</revised>
   <bug>238570</bug>
   <bug>241940</bug>
   <bug>242722</bug>
diff --git a/metadata/glsa/glsa-200812-08.xml b/metadata/glsa/glsa-200812-08.xml
index e6b9ab1fad51..186848d768e3 100644
--- a/metadata/glsa/glsa-200812-08.xml
+++ b/metadata/glsa/glsa-200812-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mgetty</product>
   <announced>2008-12-06</announced>
-  <revised>2008-12-23: 02</revised>
+  <revised count="02">2008-12-23</revised>
   <bug>235806</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-09.xml b/metadata/glsa/glsa-200812-09.xml
index 6ea7506ff183..40e3e2b122c0 100644
--- a/metadata/glsa/glsa-200812-09.xml
+++ b/metadata/glsa/glsa-200812-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">opensc</product>
   <announced>2008-12-10</announced>
-  <revised>2008-12-10: 01</revised>
+  <revised count="01">2008-12-10</revised>
   <bug>233543</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-10.xml b/metadata/glsa/glsa-200812-10.xml
index 53b06ebe3a1d..585e492eb543 100644
--- a/metadata/glsa/glsa-200812-10.xml
+++ b/metadata/glsa/glsa-200812-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Archive-Tar</product>
   <announced>2008-12-10</announced>
-  <revised>2008-12-10: 01</revised>
+  <revised count="01">2008-12-10</revised>
   <bug>192989</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-11.xml b/metadata/glsa/glsa-200812-11.xml
index e9921b020202..af956ac4b9dd 100644
--- a/metadata/glsa/glsa-200812-11.xml
+++ b/metadata/glsa/glsa-200812-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cups</product>
   <announced>2008-12-10</announced>
-  <revised>2008-12-10: 01</revised>
+  <revised count="01">2008-12-10</revised>
   <bug>238976</bug>
   <bug>249727</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200812-12.xml b/metadata/glsa/glsa-200812-12.xml
index 74bc8ecea1d7..208a5235c120 100644
--- a/metadata/glsa/glsa-200812-12.xml
+++ b/metadata/glsa/glsa-200812-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">honeyd</product>
   <announced>2008-12-12</announced>
-  <revised>2008-12-12: 01</revised>
+  <revised count="01">2008-12-12</revised>
   <bug>237481</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-13.xml b/metadata/glsa/glsa-200812-13.xml
index 998f56c04e14..005e92d8eb5e 100644
--- a/metadata/glsa/glsa-200812-13.xml
+++ b/metadata/glsa/glsa-200812-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openoffice openoffice-bin</product>
   <announced>2008-12-12</announced>
-  <revised>2008-12-12: 01</revised>
+  <revised count="01">2008-12-12</revised>
   <bug>235824</bug>
   <bug>244995</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-200812-14.xml b/metadata/glsa/glsa-200812-14.xml
index 00fcaecc7820..62f4d6217ea6 100644
--- a/metadata/glsa/glsa-200812-14.xml
+++ b/metadata/glsa/glsa-200812-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">aview</product>
   <announced>2008-12-14</announced>
-  <revised>2008-12-14: 01</revised>
+  <revised count="01">2008-12-14</revised>
   <bug>235808</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-15.xml b/metadata/glsa/glsa-200812-15.xml
index b334eaa5671d..64db3ebee111 100644
--- a/metadata/glsa/glsa-200812-15.xml
+++ b/metadata/glsa/glsa-200812-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">povray</product>
   <announced>2008-12-14</announced>
-  <revised>2008-12-14: 01</revised>
+  <revised count="01">2008-12-14</revised>
   <bug>153538</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-16.xml b/metadata/glsa/glsa-200812-16.xml
index b35073105cdd..f092fcce6678 100644
--- a/metadata/glsa/glsa-200812-16.xml
+++ b/metadata/glsa/glsa-200812-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dovecot</product>
   <announced>2008-12-14</announced>
-  <revised>2008-12-14: 01</revised>
+  <revised count="01">2008-12-14</revised>
   <bug>240409</bug>
   <bug>244962</bug>
   <bug>245316</bug>
diff --git a/metadata/glsa/glsa-200812-17.xml b/metadata/glsa/glsa-200812-17.xml
index 38e3b554e85d..c70431eb3279 100644
--- a/metadata/glsa/glsa-200812-17.xml
+++ b/metadata/glsa/glsa-200812-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ruby</product>
   <announced>2008-12-16</announced>
-  <revised>2008-12-16: 01</revised>
+  <revised count="01">2008-12-16</revised>
   <bug>225465</bug>
   <bug>236060</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200812-18.xml b/metadata/glsa/glsa-200812-18.xml
index bbf606264466..435fd14ccab0 100644
--- a/metadata/glsa/glsa-200812-18.xml
+++ b/metadata/glsa/glsa-200812-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">jasper</product>
   <announced>2008-12-16</announced>
-  <revised>2008-12-16: 01</revised>
+  <revised count="01">2008-12-16</revised>
   <bug>222819</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-19.xml b/metadata/glsa/glsa-200812-19.xml
index 9de6558c3301..6b0d02eb4dae 100644
--- a/metadata/glsa/glsa-200812-19.xml
+++ b/metadata/glsa/glsa-200812-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pdns</product>
   <announced>2008-12-19</announced>
-  <revised>2008-12-19: 01</revised>
+  <revised count="01">2008-12-19</revised>
   <bug>234032</bug>
   <bug>247079</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200812-20.xml b/metadata/glsa/glsa-200812-20.xml
index 793de9f89032..1ee47fdc91a6 100644
--- a/metadata/glsa/glsa-200812-20.xml
+++ b/metadata/glsa/glsa-200812-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpcollab</product>
   <announced>2008-12-21</announced>
-  <revised>2008-12-21: 01</revised>
+  <revised count="01">2008-12-21</revised>
   <bug>235052</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-21.xml b/metadata/glsa/glsa-200812-21.xml
index fdaa600fff6a..d08b8dcc18dd 100644
--- a/metadata/glsa/glsa-200812-21.xml
+++ b/metadata/glsa/glsa-200812-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2008-12-23</announced>
-  <revised>2008-12-23: 01</revised>
+  <revised count="01">2008-12-23</revised>
   <bug>245450</bug>
   <bug>249833</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200812-22.xml b/metadata/glsa/glsa-200812-22.xml
index 1a94a5611ddf..7bb717773862 100644
--- a/metadata/glsa/glsa-200812-22.xml
+++ b/metadata/glsa/glsa-200812-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ampache</product>
   <announced>2008-12-23</announced>
-  <revised>2008-12-23: 01</revised>
+  <revised count="01">2008-12-23</revised>
   <bug>237483</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-23.xml b/metadata/glsa/glsa-200812-23.xml
index f2eade38b169..cb1476e96027 100644
--- a/metadata/glsa/glsa-200812-23.xml
+++ b/metadata/glsa/glsa-200812-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">imlib2</product>
   <announced>2008-12-23</announced>
-  <revised>2008-12-23: 01</revised>
+  <revised count="01">2008-12-23</revised>
   <bug>248057</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200812-24.xml b/metadata/glsa/glsa-200812-24.xml
index 31986a33ca9a..90b78b9b718b 100644
--- a/metadata/glsa/glsa-200812-24.xml
+++ b/metadata/glsa/glsa-200812-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">vlc</product>
   <announced>2008-12-24</announced>
-  <revised>2008-12-24: 01</revised>
+  <revised count="01">2008-12-24</revised>
   <bug>245774</bug>
   <bug>249391</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200901-01.xml b/metadata/glsa/glsa-200901-01.xml
index c79192d4a61f..84f2815c6137 100644
--- a/metadata/glsa/glsa-200901-01.xml
+++ b/metadata/glsa/glsa-200901-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ndiswrapper</product>
   <announced>2009-01-11</announced>
-  <revised>2009-01-11: 01</revised>
+  <revised count="01">2009-01-11</revised>
   <bug>239371</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200901-02.xml b/metadata/glsa/glsa-200901-02.xml
index c08125e8bb9d..ef6f344fa71a 100644
--- a/metadata/glsa/glsa-200901-02.xml
+++ b/metadata/glsa/glsa-200901-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">jhead</product>
   <announced>2009-01-11</announced>
-  <revised>2009-01-11: 01</revised>
+  <revised count="01">2009-01-11</revised>
   <bug>242702</bug>
   <bug>243238</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200901-03.xml b/metadata/glsa/glsa-200901-03.xml
index deadb50282f3..a3c44ce6a969 100644
--- a/metadata/glsa/glsa-200901-03.xml
+++ b/metadata/glsa/glsa-200901-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pdnsd</product>
   <announced>2009-01-11</announced>
-  <revised>2009-01-11: 01</revised>
+  <revised count="01">2009-01-11</revised>
   <bug>231285</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200901-04.xml b/metadata/glsa/glsa-200901-04.xml
index c8d473712c24..db1df4fc4468 100644
--- a/metadata/glsa/glsa-200901-04.xml
+++ b/metadata/glsa/glsa-200901-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dbus</product>
   <announced>2009-01-11</announced>
-  <revised>2009-01-11: 01</revised>
+  <revised count="01">2009-01-11</revised>
   <bug>240308</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200901-05.xml b/metadata/glsa/glsa-200901-05.xml
index b3a1d2c03386..f979c20211fd 100644
--- a/metadata/glsa/glsa-200901-05.xml
+++ b/metadata/glsa/glsa-200901-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">streamripper</product>
   <announced>2009-01-11</announced>
-  <revised>2009-01-11: 01</revised>
+  <revised count="01">2009-01-11</revised>
   <bug>249039</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200901-06.xml b/metadata/glsa/glsa-200901-06.xml
index b5714967274d..03390104f060 100644
--- a/metadata/glsa/glsa-200901-06.xml
+++ b/metadata/glsa/glsa-200901-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tremulous tremulous-bin</product>
   <announced>2009-01-11</announced>
-  <revised>2009-01-11: 01</revised>
+  <revised count="01">2009-01-11</revised>
   <bug>222119</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200901-07.xml b/metadata/glsa/glsa-200901-07.xml
index afb973394abf..b09e46f58ffe 100644
--- a/metadata/glsa/glsa-200901-07.xml
+++ b/metadata/glsa/glsa-200901-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mplayer</product>
   <announced>2009-01-12</announced>
-  <revised>2009-01-12: 01</revised>
+  <revised count="01">2009-01-12</revised>
   <bug>231836</bug>
   <bug>239130</bug>
   <bug>251017</bug>
diff --git a/metadata/glsa/glsa-200901-08.xml b/metadata/glsa/glsa-200901-08.xml
index ce30e1e364ee..24e73559f1c5 100644
--- a/metadata/glsa/glsa-200901-08.xml
+++ b/metadata/glsa/glsa-200901-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">online-bookmarks</product>
   <announced>2009-01-12</announced>
-  <revised>2009-01-12: 01</revised>
+  <revised count="01">2009-01-12</revised>
   <bug>235053</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200901-09.xml b/metadata/glsa/glsa-200901-09.xml
index f57b16a1edf4..adc8a2a25b5b 100644
--- a/metadata/glsa/glsa-200901-09.xml
+++ b/metadata/glsa/glsa-200901-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2009-01-13</announced>
-  <revised>2009-01-13: 01</revised>
+  <revised count="01">2009-01-13</revised>
   <bug>225483</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200901-10.xml b/metadata/glsa/glsa-200901-10.xml
index 817a8bad88de..aaddcf0a528f 100644
--- a/metadata/glsa/glsa-200901-10.xml
+++ b/metadata/glsa/glsa-200901-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gnutls</product>
   <announced>2009-01-14</announced>
-  <revised>2009-01-14: 01</revised>
+  <revised count="01">2009-01-14</revised>
   <bug>245850</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200901-11.xml b/metadata/glsa/glsa-200901-11.xml
index fb7e87cab5ae..3321fd6e7ec3 100644
--- a/metadata/glsa/glsa-200901-11.xml
+++ b/metadata/glsa/glsa-200901-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">avahi</product>
   <announced>2009-01-14</announced>
-  <revised>2009-01-14: 01</revised>
+  <revised count="01">2009-01-14</revised>
   <bug>250913</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200901-12.xml b/metadata/glsa/glsa-200901-12.xml
index 4b15fe25635d..8e812d456612 100644
--- a/metadata/glsa/glsa-200901-12.xml
+++ b/metadata/glsa/glsa-200901-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">noip-updater</product>
   <announced>2009-01-18</announced>
-  <revised>2009-01-18: 01</revised>
+  <revised count="01">2009-01-18</revised>
   <bug>248709</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200901-13.xml b/metadata/glsa/glsa-200901-13.xml
index bf0ef9b259fc..db69bb8680c5 100644
--- a/metadata/glsa/glsa-200901-13.xml
+++ b/metadata/glsa/glsa-200901-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pidgin</product>
   <announced>2009-01-20</announced>
-  <revised>2009-01-20: 01</revised>
+  <revised count="01">2009-01-20</revised>
   <bug>230045</bug>
   <bug>234135</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200901-14.xml b/metadata/glsa/glsa-200901-14.xml
index 2cfd70daad81..37b710926f41 100644
--- a/metadata/glsa/glsa-200901-14.xml
+++ b/metadata/glsa/glsa-200901-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">scilab</product>
   <announced>2009-01-21</announced>
-  <revised>2009-01-21: 01</revised>
+  <revised count="01">2009-01-21</revised>
   <bug>245922</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200901-15.xml b/metadata/glsa/glsa-200901-15.xml
index cea499611325..41fba986c05b 100644
--- a/metadata/glsa/glsa-200901-15.xml
+++ b/metadata/glsa/glsa-200901-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">net-snmp</product>
   <announced>2009-01-21</announced>
-  <revised>2009-01-21: 01</revised>
+  <revised count="01">2009-01-21</revised>
   <bug>245306</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200902-01.xml b/metadata/glsa/glsa-200902-01.xml
index 865cf92d1ab9..2e0c40d38dc3 100644
--- a/metadata/glsa/glsa-200902-01.xml
+++ b/metadata/glsa/glsa-200902-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sudo</product>
   <announced>2009-02-06</announced>
-  <revised>2009-02-06: 01</revised>
+  <revised count="01">2009-02-06</revised>
   <bug>256633</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200902-02.xml b/metadata/glsa/glsa-200902-02.xml
index 75c83e5cca3b..a6d4e9027ba8 100644
--- a/metadata/glsa/glsa-200902-02.xml
+++ b/metadata/glsa/glsa-200902-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2009-02-12</announced>
-  <revised>2009-02-12: 01</revised>
+  <revised count="01">2009-02-12</revised>
   <bug>251346</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200902-03.xml b/metadata/glsa/glsa-200902-03.xml
index ad021c251a47..0484ae60b7c1 100644
--- a/metadata/glsa/glsa-200902-03.xml
+++ b/metadata/glsa/glsa-200902-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">valgrind</product>
   <announced>2009-02-12</announced>
-  <revised>2009-02-12: 01</revised>
+  <revised count="01">2009-02-12</revised>
   <bug>245317</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200902-04.xml b/metadata/glsa/glsa-200902-04.xml
index 0e6b52763c7f..3ec865022e06 100644
--- a/metadata/glsa/glsa-200902-04.xml
+++ b/metadata/glsa/glsa-200902-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xterm</product>
   <announced>2009-02-12</announced>
-  <revised>2009-02-12: 01</revised>
+  <revised count="01">2009-02-12</revised>
   <bug>253155</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200902-05.xml b/metadata/glsa/glsa-200902-05.xml
index 7ab94afc28ff..2e59a8816d29 100644
--- a/metadata/glsa/glsa-200902-05.xml
+++ b/metadata/glsa/glsa-200902-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ktorrent</product>
   <announced>2009-02-23</announced>
-  <revised>2009-02-23: 01</revised>
+  <revised count="01">2009-02-23</revised>
   <bug>244741</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200902-06.xml b/metadata/glsa/glsa-200902-06.xml
index 90c11e521482..17ccc6041fdb 100644
--- a/metadata/glsa/glsa-200902-06.xml
+++ b/metadata/glsa/glsa-200902-06.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">emacs edit-utils</product>
   <announced>2009-02-23</announced>
-  <revised>2009-02-23: 01</revised>
+  <revised count="01">2009-02-23</revised>
   <bug>221197</bug>
   <bug>236498</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200903-01.xml b/metadata/glsa/glsa-200903-01.xml
index 7c373050d3f2..f59e43bccc7d 100644
--- a/metadata/glsa/glsa-200903-01.xml
+++ b/metadata/glsa/glsa-200903-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">vinagre</product>
   <announced>2009-03-06</announced>
-  <revised>2009-03-06: 01</revised>
+  <revised count="01">2009-03-06</revised>
   <bug>250314</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-02.xml b/metadata/glsa/glsa-200903-02.xml
index 46b2bcdc377f..9206198d4460 100644
--- a/metadata/glsa/glsa-200903-02.xml
+++ b/metadata/glsa/glsa-200903-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">znc</product>
   <announced>2009-03-06</announced>
-  <revised>2009-03-06: 01</revised>
+  <revised count="01">2009-03-06</revised>
   <bug>260148</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-03.xml b/metadata/glsa/glsa-200903-03.xml
index 3f71f8bc00cc..cdaf9d614419 100644
--- a/metadata/glsa/glsa-200903-03.xml
+++ b/metadata/glsa/glsa-200903-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">audacity</product>
   <announced>2009-03-06</announced>
-  <revised>2009-03-06: 01</revised>
+  <revised count="01">2009-03-06</revised>
   <bug>253493</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-04.xml b/metadata/glsa/glsa-200903-04.xml
index 089b0997fd86..f4801b08d167 100644
--- a/metadata/glsa/glsa-200903-04.xml
+++ b/metadata/glsa/glsa-200903-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">devil</product>
   <announced>2009-03-06</announced>
-  <revised>2009-03-06: 01</revised>
+  <revised count="01">2009-03-06</revised>
   <bug>255217</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-05.xml b/metadata/glsa/glsa-200903-05.xml
index 059102afeaca..0aaef4a602a3 100644
--- a/metadata/glsa/glsa-200903-05.xml
+++ b/metadata/glsa/glsa-200903-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pdfjam</product>
   <announced>2009-03-07</announced>
-  <revised>2009-03-07: 01</revised>
+  <revised count="01">2009-03-07</revised>
   <bug>252734</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-06.xml b/metadata/glsa/glsa-200903-06.xml
index d98d4299f8f7..ad6de02e430c 100644
--- a/metadata/glsa/glsa-200903-06.xml
+++ b/metadata/glsa/glsa-200903-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nfs-utils</product>
   <announced>2009-03-07</announced>
-  <revised>2009-03-07: 01</revised>
+  <revised count="01">2009-03-07</revised>
   <bug>242696</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-07.xml b/metadata/glsa/glsa-200903-07.xml
index 53f6619876f4..87550ed7e405 100644
--- a/metadata/glsa/glsa-200903-07.xml
+++ b/metadata/glsa/glsa-200903-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">samba</product>
   <announced>2009-03-07</announced>
-  <revised>2009-03-07: 01</revised>
+  <revised count="01">2009-03-07</revised>
   <bug>247620</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-08.xml b/metadata/glsa/glsa-200903-08.xml
index 550b1dc55bf0..3f6b9e6d1290 100644
--- a/metadata/glsa/glsa-200903-08.xml
+++ b/metadata/glsa/glsa-200903-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">geda</product>
   <announced>2009-03-07</announced>
-  <revised>2009-03-07: 01</revised>
+  <revised count="01">2009-03-07</revised>
   <bug>247538</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-09.xml b/metadata/glsa/glsa-200903-09.xml
index 861e1b2191b3..4b68a246aea1 100644
--- a/metadata/glsa/glsa-200903-09.xml
+++ b/metadata/glsa/glsa-200903-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openttd</product>
   <announced>2009-03-07</announced>
-  <revised>2009-03-07: 01</revised>
+  <revised count="01">2009-03-07</revised>
   <bug>233929</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-10.xml b/metadata/glsa/glsa-200903-10.xml
index 053df3465348..5c42da38112b 100644
--- a/metadata/glsa/glsa-200903-10.xml
+++ b/metadata/glsa/glsa-200903-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">irrlicht</product>
   <announced>2009-03-07</announced>
-  <revised>2009-03-07: 01</revised>
+  <revised count="01">2009-03-07</revised>
   <bug>252203</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-11.xml b/metadata/glsa/glsa-200903-11.xml
index d7f794d963dc..e1751aab9301 100644
--- a/metadata/glsa/glsa-200903-11.xml
+++ b/metadata/glsa/glsa-200903-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pycrypto</product>
   <announced>2009-03-09</announced>
-  <revised>2009-03-09: 01</revised>
+  <revised count="01">2009-03-09</revised>
   <bug>258049</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-12.xml b/metadata/glsa/glsa-200903-12.xml
index 2d1c825a6272..1548d7156569 100644
--- a/metadata/glsa/glsa-200903-12.xml
+++ b/metadata/glsa/glsa-200903-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">optipng</product>
   <announced>2009-03-09</announced>
-  <revised>2009-03-09: 01</revised>
+  <revised count="01">2009-03-09</revised>
   <bug>260265</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-13.xml b/metadata/glsa/glsa-200903-13.xml
index edfc00e1b37b..d80632989601 100644
--- a/metadata/glsa/glsa-200903-13.xml
+++ b/metadata/glsa/glsa-200903-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mpfr</product>
   <announced>2009-03-09</announced>
-  <revised>2009-03-09: 01</revised>
+  <revised count="01">2009-03-09</revised>
   <bug>260968</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-14.xml b/metadata/glsa/glsa-200903-14.xml
index 1e14bae4b162..aa4fcdde3192 100644
--- a/metadata/glsa/glsa-200903-14.xml
+++ b/metadata/glsa/glsa-200903-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bind</product>
   <announced>2009-03-09</announced>
-  <revised>2009-03-09: 01</revised>
+  <revised count="01">2009-03-09</revised>
   <bug>254134</bug>
   <bug>257949</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200903-15.xml b/metadata/glsa/glsa-200903-15.xml
index 3ab8cb10ee8a..48d9475c35db 100644
--- a/metadata/glsa/glsa-200903-15.xml
+++ b/metadata/glsa/glsa-200903-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">git</product>
   <announced>2009-03-09</announced>
-  <revised>2009-03-09: 01</revised>
+  <revised count="01">2009-03-09</revised>
   <bug>251343</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-16.xml b/metadata/glsa/glsa-200903-16.xml
index d60c33d817bd..b6927e10f732 100644
--- a/metadata/glsa/glsa-200903-16.xml
+++ b/metadata/glsa/glsa-200903-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">epiphany</product>
   <announced>2009-03-09</announced>
-  <revised>2009-03-09: 01</revised>
+  <revised count="01">2009-03-09</revised>
   <bug>257000</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-17.xml b/metadata/glsa/glsa-200903-17.xml
index 16a98cf78c09..94568ee7686c 100644
--- a/metadata/glsa/glsa-200903-17.xml
+++ b/metadata/glsa/glsa-200903-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">vnc</product>
   <announced>2009-03-09</announced>
-  <revised>2009-03-09: 01</revised>
+  <revised count="01">2009-03-09</revised>
   <bug>255225</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-18.xml b/metadata/glsa/glsa-200903-18.xml
index d6da870a7086..4828e60dc151 100644
--- a/metadata/glsa/glsa-200903-18.xml
+++ b/metadata/glsa/glsa-200903-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openswan</product>
   <announced>2009-03-09</announced>
-  <revised>2009-03-09: 01</revised>
+  <revised count="01">2009-03-09</revised>
   <bug>238574</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-19.xml b/metadata/glsa/glsa-200903-19.xml
index db03e10d1df3..ad6e89cfac94 100644
--- a/metadata/glsa/glsa-200903-19.xml
+++ b/metadata/glsa/glsa-200903-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xerces-c</product>
   <announced>2009-03-09</announced>
-  <revised>2009-03-09: 01</revised>
+  <revised count="01">2009-03-09</revised>
   <bug>240496</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-20.xml b/metadata/glsa/glsa-200903-20.xml
index 3888e893ba9a..45c690cc4056 100644
--- a/metadata/glsa/glsa-200903-20.xml
+++ b/metadata/glsa/glsa-200903-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">websvn</product>
   <announced>2009-03-09</announced>
-  <revised>2009-03-09: 01</revised>
+  <revised count="01">2009-03-09</revised>
   <bug>243852</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-21.xml b/metadata/glsa/glsa-200903-21.xml
index 397fbe4daf5a..24ad5f334079 100644
--- a/metadata/glsa/glsa-200903-21.xml
+++ b/metadata/glsa/glsa-200903-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">curl</product>
   <announced>2009-03-09</announced>
-  <revised>2009-03-09: 01</revised>
+  <revised count="01">2009-03-09</revised>
   <bug>260361</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-22.xml b/metadata/glsa/glsa-200903-22.xml
index 0725d5d43506..fc3ea403d36e 100644
--- a/metadata/glsa/glsa-200903-22.xml
+++ b/metadata/glsa/glsa-200903-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ganglia</product>
   <announced>2009-03-10</announced>
-  <revised>2009-03-10: 01</revised>
+  <revised count="01">2009-03-10</revised>
   <bug>255366</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-23.xml b/metadata/glsa/glsa-200903-23.xml
index ffa423422d84..f8b5d333062e 100644
--- a/metadata/glsa/glsa-200903-23.xml
+++ b/metadata/glsa/glsa-200903-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2009-03-10</announced>
-  <revised>2009-05-28: 04</revised>
+  <revised count="04">2009-05-28</revised>
   <bug>239543</bug>
   <bug>251496</bug>
   <bug>260264</bug>
diff --git a/metadata/glsa/glsa-200903-24.xml b/metadata/glsa/glsa-200903-24.xml
index 5fb393984057..85a427b32f55 100644
--- a/metadata/glsa/glsa-200903-24.xml
+++ b/metadata/glsa/glsa-200903-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">shadow</product>
   <announced>2009-03-10</announced>
-  <revised>2009-03-10: 01</revised>
+  <revised count="01">2009-03-10</revised>
   <bug>251320</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-25.xml b/metadata/glsa/glsa-200903-25.xml
index 762ec8f5d185..2e4a12149715 100644
--- a/metadata/glsa/glsa-200903-25.xml
+++ b/metadata/glsa/glsa-200903-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">courier-authlib</product>
   <announced>2009-03-11</announced>
-  <revised>2009-03-11: 01</revised>
+  <revised count="01">2009-03-11</revised>
   <bug>252576</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-26.xml b/metadata/glsa/glsa-200903-26.xml
index b44f175cd236..1486112ddd9d 100644
--- a/metadata/glsa/glsa-200903-26.xml
+++ b/metadata/glsa/glsa-200903-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tmsnc</product>
   <announced>2009-03-12</announced>
-  <revised>2009-03-12: 01</revised>
+  <revised count="01">2009-03-12</revised>
   <bug>229157</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-27.xml b/metadata/glsa/glsa-200903-27.xml
index dfb373e18d57..b9f332c1de2e 100644
--- a/metadata/glsa/glsa-200903-27.xml
+++ b/metadata/glsa/glsa-200903-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">proftpd</product>
   <announced>2009-03-12</announced>
-  <revised>2009-03-12: 01</revised>
+  <revised count="01">2009-03-12</revised>
   <bug>258450</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-28.xml b/metadata/glsa/glsa-200903-28.xml
index 8b34c3c22891..6de7f3aa014d 100644
--- a/metadata/glsa/glsa-200903-28.xml
+++ b/metadata/glsa/glsa-200903-28.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2009-03-15</announced>
-  <revised>2009-03-15: 01</revised>
+  <revised count="01">2009-03-15</revised>
   <bug>244808</bug>
   <bug>255231</bug>
   <bug>259578</bug>
diff --git a/metadata/glsa/glsa-200903-29.xml b/metadata/glsa/glsa-200903-29.xml
index 324b1ef4e113..3119c5e2f7ef 100644
--- a/metadata/glsa/glsa-200903-29.xml
+++ b/metadata/glsa/glsa-200903-29.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bluez-utils bluez-libs</product>
   <announced>2009-03-16</announced>
-  <revised>2009-03-16: 01</revised>
+  <revised count="01">2009-03-16</revised>
   <bug>230591</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-30.xml b/metadata/glsa/glsa-200903-30.xml
index 3ed54ef5f7d0..410dacca8bd1 100644
--- a/metadata/glsa/glsa-200903-30.xml
+++ b/metadata/glsa/glsa-200903-30.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2009-03-16</announced>
-  <revised>2009-03-17: 02</revised>
+  <revised count="02">2009-03-17</revised>
   <bug>247229</bug>
   <bug>261032</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200903-31.xml b/metadata/glsa/glsa-200903-31.xml
index d4f02ac1513c..3d464c328b6c 100644
--- a/metadata/glsa/glsa-200903-31.xml
+++ b/metadata/glsa/glsa-200903-31.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libcdaudio</product>
   <announced>2009-03-17</announced>
-  <revised>2009-03-17: 01</revised>
+  <revised count="01">2009-03-17</revised>
   <bug>245649</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-32.xml b/metadata/glsa/glsa-200903-32.xml
index cf33c151f8ac..42b2dd7c4495 100644
--- a/metadata/glsa/glsa-200903-32.xml
+++ b/metadata/glsa/glsa-200903-32.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpmyadmin</product>
   <announced>2009-03-18</announced>
-  <revised>2009-03-18: 01</revised>
+  <revised count="01">2009-03-18</revised>
   <bug>237781</bug>
   <bug>244914</bug>
   <bug>246831</bug>
diff --git a/metadata/glsa/glsa-200903-33.xml b/metadata/glsa/glsa-200903-33.xml
index 018dafe8bbbe..1cd631e0ccc2 100644
--- a/metadata/glsa/glsa-200903-33.xml
+++ b/metadata/glsa/glsa-200903-33.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ffmpeg gst-plugins-ffmpeg mplayer</product>
   <announced>2009-03-19</announced>
-  <revised>2009-03-19: 01</revised>
+  <revised count="01">2009-03-19</revised>
   <bug>231831</bug>
   <bug>231834</bug>
   <bug>245313</bug>
diff --git a/metadata/glsa/glsa-200903-34.xml b/metadata/glsa/glsa-200903-34.xml
index f25adcdf37f3..206f4beb9280 100644
--- a/metadata/glsa/glsa-200903-34.xml
+++ b/metadata/glsa/glsa-200903-34.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">amarok</product>
   <announced>2009-03-20</announced>
-  <revised>2009-03-20: 01</revised>
+  <revised count="01">2009-03-20</revised>
   <bug>254896</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-35.xml b/metadata/glsa/glsa-200903-35.xml
index 205b21b10b28..8cd7698b732e 100644
--- a/metadata/glsa/glsa-200903-35.xml
+++ b/metadata/glsa/glsa-200903-35.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">muttprint</product>
   <announced>2009-03-23</announced>
-  <revised>2009-03-23: 01</revised>
+  <revised count="01">2009-03-23</revised>
   <bug>250554</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-36.xml b/metadata/glsa/glsa-200903-36.xml
index c00cde52c4be..6c9722eee847 100644
--- a/metadata/glsa/glsa-200903-36.xml
+++ b/metadata/glsa/glsa-200903-36.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mldonkey</product>
   <announced>2009-03-23</announced>
-  <revised>2009-03-23: 01</revised>
+  <revised count="01">2009-03-23</revised>
   <bug>260072</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-37.xml b/metadata/glsa/glsa-200903-37.xml
index aed5a11abdac..b90cecc2f600 100644
--- a/metadata/glsa/glsa-200903-37.xml
+++ b/metadata/glsa/glsa-200903-37.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ghostscript-gpl ghostscript-esp ghostscript-gnu</product>
   <announced>2009-03-23</announced>
-  <revised>2009-03-23: 01</revised>
+  <revised count="01">2009-03-23</revised>
   <bug>261087</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-38.xml b/metadata/glsa/glsa-200903-38.xml
index 86aa85146ee8..cbd4b4ac0f99 100644
--- a/metadata/glsa/glsa-200903-38.xml
+++ b/metadata/glsa/glsa-200903-38.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Squid</product>
   <announced>2009-03-24</announced>
-  <revised>2009-03-24: 01</revised>
+  <revised count="01">2009-03-24</revised>
   <bug>216319</bug>
   <bug>257585</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200903-39.xml b/metadata/glsa/glsa-200903-39.xml
index a1a5f70fce46..9ccec2a588fc 100644
--- a/metadata/glsa/glsa-200903-39.xml
+++ b/metadata/glsa/glsa-200903-39.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pam_krb5</product>
   <announced>2009-03-25</announced>
-  <revised>2009-03-25: 01</revised>
+  <revised count="01">2009-03-25</revised>
   <bug>257075</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-40.xml b/metadata/glsa/glsa-200903-40.xml
index a19c712dc670..5f8c75c50b8c 100644
--- a/metadata/glsa/glsa-200903-40.xml
+++ b/metadata/glsa/glsa-200903-40.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">analog</product>
   <announced>2009-03-29</announced>
-  <revised>2009-03-29: 01</revised>
+  <revised count="01">2009-03-29</revised>
   <bug>249140</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200903-41.xml b/metadata/glsa/glsa-200903-41.xml
index ce1ac35887b2..054f68d8a8eb 100644
--- a/metadata/glsa/glsa-200903-41.xml
+++ b/metadata/glsa/glsa-200903-41.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gedit</product>
   <announced>2009-03-30</announced>
-  <revised>2009-03-30: 01</revised>
+  <revised count="01">2009-03-30</revised>
   <bug>257004</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-01.xml b/metadata/glsa/glsa-200904-01.xml
index cfc315312510..707d657c141d 100644
--- a/metadata/glsa/glsa-200904-01.xml
+++ b/metadata/glsa/glsa-200904-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openfire</product>
   <announced>2009-04-02</announced>
-  <revised>2009-04-02: 01</revised>
+  <revised count="01">2009-04-02</revised>
   <bug>246008</bug>
   <bug>254309</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200904-02.xml b/metadata/glsa/glsa-200904-02.xml
index cb414af705dc..4c436ba51cda 100644
--- a/metadata/glsa/glsa-200904-02.xml
+++ b/metadata/glsa/glsa-200904-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">glib</product>
   <announced>2009-04-03</announced>
-  <revised>2009-04-05: 02</revised>
+  <revised count="02">2009-04-05</revised>
   <bug>249214</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-03.xml b/metadata/glsa/glsa-200904-03.xml
index 7547f6b6023a..8cc6a2e33e45 100644
--- a/metadata/glsa/glsa-200904-03.xml
+++ b/metadata/glsa/glsa-200904-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gnumeric</product>
   <announced>2009-04-03</announced>
-  <revised>2009-04-03: 01</revised>
+  <revised count="01">2009-04-03</revised>
   <bug>257012</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-04.xml b/metadata/glsa/glsa-200904-04.xml
index 9ba68ebb02ad..6c52deb11a50 100644
--- a/metadata/glsa/glsa-200904-04.xml
+++ b/metadata/glsa/glsa-200904-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">weechat</product>
   <announced>2009-04-04</announced>
-  <revised>2009-04-04: 01</revised>
+  <revised count="01">2009-04-04</revised>
   <bug>262997</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-05.xml b/metadata/glsa/glsa-200904-05.xml
index 55ea929df8c8..309667769794 100644
--- a/metadata/glsa/glsa-200904-05.xml
+++ b/metadata/glsa/glsa-200904-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ntp</product>
   <announced>2009-04-05</announced>
-  <revised>2009-04-05: 01</revised>
+  <revised count="01">2009-04-05</revised>
   <bug>254098</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-06.xml b/metadata/glsa/glsa-200904-06.xml
index 3311bd7e87c9..1de01cbb364d 100644
--- a/metadata/glsa/glsa-200904-06.xml
+++ b/metadata/glsa/glsa-200904-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">eog</product>
   <announced>2009-04-06</announced>
-  <revised>2009-04-06: 01</revised>
+  <revised count="01">2009-04-06</revised>
   <bug>257002</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-07.xml b/metadata/glsa/glsa-200904-07.xml
index 89888c2fafb6..25a8bd462acd 100644
--- a/metadata/glsa/glsa-200904-07.xml
+++ b/metadata/glsa/glsa-200904-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xpdf</product>
   <announced>2009-04-07</announced>
-  <revised>2009-04-07: 01</revised>
+  <revised count="01">2009-04-07</revised>
   <bug>242930</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-08.xml b/metadata/glsa/glsa-200904-08.xml
index 3c23853d69b0..f3139bf89b68 100644
--- a/metadata/glsa/glsa-200904-08.xml
+++ b/metadata/glsa/glsa-200904-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2009-04-07</announced>
-  <revised>2009-04-07: 01</revised>
+  <revised count="01">2009-04-07</revised>
   <bug>263751</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-09.xml b/metadata/glsa/glsa-200904-09.xml
index 60d2fcb2b2f1..2561ac28b618 100644
--- a/metadata/glsa/glsa-200904-09.xml
+++ b/metadata/glsa/glsa-200904-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2009-04-08</announced>
-  <revised>2009-04-08: 01</revised>
+  <revised count="01">2009-04-08</revised>
   <bug>262736</bug>
   <bug>263398</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200904-10.xml b/metadata/glsa/glsa-200904-10.xml
index bd0c7fc6a516..193c67427b65 100644
--- a/metadata/glsa/glsa-200904-10.xml
+++ b/metadata/glsa/glsa-200904-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">avahi</product>
   <announced>2009-04-08</announced>
-  <revised>2009-04-08: 01</revised>
+  <revised count="01">2009-04-08</revised>
   <bug>260971</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-11.xml b/metadata/glsa/glsa-200904-11.xml
index 7deb969834fc..4e63c3595cd9 100644
--- a/metadata/glsa/glsa-200904-11.xml
+++ b/metadata/glsa/glsa-200904-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tor</product>
   <announced>2009-04-08</announced>
-  <revised>2009-04-08: 01</revised>
+  <revised count="01">2009-04-08</revised>
   <bug>250018</bug>
   <bug>256078</bug>
   <bug>258833</bug>
diff --git a/metadata/glsa/glsa-200904-12.xml b/metadata/glsa/glsa-200904-12.xml
index 03d6ecff0c5c..85d58955ac47 100644
--- a/metadata/glsa/glsa-200904-12.xml
+++ b/metadata/glsa/glsa-200904-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wicd</product>
   <announced>2009-04-10</announced>
-  <revised>2009-04-10: 01</revised>
+  <revised count="01">2009-04-10</revised>
   <bug>258596</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-13.xml b/metadata/glsa/glsa-200904-13.xml
index 3d7f7bc0d700..9764bf941537 100644
--- a/metadata/glsa/glsa-200904-13.xml
+++ b/metadata/glsa/glsa-200904-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ventrilo-server-bin</product>
   <announced>2009-04-14</announced>
-  <revised>2009-04-14: 01</revised>
+  <revised count="01">2009-04-14</revised>
   <bug>234819</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-14.xml b/metadata/glsa/glsa-200904-14.xml
index c5560851b4cd..f892497a7dca 100644
--- a/metadata/glsa/glsa-200904-14.xml
+++ b/metadata/glsa/glsa-200904-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">f-prot</product>
   <announced>2009-04-14</announced>
-  <revised>2009-04-17: 04</revised>
+  <revised count="04">2009-04-17</revised>
   <bug>232665</bug>
   <bug>253497</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200904-15.xml b/metadata/glsa/glsa-200904-15.xml
index 701079e5a498..a596516b9c86 100644
--- a/metadata/glsa/glsa-200904-15.xml
+++ b/metadata/glsa/glsa-200904-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mpg123</product>
   <announced>2009-04-16</announced>
-  <revised>2009-04-16: 01</revised>
+  <revised count="01">2009-04-16</revised>
   <bug>265342</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-16.xml b/metadata/glsa/glsa-200904-16.xml
index 1ac6e366d992..271fbdbc74cb 100644
--- a/metadata/glsa/glsa-200904-16.xml
+++ b/metadata/glsa/glsa-200904-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libsndfile</product>
   <announced>2009-04-17</announced>
-  <revised>2009-04-17: 01</revised>
+  <revised count="01">2009-04-17</revised>
   <bug>261173</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-17.xml b/metadata/glsa/glsa-200904-17.xml
index 8d429ffbda9d..10bf37865ade 100644
--- a/metadata/glsa/glsa-200904-17.xml
+++ b/metadata/glsa/glsa-200904-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2009-04-18</announced>
-  <revised>2009-04-18: 01</revised>
+  <revised count="01">2009-04-18</revised>
   <bug>259992</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-18.xml b/metadata/glsa/glsa-200904-18.xml
index 425e3e56fdbd..5b506cd40efa 100644
--- a/metadata/glsa/glsa-200904-18.xml
+++ b/metadata/glsa/glsa-200904-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">udev</product>
   <announced>2009-04-18</announced>
-  <revised>2009-04-18: 01</revised>
+  <revised count="01">2009-04-18</revised>
   <bug>266290</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200904-19.xml b/metadata/glsa/glsa-200904-19.xml
index f04c018fcf69..b051e724a9a6 100644
--- a/metadata/glsa/glsa-200904-19.xml
+++ b/metadata/glsa/glsa-200904-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">littlecms</product>
   <announced>2009-04-19</announced>
-  <revised>2009-04-19: 01</revised>
+  <revised count="01">2009-04-19</revised>
   <bug>260269</bug>
   <bug>264604</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200904-20.xml b/metadata/glsa/glsa-200904-20.xml
index 2d1f9bf55e29..ab15eacdae14 100644
--- a/metadata/glsa/glsa-200904-20.xml
+++ b/metadata/glsa/glsa-200904-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cups</product>
   <announced>2009-04-23</announced>
-  <revised>2009-04-23: 01</revised>
+  <revised count="01">2009-04-23</revised>
   <bug>263070</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200905-01.xml b/metadata/glsa/glsa-200905-01.xml
index 134e6b0c7ee9..99f7b8099d91 100644
--- a/metadata/glsa/glsa-200905-01.xml
+++ b/metadata/glsa/glsa-200905-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2009-05-02</announced>
-  <revised>2009-05-02: 01</revised>
+  <revised count="01">2009-05-02</revised>
   <bug>218966</bug>
   <bug>224835</bug>
   <bug>232696</bug>
diff --git a/metadata/glsa/glsa-200905-02.xml b/metadata/glsa/glsa-200905-02.xml
index 01f8f9d1123a..08753e4d1a99 100644
--- a/metadata/glsa/glsa-200905-02.xml
+++ b/metadata/glsa/glsa-200905-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cscope</product>
   <announced>2009-05-24</announced>
-  <revised>2009-05-24: 01</revised>
+  <revised count="01">2009-05-24</revised>
   <bug>263023</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200905-03.xml b/metadata/glsa/glsa-200905-03.xml
index 437a926929e1..75e027433cf4 100644
--- a/metadata/glsa/glsa-200905-03.xml
+++ b/metadata/glsa/glsa-200905-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ipsec-tools</product>
   <announced>2009-05-24</announced>
-  <revised>2009-05-24: 01</revised>
+  <revised count="01">2009-05-24</revised>
   <bug>267135</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200905-04.xml b/metadata/glsa/glsa-200905-04.xml
index 9b9ea3f3bdaf..b09ffd549df6 100644
--- a/metadata/glsa/glsa-200905-04.xml
+++ b/metadata/glsa/glsa-200905-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gnutls</product>
   <announced>2009-05-24</announced>
-  <revised>2009-05-24: 01</revised>
+  <revised count="01">2009-05-24</revised>
   <bug>267774</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200905-05.xml b/metadata/glsa/glsa-200905-05.xml
index e3bdf259b2fe..d768e100c1fb 100644
--- a/metadata/glsa/glsa-200905-05.xml
+++ b/metadata/glsa/glsa-200905-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">freetype</product>
   <announced>2009-05-24</announced>
-  <revised>2009-05-25: 02</revised>
+  <revised count="02">2009-05-25</revised>
   <bug>263032</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200905-06.xml b/metadata/glsa/glsa-200905-06.xml
index d04167771820..f0daa27a2704 100644
--- a/metadata/glsa/glsa-200905-06.xml
+++ b/metadata/glsa/glsa-200905-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">acpid</product>
   <announced>2009-05-24</announced>
-  <revised>2009-05-24: 01</revised>
+  <revised count="01">2009-05-24</revised>
   <bug>268079</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200905-07.xml b/metadata/glsa/glsa-200905-07.xml
index 277c4874facf..60c03b904896 100644
--- a/metadata/glsa/glsa-200905-07.xml
+++ b/metadata/glsa/glsa-200905-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pidgin</product>
   <announced>2009-05-25</announced>
-  <revised>2009-05-25: 01</revised>
+  <revised count="01">2009-05-25</revised>
   <bug>270811</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200905-08.xml b/metadata/glsa/glsa-200905-08.xml
index a77c8ffeb91e..fbf716ccd539 100644
--- a/metadata/glsa/glsa-200905-08.xml
+++ b/metadata/glsa/glsa-200905-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ntp</product>
   <announced>2009-05-26</announced>
-  <revised>2009-05-26: 01</revised>
+  <revised count="01">2009-05-26</revised>
   <bug>263033</bug>
   <bug>268962</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200905-09.xml b/metadata/glsa/glsa-200905-09.xml
index f6de8fe576d9..d93563174531 100644
--- a/metadata/glsa/glsa-200905-09.xml
+++ b/metadata/glsa/glsa-200905-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libsndfile</product>
   <announced>2009-05-27</announced>
-  <revised>2009-05-27: 01</revised>
+  <revised count="01">2009-05-27</revised>
   <bug>269863</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200906-01.xml b/metadata/glsa/glsa-200906-01.xml
index 958e49f63807..c033355927d9 100644
--- a/metadata/glsa/glsa-200906-01.xml
+++ b/metadata/glsa/glsa-200906-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2009-06-27</announced>
-  <revised>2009-06-27: 01</revised>
+  <revised count="01">2009-06-27</revised>
   <bug>272970</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200906-02.xml b/metadata/glsa/glsa-200906-02.xml
index 48f43d309d34..9a9e750e1aa2 100644
--- a/metadata/glsa/glsa-200906-02.xml
+++ b/metadata/glsa/glsa-200906-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ruby</product>
   <announced>2009-06-28</announced>
-  <revised>2009-06-28: 01</revised>
+  <revised count="01">2009-06-28</revised>
   <bug>273213</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200906-03.xml b/metadata/glsa/glsa-200906-03.xml
index 499bd8e4a2a9..e7a151a98018 100644
--- a/metadata/glsa/glsa-200906-03.xml
+++ b/metadata/glsa/glsa-200906-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpmyadmin</product>
   <announced>2009-06-29</announced>
-  <revised>2009-06-29: 01</revised>
+  <revised count="01">2009-06-29</revised>
   <bug>263711</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200906-04.xml b/metadata/glsa/glsa-200906-04.xml
index 72b5654ec4c6..8597aa633fbf 100644
--- a/metadata/glsa/glsa-200906-04.xml
+++ b/metadata/glsa/glsa-200906-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mod_jk</product>
   <announced>2009-06-29</announced>
-  <revised>2009-06-29: 01</revised>
+  <revised count="01">2009-06-29</revised>
   <bug>265455</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200906-05.xml b/metadata/glsa/glsa-200906-05.xml
index 45c506d44da2..c2ea511bb932 100644
--- a/metadata/glsa/glsa-200906-05.xml
+++ b/metadata/glsa/glsa-200906-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2009-06-30</announced>
-  <revised>2009-06-30: 02</revised>
+  <revised count="02">2009-06-30</revised>
   <bug>242996</bug>
   <bug>248425</bug>
   <bug>258013</bug>
diff --git a/metadata/glsa/glsa-200907-01.xml b/metadata/glsa/glsa-200907-01.xml
index c733fea98ddd..44fde5df3d9c 100644
--- a/metadata/glsa/glsa-200907-01.xml
+++ b/metadata/glsa/glsa-200907-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libwmf</product>
   <announced>2009-07-02</announced>
-  <revised>2009-07-02: 01</revised>
+  <revised count="01">2009-07-02</revised>
   <bug>268161</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200907-02.xml b/metadata/glsa/glsa-200907-02.xml
index 7dace426b1f6..d9211d2c82bc 100644
--- a/metadata/glsa/glsa-200907-02.xml
+++ b/metadata/glsa/glsa-200907-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mod_security</product>
   <announced>2009-07-02</announced>
-  <revised>2009-07-02: 01</revised>
+  <revised count="01">2009-07-02</revised>
   <bug>262302</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200907-03.xml b/metadata/glsa/glsa-200907-03.xml
index 1ae10b0453b9..f1b91acb9e73 100644
--- a/metadata/glsa/glsa-200907-03.xml
+++ b/metadata/glsa/glsa-200907-03.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">apr-util</product>
   <announced>2009-07-04</announced>
-  <revised>2009-07-04: 01</revised>
+  <revised count="01">2009-07-04</revised>
   <bug>268643</bug>
   <bug>272260</bug>
   <bug>274193</bug>
diff --git a/metadata/glsa/glsa-200907-04.xml b/metadata/glsa/glsa-200907-04.xml
index 213a43423310..0dc903f4a477 100644
--- a/metadata/glsa/glsa-200907-04.xml
+++ b/metadata/glsa/glsa-200907-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">apache</product>
   <announced>2009-07-12</announced>
-  <revised>2009-07-12: 01</revised>
+  <revised count="01">2009-07-12</revised>
   <bug>268154</bug>
   <bug>271470</bug>
   <bug>276426</bug>
diff --git a/metadata/glsa/glsa-200907-05.xml b/metadata/glsa/glsa-200907-05.xml
index f7527c3eed16..265b7af3e63c 100644
--- a/metadata/glsa/glsa-200907-05.xml
+++ b/metadata/glsa/glsa-200907-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">git</product>
   <announced>2009-07-12</announced>
-  <revised>2009-07-12: 01</revised>
+  <revised count="01">2009-07-12</revised>
   <bug>273905</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200907-06.xml b/metadata/glsa/glsa-200907-06.xml
index d4f7639001c1..b6152304eda3 100644
--- a/metadata/glsa/glsa-200907-06.xml
+++ b/metadata/glsa/glsa-200907-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2009-07-12</announced>
-  <revised>2009-07-12: 01</revised>
+  <revised count="01">2009-07-12</revised>
   <bug>267846</bug>
   <bug>273908</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200907-07.xml b/metadata/glsa/glsa-200907-07.xml
index 333fa0093707..da66bbc8e065 100644
--- a/metadata/glsa/glsa-200907-07.xml
+++ b/metadata/glsa/glsa-200907-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libmodplug gst-plugins-bad</product>
   <announced>2009-07-12</announced>
-  <revised>2009-07-12: 01</revised>
+  <revised count="01">2009-07-12</revised>
   <bug>266913</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200907-08.xml b/metadata/glsa/glsa-200907-08.xml
index b1bcbffb965e..0bbc66b42ed7 100644
--- a/metadata/glsa/glsa-200907-08.xml
+++ b/metadata/glsa/glsa-200907-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rt2400 rt2500 rt2570 rt61 ralink-rt61</product>
   <announced>2009-07-12</announced>
-  <revised>2009-07-12: 01</revised>
+  <revised count="01">2009-07-12</revised>
   <bug>257023</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200907-09.xml b/metadata/glsa/glsa-200907-09.xml
index 993ed6df0c9e..1029dd171114 100644
--- a/metadata/glsa/glsa-200907-09.xml
+++ b/metadata/glsa/glsa-200907-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cyrus-sasl</product>
   <announced>2009-07-12</announced>
-  <revised>2009-07-12: 01</revised>
+  <revised count="01">2009-07-12</revised>
   <bug>270261</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200907-10.xml b/metadata/glsa/glsa-200907-10.xml
index 4d5d3aec7c3e..c34df33ef351 100644
--- a/metadata/glsa/glsa-200907-10.xml
+++ b/metadata/glsa/glsa-200907-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">syslog-ng</product>
   <announced>2009-07-12</announced>
-  <revised>2009-07-12: 01</revised>
+  <revised count="01">2009-07-12</revised>
   <bug>247278</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200907-11.xml b/metadata/glsa/glsa-200907-11.xml
index 0e34d45af153..8ace1b89d832 100644
--- a/metadata/glsa/glsa-200907-11.xml
+++ b/metadata/glsa/glsa-200907-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gst-plugins-good gst-plugins-base gst-plugins-libpng</product>
   <announced>2009-07-12</announced>
-  <revised>2009-07-12: 01</revised>
+  <revised count="01">2009-07-12</revised>
   <bug>256096</bug>
   <bug>261594</bug>
   <bug>272972</bug>
diff --git a/metadata/glsa/glsa-200907-12.xml b/metadata/glsa/glsa-200907-12.xml
index 24d66982602e..5eedb548c693 100644
--- a/metadata/glsa/glsa-200907-12.xml
+++ b/metadata/glsa/glsa-200907-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dhcp</product>
   <announced>2009-07-14</announced>
-  <revised>2009-07-14: 01</revised>
+  <revised count="01">2009-07-14</revised>
   <bug>277729</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200907-13.xml b/metadata/glsa/glsa-200907-13.xml
index 23d60513f7c8..ae781938229d 100644
--- a/metadata/glsa/glsa-200907-13.xml
+++ b/metadata/glsa/glsa-200907-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pulseaudio</product>
   <announced>2009-07-16</announced>
-  <revised>2009-07-16: 01</revised>
+  <revised count="01">2009-07-16</revised>
   <bug>276986</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200907-14.xml b/metadata/glsa/glsa-200907-14.xml
index 281fe2140e09..d9eb29017962 100644
--- a/metadata/glsa/glsa-200907-14.xml
+++ b/metadata/glsa/glsa-200907-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rb_libtorrent deluge</product>
   <announced>2009-07-17</announced>
-  <revised>2009-07-17: 01</revised>
+  <revised count="01">2009-07-17</revised>
   <bug>273156</bug>
   <bug>273961</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200907-15.xml b/metadata/glsa/glsa-200907-15.xml
index 9e3ef75bc201..096d96030c77 100644
--- a/metadata/glsa/glsa-200907-15.xml
+++ b/metadata/glsa/glsa-200907-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nagios-core</product>
   <announced>2009-07-19</announced>
-  <revised>2009-07-19: 01</revised>
+  <revised count="01">2009-07-19</revised>
   <bug>245887</bug>
   <bug>249876</bug>
   <bug>275288</bug>
diff --git a/metadata/glsa/glsa-200907-16.xml b/metadata/glsa/glsa-200907-16.xml
index 0727d8059253..5bb26beb0767 100644
--- a/metadata/glsa/glsa-200907-16.xml
+++ b/metadata/glsa/glsa-200907-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">python</product>
   <announced>2009-07-19</announced>
-  <revised>2009-07-19: 01</revised>
+  <revised count="01">2009-07-19</revised>
   <bug>246991</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200908-01.xml b/metadata/glsa/glsa-200908-01.xml
index 217074c3469b..9e2d24bdfd9a 100644
--- a/metadata/glsa/glsa-200908-01.xml
+++ b/metadata/glsa/glsa-200908-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">opensc</product>
   <announced>2009-08-01</announced>
-  <revised>2009-08-01: 01</revised>
+  <revised count="01">2009-08-01</revised>
   <bug>260514</bug>
   <bug>269920</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-200908-02.xml b/metadata/glsa/glsa-200908-02.xml
index 20686adbb371..71c2cc9cba59 100644
--- a/metadata/glsa/glsa-200908-02.xml
+++ b/metadata/glsa/glsa-200908-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bind</product>
   <announced>2009-08-01</announced>
-  <revised>2009-08-01: 01</revised>
+  <revised count="01">2009-08-01</revised>
   <bug>279508</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200908-03.xml b/metadata/glsa/glsa-200908-03.xml
index 444ec3c9bd4c..d87f71d7be5a 100644
--- a/metadata/glsa/glsa-200908-03.xml
+++ b/metadata/glsa/glsa-200908-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tiff</product>
   <announced>2009-08-07</announced>
-  <revised>2009-08-07: 01</revised>
+  <revised count="01">2009-08-07</revised>
   <bug>276339</bug>
   <bug>276988</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200908-04.xml b/metadata/glsa/glsa-200908-04.xml
index f067525e6bb1..df1c253259a4 100644
--- a/metadata/glsa/glsa-200908-04.xml
+++ b/metadata/glsa/glsa-200908-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash acroread</product>
   <announced>2009-08-07</announced>
-  <revised>2009-08-07: 01</revised>
+  <revised count="01">2009-08-07</revised>
   <bug>278813</bug>
   <bug>278819</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200908-05.xml b/metadata/glsa/glsa-200908-05.xml
index 3bf8561ef7e3..2ca005d9004a 100644
--- a/metadata/glsa/glsa-200908-05.xml
+++ b/metadata/glsa/glsa-200908-05.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">subversion</product>
   <announced>2009-08-18</announced>
-  <revised>2009-08-18: 01</revised>
+  <revised count="01">2009-08-18</revised>
   <bug>280494</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200908-06.xml b/metadata/glsa/glsa-200908-06.xml
index 2e67779a12f6..03bfa120b8e1 100644
--- a/metadata/glsa/glsa-200908-06.xml
+++ b/metadata/glsa/glsa-200908-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cdf</product>
   <announced>2009-08-18</announced>
-  <revised>2009-08-18: 01</revised>
+  <revised count="01">2009-08-18</revised>
   <bug>278679</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200908-07.xml b/metadata/glsa/glsa-200908-07.xml
index ed6fc59c7cc6..d6fea11da9bc 100644
--- a/metadata/glsa/glsa-200908-07.xml
+++ b/metadata/glsa/glsa-200908-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Compress-Raw-Zlib Compress-Raw-Bzip2</product>
   <announced>2009-08-18</announced>
-  <revised>2009-08-18: 01</revised>
+  <revised count="01">2009-08-18</revised>
   <bug>273141</bug>
   <bug>281955</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200908-08.xml b/metadata/glsa/glsa-200908-08.xml
index b3e7480805b3..0ccedf026c92 100644
--- a/metadata/glsa/glsa-200908-08.xml
+++ b/metadata/glsa/glsa-200908-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dhcp</product>
   <announced>2009-08-18</announced>
-  <revised>2009-08-18: 01</revised>
+  <revised count="01">2009-08-18</revised>
   <bug>275231</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200908-09.xml b/metadata/glsa/glsa-200908-09.xml
index a6bda4917f85..b53f86497ec8 100644
--- a/metadata/glsa/glsa-200908-09.xml
+++ b/metadata/glsa/glsa-200908-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dokuwiki</product>
   <announced>2009-08-18</announced>
-  <revised>2009-08-19: 02</revised>
+  <revised count="02">2009-08-19</revised>
   <bug>272431</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200908-10.xml b/metadata/glsa/glsa-200908-10.xml
index e320764442cf..d90550cc01ae 100644
--- a/metadata/glsa/glsa-200908-10.xml
+++ b/metadata/glsa/glsa-200908-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dillo</product>
   <announced>2009-08-18</announced>
-  <revised>2009-08-18: 01</revised>
+  <revised count="01">2009-08-18</revised>
   <bug>276432</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-01.xml b/metadata/glsa/glsa-200909-01.xml
index a485acf3a69d..10d40cce0007 100644
--- a/metadata/glsa/glsa-200909-01.xml
+++ b/metadata/glsa/glsa-200909-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pam</product>
   <announced>2009-09-07</announced>
-  <revised>2009-09-07: 01</revised>
+  <revised count="01">2009-09-07</revised>
   <bug>261512</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-02.xml b/metadata/glsa/glsa-200909-02.xml
index a5a869ef9b52..4981326f16fc 100644
--- a/metadata/glsa/glsa-200909-02.xml
+++ b/metadata/glsa/glsa-200909-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libvorbis</product>
   <announced>2009-09-07</announced>
-  <revised>2009-09-07: 01</revised>
+  <revised count="01">2009-09-07</revised>
   <bug>280590</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-03.xml b/metadata/glsa/glsa-200909-03.xml
index ac569d016a5d..c69f31395917 100644
--- a/metadata/glsa/glsa-200909-03.xml
+++ b/metadata/glsa/glsa-200909-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">apr apr-util</product>
   <announced>2009-09-09</announced>
-  <revised>2009-09-09: 01</revised>
+  <revised count="01">2009-09-09</revised>
   <bug>280514</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-04.xml b/metadata/glsa/glsa-200909-04.xml
index 81f990aabc5f..0961acb94636 100644
--- a/metadata/glsa/glsa-200909-04.xml
+++ b/metadata/glsa/glsa-200909-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2009-09-09</announced>
-  <revised>2009-09-09: 01</revised>
+  <revised count="01">2009-09-09</revised>
   <bug>264834</bug>
   <bug>265545</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200909-05.xml b/metadata/glsa/glsa-200909-05.xml
index 56062c2b33b7..40704e5ada01 100644
--- a/metadata/glsa/glsa-200909-05.xml
+++ b/metadata/glsa/glsa-200909-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openswan</product>
   <announced>2009-09-09</announced>
-  <revised>2009-09-09: 01</revised>
+  <revised count="01">2009-09-09</revised>
   <bug>264346</bug>
   <bug>275233</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200909-06.xml b/metadata/glsa/glsa-200909-06.xml
index 5e76876e4c07..b2147e3be086 100644
--- a/metadata/glsa/glsa-200909-06.xml
+++ b/metadata/glsa/glsa-200909-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">amule</product>
   <announced>2009-09-09</announced>
-  <revised>2009-09-09: 01</revised>
+  <revised count="01">2009-09-09</revised>
   <bug>268163</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-07.xml b/metadata/glsa/glsa-200909-07.xml
index db0ada08a397..095d8a10c5eb 100644
--- a/metadata/glsa/glsa-200909-07.xml
+++ b/metadata/glsa/glsa-200909-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tkman</product>
   <announced>2009-09-09</announced>
-  <revised>2009-09-09: 01</revised>
+  <revised count="01">2009-09-09</revised>
   <bug>247540</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-08.xml b/metadata/glsa/glsa-200909-08.xml
index 295ac3652518..269d593386c3 100644
--- a/metadata/glsa/glsa-200909-08.xml
+++ b/metadata/glsa/glsa-200909-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cmus</product>
   <announced>2009-09-09</announced>
-  <revised>2009-09-09: 01</revised>
+  <revised count="01">2009-09-09</revised>
   <bug>250474</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-09.xml b/metadata/glsa/glsa-200909-09.xml
index 13b658e5b5a2..929503bca685 100644
--- a/metadata/glsa/glsa-200909-09.xml
+++ b/metadata/glsa/glsa-200909-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">screenie</product>
   <announced>2009-09-09</announced>
-  <revised>2009-09-09: 01</revised>
+  <revised count="01">2009-09-09</revised>
   <bug>250476</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-10.xml b/metadata/glsa/glsa-200909-10.xml
index 66b1b1ea0346..d3594abb8468 100644
--- a/metadata/glsa/glsa-200909-10.xml
+++ b/metadata/glsa/glsa-200909-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lmbench</product>
   <announced>2009-09-09</announced>
-  <revised>2009-09-09: 01</revised>
+  <revised count="01">2009-09-09</revised>
   <bug>246015</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-11.xml b/metadata/glsa/glsa-200909-11.xml
index deeae3222102..e6e285d27cc1 100644
--- a/metadata/glsa/glsa-200909-11.xml
+++ b/metadata/glsa/glsa-200909-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gccxml</product>
   <announced>2009-09-09</announced>
-  <revised>2009-09-09: 01</revised>
+  <revised count="01">2009-09-09</revised>
   <bug>245765</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-12.xml b/metadata/glsa/glsa-200909-12.xml
index 58937d7c84f0..7198c7d30bd0 100644
--- a/metadata/glsa/glsa-200909-12.xml
+++ b/metadata/glsa/glsa-200909-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">htmldoc</product>
   <announced>2009-09-12</announced>
-  <revised>2009-09-12: 01</revised>
+  <revised count="01">2009-09-12</revised>
   <bug>278186</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-13.xml b/metadata/glsa/glsa-200909-13.xml
index acbdc8ee3a56..b4b2c7ac5180 100644
--- a/metadata/glsa/glsa-200909-13.xml
+++ b/metadata/glsa/glsa-200909-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">irssi</product>
   <announced>2009-09-12</announced>
-  <revised>2009-09-12: 01</revised>
+  <revised count="01">2009-09-12</revised>
   <bug>271875</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-14.xml b/metadata/glsa/glsa-200909-14.xml
index 7422ce6b886c..22a7c6e1181c 100644
--- a/metadata/glsa/glsa-200909-14.xml
+++ b/metadata/glsa/glsa-200909-14.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">horde horde-imp horde-passwd</product>
   <announced>2009-09-12</announced>
-  <revised>2009-09-12: 01</revised>
+  <revised count="01">2009-09-12</revised>
   <bug>256125</bug>
   <bug>262976</bug>
   <bug>262978</bug>
diff --git a/metadata/glsa/glsa-200909-15.xml b/metadata/glsa/glsa-200909-15.xml
index 4198eaac5ab2..8b93c5eb41cb 100644
--- a/metadata/glsa/glsa-200909-15.xml
+++ b/metadata/glsa/glsa-200909-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lynx</product>
   <announced>2009-09-12</announced>
-  <revised>2009-09-12: 01</revised>
+  <revised count="01">2009-09-12</revised>
   <bug>243058</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-16.xml b/metadata/glsa/glsa-200909-16.xml
index ceb3d25f0fed..851049fae14b 100644
--- a/metadata/glsa/glsa-200909-16.xml
+++ b/metadata/glsa/glsa-200909-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2009-09-13</announced>
-  <revised>2009-09-13: 01</revised>
+  <revised count="01">2009-09-13</revised>
   <bug>278564</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-17.xml b/metadata/glsa/glsa-200909-17.xml
index 6ccb121957ca..a81251a69eb1 100644
--- a/metadata/glsa/glsa-200909-17.xml
+++ b/metadata/glsa/glsa-200909-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">znc</product>
   <announced>2009-09-13</announced>
-  <revised>2009-09-13: 01</revised>
+  <revised count="01">2009-09-13</revised>
   <bug>278684</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-18.xml b/metadata/glsa/glsa-200909-18.xml
index 5e227c42c665..aa68098240dc 100644
--- a/metadata/glsa/glsa-200909-18.xml
+++ b/metadata/glsa/glsa-200909-18.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">nginx</product>
   <announced>2009-09-18</announced>
-  <revised>2009-09-18: 01</revised>
+  <revised count="01">2009-09-18</revised>
   <bug>285162</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-19.xml b/metadata/glsa/glsa-200909-19.xml
index d9f1d800a99b..726f48f2a9b5 100644
--- a/metadata/glsa/glsa-200909-19.xml
+++ b/metadata/glsa/glsa-200909-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dnsmasq</product>
   <announced>2009-09-20</announced>
-  <revised>2009-09-20: 01</revised>
+  <revised count="01">2009-09-20</revised>
   <bug>282653</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200909-20.xml b/metadata/glsa/glsa-200909-20.xml
index 37e93dae078a..7dfafdb4ecce 100644
--- a/metadata/glsa/glsa-200909-20.xml
+++ b/metadata/glsa/glsa-200909-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">curl</product>
   <announced>2009-09-25</announced>
-  <revised>2009-09-25: 01</revised>
+  <revised count="01">2009-09-25</revised>
   <bug>281515</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200910-01.xml b/metadata/glsa/glsa-200910-01.xml
index 135420ac3511..d4df7bf7a921 100644
--- a/metadata/glsa/glsa-200910-01.xml
+++ b/metadata/glsa/glsa-200910-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wget</product>
   <announced>2009-10-20</announced>
-  <revised>2009-10-20: 01</revised>
+  <revised count="01">2009-10-20</revised>
   <bug>286058</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200910-02.xml b/metadata/glsa/glsa-200910-02.xml
index 88915d997bd7..78f489794397 100644
--- a/metadata/glsa/glsa-200910-02.xml
+++ b/metadata/glsa/glsa-200910-02.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">pidgin</product>
   <announced>2009-10-22</announced>
-  <revised>2009-10-22: 01</revised>
+  <revised count="01">2009-10-22</revised>
   <bug>276000</bug>
   <bug>281545</bug>
   <bug>283324</bug>
diff --git a/metadata/glsa/glsa-200910-03.xml b/metadata/glsa/glsa-200910-03.xml
index f45671ba3774..c54cd5718e5c 100644
--- a/metadata/glsa/glsa-200910-03.xml
+++ b/metadata/glsa/glsa-200910-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2009-10-25</announced>
-  <revised>2009-10-25: 01</revised>
+  <revised count="01">2009-10-25</revised>
   <bug>289016</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200911-01.xml b/metadata/glsa/glsa-200911-01.xml
index cf59ec92fecc..3906bddb1803 100644
--- a/metadata/glsa/glsa-200911-01.xml
+++ b/metadata/glsa/glsa-200911-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">horde horde-webmail horde-groupware</product>
   <announced>2009-11-06</announced>
-  <revised>2009-11-06: 01</revised>
+  <revised count="01">2009-11-06</revised>
   <bug>285052</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200911-02.xml b/metadata/glsa/glsa-200911-02.xml
index fe5bebf16f9a..e89f9700b6e0 100644
--- a/metadata/glsa/glsa-200911-02.xml
+++ b/metadata/glsa/glsa-200911-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sun-jre-bin sun-jdk emul-linux-x86-java blackdown-jre blackdown-jdk</product>
   <announced>2009-11-17</announced>
-  <revised>2009-11-17: 01</revised>
+  <revised count="01">2009-11-17</revised>
   <bug>182824</bug>
   <bug>231337</bug>
   <bug>250012</bug>
diff --git a/metadata/glsa/glsa-200911-03.xml b/metadata/glsa/glsa-200911-03.xml
index 6c58f72d1c92..7bb7298de6c7 100644
--- a/metadata/glsa/glsa-200911-03.xml
+++ b/metadata/glsa/glsa-200911-03.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">c-client uw-imap</product>
   <announced>2009-11-25</announced>
-  <revised>2009-11-25: 01</revised>
+  <revised count="01">2009-11-25</revised>
   <bug>245425</bug>
   <bug>252567</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200911-04.xml b/metadata/glsa/glsa-200911-04.xml
index 755703dfb873..4717c875c46e 100644
--- a/metadata/glsa/glsa-200911-04.xml
+++ b/metadata/glsa/glsa-200911-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dstat</product>
   <announced>2009-11-25</announced>
-  <revised>2009-11-25: 01</revised>
+  <revised count="01">2009-11-25</revised>
   <bug>293497</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-200911-05.xml b/metadata/glsa/glsa-200911-05.xml
index d20a8ebc2838..932e58d9f27e 100644
--- a/metadata/glsa/glsa-200911-05.xml
+++ b/metadata/glsa/glsa-200911-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2009-11-25</announced>
-  <revised>2009-11-25: 01</revised>
+  <revised count="01">2009-11-25</revised>
   <bug>285280</bug>
   <bug>290710</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-200911-06.xml b/metadata/glsa/glsa-200911-06.xml
index 5747d858f686..2f5292317958 100644
--- a/metadata/glsa/glsa-200911-06.xml
+++ b/metadata/glsa/glsa-200911-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">PEAR-Net_Traceroute</product>
   <announced>2009-11-26</announced>
-  <revised>2009-11-26: 01</revised>
+  <revised count="01">2009-11-26</revised>
   <bug>294264</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-200912-01.xml b/metadata/glsa/glsa-200912-01.xml
index 16885de4fcd7..5e572235c10e 100644
--- a/metadata/glsa/glsa-200912-01.xml
+++ b/metadata/glsa/glsa-200912-01.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2009-12-01</announced>
-  <revised>2009-12-02: 02</revised>
+  <revised count="02">2009-12-02</revised>
   <bug>270305</bug>
   <bug>280591</bug>
   <bug>292022</bug>
diff --git a/metadata/glsa/glsa-200912-02.xml b/metadata/glsa/glsa-200912-02.xml
index 32b403671dfe..3dbddc4033f2 100644
--- a/metadata/glsa/glsa-200912-02.xml
+++ b/metadata/glsa/glsa-200912-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">rails</product>
   <announced>2009-12-20</announced>
-  <revised>2009-12-20: 01</revised>
+  <revised count="01">2009-12-20</revised>
   <bug>200159</bug>
   <bug>237385</bug>
   <bug>247549</bug>
diff --git a/metadata/glsa/glsa-201001-01.xml b/metadata/glsa/glsa-201001-01.xml
index aac74f1a69a2..fb7fd3c0c5b1 100644
--- a/metadata/glsa/glsa-201001-01.xml
+++ b/metadata/glsa/glsa-201001-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ntp</product>
   <announced>2010-01-03</announced>
-  <revised>2010-01-03: 01</revised>
+  <revised count="01">2010-01-03</revised>
   <bug>290881</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201001-02.xml b/metadata/glsa/glsa-201001-02.xml
index 0b08c9d7f673..0264448a8d78 100644
--- a/metadata/glsa/glsa-201001-02.xml
+++ b/metadata/glsa/glsa-201001-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2010-01-03</announced>
-  <revised>2010-01-03: 01</revised>
+  <revised count="01">2010-01-03</revised>
   <bug>296407</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201001-03.xml b/metadata/glsa/glsa-201001-03.xml
index 0a759b254dd0..b266d780a29c 100644
--- a/metadata/glsa/glsa-201001-03.xml
+++ b/metadata/glsa/glsa-201001-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2010-01-05</announced>
-  <revised>2010-01-05: 01</revised>
+  <revised count="01">2010-01-05</revised>
   <bug>249875</bug>
   <bug>255121</bug>
   <bug>260576</bug>
diff --git a/metadata/glsa/glsa-201001-04.xml b/metadata/glsa/glsa-201001-04.xml
index a4490786e2e0..aa1f176917b2 100644
--- a/metadata/glsa/glsa-201001-04.xml
+++ b/metadata/glsa/glsa-201001-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">virtualbox-bin virtualbox-ose virtualbox-guest-additions virtualbox-ose-additions</product>
   <announced>2010-01-13</announced>
-  <revised>2010-01-13: 01</revised>
+  <revised count="01">2010-01-13</revised>
   <bug>288836</bug>
   <bug>294678</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201001-05.xml b/metadata/glsa/glsa-201001-05.xml
index df877e365e0a..b21678e76661 100644
--- a/metadata/glsa/glsa-201001-05.xml
+++ b/metadata/glsa/glsa-201001-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">net-snmp</product>
   <announced>2010-01-13</announced>
-  <revised>2010-01-13: 01</revised>
+  <revised count="01">2010-01-13</revised>
   <bug>250429</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201001-06.xml b/metadata/glsa/glsa-201001-06.xml
index 4d4bfaf3fe30..57a31cc9e5e8 100644
--- a/metadata/glsa/glsa-201001-06.xml
+++ b/metadata/glsa/glsa-201001-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">aria2</product>
   <announced>2010-01-13</announced>
-  <revised>2010-01-13: 01</revised>
+  <revised count="01">2010-01-13</revised>
   <bug>288291</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201001-07.xml b/metadata/glsa/glsa-201001-07.xml
index 0ebad3a6d4db..9ba9be6975f1 100644
--- a/metadata/glsa/glsa-201001-07.xml
+++ b/metadata/glsa/glsa-201001-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">blender</product>
   <announced>2010-01-13</announced>
-  <revised>2010-01-13: 01</revised>
+  <revised count="01">2010-01-13</revised>
   <bug>245310</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201001-08.xml b/metadata/glsa/glsa-201001-08.xml
index efaae0d5f987..755296e05f0e 100644
--- a/metadata/glsa/glsa-201001-08.xml
+++ b/metadata/glsa/glsa-201001-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">squirrelmail</product>
   <announced>2010-01-13</announced>
-  <revised>2010-01-13: 01</revised>
+  <revised count="01">2010-01-13</revised>
   <bug>269567</bug>
   <bug>270671</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201001-09.xml b/metadata/glsa/glsa-201001-09.xml
index 8d834f0a88fd..f224ab27dfa8 100644
--- a/metadata/glsa/glsa-201001-09.xml
+++ b/metadata/glsa/glsa-201001-09.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">ruby</product>
   <announced>2010-01-14</announced>
-  <revised>2010-01-14: 01</revised>
+  <revised count="01">2010-01-14</revised>
   <bug>300468</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201003-01.xml b/metadata/glsa/glsa-201003-01.xml
index 8d0c77a43964..8ac9d533a467 100644
--- a/metadata/glsa/glsa-201003-01.xml
+++ b/metadata/glsa/glsa-201003-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sudo</product>
   <announced>2010-03-03</announced>
-  <revised>2010-03-03: 01</revised>
+  <revised count="01">2010-03-03</revised>
   <bug>306865</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201006-01.xml b/metadata/glsa/glsa-201006-01.xml
index 7a5e5eff114a..6860bc5abba2 100644
--- a/metadata/glsa/glsa-201006-01.xml
+++ b/metadata/glsa/glsa-201006-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">freetype</product>
   <announced>2010-06-01</announced>
-  <revised>2010-06-01: 01</revised>
+  <revised count="01">2010-06-01</revised>
   <bug>271234</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201006-02.xml b/metadata/glsa/glsa-201006-02.xml
index b05fcf56eed9..a56744b5cd67 100644
--- a/metadata/glsa/glsa-201006-02.xml
+++ b/metadata/glsa/glsa-201006-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">camlimages</product>
   <announced>2010-06-01</announced>
-  <revised>2010-06-01: 01</revised>
+  <revised count="01">2010-06-01</revised>
   <bug>276235</bug>
   <bug>290222</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201006-03.xml b/metadata/glsa/glsa-201006-03.xml
index 30e2a646974c..65bc4721d7b7 100644
--- a/metadata/glsa/glsa-201006-03.xml
+++ b/metadata/glsa/glsa-201006-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">imagemagick</product>
   <announced>2010-06-01</announced>
-  <revised>2010-06-01: 01</revised>
+  <revised count="01">2010-06-01</revised>
   <bug>271502</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201006-04.xml b/metadata/glsa/glsa-201006-04.xml
index 5b248e6d42c2..4e906c60db98 100644
--- a/metadata/glsa/glsa-201006-04.xml
+++ b/metadata/glsa/glsa-201006-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xine-lib</product>
   <announced>2010-06-01</announced>
-  <revised>2010-06-01: 01</revised>
+  <revised count="01">2010-06-01</revised>
   <bug>234777</bug>
   <bug>249041</bug>
   <bug>260069</bug>
diff --git a/metadata/glsa/glsa-201006-05.xml b/metadata/glsa/glsa-201006-05.xml
index cfad60d30bf9..6abd877389f6 100644
--- a/metadata/glsa/glsa-201006-05.xml
+++ b/metadata/glsa/glsa-201006-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2010-06-01</announced>
-  <revised>2010-06-01: 01</revised>
+  <revised count="01">2010-06-01</revised>
   <bug>297388</bug>
   <bug>318935</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201006-06.xml b/metadata/glsa/glsa-201006-06.xml
index 31bbccc05150..ba1d4a885cce 100644
--- a/metadata/glsa/glsa-201006-06.xml
+++ b/metadata/glsa/glsa-201006-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">transmission</product>
   <announced>2010-06-01</announced>
-  <revised>2010-06-01: 01</revised>
+  <revised count="01">2010-06-01</revised>
   <bug>309831</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201006-07.xml b/metadata/glsa/glsa-201006-07.xml
index 27a9070e8ca8..2d9c9083c744 100644
--- a/metadata/glsa/glsa-201006-07.xml
+++ b/metadata/glsa/glsa-201006-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">silc-toolkit silc-client</product>
   <announced>2010-06-01</announced>
-  <revised>2010-06-01: 01</revised>
+  <revised count="01">2010-06-01</revised>
   <bug>284561</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201006-08.xml b/metadata/glsa/glsa-201006-08.xml
index b4d7ac6a975a..37261cddd38e 100644
--- a/metadata/glsa/glsa-201006-08.xml
+++ b/metadata/glsa/glsa-201006-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">nano</product>
   <announced>2010-06-01</announced>
-  <revised>2010-06-01: 01</revised>
+  <revised count="01">2010-06-01</revised>
   <bug>315355</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201006-09.xml b/metadata/glsa/glsa-201006-09.xml
index c06e4c49e064..67507246b158 100644
--- a/metadata/glsa/glsa-201006-09.xml
+++ b/metadata/glsa/glsa-201006-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sudo</product>
   <announced>2010-06-01</announced>
-  <revised>2010-06-01: 01</revised>
+  <revised count="01">2010-06-01</revised>
   <bug>321697</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201006-10.xml b/metadata/glsa/glsa-201006-10.xml
index cd7d7bc8d575..26e05f79f2b4 100644
--- a/metadata/glsa/glsa-201006-10.xml
+++ b/metadata/glsa/glsa-201006-10.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">multipath-tools</product>
   <announced>2010-06-01</announced>
-  <revised>2010-06-01: 01</revised>
+  <revised count="01">2010-06-01</revised>
   <bug>264564</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201006-11.xml b/metadata/glsa/glsa-201006-11.xml
index 4bcd1d25c4d4..8b5a5621ce69 100644
--- a/metadata/glsa/glsa-201006-11.xml
+++ b/metadata/glsa/glsa-201006-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">BIND</product>
   <announced>2010-06-01</announced>
-  <revised>2010-06-01: 01</revised>
+  <revised count="01">2010-06-01</revised>
   <bug>301548</bug>
   <bug>308035</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201006-12.xml b/metadata/glsa/glsa-201006-12.xml
index 134468dc1115..66ac9eed7ffa 100644
--- a/metadata/glsa/glsa-201006-12.xml
+++ b/metadata/glsa/glsa-201006-12.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">fetchmail</product>
   <announced>2010-06-01</announced>
-  <revised>2010-06-01: 01</revised>
+  <revised count="01">2010-06-01</revised>
   <bug>280537</bug>
   <bug>307761</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201006-13.xml b/metadata/glsa/glsa-201006-13.xml
index 4bbc8de86ee6..9b61d5366717 100644
--- a/metadata/glsa/glsa-201006-13.xml
+++ b/metadata/glsa/glsa-201006-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">smarty</product>
   <announced>2010-06-02</announced>
-  <revised>2010-06-02: 01</revised>
+  <revised count="01">2010-06-02</revised>
   <bug>212147</bug>
   <bug>243856</bug>
   <bug>270494</bug>
diff --git a/metadata/glsa/glsa-201006-14.xml b/metadata/glsa/glsa-201006-14.xml
index dce23ffd5cb7..7647e0789e39 100644
--- a/metadata/glsa/glsa-201006-14.xml
+++ b/metadata/glsa/glsa-201006-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">newt</product>
   <announced>2010-06-02</announced>
-  <revised>2010-06-02: 01</revised>
+  <revised count="01">2010-06-02</revised>
   <bug>285854</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201006-15.xml b/metadata/glsa/glsa-201006-15.xml
index db8037000c3d..505bbd971b1d 100644
--- a/metadata/glsa/glsa-201006-15.xml
+++ b/metadata/glsa/glsa-201006-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xemacs</product>
   <announced>2010-06-03</announced>
-  <revised>2010-06-03: 01</revised>
+  <revised count="01">2010-06-03</revised>
   <bug>275397</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201006-16.xml b/metadata/glsa/glsa-201006-16.xml
index b0677a7150a1..099d9dc2c6f8 100644
--- a/metadata/glsa/glsa-201006-16.xml
+++ b/metadata/glsa/glsa-201006-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gd</product>
   <announced>2010-06-03</announced>
-  <revised>2010-06-03: 01</revised>
+  <revised count="01">2010-06-03</revised>
   <bug>292130</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201006-17.xml b/metadata/glsa/glsa-201006-17.xml
index e00998bc1e54..ab4d122e4506 100644
--- a/metadata/glsa/glsa-201006-17.xml
+++ b/metadata/glsa/glsa-201006-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lighttpd</product>
   <announced>2010-06-03</announced>
-  <revised>2010-06-03: 01</revised>
+  <revised count="01">2010-06-03</revised>
   <bug>303213</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201006-18.xml b/metadata/glsa/glsa-201006-18.xml
index fdb08da5d71d..29392d117c3c 100644
--- a/metadata/glsa/glsa-201006-18.xml
+++ b/metadata/glsa/glsa-201006-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sun-jre-bin sun-jdk emul-linux-x86-java</product>
   <announced>2010-06-04</announced>
-  <revised>2010-06-04: 01</revised>
+  <revised count="01">2010-06-04</revised>
   <bug>306579</bug>
   <bug>314531</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201006-19.xml b/metadata/glsa/glsa-201006-19.xml
index 06b7016859f3..06418c9c76c3 100644
--- a/metadata/glsa/glsa-201006-19.xml
+++ b/metadata/glsa/glsa-201006-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bugzilla</product>
   <announced>2010-06-04</announced>
-  <revised>2010-06-04: 02</revised>
+  <revised count="02">2010-06-04</revised>
   <bug>239564</bug>
   <bug>258592</bug>
   <bug>264572</bug>
diff --git a/metadata/glsa/glsa-201006-20.xml b/metadata/glsa/glsa-201006-20.xml
index 14cb1e891cf7..e87de39d2049 100644
--- a/metadata/glsa/glsa-201006-20.xml
+++ b/metadata/glsa/glsa-201006-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2010-06-04</announced>
-  <revised>2010-06-04: 01</revised>
+  <revised count="01">2010-06-04</revised>
   <bug>281107</bug>
   <bug>283624</bug>
   <bug>284892</bug>
diff --git a/metadata/glsa/glsa-201006-21.xml b/metadata/glsa/glsa-201006-21.xml
index 3bb499adb655..942db0490784 100644
--- a/metadata/glsa/glsa-201006-21.xml
+++ b/metadata/glsa/glsa-201006-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">unrealircd</product>
   <announced>2010-06-14</announced>
-  <revised>2010-06-14: 02</revised>
+  <revised count="02">2010-06-14</revised>
   <bug>260806</bug>
   <bug>323691</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201009-01.xml b/metadata/glsa/glsa-201009-01.xml
index 89a28ea8c8e2..4a9068ec8d8a 100644
--- a/metadata/glsa/glsa-201009-01.xml
+++ b/metadata/glsa/glsa-201009-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wxGTK</product>
   <announced>2010-09-02</announced>
-  <revised>2010-09-02: 01</revised>
+  <revised count="01">2010-09-02</revised>
   <bug>277722</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201009-02.xml b/metadata/glsa/glsa-201009-02.xml
index b5180aa050d8..b430ea186ec6 100644
--- a/metadata/glsa/glsa-201009-02.xml
+++ b/metadata/glsa/glsa-201009-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">maildrop</product>
   <announced>2010-09-06</announced>
-  <revised>2010-09-06: 01</revised>
+  <revised count="01">2010-09-06</revised>
   <bug>308043</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201009-03.xml b/metadata/glsa/glsa-201009-03.xml
index 3c8ce1090688..9665057e2c2e 100644
--- a/metadata/glsa/glsa-201009-03.xml
+++ b/metadata/glsa/glsa-201009-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">sudo</product>
   <announced>2010-09-07</announced>
-  <revised>2010-09-07: 01</revised>
+  <revised count="01">2010-09-07</revised>
   <bug>322517</bug>
   <bug>335381</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201009-04.xml b/metadata/glsa/glsa-201009-04.xml
index cc918f5c0566..4b33ca3223ac 100644
--- a/metadata/glsa/glsa-201009-04.xml
+++ b/metadata/glsa/glsa-201009-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">SARG sarg</product>
   <announced>2010-09-07</announced>
-  <revised>2010-09-07: 01</revised>
+  <revised count="01">2010-09-07</revised>
   <bug>222121</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201009-05.xml b/metadata/glsa/glsa-201009-05.xml
index bd4391882376..3f537f7126a3 100644
--- a/metadata/glsa/glsa-201009-05.xml
+++ b/metadata/glsa/glsa-201009-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2010-09-07</announced>
-  <revised>2010-09-07: 01</revised>
+  <revised count="01">2010-09-07</revised>
   <bug>297385</bug>
   <bug>306429</bug>
   <bug>313343</bug>
diff --git a/metadata/glsa/glsa-201009-06.xml b/metadata/glsa/glsa-201009-06.xml
index 9a7fcc9a1782..43bbcc144e07 100644
--- a/metadata/glsa/glsa-201009-06.xml
+++ b/metadata/glsa/glsa-201009-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2010-09-07</announced>
-  <revised>2010-09-07: 01</revised>
+  <revised count="01">2010-09-07</revised>
   <bug>314087</bug>
   <bug>321157</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201009-07.xml b/metadata/glsa/glsa-201009-07.xml
index 486d735c38b8..46008757c7cf 100644
--- a/metadata/glsa/glsa-201009-07.xml
+++ b/metadata/glsa/glsa-201009-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libxml2</product>
   <announced>2010-09-21</announced>
-  <revised>2010-09-21: 01</revised>
+  <revised count="01">2010-09-21</revised>
   <bug>280617</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201009-08.xml b/metadata/glsa/glsa-201009-08.xml
index 3938edd5161f..77cde99ce2a6 100644
--- a/metadata/glsa/glsa-201009-08.xml
+++ b/metadata/glsa/glsa-201009-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">python-updater</product>
   <announced>2010-09-21</announced>
-  <revised>2010-09-21: 01</revised>
+  <revised count="01">2010-09-21</revised>
   <bug>288361</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201009-09.xml b/metadata/glsa/glsa-201009-09.xml
index 3bf4a1ad1453..79779774b268 100644
--- a/metadata/glsa/glsa-201009-09.xml
+++ b/metadata/glsa/glsa-201009-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">fence</product>
   <announced>2010-09-29</announced>
-  <revised>2010-09-29: 01</revised>
+  <revised count="01">2010-09-29</revised>
   <bug>240576</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201010-01.xml b/metadata/glsa/glsa-201010-01.xml
index 2d80c2ee5519..6bca30a3fa4a 100644
--- a/metadata/glsa/glsa-201010-01.xml
+++ b/metadata/glsa/glsa-201010-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2010-10-05</announced>
-  <revised>2017-01-03: 9</revised>
+  <revised count="9">2017-01-03</revised>
   <bug>307637</bug>
   <bug>324153</bug>
   <bug>335887</bug>
diff --git a/metadata/glsa/glsa-201011-01.xml b/metadata/glsa/glsa-201011-01.xml
index 3686afbf966d..e608aacad5e4 100644
--- a/metadata/glsa/glsa-201011-01.xml
+++ b/metadata/glsa/glsa-201011-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">glibc</product>
   <announced>2010-11-15</announced>
-  <revised>2010-11-15: 01</revised>
+  <revised count="01">2010-11-15</revised>
   <bug>285818</bug>
   <bug>325555</bug>
   <bug>330923</bug>
diff --git a/metadata/glsa/glsa-201012-01.xml b/metadata/glsa/glsa-201012-01.xml
index 87398057392d..4e56041828a0 100644
--- a/metadata/glsa/glsa-201012-01.xml
+++ b/metadata/glsa/glsa-201012-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2010-12-17</announced>
-  <revised>2010-12-17: 01</revised>
+  <revised count="01">2010-12-17</revised>
   <bug>325451</bug>
   <bug>326717</bug>
   <bug>330003</bug>
diff --git a/metadata/glsa/glsa-201101-01.xml b/metadata/glsa/glsa-201101-01.xml
index 43973c2422f9..6431f1b5253a 100644
--- a/metadata/glsa/glsa-201101-01.xml
+++ b/metadata/glsa/glsa-201101-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gif2png</product>
   <announced>2011-01-05</announced>
-  <revised>2011-01-05: 01</revised>
+  <revised count="01">2011-01-05</revised>
   <bug>346501</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201101-02.xml b/metadata/glsa/glsa-201101-02.xml
index 84cd07c4aefb..dc19a3180fde 100644
--- a/metadata/glsa/glsa-201101-02.xml
+++ b/metadata/glsa/glsa-201101-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Tor</product>
   <announced>2011-01-15</announced>
-  <revised>2011-01-15: 01</revised>
+  <revised count="01">2011-01-15</revised>
   <bug>349312</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201101-03.xml b/metadata/glsa/glsa-201101-03.xml
index f3684ab2adb3..620011350246 100644
--- a/metadata/glsa/glsa-201101-03.xml
+++ b/metadata/glsa/glsa-201101-03.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">libvpx</product>
   <announced>2011-01-15</announced>
-  <revised>2011-01-15: 01</revised>
+  <revised count="01">2011-01-15</revised>
   <bug>345559</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201101-04.xml b/metadata/glsa/glsa-201101-04.xml
index a0f0c3b102f5..ebea82283511 100644
--- a/metadata/glsa/glsa-201101-04.xml
+++ b/metadata/glsa/glsa-201101-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">aria2</product>
   <announced>2011-01-15</announced>
-  <revised>2011-01-15: 01</revised>
+  <revised count="01">2011-01-15</revised>
   <bug>320975</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201101-05.xml b/metadata/glsa/glsa-201101-05.xml
index 45499a8bad44..f70ec4434ad1 100644
--- a/metadata/glsa/glsa-201101-05.xml
+++ b/metadata/glsa/glsa-201101-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">OpenAFS</product>
   <announced>2011-01-16</announced>
-  <revised>2011-01-16: 01</revised>
+  <revised count="01">2011-01-16</revised>
   <bug>265538</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201101-06.xml b/metadata/glsa/glsa-201101-06.xml
index 47b2d89af6af..12d53fb909dd 100644
--- a/metadata/glsa/glsa-201101-06.xml
+++ b/metadata/glsa/glsa-201101-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">IO::Socket::SSL</product>
   <announced>2011-01-16</announced>
-  <revised>2011-01-16: 01</revised>
+  <revised count="01">2011-01-16</revised>
   <bug>276360</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201101-07.xml b/metadata/glsa/glsa-201101-07.xml
index c4ce935371a4..d516587c278e 100644
--- a/metadata/glsa/glsa-201101-07.xml
+++ b/metadata/glsa/glsa-201101-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Prewikka</product>
   <announced>2011-01-16</announced>
-  <revised>2011-01-16: 01</revised>
+  <revised count="01">2011-01-16</revised>
   <bug>270056</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201101-08.xml b/metadata/glsa/glsa-201101-08.xml
index 670d40df3e8e..5753e0a5d0ef 100644
--- a/metadata/glsa/glsa-201101-08.xml
+++ b/metadata/glsa/glsa-201101-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2011-01-21</announced>
-  <revised>2011-01-21: 02</revised>
+  <revised count="02">2011-01-21</revised>
   <bug>336508</bug>
   <bug>343091</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201101-09.xml b/metadata/glsa/glsa-201101-09.xml
index 761845901a7f..d573e0d94f64 100644
--- a/metadata/glsa/glsa-201101-09.xml
+++ b/metadata/glsa/glsa-201101-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2011-01-21</announced>
-  <revised>2011-01-21: 01</revised>
+  <revised count="01">2011-01-21</revised>
   <bug>307749</bug>
   <bug>322855</bug>
   <bug>332205</bug>
diff --git a/metadata/glsa/glsa-201110-01.xml b/metadata/glsa/glsa-201110-01.xml
index 3cab9ddcb31f..0f2a9e77cede 100644
--- a/metadata/glsa/glsa-201110-01.xml
+++ b/metadata/glsa/glsa-201110-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2011-10-09</announced>
-  <revised>2015-06-06: 13</revised>
+  <revised count="13">2015-06-06</revised>
   <bug>303739</bug>
   <bug>308011</bug>
   <bug>322575</bug>
diff --git a/metadata/glsa/glsa-201110-02.xml b/metadata/glsa/glsa-201110-02.xml
index e2e028317337..af6d556017ac 100644
--- a/metadata/glsa/glsa-201110-02.xml
+++ b/metadata/glsa/glsa-201110-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2011-10-09</announced>
-  <revised>2011-10-09: 1</revised>
+  <revised count="1">2011-10-09</revised>
   <bug>323859</bug>
   <bug>330479</bug>
   <bug>339401</bug>
diff --git a/metadata/glsa/glsa-201110-03.xml b/metadata/glsa/glsa-201110-03.xml
index ba155a6d15e0..ccd0c69915d8 100644
--- a/metadata/glsa/glsa-201110-03.xml
+++ b/metadata/glsa/glsa-201110-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bugzilla</product>
   <announced>2011-10-10</announced>
-  <revised>2011-10-10: 1</revised>
+  <revised count="1">2011-10-10</revised>
   <bug>352781</bug>
   <bug>380255</bug>
   <bug>386203</bug>
diff --git a/metadata/glsa/glsa-201110-04.xml b/metadata/glsa/glsa-201110-04.xml
index 320c5296f56e..1f11c0fe74aa 100644
--- a/metadata/glsa/glsa-201110-04.xml
+++ b/metadata/glsa/glsa-201110-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Dovecot</product>
   <announced>2011-10-10</announced>
-  <revised>2011-10-10: 2</revised>
+  <revised count="2">2011-10-10</revised>
   <bug>286844</bug>
   <bug>293954</bug>
   <bug>314533</bug>
diff --git a/metadata/glsa/glsa-201110-05.xml b/metadata/glsa/glsa-201110-05.xml
index e2b8bcb9247f..29b6446cca84 100644
--- a/metadata/glsa/glsa-201110-05.xml
+++ b/metadata/glsa/glsa-201110-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gnutls</product>
   <announced>2011-10-10</announced>
-  <revised>2011-10-10: 1</revised>
+  <revised count="1">2011-10-10</revised>
   <bug>281224</bug>
   <bug>292025</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201110-06.xml b/metadata/glsa/glsa-201110-06.xml
index 142e26236585..7e74c6b998e8 100644
--- a/metadata/glsa/glsa-201110-06.xml
+++ b/metadata/glsa/glsa-201110-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2011-10-10</announced>
-  <revised>2011-10-10: 2</revised>
+  <revised count="2">2011-10-10</revised>
   <bug>306939</bug>
   <bug>332039</bug>
   <bug>340807</bug>
diff --git a/metadata/glsa/glsa-201110-07.xml b/metadata/glsa/glsa-201110-07.xml
index 3439824d9b17..9a25d95636cd 100644
--- a/metadata/glsa/glsa-201110-07.xml
+++ b/metadata/glsa/glsa-201110-07.xml
@@ -5,7 +5,7 @@
   <synopsis>A Denial of Service vulnerability was found in vsftpd.</synopsis>
   <product type="ebuild">vsftpd</product>
   <announced>2011-10-10</announced>
-  <revised>2011-10-10: 1</revised>
+  <revised count="1">2011-10-10</revised>
   <bug>357001</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201110-08.xml b/metadata/glsa/glsa-201110-08.xml
index bdeec1f2f9ba..a7e6b3aa2109 100644
--- a/metadata/glsa/glsa-201110-08.xml
+++ b/metadata/glsa/glsa-201110-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">feh</product>
   <announced>2011-10-13</announced>
-  <revised>2011-10-13: 2</revised>
+  <revised count="2">2011-10-13</revised>
   <bug>325531</bug>
   <bug>354063</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201110-09.xml b/metadata/glsa/glsa-201110-09.xml
index 6b7b581e4713..f853a02796ca 100644
--- a/metadata/glsa/glsa-201110-09.xml
+++ b/metadata/glsa/glsa-201110-09.xml
@@ -5,7 +5,7 @@
   <synopsis>A privilege escalation vulnerability was found in Conky.</synopsis>
   <product type="ebuild">Conky</product>
   <announced>2011-10-13</announced>
-  <revised>2011-10-13: 1</revised>
+  <revised count="1">2011-10-13</revised>
   <bug>354061</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201110-10.xml b/metadata/glsa/glsa-201110-10.xml
index 035e1b838016..90f697472e52 100644
--- a/metadata/glsa/glsa-201110-10.xml
+++ b/metadata/glsa/glsa-201110-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Wget</product>
   <announced>2011-10-13</announced>
-  <revised>2011-10-13: 1</revised>
+  <revised count="1">2011-10-13</revised>
   <bug>329941</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201110-11.xml b/metadata/glsa/glsa-201110-11.xml
index ec671adca179..55382bbee98f 100644
--- a/metadata/glsa/glsa-201110-11.xml
+++ b/metadata/glsa/glsa-201110-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Adobe Flash Player</product>
   <announced>2011-10-13</announced>
-  <revised>2011-10-13: 1</revised>
+  <revised count="1">2011-10-13</revised>
   <bug>354207</bug>
   <bug>359019</bug>
   <bug>363179</bug>
diff --git a/metadata/glsa/glsa-201110-12.xml b/metadata/glsa/glsa-201110-12.xml
index 623c5f64277a..7062b518450b 100644
--- a/metadata/glsa/glsa-201110-12.xml
+++ b/metadata/glsa/glsa-201110-12.xml
@@ -5,7 +5,7 @@
   <synopsis>Multiple Denial of Service vulnerabilities were found in Unbound.</synopsis>
   <product type="ebuild">unbound</product>
   <announced>2011-10-15</announced>
-  <revised>2011-10-15: 1</revised>
+  <revised count="1">2011-10-15</revised>
   <bug>309117</bug>
   <bug>368981</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201110-13.xml b/metadata/glsa/glsa-201110-13.xml
index 855fb3e4a3a1..53162fc6b4a0 100644
--- a/metadata/glsa/glsa-201110-13.xml
+++ b/metadata/glsa/glsa-201110-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Tor</product>
   <announced>2011-10-18</announced>
-  <revised>2011-10-18: 1</revised>
+  <revised count="1">2011-10-18</revised>
   <bug>351920</bug>
   <bug>359789</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201110-14.xml b/metadata/glsa/glsa-201110-14.xml
index 8a279cb9ca6d..c84db9605a60 100644
--- a/metadata/glsa/glsa-201110-14.xml
+++ b/metadata/glsa/glsa-201110-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">D-Bus</product>
   <announced>2011-10-21</announced>
-  <revised>2011-10-21: 1</revised>
+  <revised count="1">2011-10-21</revised>
   <bug>348766</bug>
   <bug>371261</bug>
   <bug>372743</bug>
diff --git a/metadata/glsa/glsa-201110-15.xml b/metadata/glsa/glsa-201110-15.xml
index a8c43777a9f3..8f6feb3fdd97 100644
--- a/metadata/glsa/glsa-201110-15.xml
+++ b/metadata/glsa/glsa-201110-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">GnuPG</product>
   <announced>2011-10-22</announced>
-  <revised>2011-10-22: 1</revised>
+  <revised count="1">2011-10-22</revised>
   <bug>329583</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201110-16.xml b/metadata/glsa/glsa-201110-16.xml
index db5aa72b9642..e294e55f6a54 100644
--- a/metadata/glsa/glsa-201110-16.xml
+++ b/metadata/glsa/glsa-201110-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Cyrus IMAP Server</product>
   <announced>2011-10-22</announced>
-  <revised>2011-10-22: 1</revised>
+  <revised count="1">2011-10-22</revised>
   <bug>283596</bug>
   <bug>382349</bug>
   <bug>385729</bug>
diff --git a/metadata/glsa/glsa-201110-17.xml b/metadata/glsa/glsa-201110-17.xml
index 4358fcc62705..ea0e65c2c6b5 100644
--- a/metadata/glsa/glsa-201110-17.xml
+++ b/metadata/glsa/glsa-201110-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">avahi</product>
   <announced>2011-10-22</announced>
-  <revised>2011-10-22: 1</revised>
+  <revised count="1">2011-10-22</revised>
   <bug>335885</bug>
   <bug>355583</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201110-18.xml b/metadata/glsa/glsa-201110-18.xml
index 8b3cd0715d83..e1a229ff5967 100644
--- a/metadata/glsa/glsa-201110-18.xml
+++ b/metadata/glsa/glsa-201110-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">rgmanager</product>
   <announced>2011-10-22</announced>
-  <revised>2011-10-22: 1</revised>
+  <revised count="1">2011-10-22</revised>
   <bug>352213</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201110-19.xml b/metadata/glsa/glsa-201110-19.xml
index c9a960b562c2..f9737367eaf6 100644
--- a/metadata/glsa/glsa-201110-19.xml
+++ b/metadata/glsa/glsa-201110-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xorg-server</product>
   <announced>2011-10-22</announced>
-  <revised>2011-10-22: 2</revised>
+  <revised count="2">2011-10-22</revised>
   <bug>387069</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201110-20.xml b/metadata/glsa/glsa-201110-20.xml
index 26a7cfa32a8a..0b8bd4620b1b 100644
--- a/metadata/glsa/glsa-201110-20.xml
+++ b/metadata/glsa/glsa-201110-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Clam AntiVirus</product>
   <announced>2011-10-24</announced>
-  <revised>2011-10-24: 2</revised>
+  <revised count="2">2011-10-24</revised>
   <bug>338226</bug>
   <bug>347627</bug>
   <bug>354019</bug>
diff --git a/metadata/glsa/glsa-201110-21.xml b/metadata/glsa/glsa-201110-21.xml
index 72feb09fd3af..846cb601fbc2 100644
--- a/metadata/glsa/glsa-201110-21.xml
+++ b/metadata/glsa/glsa-201110-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Asterisk</product>
   <announced>2011-10-24</announced>
-  <revised>2011-10-24: 1</revised>
+  <revised count="1">2011-10-24</revised>
   <bug>352059</bug>
   <bug>355967</bug>
   <bug>359767</bug>
diff --git a/metadata/glsa/glsa-201110-22.xml b/metadata/glsa/glsa-201110-22.xml
index 4b0dc06243fb..5dae728a83dc 100644
--- a/metadata/glsa/glsa-201110-22.xml
+++ b/metadata/glsa/glsa-201110-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">postgresql-server postgresql-base</product>
   <announced>2011-10-25</announced>
-  <revised>2012-03-05: 3</revised>
+  <revised count="3">2012-03-05</revised>
   <bug>261223</bug>
   <bug>284274</bug>
   <bug>297383</bug>
diff --git a/metadata/glsa/glsa-201110-23.xml b/metadata/glsa/glsa-201110-23.xml
index 343fe4989fb9..8a98f2fdf517 100644
--- a/metadata/glsa/glsa-201110-23.xml
+++ b/metadata/glsa/glsa-201110-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mod_authnz_external</product>
   <announced>2011-10-25</announced>
-  <revised>2011-10-25: 1</revised>
+  <revised count="1">2011-10-25</revised>
   <bug>386165</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201110-24.xml b/metadata/glsa/glsa-201110-24.xml
index cd3b2aa3933c..6687719ac1d0 100644
--- a/metadata/glsa/glsa-201110-24.xml
+++ b/metadata/glsa/glsa-201110-24.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Squid</product>
   <announced>2011-10-26</announced>
-  <revised>2011-10-26: 1</revised>
+  <revised count="1">2011-10-26</revised>
   <bug>279379</bug>
   <bug>279380</bug>
   <bug>301828</bug>
diff --git a/metadata/glsa/glsa-201110-25.xml b/metadata/glsa/glsa-201110-25.xml
index d8c252852866..05fc58d0044f 100644
--- a/metadata/glsa/glsa-201110-25.xml
+++ b/metadata/glsa/glsa-201110-25.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Pure-FTPd</product>
   <announced>2011-10-26</announced>
-  <revised>2011-10-26: 1</revised>
+  <revised count="1">2011-10-26</revised>
   <bug>358375</bug>
   <bug>365751</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201110-26.xml b/metadata/glsa/glsa-201110-26.xml
index 31f30d6057f6..24c215566953 100644
--- a/metadata/glsa/glsa-201110-26.xml
+++ b/metadata/glsa/glsa-201110-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libxml2</product>
   <announced>2011-10-26</announced>
-  <revised>2011-10-26: 1</revised>
+  <revised count="1">2011-10-26</revised>
   <bug>345555</bug>
   <bug>370715</bug>
   <bug>386985</bug>
diff --git a/metadata/glsa/glsa-201111-01.xml b/metadata/glsa/glsa-201111-01.xml
index c4ecff3bdd2f..7d43bd6d079f 100644
--- a/metadata/glsa/glsa-201111-01.xml
+++ b/metadata/glsa/glsa-201111-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">chromium v8</product>
   <announced>2011-11-01</announced>
-  <revised>2011-11-01: 1</revised>
+  <revised count="1">2011-11-01</revised>
   <bug>351525</bug>
   <bug>353626</bug>
   <bug>354121</bug>
diff --git a/metadata/glsa/glsa-201111-02.xml b/metadata/glsa/glsa-201111-02.xml
index 1ef3ecb92f58..292444cbb096 100644
--- a/metadata/glsa/glsa-201111-02.xml
+++ b/metadata/glsa/glsa-201111-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sun-jre-bin sun-jdk emul-linux-x86-java</product>
   <announced>2011-11-05</announced>
-  <revised>2011-11-05: 1</revised>
+  <revised count="1">2011-11-05</revised>
   <bug>340421</bug>
   <bug>354213</bug>
   <bug>370559</bug>
diff --git a/metadata/glsa/glsa-201111-03.xml b/metadata/glsa/glsa-201111-03.xml
index e9068054c0cc..38dcfa626d1e 100644
--- a/metadata/glsa/glsa-201111-03.xml
+++ b/metadata/glsa/glsa-201111-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ebuild OpenTTD</product>
   <announced>2011-11-11</announced>
-  <revised>2011-11-11: 2</revised>
+  <revised count="2">2011-11-11</revised>
   <bug>381799</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201111-04.xml b/metadata/glsa/glsa-201111-04.xml
index 3d13a9280fa0..725712c2ba68 100644
--- a/metadata/glsa/glsa-201111-04.xml
+++ b/metadata/glsa/glsa-201111-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">PhpDocumentor</product>
   <announced>2011-11-11</announced>
-  <revised>2011-11-11: 1</revised>
+  <revised count="1">2011-11-11</revised>
   <bug>213318</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201111-05.xml b/metadata/glsa/glsa-201111-05.xml
index 1c90bff85dfb..9a592f2db3cb 100644
--- a/metadata/glsa/glsa-201111-05.xml
+++ b/metadata/glsa/glsa-201111-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium v8</product>
   <announced>2011-11-19</announced>
-  <revised>2011-11-19: 1</revised>
+  <revised count="1">2011-11-19</revised>
   <bug>390113</bug>
   <bug>390779</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201111-06.xml b/metadata/glsa/glsa-201111-06.xml
index ed36e3e13d9d..388f8647e882 100644
--- a/metadata/glsa/glsa-201111-06.xml
+++ b/metadata/glsa/glsa-201111-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">MaraDNS</product>
   <announced>2011-11-20</announced>
-  <revised>2011-11-20: 1</revised>
+  <revised count="1">2011-11-20</revised>
   <bug>352569</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201111-07.xml b/metadata/glsa/glsa-201111-07.xml
index 1eb6ced915ae..031f98ba79d0 100644
--- a/metadata/glsa/glsa-201111-07.xml
+++ b/metadata/glsa/glsa-201111-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">TinTin++</product>
   <announced>2011-11-20</announced>
-  <revised>2011-11-20: 1</revised>
+  <revised count="1">2011-11-20</revised>
   <bug>209903</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201111-08.xml b/metadata/glsa/glsa-201111-08.xml
index 0d8c0c1d8059..1560a4d8ed3b 100644
--- a/metadata/glsa/glsa-201111-08.xml
+++ b/metadata/glsa/glsa-201111-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">radvd</product>
   <announced>2011-11-20</announced>
-  <revised>2011-11-20: 1</revised>
+  <revised count="1">2011-11-20</revised>
   <bug>385967</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201111-09.xml b/metadata/glsa/glsa-201111-09.xml
index e683973bddd5..5c63636abb14 100644
--- a/metadata/glsa/glsa-201111-09.xml
+++ b/metadata/glsa/glsa-201111-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Safe</product>
   <announced>2011-11-20</announced>
-  <revised>2011-11-20: 1</revised>
+  <revised count="1">2011-11-20</revised>
   <bug>325563</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201111-10.xml b/metadata/glsa/glsa-201111-10.xml
index 489ece237d8f..1e466304795a 100644
--- a/metadata/glsa/glsa-201111-10.xml
+++ b/metadata/glsa/glsa-201111-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">evince</product>
   <announced>2011-11-20</announced>
-  <revised>2011-11-20: 1</revised>
+  <revised count="1">2011-11-20</revised>
   <bug>350681</bug>
   <bug>363447</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201111-11.xml b/metadata/glsa/glsa-201111-11.xml
index 02c9444a0914..590eee2c5506 100644
--- a/metadata/glsa/glsa-201111-11.xml
+++ b/metadata/glsa/glsa-201111-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tar</product>
   <announced>2011-11-20</announced>
-  <revised>2011-11-20: 1</revised>
+  <revised count="1">2011-11-20</revised>
   <bug>313333</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201111-12.xml b/metadata/glsa/glsa-201111-12.xml
index 65aca03fcdb9..a4bb37dc592f 100644
--- a/metadata/glsa/glsa-201111-12.xml
+++ b/metadata/glsa/glsa-201111-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">abcm2ps</product>
   <announced>2011-11-20</announced>
-  <revised>2011-11-20: 1</revised>
+  <revised count="1">2011-11-20</revised>
   <bug>322859</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201201-01.xml b/metadata/glsa/glsa-201201-01.xml
index 44c2fa6e9c54..4b9b081674c6 100644
--- a/metadata/glsa/glsa-201201-01.xml
+++ b/metadata/glsa/glsa-201201-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">phpMyAdmin</product>
   <announced>2012-01-04</announced>
-  <revised>2012-01-04: 1</revised>
+  <revised count="1">2012-01-04</revised>
   <bug>302745</bug>
   <bug>335490</bug>
   <bug>336462</bug>
diff --git a/metadata/glsa/glsa-201201-02.xml b/metadata/glsa/glsa-201201-02.xml
index 25dd10b66ca5..c35483998b35 100644
--- a/metadata/glsa/glsa-201201-02.xml
+++ b/metadata/glsa/glsa-201201-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">MySQL</product>
   <announced>2012-01-05</announced>
-  <revised>2012-01-05: 1</revised>
+  <revised count="1">2012-01-05</revised>
   <bug>220813</bug>
   <bug>229329</bug>
   <bug>237166</bug>
diff --git a/metadata/glsa/glsa-201201-03.xml b/metadata/glsa/glsa-201201-03.xml
index ae58dca11ef7..f1efc0f82d62 100644
--- a/metadata/glsa/glsa-201201-03.xml
+++ b/metadata/glsa/glsa-201201-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium v8</product>
   <announced>2012-01-08</announced>
-  <revised>2012-01-08: 1</revised>
+  <revised count="1">2012-01-08</revised>
   <bug>394587</bug>
   <bug>397907</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201201-04.xml b/metadata/glsa/glsa-201201-04.xml
index 3041cf9b1676..1f1624e337cf 100644
--- a/metadata/glsa/glsa-201201-04.xml
+++ b/metadata/glsa/glsa-201201-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Logsurfer</product>
   <announced>2012-01-20</announced>
-  <revised>2012-01-20: 1</revised>
+  <revised count="1">2012-01-20</revised>
   <bug>387397</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201201-05.xml b/metadata/glsa/glsa-201201-05.xml
index 2adbd19ae940..fd67570d62b8 100644
--- a/metadata/glsa/glsa-201201-05.xml
+++ b/metadata/glsa/glsa-201201-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mDNSResponder</product>
   <announced>2012-01-22</announced>
-  <revised>2012-01-22: 1</revised>
+  <revised count="1">2012-01-22</revised>
   <bug>290822</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201201-06.xml b/metadata/glsa/glsa-201201-06.xml
index dcc9b5d234db..2ce108640f85 100644
--- a/metadata/glsa/glsa-201201-06.xml
+++ b/metadata/glsa/glsa-201201-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">iscsitarget</product>
   <announced>2012-01-23</announced>
-  <revised>2012-01-23: 1</revised>
+  <revised count="1">2012-01-23</revised>
   <bug>314187</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201201-07.xml b/metadata/glsa/glsa-201201-07.xml
index 0c3427c284b8..9c6f8788d4e9 100644
--- a/metadata/glsa/glsa-201201-07.xml
+++ b/metadata/glsa/glsa-201201-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">NX Server NX Node</product>
   <announced>2012-01-23</announced>
-  <revised>2012-01-23: 1</revised>
+  <revised count="1">2012-01-23</revised>
   <bug>378345</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201201-08.xml b/metadata/glsa/glsa-201201-08.xml
index 26240ac2abc5..f07fd9462f9e 100644
--- a/metadata/glsa/glsa-201201-08.xml
+++ b/metadata/glsa/glsa-201201-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">FontForge</product>
   <announced>2012-01-23</announced>
-  <revised>2012-01-23: 1</revised>
+  <revised count="1">2012-01-23</revised>
   <bug>386293</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201201-09.xml b/metadata/glsa/glsa-201201-09.xml
index 0dca5411061c..f570d42a26db 100644
--- a/metadata/glsa/glsa-201201-09.xml
+++ b/metadata/glsa/glsa-201201-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">FreeType</product>
   <announced>2012-01-23</announced>
-  <revised>2012-01-23: 1</revised>
+  <revised count="1">2012-01-23</revised>
   <bug>332701</bug>
   <bug>342121</bug>
   <bug>345843</bug>
diff --git a/metadata/glsa/glsa-201201-10.xml b/metadata/glsa/glsa-201201-10.xml
index d11401d01f8d..c6c2f9ea1a22 100644
--- a/metadata/glsa/glsa-201201-10.xml
+++ b/metadata/glsa/glsa-201201-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">JasPer</product>
   <announced>2012-01-23</announced>
-  <revised>2012-01-23: 1</revised>
+  <revised count="1">2012-01-23</revised>
   <bug>394879</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201201-11.xml b/metadata/glsa/glsa-201201-11.xml
index f47a40e3e2ae..453a2fde9a99 100644
--- a/metadata/glsa/glsa-201201-11.xml
+++ b/metadata/glsa/glsa-201201-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">fwbuilder</product>
   <announced>2012-01-23</announced>
-  <revised>2012-01-23: 1</revised>
+  <revised count="1">2012-01-23</revised>
   <bug>235809</bug>
   <bug>285861</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201201-12.xml b/metadata/glsa/glsa-201201-12.xml
index d34e4c28b902..df408413d0f3 100644
--- a/metadata/glsa/glsa-201201-12.xml
+++ b/metadata/glsa/glsa-201201-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Tor</product>
   <announced>2012-01-23</announced>
-  <revised>2012-01-23: 1</revised>
+  <revised count="1">2012-01-23</revised>
   <bug>388769</bug>
   <bug>394969</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201201-13.xml b/metadata/glsa/glsa-201201-13.xml
index 443fe1170231..3615378d1e9c 100644
--- a/metadata/glsa/glsa-201201-13.xml
+++ b/metadata/glsa/glsa-201201-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2012-01-23</announced>
-  <revised>2012-01-23: 1</revised>
+  <revised count="1">2012-01-23</revised>
   <bug>303723</bug>
   <bug>308021</bug>
   <bug>321935</bug>
diff --git a/metadata/glsa/glsa-201201-14.xml b/metadata/glsa/glsa-201201-14.xml
index 980c41e7bb21..9c8c6c2754e6 100644
--- a/metadata/glsa/glsa-201201-14.xml
+++ b/metadata/glsa/glsa-201201-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5-appl</product>
   <announced>2012-01-23</announced>
-  <revised>2012-01-23: 1</revised>
+  <revised count="1">2012-01-23</revised>
   <bug>374229</bug>
   <bug>396137</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201201-15.xml b/metadata/glsa/glsa-201201-15.xml
index 5c0bd1d4f86c..39434cc17b0f 100644
--- a/metadata/glsa/glsa-201201-15.xml
+++ b/metadata/glsa/glsa-201201-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ktsuss</product>
   <announced>2012-01-27</announced>
-  <revised>2012-01-27: 1</revised>
+  <revised count="1">2012-01-27</revised>
   <bug>381115</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201201-16.xml b/metadata/glsa/glsa-201201-16.xml
index 5ad983dec3ad..a3d08976f1e3 100644
--- a/metadata/glsa/glsa-201201-16.xml
+++ b/metadata/glsa/glsa-201201-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xkeyboard-config xorg-server</product>
   <announced>2012-01-27</announced>
-  <revised>2012-01-27: 1</revised>
+  <revised count="1">2012-01-27</revised>
   <bug>399347</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201201-17.xml b/metadata/glsa/glsa-201201-17.xml
index a63bb3a25e70..4a7c97462335 100644
--- a/metadata/glsa/glsa-201201-17.xml
+++ b/metadata/glsa/glsa-201201-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2012-01-28</announced>
-  <revised>2012-01-28: 1</revised>
+  <revised count="1">2012-01-28</revised>
   <bug>400551</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201201-18.xml b/metadata/glsa/glsa-201201-18.xml
index 79cb40ddd31d..9a05146455b0 100644
--- a/metadata/glsa/glsa-201201-18.xml
+++ b/metadata/glsa/glsa-201201-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bip</product>
   <announced>2012-01-30</announced>
-  <revised>2012-01-30: 1</revised>
+  <revised count="1">2012-01-30</revised>
   <bug>336321</bug>
   <bug>400599</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201201-19.xml b/metadata/glsa/glsa-201201-19.xml
index ff66f9b6283a..f3ed452dbcac 100644
--- a/metadata/glsa/glsa-201201-19.xml
+++ b/metadata/glsa/glsa-201201-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2012-01-30</announced>
-  <revised>2012-01-30: 1</revised>
+  <revised count="1">2012-01-30</revised>
   <bug>354211</bug>
   <bug>382969</bug>
   <bug>393481</bug>
diff --git a/metadata/glsa/glsa-201202-01.xml b/metadata/glsa/glsa-201202-01.xml
index d56dddf0f07f..cad8538cd711 100644
--- a/metadata/glsa/glsa-201202-01.xml
+++ b/metadata/glsa/glsa-201202-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2012-02-18</announced>
-  <revised>2012-02-18: 1</revised>
+  <revised count="1">2012-02-18</revised>
   <bug>402841</bug>
   <bug>404067</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201202-02.xml b/metadata/glsa/glsa-201202-02.xml
index 5b1111f5eb7c..a5ddb11c14f2 100644
--- a/metadata/glsa/glsa-201202-02.xml
+++ b/metadata/glsa/glsa-201202-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Quagga</product>
   <announced>2012-02-21</announced>
-  <revised>2012-02-21: 2</revised>
+  <revised count="2">2012-02-21</revised>
   <bug>334303</bug>
   <bug>359903</bug>
   <bug>384651</bug>
diff --git a/metadata/glsa/glsa-201202-03.xml b/metadata/glsa/glsa-201202-03.xml
index c8781abc8523..3baeb6dd9e4b 100644
--- a/metadata/glsa/glsa-201202-03.xml
+++ b/metadata/glsa/glsa-201202-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">maradns</product>
   <announced>2012-02-22</announced>
-  <revised>2012-02-22: 1</revised>
+  <revised count="1">2012-02-22</revised>
   <bug>397431</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201202-04.xml b/metadata/glsa/glsa-201202-04.xml
index ec90803cd34d..280556e84d85 100644
--- a/metadata/glsa/glsa-201202-04.xml
+++ b/metadata/glsa/glsa-201202-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pdns</product>
   <announced>2012-02-22</announced>
-  <revised>2012-02-22: 1</revised>
+  <revised count="1">2012-02-22</revised>
   <bug>398403</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201202-05.xml b/metadata/glsa/glsa-201202-05.xml
index 6f9f9a9ccb32..e68d4e442683 100644
--- a/metadata/glsa/glsa-201202-05.xml
+++ b/metadata/glsa/glsa-201202-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">heimdal</product>
   <announced>2012-02-22</announced>
-  <revised>2012-02-22: 1</revised>
+  <revised count="1">2012-02-22</revised>
   <bug>396105</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201202-06.xml b/metadata/glsa/glsa-201202-06.xml
index 3f3c8dd38177..18e40c3c20ff 100644
--- a/metadata/glsa/glsa-201202-06.xml
+++ b/metadata/glsa/glsa-201202-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2012-02-22</announced>
-  <revised>2012-02-22: 1</revised>
+  <revised count="1">2012-02-22</revised>
   <bug>399507</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201202-07.xml b/metadata/glsa/glsa-201202-07.xml
index 906990821f86..d20ea9966f13 100644
--- a/metadata/glsa/glsa-201202-07.xml
+++ b/metadata/glsa/glsa-201202-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libvirt</product>
   <announced>2012-02-27</announced>
-  <revised>2012-02-27: 1</revised>
+  <revised count="1">2012-02-27</revised>
   <bug>358877</bug>
   <bug>372963</bug>
   <bug>373991</bug>
diff --git a/metadata/glsa/glsa-201202-08.xml b/metadata/glsa/glsa-201202-08.xml
index 6623ec1d375e..1b2a7771f6d2 100644
--- a/metadata/glsa/glsa-201202-08.xml
+++ b/metadata/glsa/glsa-201202-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ebuild stunnel</product>
   <announced>2012-02-29</announced>
-  <revised>2012-07-30: 2</revised>
+  <revised count="2">2012-07-30</revised>
   <bug>379859</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201202-09.xml b/metadata/glsa/glsa-201202-09.xml
index 470996ff47f0..12bcf54c521b 100644
--- a/metadata/glsa/glsa-201202-09.xml
+++ b/metadata/glsa/glsa-201202-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libxml2</product>
   <announced>2012-02-29</announced>
-  <revised>2012-02-29: 2</revised>
+  <revised count="2">2012-02-29</revised>
   <bug>398361</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-01.xml b/metadata/glsa/glsa-201203-01.xml
index 165e5b8b5081..058fa3df6e47 100644
--- a/metadata/glsa/glsa-201203-01.xml
+++ b/metadata/glsa/glsa-201203-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">spamdyke</product>
   <announced>2012-03-06</announced>
-  <revised>2012-03-06: 1</revised>
+  <revised count="1">2012-03-06</revised>
   <bug>399157</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-02.xml b/metadata/glsa/glsa-201203-02.xml
index b7f7b4806445..dda5a498e1c2 100644
--- a/metadata/glsa/glsa-201203-02.xml
+++ b/metadata/glsa/glsa-201203-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cURL</product>
   <announced>2012-03-06</announced>
-  <revised>2012-03-06: 1</revised>
+  <revised count="1">2012-03-06</revised>
   <bug>308645</bug>
   <bug>373235</bug>
   <bug>400799</bug>
diff --git a/metadata/glsa/glsa-201203-03.xml b/metadata/glsa/glsa-201203-03.xml
index c9c65316a90d..d14f0e5750f3 100644
--- a/metadata/glsa/glsa-201203-03.xml
+++ b/metadata/glsa/glsa-201203-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">puppet</product>
   <announced>2012-03-06</announced>
-  <revised>2012-03-06: 1</revised>
+  <revised count="1">2012-03-06</revised>
   <bug>303729</bug>
   <bug>308031</bug>
   <bug>384859</bug>
diff --git a/metadata/glsa/glsa-201203-04.xml b/metadata/glsa/glsa-201203-04.xml
index 3a57a4ee1293..0c57f9328661 100644
--- a/metadata/glsa/glsa-201203-04.xml
+++ b/metadata/glsa/glsa-201203-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libxml2</product>
   <announced>2012-03-06</announced>
-  <revised>2012-03-06: 1</revised>
+  <revised count="1">2012-03-06</revised>
   <bug>405261</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-05.xml b/metadata/glsa/glsa-201203-05.xml
index 1b31b1ef880d..95ac56dff1c5 100644
--- a/metadata/glsa/glsa-201203-05.xml
+++ b/metadata/glsa/glsa-201203-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">rack</product>
   <announced>2012-03-06</announced>
-  <revised>2012-03-06: 1</revised>
+  <revised count="1">2012-03-06</revised>
   <bug>396455</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-06.xml b/metadata/glsa/glsa-201203-06.xml
index 9d265929e7b1..f36cdf0bc0d3 100644
--- a/metadata/glsa/glsa-201203-06.xml
+++ b/metadata/glsa/glsa-201203-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sudo</product>
   <announced>2012-03-06</announced>
-  <revised>2012-03-06: 1</revised>
+  <revised count="1">2012-03-06</revised>
   <bug>351490</bug>
   <bug>401533</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201203-07.xml b/metadata/glsa/glsa-201203-07.xml
index 7848a162cb18..151c401b2ebb 100644
--- a/metadata/glsa/glsa-201203-07.xml
+++ b/metadata/glsa/glsa-201203-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">foomatic-filters</product>
   <announced>2012-03-06</announced>
-  <revised>2012-03-06: 1</revised>
+  <revised count="1">2012-03-06</revised>
   <bug>379559</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-08.xml b/metadata/glsa/glsa-201203-08.xml
index 79fabf95a7a8..0911c0469772 100644
--- a/metadata/glsa/glsa-201203-08.xml
+++ b/metadata/glsa/glsa-201203-08.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in libxslt could result in Denial of Service.</synopsis>
   <product type="ebuild">libxslt</product>
   <announced>2012-03-06</announced>
-  <revised>2012-03-06: 1</revised>
+  <revised count="1">2012-03-06</revised>
   <bug>402861</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-09.xml b/metadata/glsa/glsa-201203-09.xml
index f8a89cf9212e..3d93d35f8e94 100644
--- a/metadata/glsa/glsa-201203-09.xml
+++ b/metadata/glsa/glsa-201203-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ImageMagick</product>
   <announced>2012-03-06</announced>
-  <revised>2012-03-06: 1</revised>
+  <revised count="1">2012-03-06</revised>
   <bug>402999</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-10.xml b/metadata/glsa/glsa-201203-10.xml
index 2bcaaaa321ff..181c566859b1 100644
--- a/metadata/glsa/glsa-201203-10.xml
+++ b/metadata/glsa/glsa-201203-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libmikmod</product>
   <announced>2012-03-06</announced>
-  <revised>2012-03-06: 1</revised>
+  <revised count="1">2012-03-06</revised>
   <bug>335892</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-11.xml b/metadata/glsa/glsa-201203-11.xml
index 9b4b7aebc251..0561690727ce 100644
--- a/metadata/glsa/glsa-201203-11.xml
+++ b/metadata/glsa/glsa-201203-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">usbmuxd</product>
   <announced>2012-03-06</announced>
-  <revised>2012-03-06: 1</revised>
+  <revised count="1">2012-03-06</revised>
   <bug>399409</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-12.xml b/metadata/glsa/glsa-201203-12.xml
index 2f7a231081cc..a3f2934b4af7 100644
--- a/metadata/glsa/glsa-201203-12.xml
+++ b/metadata/glsa/glsa-201203-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2012-03-06</announced>
-  <revised>2015-06-06: 9</revised>
+  <revised count="9">2015-06-06</revised>
   <bug>397695</bug>
   <bug>399365</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201203-13.xml b/metadata/glsa/glsa-201203-13.xml
index aeb62aa62a9e..b276e279908d 100644
--- a/metadata/glsa/glsa-201203-13.xml
+++ b/metadata/glsa/glsa-201203-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Openswan</product>
   <announced>2012-03-16</announced>
-  <revised>2012-03-16: 1</revised>
+  <revised count="1">2012-03-16</revised>
   <bug>372961</bug>
   <bug>389097</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201203-14.xml b/metadata/glsa/glsa-201203-14.xml
index a30d14104921..698ab7754c25 100644
--- a/metadata/glsa/glsa-201203-14.xml
+++ b/metadata/glsa/glsa-201203-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">audacious-plugins</product>
   <announced>2012-03-16</announced>
-  <revised>2012-03-16: 1</revised>
+  <revised count="1">2012-03-16</revised>
   <bug>383991</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-15.xml b/metadata/glsa/glsa-201203-15.xml
index e5528e1c925f..dd37960f3d30 100644
--- a/metadata/glsa/glsa-201203-15.xml
+++ b/metadata/glsa/glsa-201203-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gif2png</product>
   <announced>2012-03-16</announced>
-  <revised>2012-03-16: 1</revised>
+  <revised count="1">2012-03-16</revised>
   <bug>351698</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-16.xml b/metadata/glsa/glsa-201203-16.xml
index 2a1dd0f28c10..18c921c5982b 100644
--- a/metadata/glsa/glsa-201203-16.xml
+++ b/metadata/glsa/glsa-201203-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libmodplug</product>
   <announced>2012-03-16</announced>
-  <revised>2012-03-16: 2</revised>
+  <revised count="2">2012-03-16</revised>
   <bug>362503</bug>
   <bug>379557</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201203-17.xml b/metadata/glsa/glsa-201203-17.xml
index 8de15d627ff8..7961608f327f 100644
--- a/metadata/glsa/glsa-201203-17.xml
+++ b/metadata/glsa/glsa-201203-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">hplip</product>
   <announced>2012-03-16</announced>
-  <revised>2012-03-16: 1</revised>
+  <revised count="1">2012-03-16</revised>
   <bug>352085</bug>
   <bug>388655</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201203-18.xml b/metadata/glsa/glsa-201203-18.xml
index df8ff28b4ad3..f817a2b17a15 100644
--- a/metadata/glsa/glsa-201203-18.xml
+++ b/metadata/glsa/glsa-201203-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Minitube</product>
   <announced>2012-03-16</announced>
-  <revised>2012-03-16: 1</revised>
+  <revised count="1">2012-03-16</revised>
   <bug>388867</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-19.xml b/metadata/glsa/glsa-201203-19.xml
index 01b118404f4a..38aaee31d98f 100644
--- a/metadata/glsa/glsa-201203-19.xml
+++ b/metadata/glsa/glsa-201203-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2012-03-25</announced>
-  <revised>2012-03-25: 1</revised>
+  <revised count="1">2012-03-25</revised>
   <bug>406975</bug>
   <bug>407465</bug>
   <bug>407755</bug>
diff --git a/metadata/glsa/glsa-201203-20.xml b/metadata/glsa/glsa-201203-20.xml
index e9662188e44f..e8975a7ad692 100644
--- a/metadata/glsa/glsa-201203-20.xml
+++ b/metadata/glsa/glsa-201203-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Logwatch</product>
   <announced>2012-03-28</announced>
-  <revised>2012-03-28: 1</revised>
+  <revised count="1">2012-03-28</revised>
   <bug>356387</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-21.xml b/metadata/glsa/glsa-201203-21.xml
index b7d8a3f0d7dc..4c4d43bd37bc 100644
--- a/metadata/glsa/glsa-201203-21.xml
+++ b/metadata/glsa/glsa-201203-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Asterisk</product>
   <announced>2012-03-28</announced>
-  <revised>2012-03-28: 1</revised>
+  <revised count="1">2012-03-28</revised>
   <bug>408431</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-22.xml b/metadata/glsa/glsa-201203-22.xml
index cd962340bfb4..c9037147b3f2 100644
--- a/metadata/glsa/glsa-201203-22.xml
+++ b/metadata/glsa/glsa-201203-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nginx</product>
   <announced>2012-03-28</announced>
-  <revised>2012-03-28: 1</revised>
+  <revised count="1">2012-03-28</revised>
   <bug>293785</bug>
   <bug>293786</bug>
   <bug>293788</bug>
diff --git a/metadata/glsa/glsa-201203-23.xml b/metadata/glsa/glsa-201203-23.xml
index 417eb3dc0b4c..788daa52ed50 100644
--- a/metadata/glsa/glsa-201203-23.xml
+++ b/metadata/glsa/glsa-201203-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libzip</product>
   <announced>2012-03-29</announced>
-  <revised>2012-03-29: 1</revised>
+  <revised count="1">2012-03-29</revised>
   <bug>409117</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201203-24.xml b/metadata/glsa/glsa-201203-24.xml
index 5f21af549ba9..b19e18c11587 100644
--- a/metadata/glsa/glsa-201203-24.xml
+++ b/metadata/glsa/glsa-201203-24.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium v8</product>
   <announced>2012-03-30</announced>
-  <revised>2012-03-30: 1</revised>
+  <revised count="1">2012-03-30</revised>
   <bug>410045</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201204-01.xml b/metadata/glsa/glsa-201204-01.xml
index 31a5bb2f1ee7..aed3cc111a7f 100644
--- a/metadata/glsa/glsa-201204-01.xml
+++ b/metadata/glsa/glsa-201204-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">virtualbox</product>
   <announced>2012-04-09</announced>
-  <revised>2012-04-09: 1</revised>
+  <revised count="1">2012-04-09</revised>
   <bug>386317</bug>
   <bug>399807</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201204-02.xml b/metadata/glsa/glsa-201204-02.xml
index 20fb9cfe5ccd..d059fba358f3 100644
--- a/metadata/glsa/glsa-201204-02.xml
+++ b/metadata/glsa/glsa-201204-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">InspIRCd</product>
   <announced>2012-04-10</announced>
-  <revised>2012-04-10: 1</revised>
+  <revised count="1">2012-04-10</revised>
   <bug>409159</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201204-03.xml b/metadata/glsa/glsa-201204-03.xml
index 2a675462beaf..9cbceda9efa4 100644
--- a/metadata/glsa/glsa-201204-03.xml
+++ b/metadata/glsa/glsa-201204-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2012-04-10</announced>
-  <revised>2012-04-10: 1</revised>
+  <revised count="1">2012-04-10</revised>
   <bug>410963</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201204-04.xml b/metadata/glsa/glsa-201204-04.xml
index 3ac9395b37c8..904cecb45463 100644
--- a/metadata/glsa/glsa-201204-04.xml
+++ b/metadata/glsa/glsa-201204-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">FreeType</product>
   <announced>2012-04-17</announced>
-  <revised>2012-04-17: 1</revised>
+  <revised count="1">2012-04-17</revised>
   <bug>407257</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201204-05.xml b/metadata/glsa/glsa-201204-05.xml
index d5e96caf1d5f..67d7743b9482 100644
--- a/metadata/glsa/glsa-201204-05.xml
+++ b/metadata/glsa/glsa-201204-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">SWFTools</product>
   <announced>2012-04-17</announced>
-  <revised>2012-04-18: 2</revised>
+  <revised count="2">2012-04-18</revised>
   <bug>332649</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201204-06.xml b/metadata/glsa/glsa-201204-06.xml
index aeb9888a35f3..d24555e38ed4 100644
--- a/metadata/glsa/glsa-201204-06.xml
+++ b/metadata/glsa/glsa-201204-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">polkit</product>
   <announced>2012-04-17</announced>
-  <revised>2012-04-17: 1</revised>
+  <revised count="1">2012-04-17</revised>
   <bug>314535</bug>
   <bug>364973</bug>
   <bug>401513</bug>
diff --git a/metadata/glsa/glsa-201204-07.xml b/metadata/glsa/glsa-201204-07.xml
index 564d368408c3..a6e0d124bb98 100644
--- a/metadata/glsa/glsa-201204-07.xml
+++ b/metadata/glsa/glsa-201204-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Adobe Flash Player</product>
   <announced>2012-04-17</announced>
-  <revised>2012-04-17: 1</revised>
+  <revised count="1">2012-04-17</revised>
   <bug>390149</bug>
   <bug>404101</bug>
   <bug>407023</bug>
diff --git a/metadata/glsa/glsa-201204-08.xml b/metadata/glsa/glsa-201204-08.xml
index 74b7d859c061..48ea5757fd1f 100644
--- a/metadata/glsa/glsa-201204-08.xml
+++ b/metadata/glsa/glsa-201204-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">DBD-Pg</product>
   <announced>2012-04-17</announced>
-  <revised>2012-04-17: 1</revised>
+  <revised count="1">2012-04-17</revised>
   <bug>407549</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201205-01.xml b/metadata/glsa/glsa-201205-01.xml
index b96db195de77..fea5db6ea3b2 100644
--- a/metadata/glsa/glsa-201205-01.xml
+++ b/metadata/glsa/glsa-201205-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2012-05-15</announced>
-  <revised>2012-05-15: 1</revised>
+  <revised count="1">2012-05-15</revised>
   <bug>414199</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201205-02.xml b/metadata/glsa/glsa-201205-02.xml
index 5ea051af6ced..11af7b8402e1 100644
--- a/metadata/glsa/glsa-201205-02.xml
+++ b/metadata/glsa/glsa-201205-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ConnMan</product>
   <announced>2012-05-15</announced>
-  <revised>2012-05-15: 1</revised>
+  <revised count="1">2012-05-15</revised>
   <bug>415415</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201205-03.xml b/metadata/glsa/glsa-201205-03.xml
index 661c431162be..38f1863ee984 100644
--- a/metadata/glsa/glsa-201205-03.xml
+++ b/metadata/glsa/glsa-201205-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium v8</product>
   <announced>2012-05-21</announced>
-  <revised>2012-05-21: 1</revised>
+  <revised count="1">2012-05-21</revised>
   <bug>416119</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201205-04.xml b/metadata/glsa/glsa-201205-04.xml
index efd5b37e6181..e37fbda34247 100644
--- a/metadata/glsa/glsa-201205-04.xml
+++ b/metadata/glsa/glsa-201205-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium v8</product>
   <announced>2012-05-27</announced>
-  <revised>2012-05-27: 1</revised>
+  <revised count="1">2012-05-27</revised>
   <bug>417321</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201206-01.xml b/metadata/glsa/glsa-201206-01.xml
index 117b8e88c05d..39b724be14d7 100644
--- a/metadata/glsa/glsa-201206-01.xml
+++ b/metadata/glsa/glsa-201206-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bind</product>
   <announced>2012-06-02</announced>
-  <revised>2012-06-02: 1</revised>
+  <revised count="1">2012-06-02</revised>
   <bug>347621</bug>
   <bug>356223</bug>
   <bug>368863</bug>
diff --git a/metadata/glsa/glsa-201206-02.xml b/metadata/glsa/glsa-201206-02.xml
index be3aa2f9392c..413cfe17a10e 100644
--- a/metadata/glsa/glsa-201206-02.xml
+++ b/metadata/glsa/glsa-201206-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">qt-gui</product>
   <announced>2012-06-03</announced>
-  <revised>2012-06-03: 1</revised>
+  <revised count="1">2012-06-03</revised>
   <bug>384089</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201206-03.xml b/metadata/glsa/glsa-201206-03.xml
index 64d3fca29de1..fa6e89daee32 100644
--- a/metadata/glsa/glsa-201206-03.xml
+++ b/metadata/glsa/glsa-201206-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Opera</product>
   <announced>2012-06-15</announced>
-  <revised>2012-06-15: 1</revised>
+  <revised count="1">2012-06-15</revised>
   <bug>264831</bug>
   <bug>283391</bug>
   <bug>290862</bug>
diff --git a/metadata/glsa/glsa-201206-04.xml b/metadata/glsa/glsa-201206-04.xml
index 7efbb6b666a0..b00559f8c476 100644
--- a/metadata/glsa/glsa-201206-04.xml
+++ b/metadata/glsa/glsa-201206-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">argyllcms</product>
   <announced>2012-06-18</announced>
-  <revised>2012-06-18: 1</revised>
+  <revised count="1">2012-06-18</revised>
   <bug>416781</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201206-05.xml b/metadata/glsa/glsa-201206-05.xml
index 6651f21795e2..234a5c0bad9e 100644
--- a/metadata/glsa/glsa-201206-05.xml
+++ b/metadata/glsa/glsa-201206-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Asterisk</product>
   <announced>2012-06-21</announced>
-  <revised>2012-06-21: 1</revised>
+  <revised count="1">2012-06-21</revised>
   <bug>413353</bug>
   <bug>418189</bug>
   <bug>418191</bug>
diff --git a/metadata/glsa/glsa-201206-06.xml b/metadata/glsa/glsa-201206-06.xml
index 2194d1135b4a..393630c818e5 100644
--- a/metadata/glsa/glsa-201206-06.xml
+++ b/metadata/glsa/glsa-201206-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">OpenJPEG</product>
   <announced>2012-06-21</announced>
-  <revised>2012-06-21: 1</revised>
+  <revised count="1">2012-06-21</revised>
   <bug>409203</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201206-07.xml b/metadata/glsa/glsa-201206-07.xml
index 3a28abd5559e..72ccb27e88ea 100644
--- a/metadata/glsa/glsa-201206-07.xml
+++ b/metadata/glsa/glsa-201206-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nginx</product>
   <announced>2012-06-21</announced>
-  <revised>2012-06-21: 1</revised>
+  <revised count="1">2012-06-21</revised>
   <bug>411751</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201206-08.xml b/metadata/glsa/glsa-201206-08.xml
index de4f07e3c5ca..631f92efdff6 100644
--- a/metadata/glsa/glsa-201206-08.xml
+++ b/metadata/glsa/glsa-201206-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wicd</product>
   <announced>2012-06-21</announced>
-  <revised>2012-06-21: 1</revised>
+  <revised count="1">2012-06-21</revised>
   <bug>401005</bug>
   <bug>411729</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201206-09.xml b/metadata/glsa/glsa-201206-09.xml
index e9282f101bdc..182b83eed10a 100644
--- a/metadata/glsa/glsa-201206-09.xml
+++ b/metadata/glsa/glsa-201206-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">MediaWiki</product>
   <announced>2012-06-21</announced>
-  <revised>2012-06-21: 1</revised>
+  <revised count="1">2012-06-21</revised>
   <bug>366685</bug>
   <bug>409513</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201206-10.xml b/metadata/glsa/glsa-201206-10.xml
index 04b71a8ff9f9..c57e2b78d2a9 100644
--- a/metadata/glsa/glsa-201206-10.xml
+++ b/metadata/glsa/glsa-201206-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ejabberd</product>
   <announced>2012-06-21</announced>
-  <revised>2012-06-21: 1</revised>
+  <revised count="1">2012-06-21</revised>
   <bug>308047</bug>
   <bug>370201</bug>
   <bug>386075</bug>
diff --git a/metadata/glsa/glsa-201206-11.xml b/metadata/glsa/glsa-201206-11.xml
index 4c932eceecc0..90476ec6a1e1 100644
--- a/metadata/glsa/glsa-201206-11.xml
+++ b/metadata/glsa/glsa-201206-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Pidgin</product>
   <announced>2012-06-21</announced>
-  <revised>2012-06-21: 1</revised>
+  <revised count="1">2012-06-21</revised>
   <bug>299751</bug>
   <bug>372785</bug>
   <bug>385073</bug>
diff --git a/metadata/glsa/glsa-201206-12.xml b/metadata/glsa/glsa-201206-12.xml
index d34e5e7da672..76d2d32ddf9a 100644
--- a/metadata/glsa/glsa-201206-12.xml
+++ b/metadata/glsa/glsa-201206-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tftp-hpa</product>
   <announced>2012-06-21</announced>
-  <revised>2017-04-17: 3</revised>
+  <revised count="3">2017-04-17</revised>
   <bug>374001</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201206-13.xml b/metadata/glsa/glsa-201206-13.xml
index 5c9a40fdab85..ba3c64acf3e7 100644
--- a/metadata/glsa/glsa-201206-13.xml
+++ b/metadata/glsa/glsa-201206-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mono mono-debugger</product>
   <announced>2012-06-21</announced>
-  <revised>2012-06-21: 1</revised>
+  <revised count="1">2012-06-21</revised>
   <bug>277878</bug>
   <bug>342133</bug>
   <bug>345561</bug>
diff --git a/metadata/glsa/glsa-201206-14.xml b/metadata/glsa/glsa-201206-14.xml
index 6af7f1b8fd61..eac17fb89d62 100644
--- a/metadata/glsa/glsa-201206-14.xml
+++ b/metadata/glsa/glsa-201206-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2012-06-22</announced>
-  <revised>2012-06-22: 1</revised>
+  <revised count="1">2012-06-22</revised>
   <bug>405949</bug>
   <bug>411499</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201206-15.xml b/metadata/glsa/glsa-201206-15.xml
index 28bd63e0700a..18e442994fce 100644
--- a/metadata/glsa/glsa-201206-15.xml
+++ b/metadata/glsa/glsa-201206-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2012-06-22</announced>
-  <revised>2017-01-03: 5</revised>
+  <revised count="5">2017-01-03</revised>
   <bug>373967</bug>
   <bug>386185</bug>
   <bug>401987</bug>
diff --git a/metadata/glsa/glsa-201206-16.xml b/metadata/glsa/glsa-201206-16.xml
index 9931093f8be1..e8920ad83ef6 100644
--- a/metadata/glsa/glsa-201206-16.xml
+++ b/metadata/glsa/glsa-201206-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">TagLib</product>
   <announced>2012-06-22</announced>
-  <revised>2012-06-22: 1</revised>
+  <revised count="1">2012-06-22</revised>
   <bug>407673</bug>
   <bug>410953</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201206-17.xml b/metadata/glsa/glsa-201206-17.xml
index 81bd8d9f9a7e..649c43a6f580 100644
--- a/metadata/glsa/glsa-201206-17.xml
+++ b/metadata/glsa/glsa-201206-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">virtualenv</product>
   <announced>2012-06-22</announced>
-  <revised>2012-06-22: 1</revised>
+  <revised count="1">2012-06-22</revised>
   <bug>395285</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201206-18.xml b/metadata/glsa/glsa-201206-18.xml
index e70b8faf6d9e..ee00ffab3261 100644
--- a/metadata/glsa/glsa-201206-18.xml
+++ b/metadata/glsa/glsa-201206-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">GnuTLS</product>
   <announced>2012-06-23</announced>
-  <revised>2012-06-23: 1</revised>
+  <revised count="1">2012-06-23</revised>
   <bug>281224</bug>
   <bug>292025</bug>
   <bug>389947</bug>
diff --git a/metadata/glsa/glsa-201206-19.xml b/metadata/glsa/glsa-201206-19.xml
index 30c01976c0d9..33cb381d669c 100644
--- a/metadata/glsa/glsa-201206-19.xml
+++ b/metadata/glsa/glsa-201206-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nvidia-drivers</product>
   <announced>2012-06-23</announced>
-  <revised>2012-06-23: 1</revised>
+  <revised count="1">2012-06-23</revised>
   <bug>411617</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201206-20.xml b/metadata/glsa/glsa-201206-20.xml
index 57271d8704f2..aeda09bcb145 100644
--- a/metadata/glsa/glsa-201206-20.xml
+++ b/metadata/glsa/glsa-201206-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gdk-pixbuf</product>
   <announced>2012-06-23</announced>
-  <revised>2012-06-23: 1</revised>
+  <revised count="1">2012-06-23</revised>
   <bug>373999</bug>
   <bug>412033</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201206-21.xml b/metadata/glsa/glsa-201206-21.xml
index 3b012d8eb71d..8a2c6b8952c2 100644
--- a/metadata/glsa/glsa-201206-21.xml
+++ b/metadata/glsa/glsa-201206-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Adobe Flash Player</product>
   <announced>2012-06-23</announced>
-  <revised>2012-06-23: 1</revised>
+  <revised count="1">2012-06-23</revised>
   <bug>414603</bug>
   <bug>420311</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201206-22.xml b/metadata/glsa/glsa-201206-22.xml
index 676e1105e3cc..d6cbec859940 100644
--- a/metadata/glsa/glsa-201206-22.xml
+++ b/metadata/glsa/glsa-201206-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Samba</product>
   <announced>2012-06-24</announced>
-  <revised>2012-06-24: 1</revised>
+  <revised count="1">2012-06-24</revised>
   <bug>290633</bug>
   <bug>310105</bug>
   <bug>323785</bug>
diff --git a/metadata/glsa/glsa-201206-23.xml b/metadata/glsa/glsa-201206-23.xml
index a4ebb4f4cfca..7ad40d86ecc0 100644
--- a/metadata/glsa/glsa-201206-23.xml
+++ b/metadata/glsa/glsa-201206-23.xml
@@ -5,7 +5,7 @@
   <synopsis>PyCrypto generates weak ElGamal keys.</synopsis>
   <product type="ebuild">pycrypto</product>
   <announced>2012-06-24</announced>
-  <revised>2012-06-24: 1</revised>
+  <revised count="1">2012-06-24</revised>
   <bug>417625</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201206-24.xml b/metadata/glsa/glsa-201206-24.xml
index 3bc2a0606635..e8685a7045b2 100644
--- a/metadata/glsa/glsa-201206-24.xml
+++ b/metadata/glsa/glsa-201206-24.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">apache tomcat</product>
   <announced>2012-06-24</announced>
-  <revised>2016-03-20: 3</revised>
+  <revised count="3">2016-03-20</revised>
   <bug>272566</bug>
   <bug>273662</bug>
   <bug>303719</bug>
diff --git a/metadata/glsa/glsa-201206-25.xml b/metadata/glsa/glsa-201206-25.xml
index 4562803a1690..7ad6dfc6f5eb 100644
--- a/metadata/glsa/glsa-201206-25.xml
+++ b/metadata/glsa/glsa-201206-25.xml
@@ -5,7 +5,7 @@
   <synopsis>Multiple vulnerabilities were found in Apache HTTP Server.</synopsis>
   <product type="ebuild">apache</product>
   <announced>2012-06-24</announced>
-  <revised>2012-06-24: 1</revised>
+  <revised count="1">2012-06-24</revised>
   <bug>308049</bug>
   <bug>330195</bug>
   <bug>380475</bug>
diff --git a/metadata/glsa/glsa-201206-26.xml b/metadata/glsa/glsa-201206-26.xml
index 244dfc790a2b..b4efddddb7b9 100644
--- a/metadata/glsa/glsa-201206-26.xml
+++ b/metadata/glsa/glsa-201206-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">RPM</product>
   <announced>2012-06-24</announced>
-  <revised>2012-06-24: 1</revised>
+  <revised count="1">2012-06-24</revised>
   <bug>335880</bug>
   <bug>384967</bug>
   <bug>410949</bug>
diff --git a/metadata/glsa/glsa-201206-27.xml b/metadata/glsa/glsa-201206-27.xml
index 2ad1e1d51d94..7a64aa8cb896 100644
--- a/metadata/glsa/glsa-201206-27.xml
+++ b/metadata/glsa/glsa-201206-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mini_httpd</product>
   <announced>2012-06-24</announced>
-  <revised>2012-06-24: 1</revised>
+  <revised count="1">2012-06-24</revised>
   <bug>303755</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201206-28.xml b/metadata/glsa/glsa-201206-28.xml
index 08c0a463ed72..ab1d08f05e18 100644
--- a/metadata/glsa/glsa-201206-28.xml
+++ b/metadata/glsa/glsa-201206-28.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">TeX Live</product>
   <announced>2012-06-25</announced>
-  <revised>2012-06-25: 1</revised>
+  <revised count="1">2012-06-25</revised>
   <bug>264598</bug>
   <bug>324019</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201206-29.xml b/metadata/glsa/glsa-201206-29.xml
index 6a497fbf6df7..d9fe47e2c147 100644
--- a/metadata/glsa/glsa-201206-29.xml
+++ b/metadata/glsa/glsa-201206-29.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mount-cifs</product>
   <announced>2012-06-25</announced>
-  <revised>2014-02-02: 2</revised>
+  <revised count="2">2014-02-02</revised>
   <bug>308067</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201206-30.xml b/metadata/glsa/glsa-201206-30.xml
index f0fb5e64e7fa..a88f73fe9d63 100644
--- a/metadata/glsa/glsa-201206-30.xml
+++ b/metadata/glsa/glsa-201206-30.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sendmail</product>
   <announced>2012-06-25</announced>
-  <revised>2012-06-25: 1</revised>
+  <revised count="1">2012-06-25</revised>
   <bug>299120</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201206-31.xml b/metadata/glsa/glsa-201206-31.xml
index 8b17a3d7195b..2229602fbc6d 100644
--- a/metadata/glsa/glsa-201206-31.xml
+++ b/metadata/glsa/glsa-201206-31.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pam</product>
   <announced>2012-06-25</announced>
-  <revised>2012-06-25: 1</revised>
+  <revised count="1">2012-06-25</revised>
   <bug>343399</bug>
   <bug>386273</bug>
   <bug>388431</bug>
diff --git a/metadata/glsa/glsa-201206-32.xml b/metadata/glsa/glsa-201206-32.xml
index d3d91d8e3ff7..3dae50d96a6a 100644
--- a/metadata/glsa/glsa-201206-32.xml
+++ b/metadata/glsa/glsa-201206-32.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Links</product>
   <announced>2012-06-25</announced>
-  <revised>2012-06-25: 1</revised>
+  <revised count="1">2012-06-25</revised>
   <bug>253847</bug>
   <bug>411493</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201206-33.xml b/metadata/glsa/glsa-201206-33.xml
index d6e4f7de604d..1e4478f07400 100644
--- a/metadata/glsa/glsa-201206-33.xml
+++ b/metadata/glsa/glsa-201206-33.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Postfix</product>
   <announced>2012-06-25</announced>
-  <revised>2012-06-25: 1</revised>
+  <revised count="1">2012-06-25</revised>
   <bug>358085</bug>
   <bug>366605</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201206-34.xml b/metadata/glsa/glsa-201206-34.xml
index 566953732a51..74aacf358bb7 100644
--- a/metadata/glsa/glsa-201206-34.xml
+++ b/metadata/glsa/glsa-201206-34.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">msmtp</product>
   <announced>2012-06-25</announced>
-  <revised>2012-06-25: 1</revised>
+  <revised count="1">2012-06-25</revised>
   <bug>293647</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201206-35.xml b/metadata/glsa/glsa-201206-35.xml
index 968237043d69..946ce6cb2383 100644
--- a/metadata/glsa/glsa-201206-35.xml
+++ b/metadata/glsa/glsa-201206-35.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nbd</product>
   <announced>2012-06-25</announced>
-  <revised>2012-06-25: 1</revised>
+  <revised count="1">2012-06-25</revised>
   <bug>353097</bug>
   <bug>372891</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201206-36.xml b/metadata/glsa/glsa-201206-36.xml
index 07d978e7aa76..d676390d93ab 100644
--- a/metadata/glsa/glsa-201206-36.xml
+++ b/metadata/glsa/glsa-201206-36.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">logrotate</product>
   <announced>2012-06-25</announced>
-  <revised>2012-06-25: 1</revised>
+  <revised count="1">2012-06-25</revised>
   <bug>356811</bug>
   <bug>372973</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201207-01.xml b/metadata/glsa/glsa-201207-01.xml
index 77826694f721..0547e3f58ade 100644
--- a/metadata/glsa/glsa-201207-01.xml
+++ b/metadata/glsa/glsa-201207-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sudo</product>
   <announced>2012-07-09</announced>
-  <revised>2012-07-09: 1</revised>
+  <revised count="1">2012-07-09</revised>
   <bug>416281</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201207-02.xml b/metadata/glsa/glsa-201207-02.xml
index 281432dd426f..6c4f9676ff8c 100644
--- a/metadata/glsa/glsa-201207-02.xml
+++ b/metadata/glsa/glsa-201207-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libxml2</product>
   <announced>2012-07-09</announced>
-  <revised>2012-07-09: 1</revised>
+  <revised count="1">2012-07-09</revised>
   <bug>416209</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201207-03.xml b/metadata/glsa/glsa-201207-03.xml
index 0eb206aca6f3..9d4d400fca98 100644
--- a/metadata/glsa/glsa-201207-03.xml
+++ b/metadata/glsa/glsa-201207-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ChaSen</product>
   <announced>2012-07-09</announced>
-  <revised>2012-07-09: 1</revised>
+  <revised count="1">2012-07-09</revised>
   <bug>390769</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201207-04.xml b/metadata/glsa/glsa-201207-04.xml
index 178b217428ed..a707e4b4d3d1 100644
--- a/metadata/glsa/glsa-201207-04.xml
+++ b/metadata/glsa/glsa-201207-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xorg-server</product>
   <announced>2012-07-09</announced>
-  <revised>2012-07-09: 1</revised>
+  <revised count="1">2012-07-09</revised>
   <bug>412609</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201207-05.xml b/metadata/glsa/glsa-201207-05.xml
index 0f10c86afcf8..ea5e2f76ad90 100644
--- a/metadata/glsa/glsa-201207-05.xml
+++ b/metadata/glsa/glsa-201207-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pidgin-otr</product>
   <announced>2012-07-09</announced>
-  <revised>2012-07-09: 1</revised>
+  <revised count="1">2012-07-09</revised>
   <bug>416263</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201207-06.xml b/metadata/glsa/glsa-201207-06.xml
index f19941710a01..fc5aef2fcaa8 100644
--- a/metadata/glsa/glsa-201207-06.xml
+++ b/metadata/glsa/glsa-201207-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">jruby</product>
   <announced>2012-07-09</announced>
-  <revised>2012-07-09: 1</revised>
+  <revised count="1">2012-07-09</revised>
   <bug>396305</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201207-07.xml b/metadata/glsa/glsa-201207-07.xml
index 0b1180209dba..b7b19be392a4 100644
--- a/metadata/glsa/glsa-201207-07.xml
+++ b/metadata/glsa/glsa-201207-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">keepalived</product>
   <announced>2012-07-09</announced>
-  <revised>2012-07-09: 1</revised>
+  <revised count="1">2012-07-09</revised>
   <bug>371469</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201207-08.xml b/metadata/glsa/glsa-201207-08.xml
index 503dc2fd6eab..3ac6f45d78ef 100644
--- a/metadata/glsa/glsa-201207-08.xml
+++ b/metadata/glsa/glsa-201207-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Gnash</product>
   <announced>2012-07-09</announced>
-  <revised>2012-07-09: 1</revised>
+  <revised count="1">2012-07-09</revised>
   <bug>391283</bug>
   <bug>408209</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201207-09.xml b/metadata/glsa/glsa-201207-09.xml
index 7d0c8e7e693e..6f5860e76651 100644
--- a/metadata/glsa/glsa-201207-09.xml
+++ b/metadata/glsa/glsa-201207-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mod_fcgid</product>
   <announced>2012-07-09</announced>
-  <revised>2012-07-09: 1</revised>
+  <revised count="1">2012-07-09</revised>
   <bug>344685</bug>
   <bug>409373</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201207-10.xml b/metadata/glsa/glsa-201207-10.xml
index 661e41945e41..75ddbf5d0abe 100644
--- a/metadata/glsa/glsa-201207-10.xml
+++ b/metadata/glsa/glsa-201207-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cups</product>
   <announced>2012-07-09</announced>
-  <revised>2012-07-09: 1</revised>
+  <revised count="1">2012-07-09</revised>
   <bug>295256</bug>
   <bug>308045</bug>
   <bug>325551</bug>
diff --git a/metadata/glsa/glsa-201208-01.xml b/metadata/glsa/glsa-201208-01.xml
index 0e2bcf01b0b4..f811da4f418d 100644
--- a/metadata/glsa/glsa-201208-01.xml
+++ b/metadata/glsa/glsa-201208-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">socat</product>
   <announced>2012-08-14</announced>
-  <revised>2012-08-14: 1</revised>
+  <revised count="1">2012-08-14</revised>
   <bug>415977</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201208-02.xml b/metadata/glsa/glsa-201208-02.xml
index 6832ec913d37..568b4b9a4a18 100644
--- a/metadata/glsa/glsa-201208-02.xml
+++ b/metadata/glsa/glsa-201208-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Puppet</product>
   <announced>2012-08-14</announced>
-  <revised>2012-08-14: 1</revised>
+  <revised count="1">2012-08-14</revised>
   <bug>410857</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201208-03.xml b/metadata/glsa/glsa-201208-03.xml
index 61885e5f11e0..15a9e18bd329 100644
--- a/metadata/glsa/glsa-201208-03.xml
+++ b/metadata/glsa/glsa-201208-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2012-08-14</announced>
-  <revised>2012-08-14: 1</revised>
+  <revised count="1">2012-08-14</revised>
   <bug>423719</bug>
   <bug>426204</bug>
   <bug>429174</bug>
diff --git a/metadata/glsa/glsa-201208-04.xml b/metadata/glsa/glsa-201208-04.xml
index d687b3d29728..947453128f44 100644
--- a/metadata/glsa/glsa-201208-04.xml
+++ b/metadata/glsa/glsa-201208-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gajim</product>
   <announced>2012-08-14</announced>
-  <revised>2012-08-14: 1</revised>
+  <revised count="1">2012-08-14</revised>
   <bug>411269</bug>
   <bug>412215</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201208-05.xml b/metadata/glsa/glsa-201208-05.xml
index 70608514b4cf..b89acfb66a4e 100644
--- a/metadata/glsa/glsa-201208-05.xml
+++ b/metadata/glsa/glsa-201208-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Config-IniFiles</product>
   <announced>2012-08-14</announced>
-  <revised>2012-08-14: 1</revised>
+  <revised count="1">2012-08-14</revised>
   <bug>414485</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201208-06.xml b/metadata/glsa/glsa-201208-06.xml
index 0a44a534c55f..08dddd2b4c27 100644
--- a/metadata/glsa/glsa-201208-06.xml
+++ b/metadata/glsa/glsa-201208-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libgdata</product>
   <announced>2012-08-14</announced>
-  <revised>2012-08-14: 1</revised>
+  <revised count="1">2012-08-14</revised>
   <bug>408245</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-01.xml b/metadata/glsa/glsa-201209-01.xml
index 4b0f35cbd0a8..d278e2fc2090 100644
--- a/metadata/glsa/glsa-201209-01.xml
+++ b/metadata/glsa/glsa-201209-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2012-09-05</announced>
-  <revised>2012-09-05: 2</revised>
+  <revised count="2">2012-09-05</revised>
   <bug>431432</bug>
   <bug>432286</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201209-02.xml b/metadata/glsa/glsa-201209-02.xml
index f5ede1ee256a..077da1f9bb94 100644
--- a/metadata/glsa/glsa-201209-02.xml
+++ b/metadata/glsa/glsa-201209-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tiff</product>
   <announced>2012-09-23</announced>
-  <revised>2014-06-02: 6</revised>
+  <revised count="6">2014-06-02</revised>
   <bug>307001</bug>
   <bug>324885</bug>
   <bug>357271</bug>
diff --git a/metadata/glsa/glsa-201209-03.xml b/metadata/glsa/glsa-201209-03.xml
index ad220378c453..5816fcbc84cf 100644
--- a/metadata/glsa/glsa-201209-03.xml
+++ b/metadata/glsa/glsa-201209-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2012-09-24</announced>
-  <revised>2012-09-24: 1</revised>
+  <revised count="1">2012-09-24</revised>
   <bug>384301</bug>
   <bug>396311</bug>
   <bug>396533</bug>
diff --git a/metadata/glsa/glsa-201209-04.xml b/metadata/glsa/glsa-201209-04.xml
index 3a8c08f1258d..4d88218a3ef1 100644
--- a/metadata/glsa/glsa-201209-04.xml
+++ b/metadata/glsa/glsa-201209-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bind</product>
   <announced>2012-09-24</announced>
-  <revised>2012-09-24: 1</revised>
+  <revised count="1">2012-09-24</revised>
   <bug>402661</bug>
   <bug>419637</bug>
   <bug>427966</bug>
diff --git a/metadata/glsa/glsa-201209-05.xml b/metadata/glsa/glsa-201209-05.xml
index 244e36901e11..be768d5f8238 100644
--- a/metadata/glsa/glsa-201209-05.xml
+++ b/metadata/glsa/glsa-201209-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libreoffice</product>
   <announced>2012-09-24</announced>
-  <revised>2012-09-24: 1</revised>
+  <revised count="1">2012-09-24</revised>
   <bug>386081</bug>
   <bug>409455</bug>
   <bug>416457</bug>
diff --git a/metadata/glsa/glsa-201209-06.xml b/metadata/glsa/glsa-201209-06.xml
index 4be3bd83bfc1..3c1ebf377b86 100644
--- a/metadata/glsa/glsa-201209-06.xml
+++ b/metadata/glsa/glsa-201209-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">expat</product>
   <announced>2012-09-24</announced>
-  <revised>2012-09-24: 1</revised>
+  <revised count="1">2012-09-24</revised>
   <bug>280615</bug>
   <bug>303727</bug>
   <bug>407519</bug>
diff --git a/metadata/glsa/glsa-201209-07.xml b/metadata/glsa/glsa-201209-07.xml
index 2ef1339b8752..76290afb9b03 100644
--- a/metadata/glsa/glsa-201209-07.xml
+++ b/metadata/glsa/glsa-201209-07.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">icu</product>
   <announced>2012-09-24</announced>
-  <revised>2012-09-24: 1</revised>
+  <revised count="1">2012-09-24</revised>
   <bug>394201</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-08.xml b/metadata/glsa/glsa-201209-08.xml
index 2d1f80823610..320c8db03717 100644
--- a/metadata/glsa/glsa-201209-08.xml
+++ b/metadata/glsa/glsa-201209-08.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in SquidClamav may result in Denial of Service.</synopsis>
   <product type="ebuild">squidclamav</product>
   <announced>2012-09-24</announced>
-  <revised>2012-09-24: 1</revised>
+  <revised count="1">2012-09-24</revised>
   <bug>428778</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-09.xml b/metadata/glsa/glsa-201209-09.xml
index bad91a172b26..516acf6ab69e 100644
--- a/metadata/glsa/glsa-201209-09.xml
+++ b/metadata/glsa/glsa-201209-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">atheme</product>
   <announced>2012-09-25</announced>
-  <revised>2012-09-25: 1</revised>
+  <revised count="1">2012-09-25</revised>
   <bug>409103</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-10.xml b/metadata/glsa/glsa-201209-10.xml
index c777af605f06..688cc430422b 100644
--- a/metadata/glsa/glsa-201209-10.xml
+++ b/metadata/glsa/glsa-201209-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">calligra</product>
   <announced>2012-09-25</announced>
-  <revised>2012-09-25: 1</revised>
+  <revised count="1">2012-09-25</revised>
   <bug>428890</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-11.xml b/metadata/glsa/glsa-201209-11.xml
index b41047f03d6f..70ed202c2acc 100644
--- a/metadata/glsa/glsa-201209-11.xml
+++ b/metadata/glsa/glsa-201209-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2012-09-25</announced>
-  <revised>2012-09-25: 1</revised>
+  <revised count="1">2012-09-25</revised>
   <bug>429478</bug>
   <bug>434584</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201209-12.xml b/metadata/glsa/glsa-201209-12.xml
index cebb109cdeda..6d3624bc4366 100644
--- a/metadata/glsa/glsa-201209-12.xml
+++ b/metadata/glsa/glsa-201209-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libtasn1</product>
   <announced>2012-09-25</announced>
-  <revised>2012-09-25: 1</revised>
+  <revised count="1">2012-09-25</revised>
   <bug>409031</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-13.xml b/metadata/glsa/glsa-201209-13.xml
index 7dfa02c1cfe5..7a5d2cdc8f1d 100644
--- a/metadata/glsa/glsa-201209-13.xml
+++ b/metadata/glsa/glsa-201209-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libjpeg-turbo</product>
   <announced>2012-09-26</announced>
-  <revised>2012-09-26: 1</revised>
+  <revised count="1">2012-09-26</revised>
   <bug>426938</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-14.xml b/metadata/glsa/glsa-201209-14.xml
index ac0308a19c82..2e41c9e63e78 100644
--- a/metadata/glsa/glsa-201209-14.xml
+++ b/metadata/glsa/glsa-201209-14.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in file could result in Denial of Service.</synopsis>
   <product type="ebuild">file</product>
   <announced>2012-09-26</announced>
-  <revised>2012-09-26: 1</revised>
+  <revised count="1">2012-09-26</revised>
   <bug>427368</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-15.xml b/metadata/glsa/glsa-201209-15.xml
index ca9637fa7fbe..c7d5570fba75 100644
--- a/metadata/glsa/glsa-201209-15.xml
+++ b/metadata/glsa/glsa-201209-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2012-09-26</announced>
-  <revised>2012-09-26: 1</revised>
+  <revised count="1">2012-09-26</revised>
   <bug>425050</bug>
   <bug>433750</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201209-16.xml b/metadata/glsa/glsa-201209-16.xml
index 6c4ca06bf920..6be1aa6dc984 100644
--- a/metadata/glsa/glsa-201209-16.xml
+++ b/metadata/glsa/glsa-201209-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sqlalchemy</product>
   <announced>2012-09-26</announced>
-  <revised>2012-09-26: 1</revised>
+  <revised count="1">2012-09-26</revised>
   <bug>407437</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-17.xml b/metadata/glsa/glsa-201209-17.xml
index 71905cbea207..1c2c7f9f946c 100644
--- a/metadata/glsa/glsa-201209-17.xml
+++ b/metadata/glsa/glsa-201209-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pidgin</product>
   <announced>2012-09-27</announced>
-  <revised>2012-09-27: 1</revised>
+  <revised count="1">2012-09-27</revised>
   <bug>425076</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-18.xml b/metadata/glsa/glsa-201209-18.xml
index 855dfa3f8093..d29210c30812 100644
--- a/metadata/glsa/glsa-201209-18.xml
+++ b/metadata/glsa/glsa-201209-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">postfixadmin</product>
   <announced>2012-09-27</announced>
-  <revised>2012-09-27: 1</revised>
+  <revised count="1">2012-09-27</revised>
   <bug>400971</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-19.xml b/metadata/glsa/glsa-201209-19.xml
index a82a16aa1015..9c71537dfe74 100644
--- a/metadata/glsa/glsa-201209-19.xml
+++ b/metadata/glsa/glsa-201209-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nut</product>
   <announced>2012-09-27</announced>
-  <revised>2012-09-27: 1</revised>
+  <revised count="1">2012-09-27</revised>
   <bug>419377</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-20.xml b/metadata/glsa/glsa-201209-20.xml
index 934ff2a5f3be..19cf6109fea6 100644
--- a/metadata/glsa/glsa-201209-20.xml
+++ b/metadata/glsa/glsa-201209-20.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in mod_rpaf may result in Denial of Service.</synopsis>
   <product type="ebuild">mod_rpaf</product>
   <announced>2012-09-27</announced>
-  <revised>2012-09-27: 1</revised>
+  <revised count="1">2012-09-27</revised>
   <bug>432406</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-21.xml b/metadata/glsa/glsa-201209-21.xml
index 2e87146459e6..7a7530c144a1 100644
--- a/metadata/glsa/glsa-201209-21.xml
+++ b/metadata/glsa/glsa-201209-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">fastjar</product>
   <announced>2012-09-28</announced>
-  <revised>2012-09-28: 1</revised>
+  <revised count="1">2012-09-28</revised>
   <bug>325557</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-22.xml b/metadata/glsa/glsa-201209-22.xml
index 7f0ca963fa4f..7b2b35b9d8bd 100644
--- a/metadata/glsa/glsa-201209-22.xml
+++ b/metadata/glsa/glsa-201209-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libgssglue</product>
   <announced>2012-09-28</announced>
-  <revised>2012-09-28: 1</revised>
+  <revised count="1">2012-09-28</revised>
   <bug>385321</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201209-23.xml b/metadata/glsa/glsa-201209-23.xml
index f915ab61617c..abba53a99d11 100644
--- a/metadata/glsa/glsa-201209-23.xml
+++ b/metadata/glsa/glsa-201209-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gimp</product>
   <announced>2012-09-28</announced>
-  <revised>2012-09-28: 1</revised>
+  <revised count="1">2012-09-28</revised>
   <bug>293127</bug>
   <bug>350915</bug>
   <bug>372975</bug>
diff --git a/metadata/glsa/glsa-201209-24.xml b/metadata/glsa/glsa-201209-24.xml
index 2598c93f05c9..2d9fcdcc3456 100644
--- a/metadata/glsa/glsa-201209-24.xml
+++ b/metadata/glsa/glsa-201209-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">PostgreSQL</product>
   <announced>2012-09-28</announced>
-  <revised>2014-01-20: 2</revised>
+  <revised count="2">2014-01-20</revised>
   <bug>406037</bug>
   <bug>419727</bug>
   <bug>431766</bug>
diff --git a/metadata/glsa/glsa-201209-25.xml b/metadata/glsa/glsa-201209-25.xml
index 422b26028258..de327b0c48e2 100644
--- a/metadata/glsa/glsa-201209-25.xml
+++ b/metadata/glsa/glsa-201209-25.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">vmware-server vmware-player vmware-workstation</product>
   <announced>2012-09-29</announced>
-  <revised>2012-09-29: 2</revised>
+  <revised count="2">2012-09-29</revised>
   <bug>213548</bug>
   <bug>224637</bug>
   <bug>236167</bug>
diff --git a/metadata/glsa/glsa-201210-01.xml b/metadata/glsa/glsa-201210-01.xml
index 9b2be147cfa7..f7415a40438b 100644
--- a/metadata/glsa/glsa-201210-01.xml
+++ b/metadata/glsa/glsa-201210-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">w3m</product>
   <announced>2012-10-18</announced>
-  <revised>2012-10-18: 1</revised>
+  <revised count="1">2012-10-18</revised>
   <bug>325431</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201210-02.xml b/metadata/glsa/glsa-201210-02.xml
index 2953f4d5c318..e95c2baa20e9 100644
--- a/metadata/glsa/glsa-201210-02.xml
+++ b/metadata/glsa/glsa-201210-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">MoinMoin</product>
   <announced>2012-10-18</announced>
-  <revised>2012-10-18: 1</revised>
+  <revised count="1">2012-10-18</revised>
   <bug>305663</bug>
   <bug>339295</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201210-03.xml b/metadata/glsa/glsa-201210-03.xml
index 2377f25c57b4..fb68a508cf58 100644
--- a/metadata/glsa/glsa-201210-03.xml
+++ b/metadata/glsa/glsa-201210-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">rdesktop</product>
   <announced>2012-10-18</announced>
-  <revised>2012-10-18: 1</revised>
+  <revised count="1">2012-10-18</revised>
   <bug>364191</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201210-04.xml b/metadata/glsa/glsa-201210-04.xml
index ed78e07eac6b..34534b1d8067 100644
--- a/metadata/glsa/glsa-201210-04.xml
+++ b/metadata/glsa/glsa-201210-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ebuild</product>
   <announced>2012-10-18</announced>
-  <revised>2012-10-18: 1</revised>
+  <revised count="1">2012-10-18</revised>
   <bug>364889</bug>
   <bug>365259</bug>
   <bug>372411</bug>
diff --git a/metadata/glsa/glsa-201210-05.xml b/metadata/glsa/glsa-201210-05.xml
index 5d61a182a157..ecd0563c4c8e 100644
--- a/metadata/glsa/glsa-201210-05.xml
+++ b/metadata/glsa/glsa-201210-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bash</product>
   <announced>2012-10-20</announced>
-  <revised>2012-10-20: 1</revised>
+  <revised count="1">2012-10-20</revised>
   <bug>251319</bug>
   <bug>431850</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201210-06.xml b/metadata/glsa/glsa-201210-06.xml
index 39ac325d4d02..2cec9b05e9fa 100644
--- a/metadata/glsa/glsa-201210-06.xml
+++ b/metadata/glsa/glsa-201210-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libav</product>
   <announced>2012-10-20</announced>
-  <revised>2012-10-20: 1</revised>
+  <revised count="1">2012-10-20</revised>
   <bug>408555</bug>
   <bug>422537</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201210-07.xml b/metadata/glsa/glsa-201210-07.xml
index 3b79f41c0f40..b35728407beb 100644
--- a/metadata/glsa/glsa-201210-07.xml
+++ b/metadata/glsa/glsa-201210-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2012-10-21</announced>
-  <revised>2012-10-21: 1</revised>
+  <revised count="1">2012-10-21</revised>
   <bug>433551</bug>
   <bug>436234</bug>
   <bug>437664</bug>
diff --git a/metadata/glsa/glsa-201211-01.xml b/metadata/glsa/glsa-201211-01.xml
index 29b80098e15c..3ce37c496569 100644
--- a/metadata/glsa/glsa-201211-01.xml
+++ b/metadata/glsa/glsa-201211-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">MantisBT</product>
   <announced>2012-11-08</announced>
-  <revised>2012-11-08: 1</revised>
+  <revised count="1">2012-11-08</revised>
   <bug>348761</bug>
   <bug>381417</bug>
   <bug>386153</bug>
diff --git a/metadata/glsa/glsa-201301-01.xml b/metadata/glsa/glsa-201301-01.xml
index 38d3b766c28e..d3c323790b89 100644
--- a/metadata/glsa/glsa-201301-01.xml
+++ b/metadata/glsa/glsa-201301-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">firefox</product>
   <announced>2013-01-08</announced>
-  <revised>2013-01-08: 1</revised>
+  <revised count="1">2013-01-08</revised>
   <bug>180159</bug>
   <bug>181361</bug>
   <bug>207261</bug>
diff --git a/metadata/glsa/glsa-201301-02.xml b/metadata/glsa/glsa-201301-02.xml
index e0e83b449bc3..d893765933bc 100644
--- a/metadata/glsa/glsa-201301-02.xml
+++ b/metadata/glsa/glsa-201301-02.xml
@@ -5,7 +5,7 @@
   <synopsis>A buffer overflow in HAProxy may allow execution of arbitrary code.</synopsis>
   <product type="ebuild">haproxy</product>
   <announced>2013-01-08</announced>
-  <revised>2013-01-08: 1</revised>
+  <revised count="1">2013-01-08</revised>
   <bug>417079</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201301-03.xml b/metadata/glsa/glsa-201301-03.xml
index 84d3ca6805a3..2b2e18ea728a 100644
--- a/metadata/glsa/glsa-201301-03.xml
+++ b/metadata/glsa/glsa-201301-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tor</product>
   <announced>2013-01-08</announced>
-  <revised>2013-01-08: 1</revised>
+  <revised count="1">2013-01-08</revised>
   <bug>432188</bug>
   <bug>434882</bug>
   <bug>444804</bug>
diff --git a/metadata/glsa/glsa-201301-04.xml b/metadata/glsa/glsa-201301-04.xml
index 5b30e74cd131..1258bf2f7a8d 100644
--- a/metadata/glsa/glsa-201301-04.xml
+++ b/metadata/glsa/glsa-201301-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dhcpcd</product>
   <announced>2013-01-09</announced>
-  <revised>2013-01-09: 1</revised>
+  <revised count="1">2013-01-09</revised>
   <bug>362459</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201301-05.xml b/metadata/glsa/glsa-201301-05.xml
index 069aeebe0dbe..e3eda72e1316 100644
--- a/metadata/glsa/glsa-201301-05.xml
+++ b/metadata/glsa/glsa-201301-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bzip2</product>
   <announced>2013-01-09</announced>
-  <revised>2013-01-09: 1</revised>
+  <revised count="1">2013-01-09</revised>
   <bug>338215</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201301-06.xml b/metadata/glsa/glsa-201301-06.xml
index 6b89301f0c5d..c51e55f944cb 100644
--- a/metadata/glsa/glsa-201301-06.xml
+++ b/metadata/glsa/glsa-201301-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ISC DHCP Server</product>
   <announced>2013-01-09</announced>
-  <revised>2013-01-09: 1</revised>
+  <revised count="1">2013-01-09</revised>
   <bug>362453</bug>
   <bug>378799</bug>
   <bug>393617</bug>
diff --git a/metadata/glsa/glsa-201301-07.xml b/metadata/glsa/glsa-201301-07.xml
index 63e4c4544a1d..1138c03cf586 100644
--- a/metadata/glsa/glsa-201301-07.xml
+++ b/metadata/glsa/glsa-201301-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">DokuWiki</product>
   <announced>2013-01-09</announced>
-  <revised>2013-01-09: 1</revised>
+  <revised count="1">2013-01-09</revised>
   <bug>301310</bug>
   <bug>386155</bug>
   <bug>412891</bug>
diff --git a/metadata/glsa/glsa-201304-01.xml b/metadata/glsa/glsa-201304-01.xml
index e8c77d8b8adf..267a6840a73a 100644
--- a/metadata/glsa/glsa-201304-01.xml
+++ b/metadata/glsa/glsa-201304-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nvidia-drivers</product>
   <announced>2013-04-08</announced>
-  <revised>2013-04-08: 1</revised>
+  <revised count="1">2013-04-08</revised>
   <bug>429614</bug>
   <bug>464248</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201307-01.xml b/metadata/glsa/glsa-201307-01.xml
index 0e922a5b085e..160bb7c68808 100644
--- a/metadata/glsa/glsa-201307-01.xml
+++ b/metadata/glsa/glsa-201307-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">HAProxy</product>
   <announced>2013-07-11</announced>
-  <revised>2013-07-11: 1</revised>
+  <revised count="1">2013-07-11</revised>
   <bug>464340</bug>
   <bug>473674</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201308-01.xml b/metadata/glsa/glsa-201308-01.xml
index 0f5d830b98da..fa46469f49ef 100644
--- a/metadata/glsa/glsa-201308-01.xml
+++ b/metadata/glsa/glsa-201308-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">putty</product>
   <announced>2013-08-21</announced>
-  <revised>2013-08-21: 2</revised>
+  <revised count="2">2013-08-21</revised>
   <bug>394429</bug>
   <bug>479872</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201308-02.xml b/metadata/glsa/glsa-201308-02.xml
index 5dc984d35809..bab7fa6e14c0 100644
--- a/metadata/glsa/glsa-201308-02.xml
+++ b/metadata/glsa/glsa-201308-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">d-bus</product>
   <announced>2013-08-22</announced>
-  <revised>2013-08-22: 1</revised>
+  <revised count="1">2013-08-22</revised>
   <bug>473190</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201308-03.xml b/metadata/glsa/glsa-201308-03.xml
index dffb8a97a376..0b1d88ca15f1 100644
--- a/metadata/glsa/glsa-201308-03.xml
+++ b/metadata/glsa/glsa-201308-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Ebuild</product>
   <announced>2013-08-22</announced>
-  <revised>2014-01-30: 2</revised>
+  <revised count="2">2014-01-30</revised>
   <bug>431732</bug>
   <bug>451058</bug>
   <bug>469960</bug>
diff --git a/metadata/glsa/glsa-201308-04.xml b/metadata/glsa/glsa-201308-04.xml
index ce5601ed3e71..103ba6e2172c 100644
--- a/metadata/glsa/glsa-201308-04.xml
+++ b/metadata/glsa/glsa-201308-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">puppet</product>
   <announced>2013-08-23</announced>
-  <revised>2013-08-23: 1</revised>
+  <revised count="1">2013-08-23</revised>
   <bug>456002</bug>
   <bug>461656</bug>
   <bug>473720</bug>
diff --git a/metadata/glsa/glsa-201308-05.xml b/metadata/glsa/glsa-201308-05.xml
index a83e517156d4..ef2d01a24462 100644
--- a/metadata/glsa/glsa-201308-05.xml
+++ b/metadata/glsa/glsa-201308-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2013-08-28</announced>
-  <revised>2013-08-30: 2</revised>
+  <revised count="2">2013-08-30</revised>
   <bug>398549</bug>
   <bug>427964</bug>
   <bug>431572</bug>
diff --git a/metadata/glsa/glsa-201308-06.xml b/metadata/glsa/glsa-201308-06.xml
index d9236a706377..3c8f50bdf8c4 100644
--- a/metadata/glsa/glsa-201308-06.xml
+++ b/metadata/glsa/glsa-201308-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mysql</product>
   <announced>2013-08-29</announced>
-  <revised>2013-08-30: 2</revised>
+  <revised count="2">2013-08-30</revised>
   <bug>399375</bug>
   <bug>411503</bug>
   <bug>412889</bug>
diff --git a/metadata/glsa/glsa-201309-01.xml b/metadata/glsa/glsa-201309-01.xml
index 0f9788c73e8c..1bf4114b17b2 100644
--- a/metadata/glsa/glsa-201309-01.xml
+++ b/metadata/glsa/glsa-201309-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cyrus-sasl</product>
   <announced>2013-09-01</announced>
-  <revised>2013-09-01: 1</revised>
+  <revised count="1">2013-09-01</revised>
   <bug>476764</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201309-02.xml b/metadata/glsa/glsa-201309-02.xml
index db94be7c1c96..c18bba8b6344 100644
--- a/metadata/glsa/glsa-201309-02.xml
+++ b/metadata/glsa/glsa-201309-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">strongswan</product>
   <announced>2013-09-01</announced>
-  <revised>2013-09-01: 1</revised>
+  <revised count="1">2013-09-01</revised>
   <bug>468504</bug>
   <bug>479396</bug>
   <bug>483202</bug>
diff --git a/metadata/glsa/glsa-201309-03.xml b/metadata/glsa/glsa-201309-03.xml
index a765efbec6cd..983ce843dd94 100644
--- a/metadata/glsa/glsa-201309-03.xml
+++ b/metadata/glsa/glsa-201309-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Xlockmore</product>
   <announced>2013-09-02</announced>
-  <revised>2013-09-02: 1</revised>
+  <revised count="1">2013-09-02</revised>
   <bug>255229</bug>
   <bug>440776</bug>
   <bug>477328</bug>
diff --git a/metadata/glsa/glsa-201309-04.xml b/metadata/glsa/glsa-201309-04.xml
index 76c9e9717c1d..80c78b521907 100644
--- a/metadata/glsa/glsa-201309-04.xml
+++ b/metadata/glsa/glsa-201309-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">snack</product>
   <announced>2013-09-11</announced>
-  <revised>2013-09-11: 1</revised>
+  <revised count="1">2013-09-11</revised>
   <bug>446822</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201309-05.xml b/metadata/glsa/glsa-201309-05.xml
index 69b0be447929..3e8c6937b6e6 100644
--- a/metadata/glsa/glsa-201309-05.xml
+++ b/metadata/glsa/glsa-201309-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">pip</product>
   <announced>2013-09-12</announced>
-  <revised>2013-09-12: 1</revised>
+  <revised count="1">2013-09-12</revised>
   <bug>462616</bug>
   <bug>480202</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201309-06.xml b/metadata/glsa/glsa-201309-06.xml
index 93b8abef3125..0cdb38a043bc 100644
--- a/metadata/glsa/glsa-201309-06.xml
+++ b/metadata/glsa/glsa-201309-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2013-09-14</announced>
-  <revised>2013-09-14: 2</revised>
+  <revised count="2">2013-09-14</revised>
   <bug>437808</bug>
   <bug>442084</bug>
   <bug>446984</bug>
diff --git a/metadata/glsa/glsa-201309-07.xml b/metadata/glsa/glsa-201309-07.xml
index 159353ab56e9..b76e1a945fdb 100644
--- a/metadata/glsa/glsa-201309-07.xml
+++ b/metadata/glsa/glsa-201309-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libotr</product>
   <announced>2013-09-15</announced>
-  <revised>2013-09-15: 1</revised>
+  <revised count="1">2013-09-15</revised>
   <bug>430486</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201309-08.xml b/metadata/glsa/glsa-201309-08.xml
index 3ae2fe9a605b..cd71961f7213 100644
--- a/metadata/glsa/glsa-201309-08.xml
+++ b/metadata/glsa/glsa-201309-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">filezilla</product>
   <announced>2013-09-15</announced>
-  <revised>2013-09-15: 1</revised>
+  <revised count="1">2013-09-15</revised>
   <bug>479880</bug>
   <bug>482672</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201309-09.xml b/metadata/glsa/glsa-201309-09.xml
index c9738415020e..8eda7a8312b7 100644
--- a/metadata/glsa/glsa-201309-09.xml
+++ b/metadata/glsa/glsa-201309-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libraw</product>
   <announced>2013-09-15</announced>
-  <revised>2013-09-15: 1</revised>
+  <revised count="1">2013-09-15</revised>
   <bug>471694</bug>
   <bug>482926</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201309-10.xml b/metadata/glsa/glsa-201309-10.xml
index 8ebbcf2f6979..4687192099f3 100644
--- a/metadata/glsa/glsa-201309-10.xml
+++ b/metadata/glsa/glsa-201309-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">acroread</product>
   <announced>2013-09-15</announced>
-  <revised>2013-09-15: 1</revised>
+  <revised count="1">2013-09-15</revised>
   <bug>483210</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201309-11.xml b/metadata/glsa/glsa-201309-11.xml
index 17358674e7e2..9118cca9617c 100644
--- a/metadata/glsa/glsa-201309-11.xml
+++ b/metadata/glsa/glsa-201309-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">subversion</product>
   <announced>2013-09-23</announced>
-  <revised>2013-09-23: 1</revised>
+  <revised count="1">2013-09-23</revised>
   <bug>350166</bug>
   <bug>356741</bug>
   <bug>369065</bug>
diff --git a/metadata/glsa/glsa-201309-12.xml b/metadata/glsa/glsa-201309-12.xml
index 6f5b4b52b0df..09511e9bbdce 100644
--- a/metadata/glsa/glsa-201309-12.xml
+++ b/metadata/glsa/glsa-201309-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">apache</product>
   <announced>2013-09-23</announced>
-  <revised>2013-09-23: 1</revised>
+  <revised count="1">2013-09-23</revised>
   <bug>275645</bug>
   <bug>438680</bug>
   <bug>466502</bug>
diff --git a/metadata/glsa/glsa-201309-13.xml b/metadata/glsa/glsa-201309-13.xml
index dce5c4f351b2..59e1d15d51bf 100644
--- a/metadata/glsa/glsa-201309-13.xml
+++ b/metadata/glsa/glsa-201309-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libzrtpcpp</product>
   <announced>2013-09-24</announced>
-  <revised>2013-09-24: 1</revised>
+  <revised count="1">2013-09-24</revised>
   <bug>481228</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201309-14.xml b/metadata/glsa/glsa-201309-14.xml
index 035680ad7c96..afeef766d3ec 100644
--- a/metadata/glsa/glsa-201309-14.xml
+++ b/metadata/glsa/glsa-201309-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">moinmoin</product>
   <announced>2013-09-24</announced>
-  <revised>2013-09-24: 1</revised>
+  <revised count="1">2013-09-24</revised>
   <bug>449314</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201309-15.xml b/metadata/glsa/glsa-201309-15.xml
index 874c96c79be5..50ba980001a4 100644
--- a/metadata/glsa/glsa-201309-15.xml
+++ b/metadata/glsa/glsa-201309-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ProFTPD</product>
   <announced>2013-09-24</announced>
-  <revised>2013-09-24: 1</revised>
+  <revised count="1">2013-09-24</revised>
   <bug>305343</bug>
   <bug>343389</bug>
   <bug>348998</bug>
diff --git a/metadata/glsa/glsa-201309-16.xml b/metadata/glsa/glsa-201309-16.xml
index 3529e19ecd35..78718265d261 100644
--- a/metadata/glsa/glsa-201309-16.xml
+++ b/metadata/glsa/glsa-201309-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium v8</product>
   <announced>2013-09-24</announced>
-  <revised>2013-09-25: 2</revised>
+  <revised count="2">2013-09-25</revised>
   <bug>442096</bug>
   <bug>444826</bug>
   <bug>445246</bug>
diff --git a/metadata/glsa/glsa-201309-17.xml b/metadata/glsa/glsa-201309-17.xml
index 42c7bc34572b..1d256721b04d 100644
--- a/metadata/glsa/glsa-201309-17.xml
+++ b/metadata/glsa/glsa-201309-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">monkeyd</product>
   <announced>2013-09-25</announced>
-  <revised>2013-09-25: 1</revised>
+  <revised count="1">2013-09-25</revised>
   <bug>471906</bug>
   <bug>472400</bug>
   <bug>472644</bug>
diff --git a/metadata/glsa/glsa-201309-18.xml b/metadata/glsa/glsa-201309-18.xml
index 15b04ff76f90..325b5c463fee 100644
--- a/metadata/glsa/glsa-201309-18.xml
+++ b/metadata/glsa/glsa-201309-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libvirt</product>
   <announced>2013-09-25</announced>
-  <revised>2013-09-25: 1</revised>
+  <revised count="1">2013-09-25</revised>
   <bug>454588</bug>
   <bug>470096</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201309-19.xml b/metadata/glsa/glsa-201309-19.xml
index b233872d1e6b..e4ff190ba195 100644
--- a/metadata/glsa/glsa-201309-19.xml
+++ b/metadata/glsa/glsa-201309-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tpp</product>
   <announced>2013-09-25</announced>
-  <revised>2013-09-25: 1</revised>
+  <revised count="1">2013-09-25</revised>
   <bug>474018</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201309-20.xml b/metadata/glsa/glsa-201309-20.xml
index b3645b7adc88..33823b8e3918 100644
--- a/metadata/glsa/glsa-201309-20.xml
+++ b/metadata/glsa/glsa-201309-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dropbear</product>
   <announced>2013-09-26</announced>
-  <revised>2013-09-26: 1</revised>
+  <revised count="1">2013-09-26</revised>
   <bug>328409</bug>
   <bug>405607</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201309-21.xml b/metadata/glsa/glsa-201309-21.xml
index f8371506b803..9ec2d7b0b7d4 100644
--- a/metadata/glsa/glsa-201309-21.xml
+++ b/metadata/glsa/glsa-201309-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">klibc</product>
   <announced>2013-09-26</announced>
-  <revised>2013-09-26: 1</revised>
+  <revised count="1">2013-09-26</revised>
   <bug>369075</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201309-22.xml b/metadata/glsa/glsa-201309-22.xml
index be1827444ddb..624ee4865d1e 100644
--- a/metadata/glsa/glsa-201309-22.xml
+++ b/metadata/glsa/glsa-201309-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">squid</product>
   <announced>2013-09-27</announced>
-  <revised>2013-09-27: 1</revised>
+  <revised count="1">2013-09-27</revised>
   <bug>261208</bug>
   <bug>389133</bug>
   <bug>447596</bug>
diff --git a/metadata/glsa/glsa-201309-23.xml b/metadata/glsa/glsa-201309-23.xml
index 84ff6bad153f..56b299b0b8f6 100644
--- a/metadata/glsa/glsa-201309-23.xml
+++ b/metadata/glsa/glsa-201309-23.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">firefox,thunderbird,seamonkey</product>
   <announced>2013-09-27</announced>
-  <revised>2013-09-27: 1</revised>
+  <revised count="1">2013-09-27</revised>
   <bug>450940</bug>
   <bug>458390</bug>
   <bug>460818</bug>
diff --git a/metadata/glsa/glsa-201309-24.xml b/metadata/glsa/glsa-201309-24.xml
index 469cfec834fc..9bb8b1e1eb95 100644
--- a/metadata/glsa/glsa-201309-24.xml
+++ b/metadata/glsa/glsa-201309-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xen</product>
   <announced>2013-09-27</announced>
-  <revised>2013-09-27: 1</revised>
+  <revised count="1">2013-09-27</revised>
   <bug>385319</bug>
   <bug>386371</bug>
   <bug>420875</bug>
diff --git a/metadata/glsa/glsa-201310-01.xml b/metadata/glsa/glsa-201310-01.xml
index 839ab48ad2b3..9fedc00f1b28 100644
--- a/metadata/glsa/glsa-201310-01.xml
+++ b/metadata/glsa/glsa-201310-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Module-Signature</product>
   <announced>2013-10-04</announced>
-  <revised>2013-10-04: 1</revised>
+  <revised count="1">2013-10-04</revised>
   <bug>472428</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201310-02.xml b/metadata/glsa/glsa-201310-02.xml
index 5343be624e79..129802f1c418 100644
--- a/metadata/glsa/glsa-201310-02.xml
+++ b/metadata/glsa/glsa-201310-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">isync</product>
   <announced>2013-10-05</announced>
-  <revised>2013-10-05: 1</revised>
+  <revised count="1">2013-10-05</revised>
   <bug>458420</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201310-03.xml b/metadata/glsa/glsa-201310-03.xml
index f1acb57e970b..d68f002ab43d 100644
--- a/metadata/glsa/glsa-201310-03.xml
+++ b/metadata/glsa/glsa-201310-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">poppler</product>
   <announced>2013-10-06</announced>
-  <revised>2013-10-06: 1</revised>
+  <revised count="1">2013-10-06</revised>
   <bug>263028</bug>
   <bug>290430</bug>
   <bug>290464</bug>
diff --git a/metadata/glsa/glsa-201310-04.xml b/metadata/glsa/glsa-201310-04.xml
index f19e81d942e2..cc63efe02b36 100644
--- a/metadata/glsa/glsa-201310-04.xml
+++ b/metadata/glsa/glsa-201310-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nginx</product>
   <announced>2013-10-06</announced>
-  <revised>2013-10-06: 1</revised>
+  <revised count="1">2013-10-06</revised>
   <bug>458726</bug>
   <bug>468870</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201310-05.xml b/metadata/glsa/glsa-201310-05.xml
index 10dea9c620ed..7a3588b90364 100644
--- a/metadata/glsa/glsa-201310-05.xml
+++ b/metadata/glsa/glsa-201310-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gegl</product>
   <announced>2013-10-06</announced>
-  <revised>2013-10-06: 1</revised>
+  <revised count="1">2013-10-06</revised>
   <bug>442016</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201310-06.xml b/metadata/glsa/glsa-201310-06.xml
index fa7a305a500d..73773f79aefb 100644
--- a/metadata/glsa/glsa-201310-06.xml
+++ b/metadata/glsa/glsa-201310-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">aircrack-ng</product>
   <announced>2013-10-07</announced>
-  <revised>2013-10-07: 1</revised>
+  <revised count="1">2013-10-07</revised>
   <bug>311797</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201310-07.xml b/metadata/glsa/glsa-201310-07.xml
index 416ef24289cf..f5dc746c7beb 100644
--- a/metadata/glsa/glsa-201310-07.xml
+++ b/metadata/glsa/glsa-201310-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openjpeg</product>
   <announced>2013-10-10</announced>
-  <revised>2013-10-10: 1</revised>
+  <revised count="1">2013-10-10</revised>
   <bug>412895</bug>
   <bug>425772</bug>
   <bug>433766</bug>
diff --git a/metadata/glsa/glsa-201310-08.xml b/metadata/glsa/glsa-201310-08.xml
index 9a232d2e4540..0bdbb103a182 100644
--- a/metadata/glsa/glsa-201310-08.xml
+++ b/metadata/glsa/glsa-201310-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">quagga</product>
   <announced>2013-10-10</announced>
-  <revised>2013-10-10: 1</revised>
+  <revised count="1">2013-10-10</revised>
   <bug>408507</bug>
   <bug>475706</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201310-09.xml b/metadata/glsa/glsa-201310-09.xml
index c102f1d6c0f6..19fe361d8709 100644
--- a/metadata/glsa/glsa-201310-09.xml
+++ b/metadata/glsa/glsa-201310-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">setuptools</product>
   <announced>2013-10-10</announced>
-  <revised>2013-10-10: 1</revised>
+  <revised count="1">2013-10-10</revised>
   <bug>479964</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201310-10.xml b/metadata/glsa/glsa-201310-10.xml
index 8fb5d7efd472..443fb903d953 100644
--- a/metadata/glsa/glsa-201310-10.xml
+++ b/metadata/glsa/glsa-201310-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">PolarSSL</product>
   <announced>2013-10-17</announced>
-  <revised>2013-10-17: 1</revised>
+  <revised count="1">2013-10-17</revised>
   <bug>358783</bug>
   <bug>416399</bug>
   <bug>455562</bug>
diff --git a/metadata/glsa/glsa-201310-11.xml b/metadata/glsa/glsa-201310-11.xml
index 9bbb2a22cb30..39500921a7bd 100644
--- a/metadata/glsa/glsa-201310-11.xml
+++ b/metadata/glsa/glsa-201310-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Parallel-ForkManager</product>
   <announced>2013-10-17</announced>
-  <revised>2013-10-17: 1</revised>
+  <revised count="1">2013-10-17</revised>
   <bug>389839</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201310-12.xml b/metadata/glsa/glsa-201310-12.xml
index 4c6bb7f10590..487dd38ab3d5 100644
--- a/metadata/glsa/glsa-201310-12.xml
+++ b/metadata/glsa/glsa-201310-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">FFmpeg</product>
   <announced>2013-10-25</announced>
-  <revised>2013-10-25: 1</revised>
+  <revised count="1">2013-10-25</revised>
   <bug>285719</bug>
   <bug>307755</bug>
   <bug>339036</bug>
diff --git a/metadata/glsa/glsa-201310-13.xml b/metadata/glsa/glsa-201310-13.xml
index 6e0f1cb7a8da..b6a510893342 100644
--- a/metadata/glsa/glsa-201310-13.xml
+++ b/metadata/glsa/glsa-201310-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">MPlayer</product>
   <announced>2013-10-25</announced>
-  <revised>2013-10-25: 1</revised>
+  <revised count="1">2013-10-25</revised>
   <bug>253649</bug>
   <bug>279342</bug>
   <bug>339037</bug>
diff --git a/metadata/glsa/glsa-201310-14.xml b/metadata/glsa/glsa-201310-14.xml
index d19215af91e8..769fc3d1347b 100644
--- a/metadata/glsa/glsa-201310-14.xml
+++ b/metadata/glsa/glsa-201310-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">groff</product>
   <announced>2013-10-25</announced>
-  <revised>2013-10-25: 1</revised>
+  <revised count="1">2013-10-25</revised>
   <bug>386335</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201310-15.xml b/metadata/glsa/glsa-201310-15.xml
index 18737592095f..c66edbdbb15b 100644
--- a/metadata/glsa/glsa-201310-15.xml
+++ b/metadata/glsa/glsa-201310-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">automake</product>
   <announced>2013-10-25</announced>
-  <revised>2013-10-25: 1</revised>
+  <revised count="1">2013-10-25</revised>
   <bug>295357</bug>
   <bug>426336</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201310-16.xml b/metadata/glsa/glsa-201310-16.xml
index 2d53f7d64df7..5bc1db836090 100644
--- a/metadata/glsa/glsa-201310-16.xml
+++ b/metadata/glsa/glsa-201310-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tptest</product>
   <announced>2013-10-26</announced>
-  <revised>2013-10-26: 1</revised>
+  <revised count="1">2013-10-26</revised>
   <bug>261191</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201310-17.xml b/metadata/glsa/glsa-201310-17.xml
index bc6f510b83d7..b23f8ae10e67 100644
--- a/metadata/glsa/glsa-201310-17.xml
+++ b/metadata/glsa/glsa-201310-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pmake</product>
   <announced>2013-10-28</announced>
-  <revised>2013-10-28: 2</revised>
+  <revised count="2">2013-10-28</revised>
   <bug>367891</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201310-18.xml b/metadata/glsa/glsa-201310-18.xml
index fb3222c77246..bd2005bb1049 100644
--- a/metadata/glsa/glsa-201310-18.xml
+++ b/metadata/glsa/glsa-201310-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gnutls</product>
   <announced>2013-10-28</announced>
-  <revised>2013-10-28: 1</revised>
+  <revised count="1">2013-10-28</revised>
   <bug>455560</bug>
   <bug>471788</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201310-19.xml b/metadata/glsa/glsa-201310-19.xml
index bc2e18c75673..005d3953f817 100644
--- a/metadata/glsa/glsa-201310-19.xml
+++ b/metadata/glsa/glsa-201310-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">x2goserver</product>
   <announced>2013-10-28</announced>
-  <revised>2013-10-28: 1</revised>
+  <revised count="1">2013-10-28</revised>
   <bug>472582</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201310-20.xml b/metadata/glsa/glsa-201310-20.xml
index af17b2b88abb..f4ee0adfc32c 100644
--- a/metadata/glsa/glsa-201310-20.xml
+++ b/metadata/glsa/glsa-201310-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">acpid</product>
   <announced>2013-10-28</announced>
-  <revised>2013-10-28: 1</revised>
+  <revised count="1">2013-10-28</revised>
   <bug>434522</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201310-21.xml b/metadata/glsa/glsa-201310-21.xml
index b967c6219ed0..347d29935f89 100644
--- a/metadata/glsa/glsa-201310-21.xml
+++ b/metadata/glsa/glsa-201310-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mediawiki</product>
   <announced>2013-10-28</announced>
-  <revised>2013-10-28: 1</revised>
+  <revised count="1">2013-10-28</revised>
   <bug>460352</bug>
   <bug>466124</bug>
   <bug>468110</bug>
diff --git a/metadata/glsa/glsa-201311-01.xml b/metadata/glsa/glsa-201311-01.xml
index af4e459661c2..ac10c210d11c 100644
--- a/metadata/glsa/glsa-201311-01.xml
+++ b/metadata/glsa/glsa-201311-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mednafen</product>
   <announced>2013-11-04</announced>
-  <revised>2013-11-04: 1</revised>
+  <revised count="1">2013-11-04</revised>
   <bug>326141</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201311-02.xml b/metadata/glsa/glsa-201311-02.xml
index a0e2f185355c..8ccb918469b8 100644
--- a/metadata/glsa/glsa-201311-02.xml
+++ b/metadata/glsa/glsa-201311-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">phpmyadmin</product>
   <announced>2013-11-04</announced>
-  <revised>2013-11-04: 1</revised>
+  <revised count="1">2013-11-04</revised>
   <bug>465420</bug>
   <bug>467080</bug>
   <bug>478696</bug>
diff --git a/metadata/glsa/glsa-201311-03.xml b/metadata/glsa/glsa-201311-03.xml
index 9a83e4812fe1..4ec6ec441beb 100644
--- a/metadata/glsa/glsa-201311-03.xml
+++ b/metadata/glsa/glsa-201311-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">quassel</product>
   <announced>2013-11-07</announced>
-  <revised>2013-11-07: 1</revised>
+  <revised count="1">2013-11-07</revised>
   <bug>338879</bug>
   <bug>487632</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201311-04.xml b/metadata/glsa/glsa-201311-04.xml
index 31015d6a485b..e1730eca2635 100644
--- a/metadata/glsa/glsa-201311-04.xml
+++ b/metadata/glsa/glsa-201311-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">vixie-cron</product>
   <announced>2013-11-07</announced>
-  <revised>2013-11-07: 1</revised>
+  <revised count="1">2013-11-07</revised>
   <bug>308055</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201311-05.xml b/metadata/glsa/glsa-201311-05.xml
index bdc784e0cec6..43a453a59052 100644
--- a/metadata/glsa/glsa-201311-05.xml
+++ b/metadata/glsa/glsa-201311-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gimp</product>
   <announced>2013-11-10</announced>
-  <revised>2013-11-10: 1</revised>
+  <revised count="1">2013-11-10</revised>
   <bug>434580</bug>
   <bug>444280</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201311-06.xml b/metadata/glsa/glsa-201311-06.xml
index 42d502285162..78ffd959612d 100644
--- a/metadata/glsa/glsa-201311-06.xml
+++ b/metadata/glsa/glsa-201311-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libxml2</product>
   <announced>2013-11-10</announced>
-  <revised>2013-11-10: 1</revised>
+  <revised count="1">2013-11-10</revised>
   <bug>434344</bug>
   <bug>444836</bug>
   <bug>458430</bug>
diff --git a/metadata/glsa/glsa-201311-07.xml b/metadata/glsa/glsa-201311-07.xml
index bfdb35dbd208..4f5357666c05 100644
--- a/metadata/glsa/glsa-201311-07.xml
+++ b/metadata/glsa/glsa-201311-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">blender</product>
   <announced>2013-11-13</announced>
-  <revised>2013-11-13: 1</revised>
+  <revised count="1">2013-11-13</revised>
   <bug>219008</bug>
   <bug>293130</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201311-08.xml b/metadata/glsa/glsa-201311-08.xml
index 4db96b206f22..a9883cd09616 100644
--- a/metadata/glsa/glsa-201311-08.xml
+++ b/metadata/glsa/glsa-201311-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Netpbm</product>
   <announced>2013-11-13</announced>
-  <revised>2013-11-13: 1</revised>
+  <revised count="1">2013-11-13</revised>
   <bug>308025</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201311-09.xml b/metadata/glsa/glsa-201311-09.xml
index 27b936d23b8a..16b779a96968 100644
--- a/metadata/glsa/glsa-201311-09.xml
+++ b/metadata/glsa/glsa-201311-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">freeradius</product>
   <announced>2013-11-13</announced>
-  <revised>2013-11-13: 1</revised>
+  <revised count="1">2013-11-13</revised>
   <bug>339389</bug>
   <bug>386183</bug>
   <bug>434802</bug>
diff --git a/metadata/glsa/glsa-201311-10.xml b/metadata/glsa/glsa-201311-10.xml
index d3a2c4e2ebec..f6b576800089 100644
--- a/metadata/glsa/glsa-201311-10.xml
+++ b/metadata/glsa/glsa-201311-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">graphicsmagick</product>
   <announced>2013-11-19</announced>
-  <revised>2013-11-19: 1</revised>
+  <revised count="1">2013-11-19</revised>
   <bug>365769</bug>
   <bug>488050</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201311-11.xml b/metadata/glsa/glsa-201311-11.xml
index 9e936ff52359..79fc58d5bbf2 100644
--- a/metadata/glsa/glsa-201311-11.xml
+++ b/metadata/glsa/glsa-201311-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ctorrent</product>
   <announced>2013-11-20</announced>
-  <revised>2013-11-22: 2</revised>
+  <revised count="2">2013-11-22</revised>
   <bug>266953</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201311-12.xml b/metadata/glsa/glsa-201311-12.xml
index 3a43a0ab444d..95c25debe1d4 100644
--- a/metadata/glsa/glsa-201311-12.xml
+++ b/metadata/glsa/glsa-201311-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">opendchub</product>
   <announced>2013-11-20</announced>
-  <revised>2013-11-20: 1</revised>
+  <revised count="1">2013-11-20</revised>
   <bug>314551</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201311-13.xml b/metadata/glsa/glsa-201311-13.xml
index af78f7683dd9..a1bdcb4a8162 100644
--- a/metadata/glsa/glsa-201311-13.xml
+++ b/metadata/glsa/glsa-201311-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openvpn</product>
   <announced>2013-11-20</announced>
-  <revised>2013-11-20: 1</revised>
+  <revised count="1">2013-11-20</revised>
   <bug>293894</bug>
   <bug>468756</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201311-14.xml b/metadata/glsa/glsa-201311-14.xml
index 93ea1009bc91..4b81ea64ddd6 100644
--- a/metadata/glsa/glsa-201311-14.xml
+++ b/metadata/glsa/glsa-201311-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">qt-core qt-gui</product>
   <announced>2013-11-22</announced>
-  <revised>2013-11-22: 1</revised>
+  <revised count="1">2013-11-22</revised>
   <bug>361401</bug>
   <bug>382171</bug>
   <bug>384103</bug>
diff --git a/metadata/glsa/glsa-201311-15.xml b/metadata/glsa/glsa-201311-15.xml
index 8bc2cd85fa31..5f56d0cc88b0 100644
--- a/metadata/glsa/glsa-201311-15.xml
+++ b/metadata/glsa/glsa-201311-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">zabbix</product>
   <announced>2013-11-25</announced>
-  <revised>2013-11-25: 1</revised>
+  <revised count="1">2013-11-25</revised>
   <bug>312875</bug>
   <bug>394497</bug>
   <bug>428372</bug>
diff --git a/metadata/glsa/glsa-201311-16.xml b/metadata/glsa/glsa-201311-16.xml
index 5805bc1f5b77..716a1f82fefb 100644
--- a/metadata/glsa/glsa-201311-16.xml
+++ b/metadata/glsa/glsa-201311-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">fcron</product>
   <announced>2013-11-25</announced>
-  <revised>2013-11-25: 1</revised>
+  <revised count="1">2013-11-25</revised>
   <bug>308075</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201311-17.xml b/metadata/glsa/glsa-201311-17.xml
index 452fd3191b2f..30baf4f2b22c 100644
--- a/metadata/glsa/glsa-201311-17.xml
+++ b/metadata/glsa/glsa-201311-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">perl</product>
   <announced>2013-11-28</announced>
-  <revised>2013-11-28: 1</revised>
+  <revised count="1">2013-11-28</revised>
   <bug>249629</bug>
   <bug>313565</bug>
   <bug>362025</bug>
diff --git a/metadata/glsa/glsa-201311-18.xml b/metadata/glsa/glsa-201311-18.xml
index 9bbaea6f2d35..799c3ecf5650 100644
--- a/metadata/glsa/glsa-201311-18.xml
+++ b/metadata/glsa/glsa-201311-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">unbound</product>
   <announced>2013-11-28</announced>
-  <revised>2013-11-28: 1</revised>
+  <revised count="1">2013-11-28</revised>
   <bug>395287</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201311-19.xml b/metadata/glsa/glsa-201311-19.xml
index e5c05c782dc2..68ae32b6bf1d 100644
--- a/metadata/glsa/glsa-201311-19.xml
+++ b/metadata/glsa/glsa-201311-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">rssh</product>
   <announced>2013-11-28</announced>
-  <revised>2013-11-28: 1</revised>
+  <revised count="1">2013-11-28</revised>
   <bug>415255</bug>
   <bug>445166</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201311-20.xml b/metadata/glsa/glsa-201311-20.xml
index ef6e7803b7de..501999f8ba7c 100644
--- a/metadata/glsa/glsa-201311-20.xml
+++ b/metadata/glsa/glsa-201311-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">okular</product>
   <announced>2013-11-28</announced>
-  <revised>2013-11-28: 1</revised>
+  <revised count="1">2013-11-28</revised>
   <bug>334469</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201311-21.xml b/metadata/glsa/glsa-201311-21.xml
index c54c4a861622..80e0970856a1 100644
--- a/metadata/glsa/glsa-201311-21.xml
+++ b/metadata/glsa/glsa-201311-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cpio</product>
   <announced>2013-11-28</announced>
-  <revised>2013-11-28: 1</revised>
+  <revised count="1">2013-11-28</revised>
   <bug>314663</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201311-22.xml b/metadata/glsa/glsa-201311-22.xml
index d2ed33c7a0e5..9ea6f6ffda01 100644
--- a/metadata/glsa/glsa-201311-22.xml
+++ b/metadata/glsa/glsa-201311-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">namazu</product>
   <announced>2013-11-28</announced>
-  <revised>2013-11-28: 1</revised>
+  <revised count="1">2013-11-28</revised>
   <bug>391259</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201312-01.xml b/metadata/glsa/glsa-201312-01.xml
index ca5f01e8b2a4..3e0cc26c933c 100644
--- a/metadata/glsa/glsa-201312-01.xml
+++ b/metadata/glsa/glsa-201312-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">glibc</product>
   <announced>2013-12-03</announced>
-  <revised>2013-12-03: 1</revised>
+  <revised count="1">2013-12-03</revised>
   <bug>350744</bug>
   <bug>356567</bug>
   <bug>386323</bug>
diff --git a/metadata/glsa/glsa-201312-02.xml b/metadata/glsa/glsa-201312-02.xml
index 0232ed7f01cd..824155b3179d 100644
--- a/metadata/glsa/glsa-201312-02.xml
+++ b/metadata/glsa/glsa-201312-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">busybox</product>
   <announced>2013-12-03</announced>
-  <revised>2013-12-03: 1</revised>
+  <revised count="1">2013-12-03</revised>
   <bug>379857</bug>
   <bug>426504</bug>
   <bug>461372</bug>
diff --git a/metadata/glsa/glsa-201312-03.xml b/metadata/glsa/glsa-201312-03.xml
index ce8f08d0a4bb..34d19495f481 100644
--- a/metadata/glsa/glsa-201312-03.xml
+++ b/metadata/glsa/glsa-201312-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">OpenSSL</product>
   <announced>2013-12-03</announced>
-  <revised>2015-06-06: 5</revised>
+  <revised count="5">2015-06-06</revised>
   <bug>369753</bug>
   <bug>406199</bug>
   <bug>412643</bug>
diff --git a/metadata/glsa/glsa-201312-04.xml b/metadata/glsa/glsa-201312-04.xml
index af6bced0089e..be52f60ca198 100644
--- a/metadata/glsa/glsa-201312-04.xml
+++ b/metadata/glsa/glsa-201312-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libtheora</product>
   <announced>2013-12-03</announced>
-  <revised>2013-12-03: 1</revised>
+  <revised count="1">2013-12-03</revised>
   <bug>298039</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201312-05.xml b/metadata/glsa/glsa-201312-05.xml
index 660a36f4c0c8..421083609979 100644
--- a/metadata/glsa/glsa-201312-05.xml
+++ b/metadata/glsa/glsa-201312-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">swi-prolog</product>
   <announced>2013-12-06</announced>
-  <revised>2013-12-06: 1</revised>
+  <revised count="1">2013-12-06</revised>
   <bug>450284</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201312-06.xml b/metadata/glsa/glsa-201312-06.xml
index 341a61127d9b..6e713c85089e 100644
--- a/metadata/glsa/glsa-201312-06.xml
+++ b/metadata/glsa/glsa-201312-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">festival</product>
   <announced>2013-12-09</announced>
-  <revised>2013-12-09: 1</revised>
+  <revised count="1">2013-12-09</revised>
   <bug>386319</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201312-07.xml b/metadata/glsa/glsa-201312-07.xml
index 63701d3f059d..6bce1611f753 100644
--- a/metadata/glsa/glsa-201312-07.xml
+++ b/metadata/glsa/glsa-201312-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openexr</product>
   <announced>2013-12-09</announced>
-  <revised>2013-12-09: 1</revised>
+  <revised count="1">2013-12-09</revised>
   <bug>277202</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201312-08.xml b/metadata/glsa/glsa-201312-08.xml
index e1897bb1a97d..265f85d7befa 100644
--- a/metadata/glsa/glsa-201312-08.xml
+++ b/metadata/glsa/glsa-201312-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libwebp</product>
   <announced>2013-12-10</announced>
-  <revised>2013-12-10: 1</revised>
+  <revised count="1">2013-12-10</revised>
   <bug>442152</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201312-09.xml b/metadata/glsa/glsa-201312-09.xml
index 04126873d2d8..94426854fe8e 100644
--- a/metadata/glsa/glsa-201312-09.xml
+++ b/metadata/glsa/glsa-201312-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cabextract</product>
   <announced>2013-12-14</announced>
-  <revised>2013-12-14: 1</revised>
+  <revised count="1">2013-12-14</revised>
   <bug>329891</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201312-10.xml b/metadata/glsa/glsa-201312-10.xml
index e0a4f212e132..807586ee45cc 100644
--- a/metadata/glsa/glsa-201312-10.xml
+++ b/metadata/glsa/glsa-201312-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libsmi</product>
   <announced>2013-12-14</announced>
-  <revised>2013-12-14: 1</revised>
+  <revised count="1">2013-12-14</revised>
   <bug>342127</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201312-11.xml b/metadata/glsa/glsa-201312-11.xml
index 945fb9219e4c..404c33f117ba 100644
--- a/metadata/glsa/glsa-201312-11.xml
+++ b/metadata/glsa/glsa-201312-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">win32codecs</product>
   <announced>2013-12-16</announced>
-  <revised>2013-12-16: 1</revised>
+  <revised count="1">2013-12-16</revised>
   <bug>232999</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201312-12.xml b/metadata/glsa/glsa-201312-12.xml
index 84b05b8bf447..f491faca46bf 100644
--- a/metadata/glsa/glsa-201312-12.xml
+++ b/metadata/glsa/glsa-201312-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2013-12-16</announced>
-  <revised>2013-12-16: 1</revised>
+  <revised count="1">2013-12-16</revised>
   <bug>429324</bug>
   <bug>466268</bug>
   <bug>469752</bug>
diff --git a/metadata/glsa/glsa-201312-13.xml b/metadata/glsa/glsa-201312-13.xml
index 4ef2503ae19b..2295b2f3dbb3 100644
--- a/metadata/glsa/glsa-201312-13.xml
+++ b/metadata/glsa/glsa-201312-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2013-12-16</announced>
-  <revised>2013-12-16: 1</revised>
+  <revised count="1">2013-12-16</revised>
   <bug>484582</bug>
   <bug>490434</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201312-14.xml b/metadata/glsa/glsa-201312-14.xml
index ba38610649eb..f5f65e5e2693 100644
--- a/metadata/glsa/glsa-201312-14.xml
+++ b/metadata/glsa/glsa-201312-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libsndfile</product>
   <announced>2013-12-17</announced>
-  <revised>2013-12-17: 1</revised>
+  <revised count="1">2013-12-17</revised>
   <bug>375125</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201312-15.xml b/metadata/glsa/glsa-201312-15.xml
index 0b3dff973877..88f6a6288a04 100644
--- a/metadata/glsa/glsa-201312-15.xml
+++ b/metadata/glsa/glsa-201312-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tinyproxy</product>
   <announced>2013-12-23</announced>
-  <revised>2013-12-23: 1</revised>
+  <revised count="1">2013-12-23</revised>
   <bug>432046</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201312-16.xml b/metadata/glsa/glsa-201312-16.xml
index 2a3751213f8b..ad15b9976ab0 100644
--- a/metadata/glsa/glsa-201312-16.xml
+++ b/metadata/glsa/glsa-201312-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xfig</product>
   <announced>2013-12-27</announced>
-  <revised>2013-12-27: 1</revised>
+  <revised count="1">2013-12-27</revised>
   <bug>348344</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-01.xml b/metadata/glsa/glsa-201401-01.xml
index 99dbaab240d9..f27d73852c6a 100644
--- a/metadata/glsa/glsa-201401-01.xml
+++ b/metadata/glsa/glsa-201401-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libgdiplus</product>
   <announced>2014-01-05</announced>
-  <revised>2014-01-05: 1</revised>
+  <revised count="1">2014-01-05</revised>
   <bug>334101</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-02.xml b/metadata/glsa/glsa-201401-02.xml
index 4e12746b21c1..509d35d5fc87 100644
--- a/metadata/glsa/glsa-201401-02.xml
+++ b/metadata/glsa/glsa-201401-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gajim</product>
   <announced>2014-01-06</announced>
-  <revised>2014-01-06: 1</revised>
+  <revised count="1">2014-01-06</revised>
   <bug>442860</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-03.xml b/metadata/glsa/glsa-201401-03.xml
index da7c742377b2..0a5da6e5bf55 100644
--- a/metadata/glsa/glsa-201401-03.xml
+++ b/metadata/glsa/glsa-201401-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nagstamon</product>
   <announced>2014-01-06</announced>
-  <revised>2014-01-06: 2</revised>
+  <revised count="2">2014-01-06</revised>
   <bug>476538</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-04.xml b/metadata/glsa/glsa-201401-04.xml
index 6b6390be8657..8783065d40fa 100644
--- a/metadata/glsa/glsa-201401-04.xml
+++ b/metadata/glsa/glsa-201401-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">python</product>
   <announced>2014-01-06</announced>
-  <revised>2015-06-17: 5</revised>
+  <revised count="5">2015-06-17</revised>
   <bug>325593</bug>
   <bug>355927</bug>
   <bug>358663</bug>
diff --git a/metadata/glsa/glsa-201401-05.xml b/metadata/glsa/glsa-201401-05.xml
index 1a3a6b720a61..2e856e71a1ae 100644
--- a/metadata/glsa/glsa-201401-05.xml
+++ b/metadata/glsa/glsa-201401-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dhcp</product>
   <announced>2014-01-06</announced>
-  <revised>2014-01-06: 1</revised>
+  <revised count="1">2014-01-06</revised>
   <bug>463848</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-06.xml b/metadata/glsa/glsa-201401-06.xml
index bc524ec3ade8..12ea190af74d 100644
--- a/metadata/glsa/glsa-201401-06.xml
+++ b/metadata/glsa/glsa-201401-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">git </product>
   <announced>2014-01-10</announced>
-  <revised>2014-01-10: 1</revised>
+  <revised count="1">2014-01-10</revised>
   <bug>335891</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-07.xml b/metadata/glsa/glsa-201401-07.xml
index 839d47d43c3d..c0e733e08325 100644
--- a/metadata/glsa/glsa-201401-07.xml
+++ b/metadata/glsa/glsa-201401-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libxslt</product>
   <announced>2014-01-10</announced>
-  <revised>2014-01-10: 1</revised>
+  <revised count="1">2014-01-10</revised>
   <bug>433603</bug>
   <bug>436284</bug>
   <bug>463236</bug>
diff --git a/metadata/glsa/glsa-201401-08.xml b/metadata/glsa/glsa-201401-08.xml
index b60322e890c3..e42eedefd142 100644
--- a/metadata/glsa/glsa-201401-08.xml
+++ b/metadata/glsa/glsa-201401-08.xml
@@ -5,7 +5,7 @@
   <synopsis>NTP can be abused to amplify Denial of Service attack traffic.</synopsis>
   <product type="ebuild"/>
   <announced>2014-01-16</announced>
-  <revised>2014-01-16: 1</revised>
+  <revised count="1">2014-01-16</revised>
   <bug>496776</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-09.xml b/metadata/glsa/glsa-201401-09.xml
index 73332b647212..2da8825be7bb 100644
--- a/metadata/glsa/glsa-201401-09.xml
+++ b/metadata/glsa/glsa-201401-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openswan</product>
   <announced>2014-01-18</announced>
-  <revised>2014-01-18: 1</revised>
+  <revised count="1">2014-01-18</revised>
   <bug>483204</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-10.xml b/metadata/glsa/glsa-201401-10.xml
index 8e41bd044741..bd496074b925 100644
--- a/metadata/glsa/glsa-201401-10.xml
+++ b/metadata/glsa/glsa-201401-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libexif</product>
   <announced>2014-01-19</announced>
-  <revised>2014-01-19: 1</revised>
+  <revised count="1">2014-01-19</revised>
   <bug>426366</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-11.xml b/metadata/glsa/glsa-201401-11.xml
index 21457d3200cd..3179f7f4ee8e 100644
--- a/metadata/glsa/glsa-201401-11.xml
+++ b/metadata/glsa/glsa-201401-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">perl</product>
   <announced>2014-01-19</announced>
-  <revised>2014-01-19: 1</revised>
+  <revised count="1">2014-01-19</revised>
   <bug>384887</bug>
   <bug>448632</bug>
   <bug>460444</bug>
diff --git a/metadata/glsa/glsa-201401-12.xml b/metadata/glsa/glsa-201401-12.xml
index d227762a3013..b732c5772d0e 100644
--- a/metadata/glsa/glsa-201401-12.xml
+++ b/metadata/glsa/glsa-201401-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gnustep-base</product>
   <announced>2014-01-20</announced>
-  <revised>2014-01-20: 1</revised>
+  <revised count="1">2014-01-20</revised>
   <bug>325577</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-13.xml b/metadata/glsa/glsa-201401-13.xml
index 394b2df7702f..89e9cdd5d46c 100644
--- a/metadata/glsa/glsa-201401-13.xml
+++ b/metadata/glsa/glsa-201401-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">virtualbox</product>
   <announced>2014-01-20</announced>
-  <revised>2014-01-20: 1</revised>
+  <revised count="1">2014-01-20</revised>
   <bug>434872</bug>
   <bug>498166</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201401-14.xml b/metadata/glsa/glsa-201401-14.xml
index d6df9702abb9..6e3785d64066 100644
--- a/metadata/glsa/glsa-201401-14.xml
+++ b/metadata/glsa/glsa-201401-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">curl</product>
   <announced>2014-01-20</announced>
-  <revised>2014-01-20: 1</revised>
+  <revised count="1">2014-01-20</revised>
   <bug>456074</bug>
   <bug>465678</bug>
   <bug>474354</bug>
diff --git a/metadata/glsa/glsa-201401-15.xml b/metadata/glsa/glsa-201401-15.xml
index e52280e3ed65..ff2685e985e6 100644
--- a/metadata/glsa/glsa-201401-15.xml
+++ b/metadata/glsa/glsa-201401-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2014-01-21</announced>
-  <revised>2014-01-21: 1</revised>
+  <revised count="1">2014-01-21</revised>
   <bug>449828</bug>
   <bug>463622</bug>
   <bug>482776</bug>
diff --git a/metadata/glsa/glsa-201401-16.xml b/metadata/glsa/glsa-201401-16.xml
index 9bdc926b307b..8510a3578f26 100644
--- a/metadata/glsa/glsa-201401-16.xml
+++ b/metadata/glsa/glsa-201401-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ccid</product>
   <announced>2014-01-21</announced>
-  <revised>2014-01-21: 1</revised>
+  <revised count="1">2014-01-21</revised>
   <bug>349559</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-17.xml b/metadata/glsa/glsa-201401-17.xml
index e9bcfb131edb..37d85d6c5268 100644
--- a/metadata/glsa/glsa-201401-17.xml
+++ b/metadata/glsa/glsa-201401-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pcsc-lite</product>
   <announced>2014-01-21</announced>
-  <revised>2014-01-21: 1</revised>
+  <revised count="1">2014-01-21</revised>
   <bug>349561</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-18.xml b/metadata/glsa/glsa-201401-18.xml
index 98d03fa31513..10ed72dab113 100644
--- a/metadata/glsa/glsa-201401-18.xml
+++ b/metadata/glsa/glsa-201401-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">opensc</product>
   <announced>2014-01-21</announced>
-  <revised>2014-01-21: 1</revised>
+  <revised count="1">2014-01-21</revised>
   <bug>349567</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-19.xml b/metadata/glsa/glsa-201401-19.xml
index fc8d2f5eb296..6482f2f22593 100644
--- a/metadata/glsa/glsa-201401-19.xml
+++ b/metadata/glsa/glsa-201401-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gmime</product>
   <announced>2014-01-21</announced>
-  <revised>2014-01-21: 1</revised>
+  <revised count="1">2014-01-21</revised>
   <bug>308051</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-20.xml b/metadata/glsa/glsa-201401-20.xml
index 0c6dfbd1919f..7be0c179af10 100644
--- a/metadata/glsa/glsa-201401-20.xml
+++ b/metadata/glsa/glsa-201401-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cacti</product>
   <announced>2014-01-21</announced>
-  <revised>2014-01-21: 1</revised>
+  <revised count="1">2014-01-21</revised>
   <bug>324031</bug>
   <bug>480196</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201401-21.xml b/metadata/glsa/glsa-201401-21.xml
index 520d55962561..4383fd4bf716 100644
--- a/metadata/glsa/glsa-201401-21.xml
+++ b/metadata/glsa/glsa-201401-21.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">poppler</product>
   <announced>2014-01-21</announced>
-  <revised>2014-01-21: 1</revised>
+  <revised count="1">2014-01-21</revised>
   <bug>489720</bug>
   <bug>496770</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201401-22.xml b/metadata/glsa/glsa-201401-22.xml
index 2564bc08ad3e..13de7822608a 100644
--- a/metadata/glsa/glsa-201401-22.xml
+++ b/metadata/glsa/glsa-201401-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">activerecord</product>
   <announced>2014-01-21</announced>
-  <revised>2014-01-21: 1</revised>
+  <revised count="1">2014-01-21</revised>
   <bug>449826</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-23.xml b/metadata/glsa/glsa-201401-23.xml
index dd98240ba321..c5e37c4349a8 100644
--- a/metadata/glsa/glsa-201401-23.xml
+++ b/metadata/glsa/glsa-201401-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sudo</product>
   <announced>2014-01-21</announced>
-  <revised>2014-01-21: 1</revised>
+  <revised count="1">2014-01-21</revised>
   <bug>459722</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-24.xml b/metadata/glsa/glsa-201401-24.xml
index 0c447d6e9e80..60d46c63d597 100644
--- a/metadata/glsa/glsa-201401-24.xml
+++ b/metadata/glsa/glsa-201401-24.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">inn</product>
   <announced>2014-01-21</announced>
-  <revised>2014-01-21: 1</revised>
+  <revised count="1">2014-01-21</revised>
   <bug>432002</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-25.xml b/metadata/glsa/glsa-201401-25.xml
index 1a329567e6f3..ba35e50cda01 100644
--- a/metadata/glsa/glsa-201401-25.xml
+++ b/metadata/glsa/glsa-201401-25.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ldns</product>
   <announced>2014-01-21</announced>
-  <revised>2014-01-21: 1</revised>
+  <revised count="1">2014-01-21</revised>
   <bug>384249</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-26.xml b/metadata/glsa/glsa-201401-26.xml
index cf0f14a692fc..26befef50802 100644
--- a/metadata/glsa/glsa-201401-26.xml
+++ b/metadata/glsa/glsa-201401-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">zabbix</product>
   <announced>2014-01-23</announced>
-  <revised>2014-06-02: 2</revised>
+  <revised count="2">2014-06-02</revised>
   <bug>493250</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-27.xml b/metadata/glsa/glsa-201401-27.xml
index fbf68911db8c..31bf7e496718 100644
--- a/metadata/glsa/glsa-201401-27.xml
+++ b/metadata/glsa/glsa-201401-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">texmacs</product>
   <announced>2014-01-26</announced>
-  <revised>2014-01-26: 2</revised>
+  <revised count="2">2014-01-26</revised>
   <bug>337532</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-28.xml b/metadata/glsa/glsa-201401-28.xml
index dc443ab2fca8..383f80565edf 100644
--- a/metadata/glsa/glsa-201401-28.xml
+++ b/metadata/glsa/glsa-201401-28.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in Tomboy could result in privilege escalation.</synopsis>
   <product type="ebuild">tomboy</product>
   <announced>2014-01-26</announced>
-  <revised>2014-01-26: 1</revised>
+  <revised count="1">2014-01-26</revised>
   <bug>356583</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-29.xml b/metadata/glsa/glsa-201401-29.xml
index 61e1a6b19a49..f345cbb3c420 100644
--- a/metadata/glsa/glsa-201401-29.xml
+++ b/metadata/glsa/glsa-201401-29.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in VIPS could result in privilege escalation.</synopsis>
   <product type="ebuild">vips</product>
   <announced>2014-01-26</announced>
-  <revised>2014-01-26: 1</revised>
+  <revised count="1">2014-01-26</revised>
   <bug>344561</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-30.xml b/metadata/glsa/glsa-201401-30.xml
index 7c2922bbb446..b30d51af1b2c 100644
--- a/metadata/glsa/glsa-201401-30.xml
+++ b/metadata/glsa/glsa-201401-30.xml
@@ -9,7 +9,7 @@
     emul-linux-x86-java
   </product>
   <announced>2014-01-27</announced>
-  <revised>2014-01-27: 1</revised>
+  <revised count="1">2014-01-27</revised>
   <bug>404071</bug>
   <bug>421073</bug>
   <bug>433094</bug>
diff --git a/metadata/glsa/glsa-201401-31.xml b/metadata/glsa/glsa-201401-31.xml
index d764b99c083c..aac922ac6feb 100644
--- a/metadata/glsa/glsa-201401-31.xml
+++ b/metadata/glsa/glsa-201401-31.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in CEDET could result in privilege escalation.</synopsis>
   <product type="ebuild">cedet</product>
   <announced>2014-01-27</announced>
-  <revised>2014-01-27: 2</revised>
+  <revised count="2">2014-01-27</revised>
   <bug>398227</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-32.xml b/metadata/glsa/glsa-201401-32.xml
index c08ff426b341..69ce81cd2d7b 100644
--- a/metadata/glsa/glsa-201401-32.xml
+++ b/metadata/glsa/glsa-201401-32.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Exim</product>
   <announced>2014-01-27</announced>
-  <revised>2014-01-27: 3</revised>
+  <revised count="3">2014-01-27</revised>
   <bug>322665</bug>
   <bug>348249</bug>
   <bug>353352</bug>
diff --git a/metadata/glsa/glsa-201401-33.xml b/metadata/glsa/glsa-201401-33.xml
index b55e4c9b69f4..8dd9f2a20b9e 100644
--- a/metadata/glsa/glsa-201401-33.xml
+++ b/metadata/glsa/glsa-201401-33.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">digest-base</product>
   <announced>2014-01-29</announced>
-  <revised>2014-01-29: 1</revised>
+  <revised count="1">2014-01-29</revised>
   <bug>385487</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201401-34.xml b/metadata/glsa/glsa-201401-34.xml
index 4805c9e72a69..bba64bbbcf34 100644
--- a/metadata/glsa/glsa-201401-34.xml
+++ b/metadata/glsa/glsa-201401-34.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bind</product>
   <announced>2014-01-29</announced>
-  <revised>2014-01-29: 1</revised>
+  <revised count="1">2014-01-29</revised>
   <bug>437828</bug>
   <bug>446094</bug>
   <bug>453974</bug>
diff --git a/metadata/glsa/glsa-201402-01.xml b/metadata/glsa/glsa-201402-01.xml
index bc7713c4f7d4..1c8890bd0d8f 100644
--- a/metadata/glsa/glsa-201402-01.xml
+++ b/metadata/glsa/glsa-201402-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libmicrohttpd</product>
   <announced>2014-02-02</announced>
-  <revised>2014-02-02: 1</revised>
+  <revised count="1">2014-02-02</revised>
   <bug>493450</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-02.xml b/metadata/glsa/glsa-201402-02.xml
index b49c9c6ce517..31e25236fe70 100644
--- a/metadata/glsa/glsa-201402-02.xml
+++ b/metadata/glsa/glsa-201402-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nvidia-drivers</product>
   <announced>2014-02-02</announced>
-  <revised>2014-03-13: 3</revised>
+  <revised count="3">2014-03-13</revised>
   <bug>493448</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-03.xml b/metadata/glsa/glsa-201402-03.xml
index 3febc585c918..2a0487cf6686 100644
--- a/metadata/glsa/glsa-201402-03.xml
+++ b/metadata/glsa/glsa-201402-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pixman</product>
   <announced>2014-02-02</announced>
-  <revised>2014-02-02: 1</revised>
+  <revised count="1">2014-02-02</revised>
   <bug>493292</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-04.xml b/metadata/glsa/glsa-201402-04.xml
index 090f73d0f693..642404b46353 100644
--- a/metadata/glsa/glsa-201402-04.xml
+++ b/metadata/glsa/glsa-201402-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libwww-perl</product>
   <announced>2014-02-04</announced>
-  <revised>2014-02-04: 1</revised>
+  <revised count="1">2014-02-04</revised>
   <bug>329943</bug>
   <bug>386309</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201402-05.xml b/metadata/glsa/glsa-201402-05.xml
index c32a25b48592..3ee8a0aded6d 100644
--- a/metadata/glsa/glsa-201402-05.xml
+++ b/metadata/glsa/glsa-201402-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">banshee</product>
   <announced>2014-02-05</announced>
-  <revised>2014-02-05: 1</revised>
+  <revised count="1">2014-02-05</revised>
   <bug>345567</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-06.xml b/metadata/glsa/glsa-201402-06.xml
index b9d059a3bd8b..a1b41f6e5956 100644
--- a/metadata/glsa/glsa-201402-06.xml
+++ b/metadata/glsa/glsa-201402-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2014-02-06</announced>
-  <revised>2014-02-06: 1</revised>
+  <revised count="1">2014-02-06</revised>
   <bug>491148</bug>
   <bug>493894</bug>
   <bug>498170</bug>
diff --git a/metadata/glsa/glsa-201402-07.xml b/metadata/glsa/glsa-201402-07.xml
index fd5f197ab9c7..314ad585d36c 100644
--- a/metadata/glsa/glsa-201402-07.xml
+++ b/metadata/glsa/glsa-201402-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">freeciv</product>
   <announced>2014-02-06</announced>
-  <revised>2014-02-06: 1</revised>
+  <revised count="1">2014-02-06</revised>
   <bug>329949</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-08.xml b/metadata/glsa/glsa-201402-08.xml
index ffacb36e8c37..a5d333109290 100644
--- a/metadata/glsa/glsa-201402-08.xml
+++ b/metadata/glsa/glsa-201402-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">stunnel</product>
   <announced>2014-02-06</announced>
-  <revised>2014-02-07: 4</revised>
+  <revised count="4">2014-02-07</revised>
   <bug>460278</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-09.xml b/metadata/glsa/glsa-201402-09.xml
index bc7e910a5afe..0401b4f7ede8 100644
--- a/metadata/glsa/glsa-201402-09.xml
+++ b/metadata/glsa/glsa-201402-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mod_fcgid</product>
   <announced>2014-02-07</announced>
-  <revised>2014-02-07: 1</revised>
+  <revised count="1">2014-02-07</revised>
   <bug>487314</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-10.xml b/metadata/glsa/glsa-201402-10.xml
index 37d404f575c5..7e0f0f37c025 100644
--- a/metadata/glsa/glsa-201402-10.xml
+++ b/metadata/glsa/glsa-201402-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pulseaudio</product>
   <announced>2014-02-07</announced>
-  <revised>2014-02-07: 1</revised>
+  <revised count="1">2014-02-07</revised>
   <bug>313329</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-11.xml b/metadata/glsa/glsa-201402-11.xml
index 938f4cbbe203..3b42a11ed900 100644
--- a/metadata/glsa/glsa-201402-11.xml
+++ b/metadata/glsa/glsa-201402-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">links</product>
   <announced>2014-02-07</announced>
-  <revised>2014-02-07: 1</revised>
+  <revised count="1">2014-02-07</revised>
   <bug>493138</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-12.xml b/metadata/glsa/glsa-201402-12.xml
index 688a0a031b18..dc4f1556080c 100644
--- a/metadata/glsa/glsa-201402-12.xml
+++ b/metadata/glsa/glsa-201402-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pam_skey</product>
   <announced>2014-02-09</announced>
-  <revised>2014-02-09: 1</revised>
+  <revised count="1">2014-02-09</revised>
   <bug>482588</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-13.xml b/metadata/glsa/glsa-201402-13.xml
index c219abe019fd..9c237b9a2eeb 100644
--- a/metadata/glsa/glsa-201402-13.xml
+++ b/metadata/glsa/glsa-201402-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">djvu</product>
   <announced>2014-02-09</announced>
-  <revised>2014-02-09: 1</revised>
+  <revised count="1">2014-02-09</revised>
   <bug>497088</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-14.xml b/metadata/glsa/glsa-201402-14.xml
index d7d913036ec8..f1c8a0032b98 100644
--- a/metadata/glsa/glsa-201402-14.xml
+++ b/metadata/glsa/glsa-201402-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">icu</product>
   <announced>2014-02-10</announced>
-  <revised>2014-02-10: 1</revised>
+  <revised count="1">2014-02-10</revised>
   <bug>460426</bug>
   <bug>486948</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201402-15.xml b/metadata/glsa/glsa-201402-15.xml
index 96a493f4c370..2245b5756df7 100644
--- a/metadata/glsa/glsa-201402-15.xml
+++ b/metadata/glsa/glsa-201402-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">roundcube</product>
   <announced>2014-02-11</announced>
-  <revised>2014-02-11: 1</revised>
+  <revised count="1">2014-02-11</revised>
   <bug>488954</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-16.xml b/metadata/glsa/glsa-201402-16.xml
index 0a964ad47ecb..91395e2fa3ca 100644
--- a/metadata/glsa/glsa-201402-16.xml
+++ b/metadata/glsa/glsa-201402-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">freetype</product>
   <announced>2014-02-11</announced>
-  <revised>2014-02-11: 1</revised>
+  <revised count="1">2014-02-11</revised>
   <bug>448550</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-17.xml b/metadata/glsa/glsa-201402-17.xml
index 5d7981ad60f3..dea7a7da74ee 100644
--- a/metadata/glsa/glsa-201402-17.xml
+++ b/metadata/glsa/glsa-201402-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xpdf</product>
   <announced>2014-02-17</announced>
-  <revised>2014-02-17: 1</revised>
+  <revised count="1">2014-02-17</revised>
   <bug>386271</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-18.xml b/metadata/glsa/glsa-201402-18.xml
index 8cb7f5eba957..4cec967c43c4 100644
--- a/metadata/glsa/glsa-201402-18.xml
+++ b/metadata/glsa/glsa-201402-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mc</product>
   <announced>2014-02-20</announced>
-  <revised>2014-02-20: 1</revised>
+  <revised count="1">2014-02-20</revised>
   <bug>436518</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-19.xml b/metadata/glsa/glsa-201402-19.xml
index f2beea0bad67..b6d222131b7e 100644
--- a/metadata/glsa/glsa-201402-19.xml
+++ b/metadata/glsa/glsa-201402-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libtar</product>
   <announced>2014-02-21</announced>
-  <revised>2014-02-21: 1</revised>
+  <revised count="1">2014-02-21</revised>
   <bug>487420</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-20.xml b/metadata/glsa/glsa-201402-20.xml
index 8425594c47b4..ce87e92527f9 100644
--- a/metadata/glsa/glsa-201402-20.xml
+++ b/metadata/glsa/glsa-201402-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">kvirc</product>
   <announced>2014-02-21</announced>
-  <revised>2014-02-21: 1</revised>
+  <revised count="1">2014-02-21</revised>
   <bug>326149</bug>
   <bug>330111</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201402-21.xml b/metadata/glsa/glsa-201402-21.xml
index d53792765d97..78fda976d36a 100644
--- a/metadata/glsa/glsa-201402-21.xml
+++ b/metadata/glsa/glsa-201402-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tiff</product>
   <announced>2014-02-21</announced>
-  <revised>2014-02-21: 1</revised>
+  <revised count="1">2014-02-21</revised>
   <bug>440154</bug>
   <bug>440944</bug>
   <bug>468334</bug>
diff --git a/metadata/glsa/glsa-201402-22.xml b/metadata/glsa/glsa-201402-22.xml
index 9afd8fd4f929..178a0da0ae39 100644
--- a/metadata/glsa/glsa-201402-22.xml
+++ b/metadata/glsa/glsa-201402-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tcptrack</product>
   <announced>2014-02-21</announced>
-  <revised>2014-02-21: 1</revised>
+  <revised count="1">2014-02-21</revised>
   <bug>377917</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-23.xml b/metadata/glsa/glsa-201402-23.xml
index d7f3c340896f..834773c14f1b 100644
--- a/metadata/glsa/glsa-201402-23.xml
+++ b/metadata/glsa/glsa-201402-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libxfont</product>
   <announced>2014-02-21</announced>
-  <revised>2014-02-21: 1</revised>
+  <revised count="1">2014-02-21</revised>
   <bug>378797</bug>
   <bug>497416</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201402-24.xml b/metadata/glsa/glsa-201402-24.xml
index 8242a94c6732..89c1d87d6077 100644
--- a/metadata/glsa/glsa-201402-24.xml
+++ b/metadata/glsa/glsa-201402-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gnupg libgcrypt</product>
   <announced>2014-02-21</announced>
-  <revised>2016-08-24: 3</revised>
+  <revised count="3">2016-08-24</revised>
   <bug>449546</bug>
   <bug>478184</bug>
   <bug>484836</bug>
diff --git a/metadata/glsa/glsa-201402-25.xml b/metadata/glsa/glsa-201402-25.xml
index 83010b8155ee..e4bd8e090e1a 100644
--- a/metadata/glsa/glsa-201402-25.xml
+++ b/metadata/glsa/glsa-201402-25.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2014-02-21</announced>
-  <revised>2014-02-21: 1</revised>
+  <revised count="1">2014-02-21</revised>
   <bug>497838</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-26.xml b/metadata/glsa/glsa-201402-26.xml
index e57e541d9ad1..8574619fbb81 100644
--- a/metadata/glsa/glsa-201402-26.xml
+++ b/metadata/glsa/glsa-201402-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libssh</product>
   <announced>2014-02-21</announced>
-  <revised>2014-02-21: 1</revised>
+  <revised count="1">2014-02-21</revised>
   <bug>444147</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-27.xml b/metadata/glsa/glsa-201402-27.xml
index b6367069fafb..d356bba13ff7 100644
--- a/metadata/glsa/glsa-201402-27.xml
+++ b/metadata/glsa/glsa-201402-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pidgin-knotify</product>
   <announced>2014-02-26</announced>
-  <revised>2014-02-26: 1</revised>
+  <revised count="1">2014-02-26</revised>
   <bug>336916</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-28.xml b/metadata/glsa/glsa-201402-28.xml
index 4aae40a3520c..dcf83d80cd89 100644
--- a/metadata/glsa/glsa-201402-28.xml
+++ b/metadata/glsa/glsa-201402-28.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chrony</product>
   <announced>2014-02-28</announced>
-  <revised>2014-02-28: 1</revised>
+  <revised count="1">2014-02-28</revised>
   <bug>480364</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201402-29.xml b/metadata/glsa/glsa-201402-29.xml
index 716138dfd21e..d9fd8769766e 100644
--- a/metadata/glsa/glsa-201402-29.xml
+++ b/metadata/glsa/glsa-201402-29.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">argyllcms</product>
   <announced>2014-02-28</announced>
-  <revised>2014-02-28: 1</revised>
+  <revised count="1">2014-02-28</revised>
   <bug>437652</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201403-01.xml b/metadata/glsa/glsa-201403-01.xml
index 12f7da6ad231..ffa1d0bb567b 100644
--- a/metadata/glsa/glsa-201403-01.xml
+++ b/metadata/glsa/glsa-201403-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium v8</product>
   <announced>2014-03-05</announced>
-  <revised>2014-03-05: 1</revised>
+  <revised count="1">2014-03-05</revised>
   <bug>486742</bug>
   <bug>488148</bug>
   <bug>491128</bug>
diff --git a/metadata/glsa/glsa-201403-02.xml b/metadata/glsa/glsa-201403-02.xml
index 12f189d13e51..d6a3b02c2958 100644
--- a/metadata/glsa/glsa-201403-02.xml
+++ b/metadata/glsa/glsa-201403-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libyaml</product>
   <announced>2014-03-08</announced>
-  <revised>2014-03-08: 1</revised>
+  <revised count="1">2014-03-08</revised>
   <bug>499920</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201403-03.xml b/metadata/glsa/glsa-201403-03.xml
index ff79983d5413..4d1dd97ce594 100644
--- a/metadata/glsa/glsa-201403-03.xml
+++ b/metadata/glsa/glsa-201403-03.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in file could result in Denial of Service.</synopsis>
   <product type="ebuild">file</product>
   <announced>2014-03-13</announced>
-  <revised>2014-03-13: 1</revised>
+  <revised count="1">2014-03-13</revised>
   <bug>501574</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201403-04.xml b/metadata/glsa/glsa-201403-04.xml
index d08ab9d39a3a..9c88b3663438 100644
--- a/metadata/glsa/glsa-201403-04.xml
+++ b/metadata/glsa/glsa-201403-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">qt-core</product>
   <announced>2014-03-13</announced>
-  <revised>2014-03-13: 1</revised>
+  <revised count="1">2014-03-13</revised>
   <bug>494728</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201403-05.xml b/metadata/glsa/glsa-201403-05.xml
index c7ac7149172d..c4ae0f7f9e7f 100644
--- a/metadata/glsa/glsa-201403-05.xml
+++ b/metadata/glsa/glsa-201403-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">emacs</product>
   <announced>2014-03-20</announced>
-  <revised>2014-03-20: 1</revised>
+  <revised count="1">2014-03-20</revised>
   <bug>398239</bug>
   <bug>431178</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201403-06.xml b/metadata/glsa/glsa-201403-06.xml
index 6f3112195e69..2a80fadef2c4 100644
--- a/metadata/glsa/glsa-201403-06.xml
+++ b/metadata/glsa/glsa-201403-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libupnp</product>
   <announced>2014-03-26</announced>
-  <revised>2014-03-26: 1</revised>
+  <revised count="1">2014-03-26</revised>
   <bug>454570</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201403-07.xml b/metadata/glsa/glsa-201403-07.xml
index 97602544000b..82b2421b17d6 100644
--- a/metadata/glsa/glsa-201403-07.xml
+++ b/metadata/glsa/glsa-201403-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">grep</product>
   <announced>2014-03-26</announced>
-  <revised>2014-03-26: 1</revised>
+  <revised count="1">2014-03-26</revised>
   <bug>448246</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201403-08.xml b/metadata/glsa/glsa-201403-08.xml
index 71eba2cbfe4b..13b0ef1a1217 100644
--- a/metadata/glsa/glsa-201403-08.xml
+++ b/metadata/glsa/glsa-201403-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">PlRPC</product>
   <announced>2014-03-27</announced>
-  <revised>2014-03-27: 1</revised>
+  <revised count="1">2014-03-27</revised>
   <bug>497692</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201404-01.xml b/metadata/glsa/glsa-201404-01.xml
index 7e798f678ffd..8ee24615d8ca 100644
--- a/metadata/glsa/glsa-201404-01.xml
+++ b/metadata/glsa/glsa-201404-01.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in CUPS may allow for arbitrary file access.</synopsis>
   <product type="ebuild">cups</product>
   <announced>2014-04-07</announced>
-  <revised>2014-04-07: 1</revised>
+  <revised count="1">2014-04-07</revised>
   <bug>442926</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201404-02.xml b/metadata/glsa/glsa-201404-02.xml
index a27a8d66e3b2..81ce914d5233 100644
--- a/metadata/glsa/glsa-201404-02.xml
+++ b/metadata/glsa/glsa-201404-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libproxy</product>
   <announced>2014-04-07</announced>
-  <revised>2014-04-07: 1</revised>
+  <revised count="1">2014-04-07</revised>
   <bug>438146</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201404-03.xml b/metadata/glsa/glsa-201404-03.xml
index 93cc7f1ca975..80ee94e3ac34 100644
--- a/metadata/glsa/glsa-201404-03.xml
+++ b/metadata/glsa/glsa-201404-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">optipng</product>
   <announced>2014-04-07</announced>
-  <revised>2014-04-07: 1</revised>
+  <revised count="1">2014-04-07</revised>
   <bug>435340</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201404-04.xml b/metadata/glsa/glsa-201404-04.xml
index 698df1581aea..75cbe97a9652 100644
--- a/metadata/glsa/glsa-201404-04.xml
+++ b/metadata/glsa/glsa-201404-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">crack</product>
   <announced>2014-04-07</announced>
-  <revised>2014-04-07: 1</revised>
+  <revised count="1">2014-04-07</revised>
   <bug>460164</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201404-05.xml b/metadata/glsa/glsa-201404-05.xml
index 75672f637e96..cab53ae9d8d4 100644
--- a/metadata/glsa/glsa-201404-05.xml
+++ b/metadata/glsa/glsa-201404-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openafs</product>
   <announced>2014-04-07</announced>
-  <revised>2014-04-07: 1</revised>
+  <revised count="1">2014-04-07</revised>
   <bug>265538</bug>
   <bug>355533</bug>
   <bug>460494</bug>
diff --git a/metadata/glsa/glsa-201404-06.xml b/metadata/glsa/glsa-201404-06.xml
index 77084c0da24b..09da42e418c5 100644
--- a/metadata/glsa/glsa-201404-06.xml
+++ b/metadata/glsa/glsa-201404-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mesa</product>
   <announced>2014-04-08</announced>
-  <revised>2014-04-08: 1</revised>
+  <revised count="1">2014-04-08</revised>
   <bug>432400</bug>
   <bug>445916</bug>
   <bug>472280</bug>
diff --git a/metadata/glsa/glsa-201404-07.xml b/metadata/glsa/glsa-201404-07.xml
index 91ca3db1d489..1adb4991e35f 100644
--- a/metadata/glsa/glsa-201404-07.xml
+++ b/metadata/glsa/glsa-201404-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2014-04-08</announced>
-  <revised>2015-06-06: 4</revised>
+  <revised count="4">2015-06-06</revised>
   <bug>505278</bug>
   <bug>507074</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201405-01.xml b/metadata/glsa/glsa-201405-01.xml
index 63128b60934d..4b428fbdce0a 100644
--- a/metadata/glsa/glsa-201405-01.xml
+++ b/metadata/glsa/glsa-201405-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">udisks</product>
   <announced>2014-05-02</announced>
-  <revised>2014-05-02: 1</revised>
+  <revised count="1">2014-05-02</revised>
   <bug>504100</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201405-02.xml b/metadata/glsa/glsa-201405-02.xml
index 909b2e56ac8d..feb538b9f1c1 100644
--- a/metadata/glsa/glsa-201405-02.xml
+++ b/metadata/glsa/glsa-201405-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libsrtp</product>
   <announced>2014-05-03</announced>
-  <revised>2014-05-03: 1</revised>
+  <revised count="1">2014-05-03</revised>
   <bug>472302</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201405-03.xml b/metadata/glsa/glsa-201405-03.xml
index 25782fe5b7ba..b41ae2c6e0b3 100644
--- a/metadata/glsa/glsa-201405-03.xml
+++ b/metadata/glsa/glsa-201405-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">weechat</product>
   <announced>2014-05-03</announced>
-  <revised>2014-05-03: 1</revised>
+  <revised count="1">2014-05-03</revised>
   <bug>442600</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201405-04.xml b/metadata/glsa/glsa-201405-04.xml
index 3ab21fb09817..7601e78a1848 100644
--- a/metadata/glsa/glsa-201405-04.xml
+++ b/metadata/glsa/glsa-201405-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2014-05-03</announced>
-  <revised>2014-05-03: 1</revised>
+  <revised count="1">2014-05-03</revised>
   <bug>501960</bug>
   <bug>504286</bug>
   <bug>507176</bug>
diff --git a/metadata/glsa/glsa-201405-05.xml b/metadata/glsa/glsa-201405-05.xml
index cbf628acbb50..4d4d968a9a81 100644
--- a/metadata/glsa/glsa-201405-05.xml
+++ b/metadata/glsa/glsa-201405-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2014-05-03</announced>
-  <revised>2014-05-03: 1</revised>
+  <revised count="1">2014-05-03</revised>
   <bug>504180</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201405-06.xml b/metadata/glsa/glsa-201405-06.xml
index cffd32484ca6..9b1db626328d 100644
--- a/metadata/glsa/glsa-201405-06.xml
+++ b/metadata/glsa/glsa-201405-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openssh</product>
   <announced>2014-05-11</announced>
-  <revised>2014-05-11: 1</revised>
+  <revised count="1">2014-05-11</revised>
   <bug>231292</bug>
   <bug>247466</bug>
   <bug>386307</bug>
diff --git a/metadata/glsa/glsa-201405-07.xml b/metadata/glsa/glsa-201405-07.xml
index 6d476b01541d..810ca22c24a3 100644
--- a/metadata/glsa/glsa-201405-07.xml
+++ b/metadata/glsa/glsa-201405-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xorg-server</product>
   <announced>2014-05-15</announced>
-  <revised>2014-05-15: 1</revised>
+  <revised count="1">2014-05-15</revised>
   <bug>466222</bug>
   <bug>471098</bug>
   <bug>487360</bug>
diff --git a/metadata/glsa/glsa-201405-08.xml b/metadata/glsa/glsa-201405-08.xml
index fed09416c3c5..8640a9ff9ca5 100644
--- a/metadata/glsa/glsa-201405-08.xml
+++ b/metadata/glsa/glsa-201405-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2014-05-16</announced>
-  <revised>2014-05-16: 1</revised>
+  <revised count="1">2014-05-16</revised>
   <bug>462278</bug>
   <bug>467710</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201405-09.xml b/metadata/glsa/glsa-201405-09.xml
index 359a4aad1f55..55207eef8b97 100644
--- a/metadata/glsa/glsa-201405-09.xml
+++ b/metadata/glsa/glsa-201405-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">imagemagick</product>
   <announced>2014-05-17</announced>
-  <revised>2014-05-17: 1</revised>
+  <revised count="1">2014-05-17</revised>
   <bug>409431</bug>
   <bug>483032</bug>
   <bug>500988</bug>
diff --git a/metadata/glsa/glsa-201405-10.xml b/metadata/glsa/glsa-201405-10.xml
index a4d3f629ad19..c766f347be9b 100644
--- a/metadata/glsa/glsa-201405-10.xml
+++ b/metadata/glsa/glsa-201405-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">rack</product>
   <announced>2014-05-17</announced>
-  <revised>2014-05-17: 1</revised>
+  <revised count="1">2014-05-17</revised>
   <bug>451620</bug>
   <bug>456176</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201405-11.xml b/metadata/glsa/glsa-201405-11.xml
index 8a4744ef4258..14a3ad92629e 100644
--- a/metadata/glsa/glsa-201405-11.xml
+++ b/metadata/glsa/glsa-201405-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bacula</product>
   <announced>2014-05-17</announced>
-  <revised>2014-05-17: 1</revised>
+  <revised count="1">2014-05-17</revised>
   <bug>434878</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201405-12.xml b/metadata/glsa/glsa-201405-12.xml
index 55793389e723..2960b2b6c96f 100644
--- a/metadata/glsa/glsa-201405-12.xml
+++ b/metadata/glsa/glsa-201405-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ettercap</product>
   <announced>2014-05-17</announced>
-  <revised>2014-05-17: 1</revised>
+  <revised count="1">2014-05-17</revised>
   <bug>340897</bug>
   <bug>451198</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201405-13.xml b/metadata/glsa/glsa-201405-13.xml
index 4614822a0fd5..7c1872692e0d 100644
--- a/metadata/glsa/glsa-201405-13.xml
+++ b/metadata/glsa/glsa-201405-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pango</product>
   <announced>2014-05-17</announced>
-  <revised>2014-05-17: 1</revised>
+  <revised count="1">2014-05-17</revised>
   <bug>268976</bug>
   <bug>352087</bug>
   <bug>357067</bug>
diff --git a/metadata/glsa/glsa-201405-14.xml b/metadata/glsa/glsa-201405-14.xml
index 1ce854651443..5983113bd598 100644
--- a/metadata/glsa/glsa-201405-14.xml
+++ b/metadata/glsa/glsa-201405-14.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in Ruby OpenID may lead to Denial of Service.</synopsis>
   <product type="ebuild">ruby-openid</product>
   <announced>2014-05-17</announced>
-  <revised>2014-05-17: 1</revised>
+  <revised count="1">2014-05-17</revised>
   <bug>460156</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201405-15.xml b/metadata/glsa/glsa-201405-15.xml
index 770806e6cd53..b0d64f46354b 100644
--- a/metadata/glsa/glsa-201405-15.xml
+++ b/metadata/glsa/glsa-201405-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">util-linux</product>
   <announced>2014-05-18</announced>
-  <revised>2014-05-18: 1</revised>
+  <revised count="1">2014-05-18</revised>
   <bug>359759</bug>
   <bug>450740</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201405-16.xml b/metadata/glsa/glsa-201405-16.xml
index d7068d5b37f1..229014a3a906 100644
--- a/metadata/glsa/glsa-201405-16.xml
+++ b/metadata/glsa/glsa-201405-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mono</product>
   <announced>2014-05-18</announced>
-  <revised>2014-05-18: 1</revised>
+  <revised count="1">2014-05-18</revised>
   <bug>433768</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201405-17.xml b/metadata/glsa/glsa-201405-17.xml
index d516e718810d..54a2313c9e0a 100644
--- a/metadata/glsa/glsa-201405-17.xml
+++ b/metadata/glsa/glsa-201405-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">munin</product>
   <announced>2014-05-18</announced>
-  <revised>2014-05-18: 1</revised>
+  <revised count="1">2014-05-18</revised>
   <bug>412881</bug>
   <bug>445250</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201405-18.xml b/metadata/glsa/glsa-201405-18.xml
index ae2642de0ea4..7afa2c980a8d 100644
--- a/metadata/glsa/glsa-201405-18.xml
+++ b/metadata/glsa/glsa-201405-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openconnect</product>
   <announced>2014-05-18</announced>
-  <revised>2014-05-18: 1</revised>
+  <revised count="1">2014-05-18</revised>
   <bug>457068</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201405-19.xml b/metadata/glsa/glsa-201405-19.xml
index 8a294d0144b3..d16abbf4d38e 100644
--- a/metadata/glsa/glsa-201405-19.xml
+++ b/metadata/glsa/glsa-201405-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mcrypt</product>
   <announced>2014-05-18</announced>
-  <revised>2014-05-18: 1</revised>
+  <revised count="1">2014-05-18</revised>
   <bug>434112</bug>
   <bug>440778</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201405-20.xml b/metadata/glsa/glsa-201405-20.xml
index bc50aa606db4..8ed494ebb41f 100644
--- a/metadata/glsa/glsa-201405-20.xml
+++ b/metadata/glsa/glsa-201405-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">jbigkit</product>
   <announced>2014-05-18</announced>
-  <revised>2014-05-18: 1</revised>
+  <revised count="1">2014-05-18</revised>
   <bug>507254</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201405-21.xml b/metadata/glsa/glsa-201405-21.xml
index 03255f8417f8..342671e4105d 100644
--- a/metadata/glsa/glsa-201405-21.xml
+++ b/metadata/glsa/glsa-201405-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">shadowircd</product>
   <announced>2014-05-18</announced>
-  <revised>2014-05-18: 1</revised>
+  <revised count="1">2014-05-18</revised>
   <bug>449544</bug>
   <bug>449790</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201405-22.xml b/metadata/glsa/glsa-201405-22.xml
index 30051e3a4efa..b72f172093d5 100644
--- a/metadata/glsa/glsa-201405-22.xml
+++ b/metadata/glsa/glsa-201405-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pidgin</product>
   <announced>2014-05-18</announced>
-  <revised>2014-05-18: 1</revised>
+  <revised count="1">2014-05-18</revised>
   <bug>457580</bug>
   <bug>499596</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201405-23.xml b/metadata/glsa/glsa-201405-23.xml
index faf4efffe97d..21b4c63c06c4 100644
--- a/metadata/glsa/glsa-201405-23.xml
+++ b/metadata/glsa/glsa-201405-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">lib3ds</product>
   <announced>2014-05-18</announced>
-  <revised>2014-12-10: 2</revised>
+  <revised count="2">2014-12-10</revised>
   <bug>308033</bug>
   <bug>519936</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201405-24.xml b/metadata/glsa/glsa-201405-24.xml
index d36976123c70..069f8d1f85f2 100644
--- a/metadata/glsa/glsa-201405-24.xml
+++ b/metadata/glsa/glsa-201405-24.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">apr apr-util</product>
   <announced>2014-05-18</announced>
-  <revised>2014-05-18: 1</revised>
+  <revised count="1">2014-05-18</revised>
   <bug>339527</bug>
   <bug>366903</bug>
   <bug>368651</bug>
diff --git a/metadata/glsa/glsa-201405-25.xml b/metadata/glsa/glsa-201405-25.xml
index 5d9d754348bf..05a9a27dcbe7 100644
--- a/metadata/glsa/glsa-201405-25.xml
+++ b/metadata/glsa/glsa-201405-25.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">symfony</product>
   <announced>2014-05-18</announced>
-  <revised>2014-05-18: 1</revised>
+  <revised count="1">2014-05-18</revised>
   <bug>444696</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201405-26.xml b/metadata/glsa/glsa-201405-26.xml
index c16762bfedb2..edc73ab71638 100644
--- a/metadata/glsa/glsa-201405-26.xml
+++ b/metadata/glsa/glsa-201405-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">x2go</product>
   <announced>2014-05-19</announced>
-  <revised>2014-05-19: 1</revised>
+  <revised count="1">2014-05-19</revised>
   <bug>497260</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201405-27.xml b/metadata/glsa/glsa-201405-27.xml
index 71c5a242ff23..f3273d99db87 100644
--- a/metadata/glsa/glsa-201405-27.xml
+++ b/metadata/glsa/glsa-201405-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libyaml</product>
   <announced>2014-05-23</announced>
-  <revised>2014-05-23: 1</revised>
+  <revised count="1">2014-05-23</revised>
   <bug>505948</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201405-28.xml b/metadata/glsa/glsa-201405-28.xml
index f653d89ea69c..af86322b917f 100644
--- a/metadata/glsa/glsa-201405-28.xml
+++ b/metadata/glsa/glsa-201405-28.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xmonad-contrib</product>
   <announced>2014-05-28</announced>
-  <revised>2014-05-28: 1</revised>
+  <revised count="1">2014-05-28</revised>
   <bug>478288</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-01.xml b/metadata/glsa/glsa-201406-01.xml
index 25d237860649..f0687386203b 100644
--- a/metadata/glsa/glsa-201406-01.xml
+++ b/metadata/glsa/glsa-201406-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dbus</product>
   <announced>2014-06-01</announced>
-  <revised>2014-06-01: 1</revised>
+  <revised count="1">2014-06-01</revised>
   <bug>436028</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-02.xml b/metadata/glsa/glsa-201406-02.xml
index 305941f955ad..98d4ead1e30f 100644
--- a/metadata/glsa/glsa-201406-02.xml
+++ b/metadata/glsa/glsa-201406-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libarchive</product>
   <announced>2014-06-01</announced>
-  <revised>2014-06-01: 1</revised>
+  <revised count="1">2014-06-01</revised>
   <bug>366687</bug>
   <bug>463632</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201406-03.xml b/metadata/glsa/glsa-201406-03.xml
index afb0163914da..6f24c0492faa 100644
--- a/metadata/glsa/glsa-201406-03.xml
+++ b/metadata/glsa/glsa-201406-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">fail2ban</product>
   <announced>2014-06-01</announced>
-  <revised>2014-06-01: 1</revised>
+  <revised count="1">2014-06-01</revised>
   <bug>364883</bug>
   <bug>473118</bug>
   <bug>499802</bug>
diff --git a/metadata/glsa/glsa-201406-04.xml b/metadata/glsa/glsa-201406-04.xml
index de00575f6177..958e65c665bf 100644
--- a/metadata/glsa/glsa-201406-04.xml
+++ b/metadata/glsa/glsa-201406-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">systemtap</product>
   <announced>2014-06-05</announced>
-  <revised>2014-06-05: 1</revised>
+  <revised count="1">2014-06-05</revised>
   <bug>405345</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-05.xml b/metadata/glsa/glsa-201406-05.xml
index 41eccabc631e..f04f8b375ac6 100644
--- a/metadata/glsa/glsa-201406-05.xml
+++ b/metadata/glsa/glsa-201406-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mutt</product>
   <announced>2014-06-05</announced>
-  <revised>2014-06-05: 1</revised>
+  <revised count="1">2014-06-05</revised>
   <bug>504462</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-06.xml b/metadata/glsa/glsa-201406-06.xml
index 375b24269866..83a71b867393 100644
--- a/metadata/glsa/glsa-201406-06.xml
+++ b/metadata/glsa/glsa-201406-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mumble</product>
   <announced>2014-06-06</announced>
-  <revised>2014-06-06: 1</revised>
+  <revised count="1">2014-06-06</revised>
   <bug>500486</bug>
   <bug>510380</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201406-07.xml b/metadata/glsa/glsa-201406-07.xml
index b58ef4ff270b..cea16bf5800d 100644
--- a/metadata/glsa/glsa-201406-07.xml
+++ b/metadata/glsa/glsa-201406-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">echoping</product>
   <announced>2014-06-06</announced>
-  <revised>2014-06-06: 1</revised>
+  <revised count="1">2014-06-06</revised>
   <bug>349569</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-08.xml b/metadata/glsa/glsa-201406-08.xml
index 298d06adf75a..c32fdcefe1aa 100644
--- a/metadata/glsa/glsa-201406-08.xml
+++ b/metadata/glsa/glsa-201406-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2014-06-10</announced>
-  <revised>2014-06-10: 1</revised>
+  <revised count="1">2014-06-10</revised>
   <bug>510278</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-09.xml b/metadata/glsa/glsa-201406-09.xml
index 427862c5ea8f..3dbbc91410ac 100644
--- a/metadata/glsa/glsa-201406-09.xml
+++ b/metadata/glsa/glsa-201406-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gnutls</product>
   <announced>2014-06-13</announced>
-  <revised>2014-06-13: 1</revised>
+  <revised count="1">2014-06-13</revised>
   <bug>501282</bug>
   <bug>503394</bug>
   <bug>511840</bug>
diff --git a/metadata/glsa/glsa-201406-10.xml b/metadata/glsa/glsa-201406-10.xml
index 569acafee9ca..b433da16c7d4 100644
--- a/metadata/glsa/glsa-201406-10.xml
+++ b/metadata/glsa/glsa-201406-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">lighttpd</product>
   <announced>2014-06-13</announced>
-  <revised>2014-06-13: 1</revised>
+  <revised count="1">2014-06-13</revised>
   <bug>392581</bug>
   <bug>444179</bug>
   <bug>490432</bug>
diff --git a/metadata/glsa/glsa-201406-11.xml b/metadata/glsa/glsa-201406-11.xml
index 039984779521..7d51ae825dbc 100644
--- a/metadata/glsa/glsa-201406-11.xml
+++ b/metadata/glsa/glsa-201406-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libXfont</product>
   <announced>2014-06-14</announced>
-  <revised>2014-06-14: 1</revised>
+  <revised count="1">2014-06-14</revised>
   <bug>510250</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-12.xml b/metadata/glsa/glsa-201406-12.xml
index 9a10f4c95b7a..25b550027560 100644
--- a/metadata/glsa/glsa-201406-12.xml
+++ b/metadata/glsa/glsa-201406-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">freeradius</product>
   <announced>2014-06-15</announced>
-  <revised>2014-06-15: 1</revised>
+  <revised count="1">2014-06-15</revised>
   <bug>501754</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-13.xml b/metadata/glsa/glsa-201406-13.xml
index 6d01442ad9ca..edee5ee1a35b 100644
--- a/metadata/glsa/glsa-201406-13.xml
+++ b/metadata/glsa/glsa-201406-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">memcached</product>
   <announced>2014-06-15</announced>
-  <revised>2014-06-15: 1</revised>
+  <revised count="1">2014-06-15</revised>
   <bug>279386</bug>
   <bug>452098</bug>
   <bug>467962</bug>
diff --git a/metadata/glsa/glsa-201406-14.xml b/metadata/glsa/glsa-201406-14.xml
index 81f6718cc377..5c3b5f8f06b2 100644
--- a/metadata/glsa/glsa-201406-14.xml
+++ b/metadata/glsa/glsa-201406-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">opera</product>
   <announced>2014-06-15</announced>
-  <revised>2014-06-15: 1</revised>
+  <revised count="1">2014-06-15</revised>
   <bug>442044</bug>
   <bug>444040</bug>
   <bug>446096</bug>
diff --git a/metadata/glsa/glsa-201406-15.xml b/metadata/glsa/glsa-201406-15.xml
index 2f0e4744fd35..a3cbc86bc149 100644
--- a/metadata/glsa/glsa-201406-15.xml
+++ b/metadata/glsa/glsa-201406-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">kdirstat</product>
   <announced>2014-06-15</announced>
-  <revised>2014-06-15: 1</revised>
+  <revised count="1">2014-06-15</revised>
   <bug>504994</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-16.xml b/metadata/glsa/glsa-201406-16.xml
index dd2001840878..5bca73ef3470 100644
--- a/metadata/glsa/glsa-201406-16.xml
+++ b/metadata/glsa/glsa-201406-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cups-filters</product>
   <announced>2014-06-16</announced>
-  <revised>2014-06-16: 1</revised>
+  <revised count="1">2014-06-16</revised>
   <bug>504474</bug>
   <bug>506518</bug>
   <bug>508844</bug>
diff --git a/metadata/glsa/glsa-201406-17.xml b/metadata/glsa/glsa-201406-17.xml
index b23ce4f81a1f..5361610e6a37 100644
--- a/metadata/glsa/glsa-201406-17.xml
+++ b/metadata/glsa/glsa-201406-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2014-06-17</announced>
-  <revised>2014-06-17: 1</revised>
+  <revised count="1">2014-06-17</revised>
   <bug>512888</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-18.xml b/metadata/glsa/glsa-201406-18.xml
index e17b2f1bc303..b9f2d0d9c5a3 100644
--- a/metadata/glsa/glsa-201406-18.xml
+++ b/metadata/glsa/glsa-201406-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">rxvt-unicode</product>
   <announced>2014-06-19</announced>
-  <revised>2014-06-19: 1</revised>
+  <revised count="1">2014-06-19</revised>
   <bug>509174</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-19.xml b/metadata/glsa/glsa-201406-19.xml
index 55e526eb7138..596ac2e9d082 100644
--- a/metadata/glsa/glsa-201406-19.xml
+++ b/metadata/glsa/glsa-201406-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nss</product>
   <announced>2014-06-21</announced>
-  <revised>2014-06-21: 1</revised>
+  <revised count="1">2014-06-21</revised>
   <bug>455558</bug>
   <bug>486114</bug>
   <bug>491234</bug>
diff --git a/metadata/glsa/glsa-201406-20.xml b/metadata/glsa/glsa-201406-20.xml
index bebb6d089d1b..117d2ba4e281 100644
--- a/metadata/glsa/glsa-201406-20.xml
+++ b/metadata/glsa/glsa-201406-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nginx</product>
   <announced>2014-06-22</announced>
-  <revised>2014-06-22: 1</revised>
+  <revised count="1">2014-06-22</revised>
   <bug>505018</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-21.xml b/metadata/glsa/glsa-201406-21.xml
index 48c4999b1c34..b090cc9eb73c 100644
--- a/metadata/glsa/glsa-201406-21.xml
+++ b/metadata/glsa/glsa-201406-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">curl</product>
   <announced>2014-06-22</announced>
-  <revised>2014-06-22: 1</revised>
+  <revised count="1">2014-06-22</revised>
   <bug>505864</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-22.xml b/metadata/glsa/glsa-201406-22.xml
index 0b30bc081c3e..008a86b66e80 100644
--- a/metadata/glsa/glsa-201406-22.xml
+++ b/metadata/glsa/glsa-201406-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nas</product>
   <announced>2014-06-25</announced>
-  <revised>2014-06-25: 1</revised>
+  <revised count="1">2014-06-25</revised>
   <bug>484480</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-23.xml b/metadata/glsa/glsa-201406-23.xml
index dd457b32196e..8e64dae79bdf 100644
--- a/metadata/glsa/glsa-201406-23.xml
+++ b/metadata/glsa/glsa-201406-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">denyhost</product>
   <announced>2014-06-25</announced>
-  <revised>2014-06-25: 1</revised>
+  <revised count="1">2014-06-25</revised>
   <bug>495130</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-24.xml b/metadata/glsa/glsa-201406-24.xml
index d31697657449..ee4e6c46930e 100644
--- a/metadata/glsa/glsa-201406-24.xml
+++ b/metadata/glsa/glsa-201406-24.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dnsmasq</product>
   <announced>2014-06-25</announced>
-  <revised>2014-06-25: 1</revised>
+  <revised count="1">2014-06-25</revised>
   <bug>436894</bug>
   <bug>453170</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201406-25.xml b/metadata/glsa/glsa-201406-25.xml
index 9a72cd1b3d10..8703f2b446d9 100644
--- a/metadata/glsa/glsa-201406-25.xml
+++ b/metadata/glsa/glsa-201406-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2014-06-25</announced>
-  <revised>2014-06-25: 2</revised>
+  <revised count="2">2014-06-25</revised>
   <bug>513102</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-26.xml b/metadata/glsa/glsa-201406-26.xml
index 98c3afdfb208..d6f1285460e2 100644
--- a/metadata/glsa/glsa-201406-26.xml
+++ b/metadata/glsa/glsa-201406-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">django</product>
   <announced>2014-06-26</announced>
-  <revised>2014-12-03: 2</revised>
+  <revised count="2">2014-12-03</revised>
   <bug>508514</bug>
   <bug>510382</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201406-27.xml b/metadata/glsa/glsa-201406-27.xml
index eb4521c659fe..9707a95f53a1 100644
--- a/metadata/glsa/glsa-201406-27.xml
+++ b/metadata/glsa/glsa-201406-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">polkit spice-gtk systemd hplip libvirt</product>
   <announced>2014-06-26</announced>
-  <revised>2014-06-26: 1</revised>
+  <revised count="1">2014-06-26</revised>
   <bug>484486</bug>
   <bug>484488</bug>
   <bug>485420</bug>
diff --git a/metadata/glsa/glsa-201406-28.xml b/metadata/glsa/glsa-201406-28.xml
index 81d8862a50b7..b5d1cf6ee761 100644
--- a/metadata/glsa/glsa-201406-28.xml
+++ b/metadata/glsa/glsa-201406-28.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libav</product>
   <announced>2014-06-26</announced>
-  <revised>2014-06-26: 1</revised>
+  <revised count="1">2014-06-26</revised>
   <bug>439052</bug>
   <bug>452202</bug>
   <bug>470734</bug>
diff --git a/metadata/glsa/glsa-201406-29.xml b/metadata/glsa/glsa-201406-29.xml
index e5b4a4b5afa0..c7e574adf784 100644
--- a/metadata/glsa/glsa-201406-29.xml
+++ b/metadata/glsa/glsa-201406-29.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">spice-gtk</product>
   <announced>2014-06-26</announced>
-  <revised>2014-06-26: 1</revised>
+  <revised count="1">2014-06-26</revised>
   <bug>435694</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-30.xml b/metadata/glsa/glsa-201406-30.xml
index 595d1915cfbc..e0a5069376cf 100644
--- a/metadata/glsa/glsa-201406-30.xml
+++ b/metadata/glsa/glsa-201406-30.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sudo</product>
   <announced>2014-06-27</announced>
-  <revised>2014-06-27: 1</revised>
+  <revised count="1">2014-06-27</revised>
   <bug>503586</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-31.xml b/metadata/glsa/glsa-201406-31.xml
index fcb30f216784..bfab1b121282 100644
--- a/metadata/glsa/glsa-201406-31.xml
+++ b/metadata/glsa/glsa-201406-31.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">konqueror</product>
   <announced>2014-06-27</announced>
-  <revised>2014-06-27: 1</revised>
+  <revised count="1">2014-06-27</revised>
   <bug>438452</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201406-32.xml b/metadata/glsa/glsa-201406-32.xml
index f64277d04269..4765829ff1a7 100644
--- a/metadata/glsa/glsa-201406-32.xml
+++ b/metadata/glsa/glsa-201406-32.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">icedtea-bin</product>
   <announced>2014-06-29</announced>
-  <revised>2016-04-19: 2</revised>
+  <revised count="2">2016-04-19</revised>
   <bug>312297</bug>
   <bug>330205</bug>
   <bug>340819</bug>
diff --git a/metadata/glsa/glsa-201406-33.xml b/metadata/glsa/glsa-201406-33.xml
index 6647cb576ca5..851973038a51 100644
--- a/metadata/glsa/glsa-201406-33.xml
+++ b/metadata/glsa/glsa-201406-33.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2014-06-29</announced>
-  <revised>2014-06-29: 1</revised>
+  <revised count="1">2014-06-29</revised>
   <bug>503792</bug>
   <bug>507298</bug>
   <bug>508506</bug>
diff --git a/metadata/glsa/glsa-201406-34.xml b/metadata/glsa/glsa-201406-34.xml
index 32bca1fdc41e..88b999181402 100644
--- a/metadata/glsa/glsa-201406-34.xml
+++ b/metadata/glsa/glsa-201406-34.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">kdelibs</product>
   <announced>2014-06-29</announced>
-  <revised>2014-06-29: 1</revised>
+  <revised count="1">2014-06-29</revised>
   <bug>358025</bug>
   <bug>384227</bug>
   <bug>469140</bug>
diff --git a/metadata/glsa/glsa-201406-35.xml b/metadata/glsa/glsa-201406-35.xml
index ce63c6c3d1ec..b4dffc6c0aff 100644
--- a/metadata/glsa/glsa-201406-35.xml
+++ b/metadata/glsa/glsa-201406-35.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openfire</product>
   <announced>2014-06-30</announced>
-  <revised>2014-06-30: 1</revised>
+  <revised count="1">2014-06-30</revised>
   <bug>266129</bug>
   <bug>507242</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201406-36.xml b/metadata/glsa/glsa-201406-36.xml
index c6ab249f23bd..6b74642de664 100644
--- a/metadata/glsa/glsa-201406-36.xml
+++ b/metadata/glsa/glsa-201406-36.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">OpenLDAP</product>
   <announced>2014-06-30</announced>
-  <revised>2014-06-30: 1</revised>
+  <revised count="1">2014-06-30</revised>
   <bug>290345</bug>
   <bug>323777</bug>
   <bug>355333</bug>
diff --git a/metadata/glsa/glsa-201407-01.xml b/metadata/glsa/glsa-201407-01.xml
index 8c03385d3c94..10697913e884 100644
--- a/metadata/glsa/glsa-201407-01.xml
+++ b/metadata/glsa/glsa-201407-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openttd</product>
   <announced>2014-07-07</announced>
-  <revised>2014-07-07: 1</revised>
+  <revised count="1">2014-07-07</revised>
   <bug>492876</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201407-02.xml b/metadata/glsa/glsa-201407-02.xml
index 00de5462604d..97f933e5523f 100644
--- a/metadata/glsa/glsa-201407-02.xml
+++ b/metadata/glsa/glsa-201407-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2014-07-09</announced>
-  <revised>2014-07-09: 1</revised>
+  <revised count="1">2014-07-09</revised>
   <bug>516750</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201407-03.xml b/metadata/glsa/glsa-201407-03.xml
index 68bf74563259..e5a2e5dc67c4 100644
--- a/metadata/glsa/glsa-201407-03.xml
+++ b/metadata/glsa/glsa-201407-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xen</product>
   <announced>2014-07-16</announced>
-  <revised>2014-07-16: 1</revised>
+  <revised count="1">2014-07-16</revised>
   <bug>440768</bug>
   <bug>484478</bug>
   <bug>486354</bug>
diff --git a/metadata/glsa/glsa-201407-04.xml b/metadata/glsa/glsa-201407-04.xml
index bed6f487da0e..4b478172bfa2 100644
--- a/metadata/glsa/glsa-201407-04.xml
+++ b/metadata/glsa/glsa-201407-04.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in GnuPG can lead to a Denial of Service condition.</synopsis>
   <product type="ebuild">GnuPG. </product>
   <announced>2014-07-16</announced>
-  <revised>2014-07-16: 1</revised>
+  <revised count="1">2014-07-16</revised>
   <bug>514718</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201407-05.xml b/metadata/glsa/glsa-201407-05.xml
index d5b487a678bf..ebd278ccbdf1 100644
--- a/metadata/glsa/glsa-201407-05.xml
+++ b/metadata/glsa/glsa-201407-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2014-07-27</announced>
-  <revised>2015-06-06: 2</revised>
+  <revised count="2">2015-06-06</revised>
   <bug>512506</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201408-01.xml b/metadata/glsa/glsa-201408-01.xml
index b0cefd19a32e..1e72ebdd00dd 100644
--- a/metadata/glsa/glsa-201408-01.xml
+++ b/metadata/glsa/glsa-201408-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ZendFramework</product>
   <announced>2014-08-04</announced>
-  <revised>2014-08-04: 1</revised>
+  <revised count="1">2014-08-04</revised>
   <bug>369139</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201408-02.xml b/metadata/glsa/glsa-201408-02.xml
index b77f91fdfa7b..4e87ec5c2c98 100644
--- a/metadata/glsa/glsa-201408-02.xml
+++ b/metadata/glsa/glsa-201408-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">freetype</product>
   <announced>2014-08-09</announced>
-  <revised>2014-08-09: 1</revised>
+  <revised count="1">2014-08-09</revised>
   <bug>504088</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201408-03.xml b/metadata/glsa/glsa-201408-03.xml
index 397b576da1b3..b9f8bd63e9f7 100644
--- a/metadata/glsa/glsa-201408-03.xml
+++ b/metadata/glsa/glsa-201408-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libssh</product>
   <announced>2014-08-10</announced>
-  <revised>2014-08-10: 1</revised>
+  <revised count="1">2014-08-10</revised>
   <bug>503504</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201408-04.xml b/metadata/glsa/glsa-201408-04.xml
index 9ad1498d03c4..59adb216da58 100644
--- a/metadata/glsa/glsa-201408-04.xml
+++ b/metadata/glsa/glsa-201408-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">catfish</product>
   <announced>2014-08-13</announced>
-  <revised>2014-08-13: 1</revised>
+  <revised count="1">2014-08-13</revised>
   <bug>502536</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201408-05.xml b/metadata/glsa/glsa-201408-05.xml
index a4b0236e362d..975b8ea69a14 100644
--- a/metadata/glsa/glsa-201408-05.xml
+++ b/metadata/glsa/glsa-201408-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2014-08-14</announced>
-  <revised>2014-08-14: 1</revised>
+  <revised count="1">2014-08-14</revised>
   <bug>519790</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201408-06.xml b/metadata/glsa/glsa-201408-06.xml
index 8b2df195dbe1..0b93b3cd0086 100644
--- a/metadata/glsa/glsa-201408-06.xml
+++ b/metadata/glsa/glsa-201408-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2014-08-14</announced>
-  <revised>2015-06-06: 4</revised>
+  <revised count="4">2015-06-06</revised>
   <bug>503014</bug>
   <bug>507378</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201408-07.xml b/metadata/glsa/glsa-201408-07.xml
index 6b0d248a3eaa..c3d308c6429d 100644
--- a/metadata/glsa/glsa-201408-07.xml
+++ b/metadata/glsa/glsa-201408-07.xml
@@ -9,7 +9,7 @@
   </synopsis>
   <product type="ebuild">modplug</product>
   <announced>2014-08-16</announced>
-  <revised>2014-08-16: 1</revised>
+  <revised count="1">2014-08-16</revised>
   <bug>480388</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201408-08.xml b/metadata/glsa/glsa-201408-08.xml
index f76bf5656ed3..1a9f4a94adc9 100644
--- a/metadata/glsa/glsa-201408-08.xml
+++ b/metadata/glsa/glsa-201408-08.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in file could result in Denial of Service. </synopsis>
   <product type="ebuild">file</product>
   <announced>2014-08-26</announced>
-  <revised>2014-08-29: 6</revised>
+  <revised count="6">2014-08-29</revised>
   <bug>505534</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201408-09.xml b/metadata/glsa/glsa-201408-09.xml
index 09a59b1c6ddb..efcb1ea70444 100644
--- a/metadata/glsa/glsa-201408-09.xml
+++ b/metadata/glsa/glsa-201408-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libtasn1</product>
   <announced>2014-08-29</announced>
-  <revised>2014-08-29: 1</revised>
+  <revised count="1">2014-08-29</revised>
   <bug>511536</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201408-10.xml b/metadata/glsa/glsa-201408-10.xml
index 66cab7ca7fc6..706dc506c87f 100644
--- a/metadata/glsa/glsa-201408-10.xml
+++ b/metadata/glsa/glsa-201408-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libgcrypt,side-channel,elgamal</product>
   <announced>2014-08-29</announced>
-  <revised>2014-08-29: 1</revised>
+  <revised count="1">2014-08-29</revised>
   <bug>519396</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201408-11.xml b/metadata/glsa/glsa-201408-11.xml
index 21332284d9a8..41f211aa87cf 100644
--- a/metadata/glsa/glsa-201408-11.xml
+++ b/metadata/glsa/glsa-201408-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2014-08-29</announced>
-  <revised>2015-08-22: 4</revised>
+  <revised count="4">2015-08-22</revised>
   <bug>459904</bug>
   <bug>472204</bug>
   <bug>472558</bug>
diff --git a/metadata/glsa/glsa-201408-12.xml b/metadata/glsa/glsa-201408-12.xml
index b8dcfb7d3930..35482ae3e690 100644
--- a/metadata/glsa/glsa-201408-12.xml
+++ b/metadata/glsa/glsa-201408-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">apache,dos,ace</product>
   <announced>2014-08-29</announced>
-  <revised>2014-08-29: 1</revised>
+  <revised count="1">2014-08-29</revised>
   <bug>504990</bug>
   <bug>507866</bug>
   <bug>517298</bug>
diff --git a/metadata/glsa/glsa-201408-13.xml b/metadata/glsa/glsa-201408-13.xml
index 5f85b849ec16..1eca4cf0e367 100644
--- a/metadata/glsa/glsa-201408-13.xml
+++ b/metadata/glsa/glsa-201408-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">jinja</product>
   <announced>2014-08-29</announced>
-  <revised>2014-08-29: 1</revised>
+  <revised count="1">2014-08-29</revised>
   <bug>497690</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201408-14.xml b/metadata/glsa/glsa-201408-14.xml
index bb406e194d25..596005e30178 100644
--- a/metadata/glsa/glsa-201408-14.xml
+++ b/metadata/glsa/glsa-201408-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">stunnel</product>
   <announced>2014-08-29</announced>
-  <revised>2014-08-29: 1</revised>
+  <revised count="1">2014-08-29</revised>
   <bug>503506</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201408-15.xml b/metadata/glsa/glsa-201408-15.xml
index 0ca39d89ca2d..a4a24e06290a 100644
--- a/metadata/glsa/glsa-201408-15.xml
+++ b/metadata/glsa/glsa-201408-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">postgresql-server</product>
   <announced>2014-08-29</announced>
-  <revised>2014-08-29: 1</revised>
+  <revised count="1">2014-08-29</revised>
   <bug>456080</bug>
   <bug>463884</bug>
   <bug>501946</bug>
diff --git a/metadata/glsa/glsa-201408-16.xml b/metadata/glsa/glsa-201408-16.xml
index 4bcf43bc62d8..d86d8a986b15 100644
--- a/metadata/glsa/glsa-201408-16.xml
+++ b/metadata/glsa/glsa-201408-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2014-08-30</announced>
-  <revised>2014-08-30: 1</revised>
+  <revised count="1">2014-08-30</revised>
   <bug>504328</bug>
   <bug>504890</bug>
   <bug>507212</bug>
diff --git a/metadata/glsa/glsa-201408-17.xml b/metadata/glsa/glsa-201408-17.xml
index 048cf72f1ea4..fd864eacbdfa 100644
--- a/metadata/glsa/glsa-201408-17.xml
+++ b/metadata/glsa/glsa-201408-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">qemu</product>
   <announced>2014-08-30</announced>
-  <revised>2014-09-02: 3</revised>
+  <revised count="3">2014-09-02</revised>
   <bug>201434</bug>
   <bug>486352</bug>
   <bug>505946</bug>
diff --git a/metadata/glsa/glsa-201408-18.xml b/metadata/glsa/glsa-201408-18.xml
index 0e7f53216f80..e735e9ead478 100644
--- a/metadata/glsa/glsa-201408-18.xml
+++ b/metadata/glsa/glsa-201408-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nrpe</product>
   <announced>2014-08-30</announced>
-  <revised>2014-08-30: 1</revised>
+  <revised count="1">2014-08-30</revised>
   <bug>397603</bug>
   <bug>459870</bug>
   <bug>508122</bug>
diff --git a/metadata/glsa/glsa-201408-19.xml b/metadata/glsa/glsa-201408-19.xml
index b38a0ff5d8de..6736d322061b 100644
--- a/metadata/glsa/glsa-201408-19.xml
+++ b/metadata/glsa/glsa-201408-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openoffice</product>
   <announced>2014-08-31</announced>
-  <revised>2014-08-31: 1</revised>
+  <revised count="1">2014-08-31</revised>
   <bug>283370</bug>
   <bug>305195</bug>
   <bug>320491</bug>
diff --git a/metadata/glsa/glsa-201409-01.xml b/metadata/glsa/glsa-201409-01.xml
index 7bd0b113b1af..1a1d1983749a 100644
--- a/metadata/glsa/glsa-201409-01.xml
+++ b/metadata/glsa/glsa-201409-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2014-09-01</announced>
-  <revised>2014-09-01: 1</revised>
+  <revised count="1">2014-09-01</revised>
   <bug>519014</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201409-02.xml b/metadata/glsa/glsa-201409-02.xml
index 457998377bf5..54ad07f110da 100644
--- a/metadata/glsa/glsa-201409-02.xml
+++ b/metadata/glsa/glsa-201409-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">net-snmp</product>
   <announced>2014-09-01</announced>
-  <revised>2014-09-01: 1</revised>
+  <revised count="1">2014-09-01</revised>
   <bug>431752</bug>
   <bug>493296</bug>
   <bug>502968</bug>
diff --git a/metadata/glsa/glsa-201409-03.xml b/metadata/glsa/glsa-201409-03.xml
index 7c73b53ba539..b79f392b77e6 100644
--- a/metadata/glsa/glsa-201409-03.xml
+++ b/metadata/glsa/glsa-201409-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dhcpcd</product>
   <announced>2014-09-03</announced>
-  <revised>2014-09-03: 1</revised>
+  <revised count="1">2014-09-03</revised>
   <bug>518596</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201409-04.xml b/metadata/glsa/glsa-201409-04.xml
index 0c47a5bd6d02..fc4e0e838898 100644
--- a/metadata/glsa/glsa-201409-04.xml
+++ b/metadata/glsa/glsa-201409-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mysql</product>
   <announced>2014-09-04</announced>
-  <revised>2014-09-04: 1</revised>
+  <revised count="1">2014-09-04</revised>
   <bug>460748</bug>
   <bug>488212</bug>
   <bug>498164</bug>
diff --git a/metadata/glsa/glsa-201409-05.xml b/metadata/glsa/glsa-201409-05.xml
index bf6e90125a02..ee82cd9396a7 100644
--- a/metadata/glsa/glsa-201409-05.xml
+++ b/metadata/glsa/glsa-201409-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2014-09-19</announced>
-  <revised>2014-09-19: 1</revised>
+  <revised count="1">2014-09-19</revised>
   <bug>522448</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201409-06.xml b/metadata/glsa/glsa-201409-06.xml
index 0219bc18ebd0..e3ac39dbe565 100644
--- a/metadata/glsa/glsa-201409-06.xml
+++ b/metadata/glsa/glsa-201409-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2014-09-19</announced>
-  <revised>2014-09-19: 1</revised>
+  <revised count="1">2014-09-19</revised>
   <bug>522484</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201409-07.xml b/metadata/glsa/glsa-201409-07.xml
index d87503478e99..6265fadea682 100644
--- a/metadata/glsa/glsa-201409-07.xml
+++ b/metadata/glsa/glsa-201409-07.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in c-icap could result in Denial of Service. </synopsis>
   <product type="ebuild">c-icap,DoS</product>
   <announced>2014-09-19</announced>
-  <revised>2014-09-19: 1</revised>
+  <revised count="1">2014-09-19</revised>
   <bug>455324</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201409-08.xml b/metadata/glsa/glsa-201409-08.xml
index 2164c92f8166..6c07d082ac20 100644
--- a/metadata/glsa/glsa-201409-08.xml
+++ b/metadata/glsa/glsa-201409-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libxml2</product>
   <announced>2014-09-19</announced>
-  <revised>2014-09-19: 1</revised>
+  <revised count="1">2014-09-19</revised>
   <bug>509834</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201409-09.xml b/metadata/glsa/glsa-201409-09.xml
index d8c558bb9f7f..6a97564649d7 100644
--- a/metadata/glsa/glsa-201409-09.xml
+++ b/metadata/glsa/glsa-201409-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bash</product>
   <announced>2014-09-24</announced>
-  <revised>2014-10-04: 4</revised>
+  <revised count="4">2014-10-04</revised>
   <bug>523592</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201409-10.xml b/metadata/glsa/glsa-201409-10.xml
index eb699e756596..fcebaf8a6bda 100644
--- a/metadata/glsa/glsa-201409-10.xml
+++ b/metadata/glsa/glsa-201409-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bash</product>
   <announced>2014-09-25</announced>
-  <revised>2014-10-04: 2</revised>
+  <revised count="2">2014-10-04</revised>
   <bug>523592</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201410-01.xml b/metadata/glsa/glsa-201410-01.xml
index b94a39259791..d74388e868d9 100644
--- a/metadata/glsa/glsa-201410-01.xml
+++ b/metadata/glsa/glsa-201410-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bash</product>
   <announced>2014-10-04</announced>
-  <revised>2014-10-04: 1</revised>
+  <revised count="1">2014-10-04</revised>
   <bug>523742</bug>
   <bug>524256</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201410-02.xml b/metadata/glsa/glsa-201410-02.xml
index 9234024e9997..9fc185310af6 100644
--- a/metadata/glsa/glsa-201410-02.xml
+++ b/metadata/glsa/glsa-201410-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Locale-Maketext</product>
   <announced>2014-10-12</announced>
-  <revised>2014-12-29: 2</revised>
+  <revised count="2">2014-12-29</revised>
   <bug>446376</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201411-01.xml b/metadata/glsa/glsa-201411-01.xml
index a43756487d30..243cdc64dd10 100644
--- a/metadata/glsa/glsa-201411-01.xml
+++ b/metadata/glsa/glsa-201411-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">VLC</product>
   <announced>2014-11-05</announced>
-  <revised>2014-11-05: 1</revised>
+  <revised count="1">2014-11-05</revised>
   <bug>279340</bug>
   <bug>285370</bug>
   <bug>316709</bug>
diff --git a/metadata/glsa/glsa-201411-02.xml b/metadata/glsa/glsa-201411-02.xml
index 655777e729f3..8137c0f002ef 100644
--- a/metadata/glsa/glsa-201411-02.xml
+++ b/metadata/glsa/glsa-201411-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mysql mariadb</product>
   <announced>2014-11-05</announced>
-  <revised>2014-11-05: 1</revised>
+  <revised count="1">2014-11-05</revised>
   <bug>525504</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201411-03.xml b/metadata/glsa/glsa-201411-03.xml
index 345ce46493e3..0b0735784fb3 100644
--- a/metadata/glsa/glsa-201411-03.xml
+++ b/metadata/glsa/glsa-201411-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tigervnc</product>
   <announced>2014-11-05</announced>
-  <revised>2014-11-05: 1</revised>
+  <revised count="1">2014-11-05</revised>
   <bug>505170</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201411-04.xml b/metadata/glsa/glsa-201411-04.xml
index 41511126b5b9..6bb6b3330079 100644
--- a/metadata/glsa/glsa-201411-04.xml
+++ b/metadata/glsa/glsa-201411-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2014-11-09</announced>
-  <revised>2015-08-22: 3</revised>
+  <revised count="3">2015-08-22</revised>
   <bug>525960</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201411-05.xml b/metadata/glsa/glsa-201411-05.xml
index 4d4ad3c2e013..17bd48941252 100644
--- a/metadata/glsa/glsa-201411-05.xml
+++ b/metadata/glsa/glsa-201411-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wget</product>
   <announced>2014-11-16</announced>
-  <revised>2014-11-16: 1</revised>
+  <revised count="1">2014-11-16</revised>
   <bug>527056</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201411-06.xml b/metadata/glsa/glsa-201411-06.xml
index 304bc9b0915b..736cc5bdbc70 100644
--- a/metadata/glsa/glsa-201411-06.xml
+++ b/metadata/glsa/glsa-201411-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2014-11-21</announced>
-  <revised>2014-11-21: 2</revised>
+  <revised count="2">2014-11-21</revised>
   <bug>525430</bug>
   <bug>529088</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201411-07.xml b/metadata/glsa/glsa-201411-07.xml
index 2c9829742e46..90a31b3b8872 100644
--- a/metadata/glsa/glsa-201411-07.xml
+++ b/metadata/glsa/glsa-201411-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openswan</product>
   <announced>2014-11-23</announced>
-  <revised>2014-11-23: 1</revised>
+  <revised count="1">2014-11-23</revised>
   <bug>499870</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201411-08.xml b/metadata/glsa/glsa-201411-08.xml
index 97c1b7802115..804ccf23a4e2 100644
--- a/metadata/glsa/glsa-201411-08.xml
+++ b/metadata/glsa/glsa-201411-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">aircrack-ng</product>
   <announced>2014-11-23</announced>
-  <revised>2014-11-23: 1</revised>
+  <revised count="1">2014-11-23</revised>
   <bug>528132</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201411-09.xml b/metadata/glsa/glsa-201411-09.xml
index 10d05c35958b..884c5644b345 100644
--- a/metadata/glsa/glsa-201411-09.xml
+++ b/metadata/glsa/glsa-201411-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ansible</product>
   <announced>2014-11-23</announced>
-  <revised>2014-11-23: 1</revised>
+  <revised count="1">2014-11-23</revised>
   <bug>516564</bug>
   <bug>517770</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201411-10.xml b/metadata/glsa/glsa-201411-10.xml
index a8032537d28c..5be49c64d595 100644
--- a/metadata/glsa/glsa-201411-10.xml
+++ b/metadata/glsa/glsa-201411-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2014-11-23</announced>
-  <revised>2014-11-23: 1</revised>
+  <revised count="1">2014-11-23</revised>
   <bug>523216</bug>
   <bug>526208</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201411-11.xml b/metadata/glsa/glsa-201411-11.xml
index 6f4b90873e70..5a35d2ab27ce 100644
--- a/metadata/glsa/glsa-201411-11.xml
+++ b/metadata/glsa/glsa-201411-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">squid</product>
   <announced>2014-11-27</announced>
-  <revised>2014-11-27: 1</revised>
+  <revised count="1">2014-11-27</revised>
   <bug>504176</bug>
   <bug>522498</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201412-01.xml b/metadata/glsa/glsa-201412-01.xml
index bb0d7f66962b..4028f8574858 100644
--- a/metadata/glsa/glsa-201412-01.xml
+++ b/metadata/glsa/glsa-201412-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">qemu</product>
   <announced>2014-12-08</announced>
-  <revised>2014-12-08: 1</revised>
+  <revised count="1">2014-12-08</revised>
   <bug>514680</bug>
   <bug>519506</bug>
   <bug>520688</bug>
diff --git a/metadata/glsa/glsa-201412-02.xml b/metadata/glsa/glsa-201412-02.xml
index 74ba30b8a2c0..c64bb1ebce4c 100644
--- a/metadata/glsa/glsa-201412-02.xml
+++ b/metadata/glsa/glsa-201412-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nfs-utils</product>
   <announced>2014-12-08</announced>
-  <revised>2014-12-08: 1</revised>
+  <revised count="1">2014-12-08</revised>
   <bug>464636</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-03.xml b/metadata/glsa/glsa-201412-03.xml
index 72c37fba4b23..26a12152e17a 100644
--- a/metadata/glsa/glsa-201412-03.xml
+++ b/metadata/glsa/glsa-201412-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dovecot</product>
   <announced>2014-12-08</announced>
-  <revised>2014-12-08: 1</revised>
+  <revised count="1">2014-12-08</revised>
   <bug>509954</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-04.xml b/metadata/glsa/glsa-201412-04.xml
index 36094bee2a79..893f27f165ec 100644
--- a/metadata/glsa/glsa-201412-04.xml
+++ b/metadata/glsa/glsa-201412-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libvirt</product>
   <announced>2014-12-08</announced>
-  <revised>2014-12-08: 1</revised>
+  <revised count="1">2014-12-08</revised>
   <bug>483048</bug>
   <bug>484014</bug>
   <bug>485520</bug>
diff --git a/metadata/glsa/glsa-201412-05.xml b/metadata/glsa/glsa-201412-05.xml
index 8bd382a76f9c..a0d48f74c473 100644
--- a/metadata/glsa/glsa-201412-05.xml
+++ b/metadata/glsa/glsa-201412-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2014-12-09</announced>
-  <revised>2014-12-09: 2</revised>
+  <revised count="2">2014-12-09</revised>
   <bug>529728</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-06.xml b/metadata/glsa/glsa-201412-06.xml
index 32cfc0341cdd..a01b6e448b47 100644
--- a/metadata/glsa/glsa-201412-06.xml
+++ b/metadata/glsa/glsa-201412-06.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in libxml2 could result in Denial of Service.</synopsis>
   <product type="ebuild">libxml2</product>
   <announced>2014-12-10</announced>
-  <revised>2014-12-10: 1</revised>
+  <revised count="1">2014-12-10</revised>
   <bug>525656</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-07.xml b/metadata/glsa/glsa-201412-07.xml
index 90343709956c..dec22ba9c8c1 100644
--- a/metadata/glsa/glsa-201412-07.xml
+++ b/metadata/glsa/glsa-201412-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">flash,ACE</product>
   <announced>2014-12-11</announced>
-  <revised>2014-12-11: 1</revised>
+  <revised count="1">2014-12-11</revised>
   <bug>530692</bug>
   <bug>532074</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201412-08.xml b/metadata/glsa/glsa-201412-08.xml
index c027c3522d76..956fd24a1a38 100644
--- a/metadata/glsa/glsa-201412-08.xml
+++ b/metadata/glsa/glsa-201412-08.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2014-12-11</announced>
-  <revised>2014-12-11: 1</revised>
+  <revised count="1">2014-12-11</revised>
   <bug>159556</bug>
   <bug>208464</bug>
   <bug>253822</bug>
diff --git a/metadata/glsa/glsa-201412-09.xml b/metadata/glsa/glsa-201412-09.xml
index ccbe05f2adde..cde3c49b85c9 100644
--- a/metadata/glsa/glsa-201412-09.xml
+++ b/metadata/glsa/glsa-201412-09.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2014-12-11</announced>
-  <revised>2014-12-11: 2</revised>
+  <revised count="2">2014-12-11</revised>
   <bug>194151</bug>
   <bug>294253</bug>
   <bug>294256</bug>
diff --git a/metadata/glsa/glsa-201412-10.xml b/metadata/glsa/glsa-201412-10.xml
index cd3edcdabbd0..a736377a2d10 100644
--- a/metadata/glsa/glsa-201412-10.xml
+++ b/metadata/glsa/glsa-201412-10.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2014-12-11</announced>
-  <revised>2014-12-11: 1</revised>
+  <revised count="1">2014-12-11</revised>
   <bug>284536</bug>
   <bug>300903</bug>
   <bug>334475</bug>
diff --git a/metadata/glsa/glsa-201412-11.xml b/metadata/glsa/glsa-201412-11.xml
index 10a8b1b903ff..cd7a6ced5a2f 100644
--- a/metadata/glsa/glsa-201412-11.xml
+++ b/metadata/glsa/glsa-201412-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">emul-linux-x86-baselibs</product>
   <announced>2014-12-12</announced>
-  <revised>2014-12-12: 1</revised>
+  <revised count="1">2014-12-12</revised>
   <bug>196865</bug>
   <bug>335508</bug>
   <bug>483632</bug>
diff --git a/metadata/glsa/glsa-201412-12.xml b/metadata/glsa/glsa-201412-12.xml
index e7a4bf0885f5..0584e44cd132 100644
--- a/metadata/glsa/glsa-201412-12.xml
+++ b/metadata/glsa/glsa-201412-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dbus</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>512940</bug>
   <bug>516080</bug>
   <bug>522982</bug>
diff --git a/metadata/glsa/glsa-201412-13.xml b/metadata/glsa/glsa-201412-13.xml
index 4f61da3ca173..867422c4d3a1 100644
--- a/metadata/glsa/glsa-201412-13.xml
+++ b/metadata/glsa/glsa-201412-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>524764</bug>
   <bug>529858</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201412-14.xml b/metadata/glsa/glsa-201412-14.xml
index 059610b640ca..202a6baa83bf 100644
--- a/metadata/glsa/glsa-201412-14.xml
+++ b/metadata/glsa/glsa-201412-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xfig</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>297379</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-15.xml b/metadata/glsa/glsa-201412-15.xml
index ee8e27cc8cfc..6b3c81fbd9ef 100644
--- a/metadata/glsa/glsa-201412-15.xml
+++ b/metadata/glsa/glsa-201412-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mcollective</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>513292</bug>
   <bug>517286</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201412-16.xml b/metadata/glsa/glsa-201412-16.xml
index 6d8cf5f5121d..9952692321c9 100644
--- a/metadata/glsa/glsa-201412-16.xml
+++ b/metadata/glsa/glsa-201412-16.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in CouchDB could result in Denial of Service.</synopsis>
   <product type="ebuild">couchdb</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>506354</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-17.xml b/metadata/glsa/glsa-201412-17.xml
index 620382058bc6..03bd221dbfa7 100644
--- a/metadata/glsa/glsa-201412-17.xml
+++ b/metadata/glsa/glsa-201412-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ghostscript-gpl</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>264594</bug>
   <bug>300192</bug>
   <bug>332061</bug>
diff --git a/metadata/glsa/glsa-201412-18.xml b/metadata/glsa/glsa-201412-18.xml
index 797421cdd7cc..16bba45a52af 100644
--- a/metadata/glsa/glsa-201412-18.xml
+++ b/metadata/glsa/glsa-201412-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">freerdp</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>511688</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-19.xml b/metadata/glsa/glsa-201412-19.xml
index 2c7f6546ea82..70ed68f9640f 100644
--- a/metadata/glsa/glsa-201412-19.xml
+++ b/metadata/glsa/glsa-201412-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ppp</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 2</revised>
+  <revised count="2">2014-12-13</revised>
   <bug>519650</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-20.xml b/metadata/glsa/glsa-201412-20.xml
index 2e4b6c269e3c..88ee9b5c9853 100644
--- a/metadata/glsa/glsa-201412-20.xml
+++ b/metadata/glsa/glsa-201412-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gnustep-base</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>508370</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-21.xml b/metadata/glsa/glsa-201412-21.xml
index 5a686582dfa5..8d0bc81ec05b 100644
--- a/metadata/glsa/glsa-201412-21.xml
+++ b/metadata/glsa/glsa-201412-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mod_wsgi</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>510938</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-22.xml b/metadata/glsa/glsa-201412-22.xml
index 96232da76d4b..04fab3b843c2 100644
--- a/metadata/glsa/glsa-201412-22.xml
+++ b/metadata/glsa/glsa-201412-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">django</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>521324</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-23.xml b/metadata/glsa/glsa-201412-23.xml
index 681a372f129e..0f42b518767a 100644
--- a/metadata/glsa/glsa-201412-23.xml
+++ b/metadata/glsa/glsa-201412-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nagios-core</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>447802</bug>
   <bug>495132</bug>
   <bug>501200</bug>
diff --git a/metadata/glsa/glsa-201412-24.xml b/metadata/glsa/glsa-201412-24.xml
index 77fa771a17b1..efd7b71adc8d 100644
--- a/metadata/glsa/glsa-201412-24.xml
+++ b/metadata/glsa/glsa-201412-24.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openjpeg</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>484802</bug>
   <bug>493662</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201412-25.xml b/metadata/glsa/glsa-201412-25.xml
index 36c534d9a4d5..58d21454aed1 100644
--- a/metadata/glsa/glsa-201412-25.xml
+++ b/metadata/glsa/glsa-201412-25.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">qtgui</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>508984</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-26.xml b/metadata/glsa/glsa-201412-26.xml
index 7e4c451cf909..35085b83756b 100644
--- a/metadata/glsa/glsa-201412-26.xml
+++ b/metadata/glsa/glsa-201412-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">strongswan</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>507722</bug>
   <bug>509832</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201412-27.xml b/metadata/glsa/glsa-201412-27.xml
index 56adc3346586..227cffd10672 100644
--- a/metadata/glsa/glsa-201412-27.xml
+++ b/metadata/glsa/glsa-201412-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Ruby</product>
   <announced>2014-12-13</announced>
-  <revised>2014-12-13: 1</revised>
+  <revised count="1">2014-12-13</revised>
   <bug>355439</bug>
   <bug>369141</bug>
   <bug>396301</bug>
diff --git a/metadata/glsa/glsa-201412-28.xml b/metadata/glsa/glsa-201412-28.xml
index bc7584ff6dee..32a2c1173f10 100644
--- a/metadata/glsa/glsa-201412-28.xml
+++ b/metadata/glsa/glsa-201412-28.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">rails</product>
   <announced>2014-12-14</announced>
-  <revised>2014-12-14: 1</revised>
+  <revised count="1">2014-12-14</revised>
   <bug>354249</bug>
   <bug>379511</bug>
   <bug>386377</bug>
diff --git a/metadata/glsa/glsa-201412-29.xml b/metadata/glsa/glsa-201412-29.xml
index d2b922f63db1..6e8e0cba393d 100644
--- a/metadata/glsa/glsa-201412-29.xml
+++ b/metadata/glsa/glsa-201412-29.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tomcat</product>
   <announced>2014-12-15</announced>
-  <revised>2016-03-20: 2</revised>
+  <revised count="2">2016-03-20</revised>
   <bug>442014</bug>
   <bug>469434</bug>
   <bug>500600</bug>
diff --git a/metadata/glsa/glsa-201412-30.xml b/metadata/glsa/glsa-201412-30.xml
index 25c7a2baa3a9..04b8e52f486b 100644
--- a/metadata/glsa/glsa-201412-30.xml
+++ b/metadata/glsa/glsa-201412-30.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">varnish</product>
   <announced>2014-12-15</announced>
-  <revised>2014-12-15: 1</revised>
+  <revised count="1">2014-12-15</revised>
   <bug>458888</bug>
   <bug>489944</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201412-31.xml b/metadata/glsa/glsa-201412-31.xml
index d7c275fc13c1..afba26975529 100644
--- a/metadata/glsa/glsa-201412-31.xml
+++ b/metadata/glsa/glsa-201412-31.xml
@@ -5,7 +5,7 @@
   <synopsis>Multiple vulnerabilities in ZNC could lead to Denial of Service.</synopsis>
   <product type="ebuild">znc</product>
   <announced>2014-12-19</announced>
-  <revised>2014-12-19: 1</revised>
+  <revised count="1">2014-12-19</revised>
   <bug>471738</bug>
   <bug>507794</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201412-32.xml b/metadata/glsa/glsa-201412-32.xml
index 05e7eb2dcfb5..77f42d08bef4 100644
--- a/metadata/glsa/glsa-201412-32.xml
+++ b/metadata/glsa/glsa-201412-32.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sendmail</product>
   <announced>2014-12-22</announced>
-  <revised>2014-12-22: 1</revised>
+  <revised count="1">2014-12-22</revised>
   <bug>511760</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-33.xml b/metadata/glsa/glsa-201412-33.xml
index 216978553f1d..3db974ee809c 100644
--- a/metadata/glsa/glsa-201412-33.xml
+++ b/metadata/glsa/glsa-201412-33.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pdns-recursor</product>
   <announced>2014-12-22</announced>
-  <revised>2014-12-22: 1</revised>
+  <revised count="1">2014-12-22</revised>
   <bug>299942</bug>
   <bug>404377</bug>
   <bug>514946</bug>
diff --git a/metadata/glsa/glsa-201412-34.xml b/metadata/glsa/glsa-201412-34.xml
index bbd4379f5c8c..aef798faa5c6 100644
--- a/metadata/glsa/glsa-201412-34.xml
+++ b/metadata/glsa/glsa-201412-34.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ntp</product>
   <announced>2014-12-24</announced>
-  <revised>2014-12-24: 2</revised>
+  <revised count="2">2014-12-24</revised>
   <bug>533076</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-35.xml b/metadata/glsa/glsa-201412-35.xml
index 905248fbe0f4..e260519fd008 100644
--- a/metadata/glsa/glsa-201412-35.xml
+++ b/metadata/glsa/glsa-201412-35.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">rsyslog</product>
   <announced>2014-12-24</announced>
-  <revised>2014-12-24: 1</revised>
+  <revised count="1">2014-12-24</revised>
   <bug>395709</bug>
   <bug>491856</bug>
   <bug>524058</bug>
diff --git a/metadata/glsa/glsa-201412-36.xml b/metadata/glsa/glsa-201412-36.xml
index 0e0b03ce8f9e..54314591da1d 100644
--- a/metadata/glsa/glsa-201412-36.xml
+++ b/metadata/glsa/glsa-201412-36.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libvirt</product>
   <announced>2014-12-24</announced>
-  <revised>2014-12-24: 1</revised>
+  <revised count="1">2014-12-24</revised>
   <bug>532204</bug>
   <bug>533286</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201412-37.xml b/metadata/glsa/glsa-201412-37.xml
index bed0bac86174..2b238ea083b9 100644
--- a/metadata/glsa/glsa-201412-37.xml
+++ b/metadata/glsa/glsa-201412-37.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">qemu</product>
   <announced>2014-12-24</announced>
-  <revised>2014-12-24: 1</revised>
+  <revised count="1">2014-12-24</revised>
   <bug>528922</bug>
   <bug>529030</bug>
   <bug>531666</bug>
diff --git a/metadata/glsa/glsa-201412-38.xml b/metadata/glsa/glsa-201412-38.xml
index b43a44925d45..fbfeb8a656d7 100644
--- a/metadata/glsa/glsa-201412-38.xml
+++ b/metadata/glsa/glsa-201412-38.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">icecast</product>
   <announced>2014-12-26</announced>
-  <revised>2014-12-26: 1</revised>
+  <revised count="1">2014-12-26</revised>
   <bug>529956</bug>
   <bug>530784</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201412-39.xml b/metadata/glsa/glsa-201412-39.xml
index 890867c09dd5..51e0d9d3f0c6 100644
--- a/metadata/glsa/glsa-201412-39.xml
+++ b/metadata/glsa/glsa-201412-39.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2014-12-26</announced>
-  <revised>2015-06-06: 2</revised>
+  <revised count="2">2015-06-06</revised>
   <bug>494816</bug>
   <bug>519264</bug>
   <bug>525468</bug>
diff --git a/metadata/glsa/glsa-201412-40.xml b/metadata/glsa/glsa-201412-40.xml
index 6fd8213d274e..eb1203f71132 100644
--- a/metadata/glsa/glsa-201412-40.xml
+++ b/metadata/glsa/glsa-201412-40.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">flac</product>
   <announced>2014-12-26</announced>
-  <revised>2014-12-26: 1</revised>
+  <revised count="1">2014-12-26</revised>
   <bug>530288</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-41.xml b/metadata/glsa/glsa-201412-41.xml
index 0bd48239295b..0e4423b9b5fc 100644
--- a/metadata/glsa/glsa-201412-41.xml
+++ b/metadata/glsa/glsa-201412-41.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in OpenVPN could lead to Denial of Service.</synopsis>
   <product type="ebuild">openvpn</product>
   <announced>2014-12-26</announced>
-  <revised>2014-12-26: 1</revised>
+  <revised count="1">2014-12-26</revised>
   <bug>531308</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-42.xml b/metadata/glsa/glsa-201412-42.xml
index 154aa2a3614c..b9ef0229df6a 100644
--- a/metadata/glsa/glsa-201412-42.xml
+++ b/metadata/glsa/glsa-201412-42.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xen</product>
   <announced>2014-12-26</announced>
-  <revised>2014-12-31: 2</revised>
+  <revised count="2">2014-12-31</revised>
   <bug>523524</bug>
   <bug>524200</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201412-43.xml b/metadata/glsa/glsa-201412-43.xml
index 8a7474b99971..1a220818faa3 100644
--- a/metadata/glsa/glsa-201412-43.xml
+++ b/metadata/glsa/glsa-201412-43.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mupdf</product>
   <announced>2014-12-26</announced>
-  <revised>2014-12-26: 1</revised>
+  <revised count="1">2014-12-26</revised>
   <bug>358029</bug>
   <bug>498876</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201412-44.xml b/metadata/glsa/glsa-201412-44.xml
index 322a50c1334a..9face7df7839 100644
--- a/metadata/glsa/glsa-201412-44.xml
+++ b/metadata/glsa/glsa-201412-44.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">policycoreutils</product>
   <announced>2014-12-26</announced>
-  <revised>2014-12-26: 1</revised>
+  <revised count="1">2014-12-26</revised>
   <bug>509896</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-45.xml b/metadata/glsa/glsa-201412-45.xml
index 1db552f58486..ffa682fec95f 100644
--- a/metadata/glsa/glsa-201412-45.xml
+++ b/metadata/glsa/glsa-201412-45.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">facter</product>
   <announced>2014-12-26</announced>
-  <revised>2014-12-26: 1</revised>
+  <revised count="1">2014-12-26</revised>
   <bug>514476</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-46.xml b/metadata/glsa/glsa-201412-46.xml
index 45ae0c058c9e..973ec5a5ac22 100644
--- a/metadata/glsa/glsa-201412-46.xml
+++ b/metadata/glsa/glsa-201412-46.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">lcms</product>
   <announced>2014-12-26</announced>
-  <revised>2014-12-26: 1</revised>
+  <revised count="1">2014-12-26</revised>
   <bug>479874</bug>
   <bug>507788</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201412-47.xml b/metadata/glsa/glsa-201412-47.xml
index f0c8cfaa53c9..e96ce7acb230 100644
--- a/metadata/glsa/glsa-201412-47.xml
+++ b/metadata/glsa/glsa-201412-47.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">torque</product>
   <announced>2014-12-26</announced>
-  <revised>2014-12-26: 1</revised>
+  <revised count="1">2014-12-26</revised>
   <bug>372959</bug>
   <bug>378805</bug>
   <bug>390167</bug>
diff --git a/metadata/glsa/glsa-201412-48.xml b/metadata/glsa/glsa-201412-48.xml
index 2a79eea7626b..62aec4732ba5 100644
--- a/metadata/glsa/glsa-201412-48.xml
+++ b/metadata/glsa/glsa-201412-48.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">file</product>
   <announced>2014-12-27</announced>
-  <revised>2014-12-27: 1</revised>
+  <revised count="1">2014-12-27</revised>
   <bug>532686</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-49.xml b/metadata/glsa/glsa-201412-49.xml
index fab26bb23fec..4a29b33da07f 100644
--- a/metadata/glsa/glsa-201412-49.xml
+++ b/metadata/glsa/glsa-201412-49.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">fish</product>
   <announced>2014-12-28</announced>
-  <revised>2014-12-28: 1</revised>
+  <revised count="1">2014-12-28</revised>
   <bug>509044</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-50.xml b/metadata/glsa/glsa-201412-50.xml
index 15f49a67686c..69b66ce820e9 100644
--- a/metadata/glsa/glsa-201412-50.xml
+++ b/metadata/glsa/glsa-201412-50.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">getmail</product>
   <announced>2014-12-28</announced>
-  <revised>2014-12-28: 1</revised>
+  <revised count="1">2014-12-28</revised>
   <bug>524684</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201412-51.xml b/metadata/glsa/glsa-201412-51.xml
index 2982e7133974..e71795294cac 100644
--- a/metadata/glsa/glsa-201412-51.xml
+++ b/metadata/glsa/glsa-201412-51.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">asterisk,dos,escalated,acl</product>
   <announced>2014-12-28</announced>
-  <revised>2014-12-28: 1</revised>
+  <revised count="1">2014-12-28</revised>
   <bug>530056</bug>
   <bug>532242</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201412-52.xml b/metadata/glsa/glsa-201412-52.xml
index 9ecd83e494cd..ec734ed900e4 100644
--- a/metadata/glsa/glsa-201412-52.xml
+++ b/metadata/glsa/glsa-201412-52.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2014-12-28</announced>
-  <revised>2014-12-28: 1</revised>
+  <revised count="1">2014-12-28</revised>
   <bug>522968</bug>
   <bug>529100</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201412-53.xml b/metadata/glsa/glsa-201412-53.xml
index c39db7378961..d63d0b4fd4ff 100644
--- a/metadata/glsa/glsa-201412-53.xml
+++ b/metadata/glsa/glsa-201412-53.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2014-12-31</announced>
-  <revised>2014-12-31: 1</revised>
+  <revised count="1">2014-12-31</revised>
   <bug>516334</bug>
   <bug>517936</bug>
   <bug>519518</bug>
diff --git a/metadata/glsa/glsa-201502-01.xml b/metadata/glsa/glsa-201502-01.xml
index 1833b8c41407..4d63c1613534 100644
--- a/metadata/glsa/glsa-201502-01.xml
+++ b/metadata/glsa/glsa-201502-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mpg123</product>
   <announced>2015-02-06</announced>
-  <revised>2015-02-06: 1</revised>
+  <revised count="1">2015-02-06</revised>
   <bug>500262</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201502-02.xml b/metadata/glsa/glsa-201502-02.xml
index 9cf280e6fbcd..fa0c0bb0a492 100644
--- a/metadata/glsa/glsa-201502-02.xml
+++ b/metadata/glsa/glsa-201502-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2015-02-06</announced>
-  <revised>2015-02-06: 1</revised>
+  <revised count="1">2015-02-06</revised>
   <bug>536562</bug>
   <bug>537378</bug>
   <bug>537426</bug>
diff --git a/metadata/glsa/glsa-201502-03.xml b/metadata/glsa/glsa-201502-03.xml
index db0ee8251460..cbf57d011280 100644
--- a/metadata/glsa/glsa-201502-03.xml
+++ b/metadata/glsa/glsa-201502-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">bind</product>
   <announced>2015-02-07</announced>
-  <revised>2015-02-07: 1</revised>
+  <revised count="1">2015-02-07</revised>
   <bug>531998</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201502-04.xml b/metadata/glsa/glsa-201502-04.xml
index c44424083e05..601acd4dae22 100644
--- a/metadata/glsa/glsa-201502-04.xml
+++ b/metadata/glsa/glsa-201502-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mediawiki</product>
   <announced>2015-02-07</announced>
-  <revised>2015-02-07: 1</revised>
+  <revised count="1">2015-02-07</revised>
   <bug>498064</bug>
   <bug>499632</bug>
   <bug>503012</bug>
diff --git a/metadata/glsa/glsa-201502-05.xml b/metadata/glsa/glsa-201502-05.xml
index 7f7bc74f2446..7064d10028a2 100644
--- a/metadata/glsa/glsa-201502-05.xml
+++ b/metadata/glsa/glsa-201502-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tcpdump</product>
   <announced>2015-02-07</announced>
-  <revised>2015-02-07: 1</revised>
+  <revised count="1">2015-02-07</revised>
   <bug>534660</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201502-06.xml b/metadata/glsa/glsa-201502-06.xml
index 7d0eacb5997e..d7f77934bd03 100644
--- a/metadata/glsa/glsa-201502-06.xml
+++ b/metadata/glsa/glsa-201502-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nginx</product>
   <announced>2015-02-07</announced>
-  <revised>2015-02-07: 1</revised>
+  <revised count="1">2015-02-07</revised>
   <bug>522994</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201502-07.xml b/metadata/glsa/glsa-201502-07.xml
index abbde33bbb9b..7a2b08f7dde7 100644
--- a/metadata/glsa/glsa-201502-07.xml
+++ b/metadata/glsa/glsa-201502-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libevent</product>
   <announced>2015-02-07</announced>
-  <revised>2015-02-07: 1</revised>
+  <revised count="1">2015-02-07</revised>
   <bug>535774</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201502-08.xml b/metadata/glsa/glsa-201502-08.xml
index e5432f6bcc35..95b4150d0a80 100644
--- a/metadata/glsa/glsa-201502-08.xml
+++ b/metadata/glsa/glsa-201502-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libav</product>
   <announced>2015-02-07</announced>
-  <revised>2015-02-07: 1</revised>
+  <revised count="1">2015-02-07</revised>
   <bug>492582</bug>
   <bug>515234</bug>
   <bug>531832</bug>
diff --git a/metadata/glsa/glsa-201502-09.xml b/metadata/glsa/glsa-201502-09.xml
index 648bc78c9c7c..748e00bbeda8 100644
--- a/metadata/glsa/glsa-201502-09.xml
+++ b/metadata/glsa/glsa-201502-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">antiword</product>
   <announced>2015-02-07</announced>
-  <revised>2015-02-07: 1</revised>
+  <revised count="1">2015-02-07</revised>
   <bug>531404</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201502-10.xml b/metadata/glsa/glsa-201502-10.xml
index 843be6759c51..7fb6d42ac045 100644
--- a/metadata/glsa/glsa-201502-10.xml
+++ b/metadata/glsa/glsa-201502-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2015-02-15</announced>
-  <revised>2017-01-03: 3</revised>
+  <revised count="3">2017-01-03</revised>
   <bug>531264</bug>
   <bug>533358</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201502-11.xml b/metadata/glsa/glsa-201502-11.xml
index 42c687d58351..c0d401758aa3 100644
--- a/metadata/glsa/glsa-201502-11.xml
+++ b/metadata/glsa/glsa-201502-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cpio</product>
   <announced>2015-02-15</announced>
-  <revised>2015-02-15: 1</revised>
+  <revised count="1">2015-02-15</revised>
   <bug>530512</bug>
   <bug>536010</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201502-12.xml b/metadata/glsa/glsa-201502-12.xml
index 513a49089011..1975edd5b5c4 100644
--- a/metadata/glsa/glsa-201502-12.xml
+++ b/metadata/glsa/glsa-201502-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">oracle jre, oracle jdk</product>
   <announced>2015-02-15</announced>
-  <revised>2015-02-15: 1</revised>
+  <revised count="1">2015-02-15</revised>
   <bug>507798</bug>
   <bug>508716</bug>
   <bug>517220</bug>
diff --git a/metadata/glsa/glsa-201502-13.xml b/metadata/glsa/glsa-201502-13.xml
index 2196b07f7f3f..c4c3d83f9050 100644
--- a/metadata/glsa/glsa-201502-13.xml
+++ b/metadata/glsa/glsa-201502-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2015-02-17</announced>
-  <revised>2015-02-17: 1</revised>
+  <revised count="1">2015-02-17</revised>
   <bug>537366</bug>
   <bug>539094</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201502-14.xml b/metadata/glsa/glsa-201502-14.xml
index 621548929b02..8abef79d55b7 100644
--- a/metadata/glsa/glsa-201502-14.xml
+++ b/metadata/glsa/glsa-201502-14.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in grep could result in Denial of Service. </synopsis>
   <product type="ebuild">grep,dos</product>
   <announced>2015-02-25</announced>
-  <revised>2015-02-25: 1</revised>
+  <revised count="1">2015-02-25</revised>
   <bug>537046</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201502-15.xml b/metadata/glsa/glsa-201502-15.xml
index f65dd09c3cca..d41a3b3e3e88 100644
--- a/metadata/glsa/glsa-201502-15.xml
+++ b/metadata/glsa/glsa-201502-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">samba</product>
   <announced>2015-02-25</announced>
-  <revised>2015-02-25: 1</revised>
+  <revised count="1">2015-02-25</revised>
   <bug>479868</bug>
   <bug>491070</bug>
   <bug>493664</bug>
diff --git a/metadata/glsa/glsa-201503-01.xml b/metadata/glsa/glsa-201503-01.xml
index bb4fcc4ca2a5..5ce46ba2b527 100644
--- a/metadata/glsa/glsa-201503-01.xml
+++ b/metadata/glsa/glsa-201503-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">jasper</product>
   <announced>2015-03-06</announced>
-  <revised>2015-03-06: 1</revised>
+  <revised count="1">2015-03-06</revised>
   <bug>531688</bug>
   <bug>533744</bug>
   <bug>537530</bug>
diff --git a/metadata/glsa/glsa-201503-02.xml b/metadata/glsa/glsa-201503-02.xml
index 9133e2b9f07a..8665dc717d91 100644
--- a/metadata/glsa/glsa-201503-02.xml
+++ b/metadata/glsa/glsa-201503-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dbus</product>
   <announced>2015-03-07</announced>
-  <revised>2015-03-07: 1</revised>
+  <revised count="1">2015-03-07</revised>
   <bug>539482</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201503-03.xml b/metadata/glsa/glsa-201503-03.xml
index e527a11bb425..bf9970990aa3 100644
--- a/metadata/glsa/glsa-201503-03.xml
+++ b/metadata/glsa/glsa-201503-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2015-03-08</announced>
-  <revised>2015-08-22: 2</revised>
+  <revised count="2">2015-08-22</revised>
   <bug>530820</bug>
   <bug>532914</bug>
   <bug>533998</bug>
diff --git a/metadata/glsa/glsa-201503-04.xml b/metadata/glsa/glsa-201503-04.xml
index 59ecc437d2fa..24bffbca5eb9 100644
--- a/metadata/glsa/glsa-201503-04.xml
+++ b/metadata/glsa/glsa-201503-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">glibc</product>
   <announced>2015-03-08</announced>
-  <revised>2015-03-08: 1</revised>
+  <revised count="1">2015-03-08</revised>
   <bug>431218</bug>
   <bug>434408</bug>
   <bug>454862</bug>
diff --git a/metadata/glsa/glsa-201503-05.xml b/metadata/glsa/glsa-201503-05.xml
index 2c030d7066ba..3e7763a91034 100644
--- a/metadata/glsa/glsa-201503-05.xml
+++ b/metadata/glsa/glsa-201503-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">freetype</product>
   <announced>2015-03-08</announced>
-  <revised>2015-03-08: 1</revised>
+  <revised count="1">2015-03-08</revised>
   <bug>532152</bug>
   <bug>539796</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201503-06.xml b/metadata/glsa/glsa-201503-06.xml
index 6703fa28e4da..715df8a4a1b4 100644
--- a/metadata/glsa/glsa-201503-06.xml
+++ b/metadata/glsa/glsa-201503-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">icu</product>
   <announced>2015-03-14</announced>
-  <revised>2015-03-14: 1</revised>
+  <revised count="1">2015-03-14</revised>
   <bug>537560</bug>
   <bug>539108</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201503-07.xml b/metadata/glsa/glsa-201503-07.xml
index 8ebb9e2968d5..cb2982765929 100644
--- a/metadata/glsa/glsa-201503-07.xml
+++ b/metadata/glsa/glsa-201503-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">hivex</product>
   <announced>2015-03-14</announced>
-  <revised>2015-03-14: 1</revised>
+  <revised count="1">2015-03-14</revised>
   <bug>490990</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201503-08.xml b/metadata/glsa/glsa-201503-08.xml
index 67a1de6b2f99..48633c2dacf0 100644
--- a/metadata/glsa/glsa-201503-08.xml
+++ b/metadata/glsa/glsa-201503-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">file,Dos</product>
   <announced>2015-03-16</announced>
-  <revised>2015-03-16: 1</revised>
+  <revised count="1">2015-03-16</revised>
   <bug>503582</bug>
   <bug>532768</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201503-09.xml b/metadata/glsa/glsa-201503-09.xml
index 564336c21bb1..21abca4a1c78 100644
--- a/metadata/glsa/glsa-201503-09.xml
+++ b/metadata/glsa/glsa-201503-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">flash,ACE,DoS</product>
   <announced>2015-03-16</announced>
-  <revised>2015-03-16: 1</revised>
+  <revised count="1">2015-03-16</revised>
   <bug>543112</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201503-10.xml b/metadata/glsa/glsa-201503-10.xml
index 843b180618df..b1968049e389 100644
--- a/metadata/glsa/glsa-201503-10.xml
+++ b/metadata/glsa/glsa-201503-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">python</product>
   <announced>2015-03-18</announced>
-  <revised>2015-06-17: 2</revised>
+  <revised count="2">2015-06-17</revised>
   <bug>495224</bug>
   <bug>500518</bug>
   <bug>505068</bug>
diff --git a/metadata/glsa/glsa-201503-11.xml b/metadata/glsa/glsa-201503-11.xml
index 8c888d6869ed..c4c25061c999 100644
--- a/metadata/glsa/glsa-201503-11.xml
+++ b/metadata/glsa/glsa-201503-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2015-03-19</announced>
-  <revised>2015-06-06: 2</revised>
+  <revised count="2">2015-06-06</revised>
   <bug>543552</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201503-12.xml b/metadata/glsa/glsa-201503-12.xml
index 348b47a45101..baf77316cf89 100644
--- a/metadata/glsa/glsa-201503-12.xml
+++ b/metadata/glsa/glsa-201503-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">chromimu</product>
   <announced>2015-03-22</announced>
-  <revised>2015-03-22: 1</revised>
+  <revised count="1">2015-03-22</revised>
   <bug>542090</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201503-13.xml b/metadata/glsa/glsa-201503-13.xml
index a63167e30d93..9565811f41f0 100644
--- a/metadata/glsa/glsa-201503-13.xml
+++ b/metadata/glsa/glsa-201503-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">busybox</product>
   <announced>2015-03-29</announced>
-  <revised>2015-03-29: 1</revised>
+  <revised count="1">2015-03-29</revised>
   <bug>515254</bug>
   <bug>537978</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201504-01.xml b/metadata/glsa/glsa-201504-01.xml
index 7b5e6a6b818f..9662114294f5 100644
--- a/metadata/glsa/glsa-201504-01.xml
+++ b/metadata/glsa/glsa-201504-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">firefox thunderbird seamonkey</product>
   <announced>2015-04-07</announced>
-  <revised>2015-04-08: 2</revised>
+  <revised count="2">2015-04-08</revised>
   <bug>489796</bug>
   <bug>491234</bug>
   <bug>493850</bug>
diff --git a/metadata/glsa/glsa-201504-02.xml b/metadata/glsa/glsa-201504-02.xml
index 32fdd4a46a3a..97f9ef384fd7 100644
--- a/metadata/glsa/glsa-201504-02.xml
+++ b/metadata/glsa/glsa-201504-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sudo</product>
   <announced>2015-04-11</announced>
-  <revised>2015-04-11: 1</revised>
+  <revised count="1">2015-04-11</revised>
   <bug>539532</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201504-03.xml b/metadata/glsa/glsa-201504-03.xml
index b70cb21789cb..bfdeabb67ae5 100644
--- a/metadata/glsa/glsa-201504-03.xml
+++ b/metadata/glsa/glsa-201504-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">apache</product>
   <announced>2015-04-11</announced>
-  <revised>2015-04-19: 2</revised>
+  <revised count="2">2015-04-19</revised>
   <bug>535948</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201504-04.xml b/metadata/glsa/glsa-201504-04.xml
index 8b41616362f3..b6a520bf0b2f 100644
--- a/metadata/glsa/glsa-201504-04.xml
+++ b/metadata/glsa/glsa-201504-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xen</product>
   <announced>2015-04-11</announced>
-  <revised>2015-04-11: 1</revised>
+  <revised count="1">2015-04-11</revised>
   <bug>478280</bug>
   <bug>482138</bug>
   <bug>512294</bug>
diff --git a/metadata/glsa/glsa-201504-05.xml b/metadata/glsa/glsa-201504-05.xml
index de1d07ec03df..3b60db2ecd8e 100644
--- a/metadata/glsa/glsa-201504-05.xml
+++ b/metadata/glsa/glsa-201504-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mysql mariadb</product>
   <announced>2015-04-11</announced>
-  <revised>2015-04-11: 1</revised>
+  <revised count="1">2015-04-11</revised>
   <bug>537216</bug>
   <bug>537262</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201504-06.xml b/metadata/glsa/glsa-201504-06.xml
index 7c5681919cfd..6a2a13c95a94 100644
--- a/metadata/glsa/glsa-201504-06.xml
+++ b/metadata/glsa/glsa-201504-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xorg-server</product>
   <announced>2015-04-17</announced>
-  <revised>2015-04-17: 2</revised>
+  <revised count="2">2015-04-17</revised>
   <bug>532086</bug>
   <bug>539692</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201504-07.xml b/metadata/glsa/glsa-201504-07.xml
index 1c6d4427358d..40f19c42d858 100644
--- a/metadata/glsa/glsa-201504-07.xml
+++ b/metadata/glsa/glsa-201504-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2015-04-17</announced>
-  <revised>2015-04-17: 1</revised>
+  <revised count="1">2015-04-17</revised>
   <bug>546706</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201505-01.xml b/metadata/glsa/glsa-201505-01.xml
index 63198bec4cf9..f362bdee66a3 100644
--- a/metadata/glsa/glsa-201505-01.xml
+++ b/metadata/glsa/glsa-201505-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ettercap</product>
   <announced>2015-05-13</announced>
-  <revised>2015-05-13: 1</revised>
+  <revised count="1">2015-05-13</revised>
   <bug>532764</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201505-02.xml b/metadata/glsa/glsa-201505-02.xml
index f70cdee0aa03..899f72c91ee5 100644
--- a/metadata/glsa/glsa-201505-02.xml
+++ b/metadata/glsa/glsa-201505-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2015-05-31</announced>
-  <revised>2015-05-31: 1</revised>
+  <revised count="1">2015-05-31</revised>
   <bug>549388</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201505-03.xml b/metadata/glsa/glsa-201505-03.xml
index 50b406c2388a..9b2a7e89719e 100644
--- a/metadata/glsa/glsa-201505-03.xml
+++ b/metadata/glsa/glsa-201505-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">phpMyAdmin</product>
   <announced>2015-05-31</announced>
-  <revised>2016-05-14: 2</revised>
+  <revised count="2">2016-05-14</revised>
   <bug>517858</bug>
   <bug>522844</bug>
   <bug>530054</bug>
diff --git a/metadata/glsa/glsa-201506-01.xml b/metadata/glsa/glsa-201506-01.xml
index 5b2fbfd53e5a..007d711041a3 100644
--- a/metadata/glsa/glsa-201506-01.xml
+++ b/metadata/glsa/glsa-201506-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2015-06-21</announced>
-  <revised>2015-06-21: 1</revised>
+  <revised count="1">2015-06-21</revised>
   <bug>551658</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201506-02.xml b/metadata/glsa/glsa-201506-02.xml
index 9dc01f8251ff..10a2fff63371 100644
--- a/metadata/glsa/glsa-201506-02.xml
+++ b/metadata/glsa/glsa-201506-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dos</product>
   <announced>2015-06-22</announced>
-  <revised>2016-02-26: 2</revised>
+  <revised count="2">2016-02-26</revised>
   <bug>551832</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201506-03.xml b/metadata/glsa/glsa-201506-03.xml
index eb65beca177d..c851080b7baf 100644
--- a/metadata/glsa/glsa-201506-03.xml
+++ b/metadata/glsa/glsa-201506-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gnutls</product>
   <announced>2015-06-22</announced>
-  <revised>2015-06-22: 1</revised>
+  <revised count="1">2015-06-22</revised>
   <bug>546760</bug>
   <bug>548636</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201506-04.xml b/metadata/glsa/glsa-201506-04.xml
index 3276535c8b3e..3dea7fe20f2e 100644
--- a/metadata/glsa/glsa-201506-04.xml
+++ b/metadata/glsa/glsa-201506-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2015-06-23</announced>
-  <revised>2015-06-23: 1</revised>
+  <revised count="1">2015-06-23</revised>
   <bug>545300</bug>
   <bug>546728</bug>
   <bug>548108</bug>
diff --git a/metadata/glsa/glsa-201507-01.xml b/metadata/glsa/glsa-201507-01.xml
index bf53393b4363..124f3779a8ad 100644
--- a/metadata/glsa/glsa-201507-01.xml
+++ b/metadata/glsa/glsa-201507-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chrony</product>
   <announced>2015-07-05</announced>
-  <revised>2015-07-05: 1</revised>
+  <revised count="1">2015-07-05</revised>
   <bug>545918</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-02.xml b/metadata/glsa/glsa-201507-02.xml
index d14ca08e651c..5ebfd72e89e8 100644
--- a/metadata/glsa/glsa-201507-02.xml
+++ b/metadata/glsa/glsa-201507-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tor</product>
   <announced>2015-07-06</announced>
-  <revised>2015-07-06: 1</revised>
+  <revised count="1">2015-07-06</revised>
   <bug>545940</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-03.xml b/metadata/glsa/glsa-201507-03.xml
index 3311d81b4be5..14eb3aa499e9 100644
--- a/metadata/glsa/glsa-201507-03.xml
+++ b/metadata/glsa/glsa-201507-03.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in Exiv2 could lead to Denial of Service condition.</synopsis>
   <product type="ebuild">exiv2</product>
   <announced>2015-07-07</announced>
-  <revised>2015-07-07: 1</revised>
+  <revised count="1">2015-07-07</revised>
   <bug>534608</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-04.xml b/metadata/glsa/glsa-201507-04.xml
index 959c18c24d31..073e470b67da 100644
--- a/metadata/glsa/glsa-201507-04.xml
+++ b/metadata/glsa/glsa-201507-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">icu</product>
   <announced>2015-07-07</announced>
-  <revised>2015-07-07: 1</revised>
+  <revised count="1">2015-07-07</revised>
   <bug>546156</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-05.xml b/metadata/glsa/glsa-201507-05.xml
index 169f14250004..141b71bea8cf 100644
--- a/metadata/glsa/glsa-201507-05.xml
+++ b/metadata/glsa/glsa-201507-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sqlite</product>
   <announced>2015-07-07</announced>
-  <revised>2015-07-07: 1</revised>
+  <revised count="1">2015-07-07</revised>
   <bug>546626</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-06.xml b/metadata/glsa/glsa-201507-06.xml
index f71f630ab813..9663d45be2a3 100644
--- a/metadata/glsa/glsa-201507-06.xml
+++ b/metadata/glsa/glsa-201507-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">unrtf</product>
   <announced>2015-07-07</announced>
-  <revised>2015-07-07: 1</revised>
+  <revised count="1">2015-07-07</revised>
   <bug>531544</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-07.xml b/metadata/glsa/glsa-201507-07.xml
index 24ea32513d74..6f44b1eaec86 100644
--- a/metadata/glsa/glsa-201507-07.xml
+++ b/metadata/glsa/glsa-201507-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libvncserver</product>
   <announced>2015-07-07</announced>
-  <revised>2015-07-07: 1</revised>
+  <revised count="1">2015-07-07</revised>
   <bug>523590</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-08.xml b/metadata/glsa/glsa-201507-08.xml
index c1f7da27b9fc..678c5f652b60 100644
--- a/metadata/glsa/glsa-201507-08.xml
+++ b/metadata/glsa/glsa-201507-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libxml2</product>
   <announced>2015-07-07</announced>
-  <revised>2015-07-07: 1</revised>
+  <revised count="1">2015-07-07</revised>
   <bug>546720</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-09.xml b/metadata/glsa/glsa-201507-09.xml
index 034d759183a9..d03fc72ab93b 100644
--- a/metadata/glsa/glsa-201507-09.xml
+++ b/metadata/glsa/glsa-201507-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pypam</product>
   <announced>2015-07-09</announced>
-  <revised>2015-07-09: 1</revised>
+  <revised count="1">2015-07-09</revised>
   <bug>407603</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-10.xml b/metadata/glsa/glsa-201507-10.xml
index 3d52c555a53b..8e3875663d3b 100644
--- a/metadata/glsa/glsa-201507-10.xml
+++ b/metadata/glsa/glsa-201507-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">t1utils</product>
   <announced>2015-07-10</announced>
-  <revised>2015-07-10: 1</revised>
+  <revised count="1">2015-07-10</revised>
   <bug>548638</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-11.xml b/metadata/glsa/glsa-201507-11.xml
index 38af314cabfb..d6b145118660 100644
--- a/metadata/glsa/glsa-201507-11.xml
+++ b/metadata/glsa/glsa-201507-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">perl</product>
   <announced>2015-07-10</announced>
-  <revised>2015-07-10: 1</revised>
+  <revised count="1">2015-07-10</revised>
   <bug>216671</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-12.xml b/metadata/glsa/glsa-201507-12.xml
index ed8f63e8f7f0..9f9381c92dab 100644
--- a/metadata/glsa/glsa-201507-12.xml
+++ b/metadata/glsa/glsa-201507-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libcapsinetwork</product>
   <announced>2015-07-10</announced>
-  <revised>2015-07-11: 2</revised>
+  <revised count="2">2015-07-11</revised>
   <bug>544324</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-13.xml b/metadata/glsa/glsa-201507-13.xml
index 24d9bff62258..0f83388b7230 100644
--- a/metadata/glsa/glsa-201507-13.xml
+++ b/metadata/glsa/glsa-201507-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ACE,DoS,flash</product>
   <announced>2015-07-10</announced>
-  <revised>2015-07-10: 1</revised>
+  <revised count="1">2015-07-10</revised>
   <bug>552946</bug>
   <bug>554220</bug>
   <bug>554250</bug>
diff --git a/metadata/glsa/glsa-201507-14.xml b/metadata/glsa/glsa-201507-14.xml
index a81c3ef16fba..edd856b06392 100644
--- a/metadata/glsa/glsa-201507-14.xml
+++ b/metadata/glsa/glsa-201507-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">oracle-jre oracle-jdk</product>
   <announced>2015-07-10</announced>
-  <revised>2015-07-11: 2</revised>
+  <revised count="2">2015-07-11</revised>
   <bug>537214</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-15.xml b/metadata/glsa/glsa-201507-15.xml
index 4b90e12527ec..b0af0582e7c6 100644
--- a/metadata/glsa/glsa-201507-15.xml
+++ b/metadata/glsa/glsa-201507-15.xml
@@ -5,7 +5,7 @@
   <synopsis>Certain checks on untrusted certificates can be bypassed.</synopsis>
   <product type="ebuild">openssl</product>
   <announced>2015-07-10</announced>
-  <revised>2016-02-26: 3</revised>
+  <revised count="3">2016-02-26</revised>
   <bug>554172</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-16.xml b/metadata/glsa/glsa-201507-16.xml
index 47f3f2e96e3f..2bb1433767f7 100644
--- a/metadata/glsa/glsa-201507-16.xml
+++ b/metadata/glsa/glsa-201507-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">portage</product>
   <announced>2015-07-10</announced>
-  <revised>2015-07-10: 2</revised>
+  <revised count="2">2015-07-10</revised>
   <bug>469888</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-17.xml b/metadata/glsa/glsa-201507-17.xml
index d03dba747a8d..917f618700fc 100644
--- a/metadata/glsa/glsa-201507-17.xml
+++ b/metadata/glsa/glsa-201507-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">net-snmp</product>
   <announced>2015-07-10</announced>
-  <revised>2015-07-10: 2</revised>
+  <revised count="2">2015-07-10</revised>
   <bug>522062</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-18.xml b/metadata/glsa/glsa-201507-18.xml
index 094919127a18..c0ae52291a7e 100644
--- a/metadata/glsa/glsa-201507-18.xml
+++ b/metadata/glsa/glsa-201507-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2015-07-10</announced>
-  <revised>2015-07-10: 1</revised>
+  <revised count="1">2015-07-10</revised>
   <bug>552904</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-19.xml b/metadata/glsa/glsa-201507-19.xml
index 97018a350e00..583e00fa410d 100644
--- a/metadata/glsa/glsa-201507-19.xml
+++ b/metadata/glsa/glsa-201507-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mysql</product>
   <announced>2015-07-10</announced>
-  <revised>2015-07-10: 1</revised>
+  <revised count="1">2015-07-10</revised>
   <bug>546722</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-20.xml b/metadata/glsa/glsa-201507-20.xml
index 5a488a8d3ebc..7ea9b43572b4 100644
--- a/metadata/glsa/glsa-201507-20.xml
+++ b/metadata/glsa/glsa-201507-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">postgresql</product>
   <announced>2015-07-18</announced>
-  <revised>2017-01-03: 3</revised>
+  <revised count="3">2017-01-03</revised>
   <bug>539018</bug>
   <bug>550172</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201507-21.xml b/metadata/glsa/glsa-201507-21.xml
index 523aabd74916..b89df0542438 100644
--- a/metadata/glsa/glsa-201507-21.xml
+++ b/metadata/glsa/glsa-201507-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libXfont</product>
   <announced>2015-07-22</announced>
-  <revised>2015-07-22: 1</revised>
+  <revised count="1">2015-07-22</revised>
   <bug>543620</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201507-22.xml b/metadata/glsa/glsa-201507-22.xml
index a95d6f4e103f..93eff8f2e42d 100644
--- a/metadata/glsa/glsa-201507-22.xml
+++ b/metadata/glsa/glsa-201507-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">e2fsprogs</product>
   <announced>2015-07-23</announced>
-  <revised>2015-07-23: 1</revised>
+  <revised count="1">2015-07-23</revised>
   <bug>540536</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201508-01.xml b/metadata/glsa/glsa-201508-01.xml
index 767c4cd7124e..09bb8698abae 100644
--- a/metadata/glsa/glsa-201508-01.xml
+++ b/metadata/glsa/glsa-201508-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">flash,ACE,DoS</product>
   <announced>2015-08-15</announced>
-  <revised>2015-08-15: 1</revised>
+  <revised count="1">2015-08-15</revised>
   <bug>554882</bug>
   <bug>557342</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201508-02.xml b/metadata/glsa/glsa-201508-02.xml
index f0a5cb1dc852..0fe6cc72d290 100644
--- a/metadata/glsa/glsa-201508-02.xml
+++ b/metadata/glsa/glsa-201508-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libgadu</product>
   <announced>2015-08-15</announced>
-  <revised>2015-08-15: 1</revised>
+  <revised count="1">2015-08-15</revised>
   <bug>490238</bug>
   <bug>505558</bug>
   <bug>510714</bug>
diff --git a/metadata/glsa/glsa-201508-03.xml b/metadata/glsa/glsa-201508-03.xml
index 2f84388d8f89..918d6488611c 100644
--- a/metadata/glsa/glsa-201508-03.xml
+++ b/metadata/glsa/glsa-201508-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">icecast</product>
   <announced>2015-08-15</announced>
-  <revised>2015-08-15: 1</revised>
+  <revised count="1">2015-08-15</revised>
   <bug>545968</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201509-01.xml b/metadata/glsa/glsa-201509-01.xml
index ad9a58d9b465..50b89aa21227 100644
--- a/metadata/glsa/glsa-201509-01.xml
+++ b/metadata/glsa/glsa-201509-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ntp</product>
   <announced>2015-09-24</announced>
-  <revised>2015-09-24: 1</revised>
+  <revised count="1">2015-09-24</revised>
   <bug>545836</bug>
   <bug>553682</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201509-02.xml b/metadata/glsa/glsa-201509-02.xml
index ca43baa0da0a..22ab0e333905 100644
--- a/metadata/glsa/glsa-201509-02.xml
+++ b/metadata/glsa/glsa-201509-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">curl</product>
   <announced>2015-09-24</announced>
-  <revised>2015-09-24: 1</revised>
+  <revised count="1">2015-09-24</revised>
   <bug>547376</bug>
   <bug>552618</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201509-03.xml b/metadata/glsa/glsa-201509-03.xml
index 3bd02c1ae646..ccc6351646b9 100644
--- a/metadata/glsa/glsa-201509-03.xml
+++ b/metadata/glsa/glsa-201509-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cacti</product>
   <announced>2015-09-24</announced>
-  <revised>2015-09-24: 1</revised>
+  <revised count="1">2015-09-24</revised>
   <bug>506356</bug>
   <bug>515108</bug>
   <bug>554758</bug>
diff --git a/metadata/glsa/glsa-201509-04.xml b/metadata/glsa/glsa-201509-04.xml
index 037f5e0260a5..ac0ce9ca160d 100644
--- a/metadata/glsa/glsa-201509-04.xml
+++ b/metadata/glsa/glsa-201509-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libtasn1</product>
   <announced>2015-09-24</announced>
-  <revised>2015-09-24: 1</revised>
+  <revised count="1">2015-09-24</revised>
   <bug>544922</bug>
   <bug>548252</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201509-05.xml b/metadata/glsa/glsa-201509-05.xml
index 27e87aa7a453..10f969848090 100644
--- a/metadata/glsa/glsa-201509-05.xml
+++ b/metadata/glsa/glsa-201509-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">networkmanager</product>
   <announced>2015-09-24</announced>
-  <revised>2015-09-24: 1</revised>
+  <revised count="1">2015-09-24</revised>
   <bug>545980</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201509-06.xml b/metadata/glsa/glsa-201509-06.xml
index 680ff6ca7187..3451eaa93a00 100644
--- a/metadata/glsa/glsa-201509-06.xml
+++ b/metadata/glsa/glsa-201509-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">git</product>
   <announced>2015-09-24</announced>
-  <revised>2015-09-24: 1</revised>
+  <revised count="1">2015-09-24</revised>
   <bug>532984</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201509-07.xml b/metadata/glsa/glsa-201509-07.xml
index 0a52591576aa..f71c291a7407 100644
--- a/metadata/glsa/glsa-201509-07.xml
+++ b/metadata/glsa/glsa-201509-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ACE,DoS,flash</product>
   <announced>2015-09-25</announced>
-  <revised>2015-09-25: 1</revised>
+  <revised count="1">2015-09-25</revised>
   <bug>561076</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201510-01.xml b/metadata/glsa/glsa-201510-01.xml
index f22c88f88811..52af9d49c609 100644
--- a/metadata/glsa/glsa-201510-01.xml
+++ b/metadata/glsa/glsa-201510-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bind</product>
   <announced>2015-10-18</announced>
-  <revised>2015-10-18: 1</revised>
+  <revised count="1">2015-10-18</revised>
   <bug>540640</bug>
   <bug>553584</bug>
   <bug>556150</bug>
diff --git a/metadata/glsa/glsa-201510-02.xml b/metadata/glsa/glsa-201510-02.xml
index 673c0fdfe243..808573e707da 100644
--- a/metadata/glsa/glsa-201510-02.xml
+++ b/metadata/glsa/glsa-201510-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">qemu</product>
   <announced>2015-10-31</announced>
-  <revised>2015-10-31: 1</revised>
+  <revised count="1">2015-10-31</revised>
   <bug>551752</bug>
   <bug>555680</bug>
   <bug>556050</bug>
diff --git a/metadata/glsa/glsa-201510-03.xml b/metadata/glsa/glsa-201510-03.xml
index bd2c2671a4e8..2ac3862c1dd0 100644
--- a/metadata/glsa/glsa-201510-03.xml
+++ b/metadata/glsa/glsa-201510-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2015-10-31</announced>
-  <revised>2015-10-31: 1</revised>
+  <revised count="1">2015-10-31</revised>
   <bug>536034</bug>
   <bug>542206</bug>
   <bug>548898</bug>
diff --git a/metadata/glsa/glsa-201510-04.xml b/metadata/glsa/glsa-201510-04.xml
index e7b5e6f1612d..ffc6246d3228 100644
--- a/metadata/glsa/glsa-201510-04.xml
+++ b/metadata/glsa/glsa-201510-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tcpdump</product>
   <announced>2015-10-31</announced>
-  <revised>2015-10-31: 1</revised>
+  <revised count="1">2015-10-31</revised>
   <bug>552632</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201510-05.xml b/metadata/glsa/glsa-201510-05.xml
index 1e2467341e39..c0ddd1bffabd 100644
--- a/metadata/glsa/glsa-201510-05.xml
+++ b/metadata/glsa/glsa-201510-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mediawiki</product>
   <announced>2015-10-31</announced>
-  <revised>2015-10-31: 1</revised>
+  <revised count="1">2015-10-31</revised>
   <bug>545944</bug>
   <bug>557844</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201510-06.xml b/metadata/glsa/glsa-201510-06.xml
index debbd22f879c..7860dad6cc0c 100644
--- a/metadata/glsa/glsa-201510-06.xml
+++ b/metadata/glsa/glsa-201510-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">django</product>
   <announced>2015-10-31</announced>
-  <revised>2015-10-31: 1</revised>
+  <revised count="1">2015-10-31</revised>
   <bug>554864</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201510-07.xml b/metadata/glsa/glsa-201510-07.xml
index dac649c67ed1..f11af6b8b084 100644
--- a/metadata/glsa/glsa-201510-07.xml
+++ b/metadata/glsa/glsa-201510-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cups</product>
   <announced>2015-10-31</announced>
-  <revised>2015-10-31: 1</revised>
+  <revised count="1">2015-10-31</revised>
   <bug>551846</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201510-08.xml b/metadata/glsa/glsa-201510-08.xml
index 391609dbf1e8..4b849e224167 100644
--- a/metadata/glsa/glsa-201510-08.xml
+++ b/metadata/glsa/glsa-201510-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cups-filters</product>
   <announced>2015-10-31</announced>
-  <revised>2015-10-31: 1</revised>
+  <revised count="1">2015-10-31</revised>
   <bug>553644</bug>
   <bug>553836</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201511-01.xml b/metadata/glsa/glsa-201511-01.xml
index 1050fd426c2e..c946c0eb2afd 100644
--- a/metadata/glsa/glsa-201511-01.xml
+++ b/metadata/glsa/glsa-201511-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2015-11-02</announced>
-  <revised>2015-11-02: 2</revised>
+  <revised count="2">2015-11-02</revised>
   <bug>524414</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201511-02.xml b/metadata/glsa/glsa-201511-02.xml
index e3ff45ff6724..ea9d37ad7000 100644
--- a/metadata/glsa/glsa-201511-02.xml
+++ b/metadata/glsa/glsa-201511-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2015-11-17</announced>
-  <revised>2015-11-17: 1</revised>
+  <revised count="1">2015-11-17</revised>
   <bug>563014</bug>
   <bug>563172</bug>
   <bug>565318</bug>
diff --git a/metadata/glsa/glsa-201512-01.xml b/metadata/glsa/glsa-201512-01.xml
index 53130fc217c7..b38f18f341e8 100644
--- a/metadata/glsa/glsa-201512-01.xml
+++ b/metadata/glsa/glsa-201512-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dnsmasq</product>
   <announced>2015-12-17</announced>
-  <revised>2015-12-17: 1</revised>
+  <revised count="1">2015-12-17</revised>
   <bug>547966</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201512-02.xml b/metadata/glsa/glsa-201512-02.xml
index 3115d9bab8d7..a1c97640574e 100644
--- a/metadata/glsa/glsa-201512-02.xml
+++ b/metadata/glsa/glsa-201512-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ipython</product>
   <announced>2015-12-17</announced>
-  <revised>2015-12-17: 1</revised>
+  <revised count="1">2015-12-17</revised>
   <bug>560708</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201512-03.xml b/metadata/glsa/glsa-201512-03.xml
index 74f4618b45ef..50be132a3fea 100644
--- a/metadata/glsa/glsa-201512-03.xml
+++ b/metadata/glsa/glsa-201512-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">grub</product>
   <announced>2015-12-19</announced>
-  <revised>2015-12-19: 1</revised>
+  <revised count="1">2015-12-19</revised>
   <bug>568326</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201512-04.xml b/metadata/glsa/glsa-201512-04.xml
index c23dc834e633..2d3165833996 100644
--- a/metadata/glsa/glsa-201512-04.xml
+++ b/metadata/glsa/glsa-201512-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openssh</product>
   <announced>2015-12-20</announced>
-  <revised>2015-12-21: 4</revised>
+  <revised count="4">2015-12-21</revised>
   <bug>553724</bug>
   <bug>555518</bug>
   <bug>557340</bug>
diff --git a/metadata/glsa/glsa-201512-05.xml b/metadata/glsa/glsa-201512-05.xml
index 0911edda2572..ee4fb12e373c 100644
--- a/metadata/glsa/glsa-201512-05.xml
+++ b/metadata/glsa/glsa-201512-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gdk-pixbuf</product>
   <announced>2015-12-21</announced>
-  <revised>2015-12-21: 1</revised>
+  <revised count="1">2015-12-21</revised>
   <bug>556314</bug>
   <bug>562878</bug>
   <bug>562880</bug>
diff --git a/metadata/glsa/glsa-201512-06.xml b/metadata/glsa/glsa-201512-06.xml
index f2b3d5066a68..08f3ee58c3d9 100644
--- a/metadata/glsa/glsa-201512-06.xml
+++ b/metadata/glsa/glsa-201512-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mpfr</product>
   <announced>2015-12-30</announced>
-  <revised>2015-12-30: 1</revised>
+  <revised count="1">2015-12-30</revised>
   <bug>532028</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201512-07.xml b/metadata/glsa/glsa-201512-07.xml
index 9507b17fcc26..a0071f243448 100644
--- a/metadata/glsa/glsa-201512-07.xml
+++ b/metadata/glsa/glsa-201512-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gstreamer</product>
   <announced>2015-12-30</announced>
-  <revised>2016-02-09: 3</revised>
+  <revised count="3">2016-02-09</revised>
   <bug>553742</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201512-08.xml b/metadata/glsa/glsa-201512-08.xml
index 0c315e3258d6..cd10269a28f3 100644
--- a/metadata/glsa/glsa-201512-08.xml
+++ b/metadata/glsa/glsa-201512-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">clamav</product>
   <announced>2015-12-30</announced>
-  <revised>2015-12-30: 1</revised>
+  <revised count="1">2015-12-30</revised>
   <bug>538084</bug>
   <bug>548066</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201512-09.xml b/metadata/glsa/glsa-201512-09.xml
index cfdfcfb4a6f7..b4e7aeefb800 100644
--- a/metadata/glsa/glsa-201512-09.xml
+++ b/metadata/glsa/glsa-201512-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">encfs</product>
   <announced>2015-12-30</announced>
-  <revised>2015-12-30: 1</revised>
+  <revised count="1">2015-12-30</revised>
   <bug>510290</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201512-10.xml b/metadata/glsa/glsa-201512-10.xml
index 0059fd853ae6..0e2ddc3f0563 100644
--- a/metadata/glsa/glsa-201512-10.xml
+++ b/metadata/glsa/glsa-201512-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">thunderbird firefox</product>
   <announced>2015-12-30</announced>
-  <revised>2015-12-31: 2</revised>
+  <revised count="2">2015-12-31</revised>
   <bug>545232</bug>
   <bug>554036</bug>
   <bug>556942</bug>
diff --git a/metadata/glsa/glsa-201512-11.xml b/metadata/glsa/glsa-201512-11.xml
index 0d744a89187b..dc74876517a1 100644
--- a/metadata/glsa/glsa-201512-11.xml
+++ b/metadata/glsa/glsa-201512-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">firebird</product>
   <announced>2015-12-30</announced>
-  <revised>2015-12-30: 1</revised>
+  <revised count="1">2015-12-30</revised>
   <bug>460780</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201512-12.xml b/metadata/glsa/glsa-201512-12.xml
index f1302db8e76f..8a015dd4de5a 100644
--- a/metadata/glsa/glsa-201512-12.xml
+++ b/metadata/glsa/glsa-201512-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">systemsettings</product>
   <announced>2015-12-30</announced>
-  <revised>2015-12-30: 1</revised>
+  <revised count="1">2015-12-30</revised>
   <bug>528468</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201512-13.xml b/metadata/glsa/glsa-201512-13.xml
index 888290073ca3..004bcc7060a4 100644
--- a/metadata/glsa/glsa-201512-13.xml
+++ b/metadata/glsa/glsa-201512-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">inspircd</product>
   <announced>2015-12-30</announced>
-  <revised>2015-12-30: 1</revised>
+  <revised count="1">2015-12-30</revised>
   <bug>545034</bug>
   <bug>570244</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201601-01.xml b/metadata/glsa/glsa-201601-01.xml
index bfb1d654afe5..1b51270b35ed 100644
--- a/metadata/glsa/glsa-201601-01.xml
+++ b/metadata/glsa/glsa-201601-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openssh</product>
   <announced>2016-01-16</announced>
-  <revised>2016-01-16: 1</revised>
+  <revised count="1">2016-01-16</revised>
   <bug>571892</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201601-02.xml b/metadata/glsa/glsa-201601-02.xml
index 2b785f4366c3..50f8046c7ffb 100644
--- a/metadata/glsa/glsa-201601-02.xml
+++ b/metadata/glsa/glsa-201601-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">webkit-gtk</product>
   <announced>2016-01-26</announced>
-  <revised>2016-01-26: 1</revised>
+  <revised count="1">2016-01-26</revised>
   <bug>536234</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201601-03.xml b/metadata/glsa/glsa-201601-03.xml
index bc787b7d2960..a6c4472475d1 100644
--- a/metadata/glsa/glsa-201601-03.xml
+++ b/metadata/glsa/glsa-201601-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe flash</product>
   <announced>2016-01-26</announced>
-  <revised>2016-01-26: 1</revised>
+  <revised count="1">2016-01-26</revised>
   <bug>567838</bug>
   <bug>570040</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201601-04.xml b/metadata/glsa/glsa-201601-04.xml
index 3245242a0e9d..50cdc94918ef 100644
--- a/metadata/glsa/glsa-201601-04.xml
+++ b/metadata/glsa/glsa-201601-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">opensmtpd</product>
   <announced>2016-01-27</announced>
-  <revised>2016-01-27: 1</revised>
+  <revised count="1">2016-01-27</revised>
   <bug>562034</bug>
   <bug>562290</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201601-05.xml b/metadata/glsa/glsa-201601-05.xml
index e84d2b1c822a..46d883ffdd60 100644
--- a/metadata/glsa/glsa-201601-05.xml
+++ b/metadata/glsa/glsa-201601-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2016-01-29</announced>
-  <revised>2016-02-26: 3</revised>
+  <revised count="3">2016-02-26</revised>
   <bug>572854</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201602-01.xml b/metadata/glsa/glsa-201602-01.xml
index f9c6b14aa12c..a69e0579736f 100644
--- a/metadata/glsa/glsa-201602-01.xml
+++ b/metadata/glsa/glsa-201602-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">qemu</product>
   <announced>2016-02-04</announced>
-  <revised>2016-02-04: 1</revised>
+  <revised count="1">2016-02-04</revised>
   <bug>544328</bug>
   <bug>549404</bug>
   <bug>557206</bug>
diff --git a/metadata/glsa/glsa-201602-02.xml b/metadata/glsa/glsa-201602-02.xml
index 15fc874dc557..cd1be05d1eb8 100644
--- a/metadata/glsa/glsa-201602-02.xml
+++ b/metadata/glsa/glsa-201602-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">glibc</product>
   <announced>2016-02-17</announced>
-  <revised>2016-02-17: 1</revised>
+  <revised count="1">2016-02-17</revised>
   <bug>516884</bug>
   <bug>517082</bug>
   <bug>521932</bug>
diff --git a/metadata/glsa/glsa-201602-03.xml b/metadata/glsa/glsa-201602-03.xml
index 669fafe4d5f9..aec5b377fede 100644
--- a/metadata/glsa/glsa-201602-03.xml
+++ b/metadata/glsa/glsa-201602-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-02-27</announced>
-  <revised>2016-02-27: 3</revised>
+  <revised count="3">2016-02-27</revised>
   <bug>551144</bug>
   <bug>553818</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201603-01.xml b/metadata/glsa/glsa-201603-01.xml
index 32c5d76385a9..ec18e596fe5a 100644
--- a/metadata/glsa/glsa-201603-01.xml
+++ b/metadata/glsa/glsa-201603-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gimp</product>
   <announced>2016-03-06</announced>
-  <revised>2016-05-04: 2</revised>
+  <revised count="2">2016-05-04</revised>
   <bug>434582</bug>
   <bug>493372</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201603-02.xml b/metadata/glsa/glsa-201603-02.xml
index 1d2216a52984..af1eeba34e44 100644
--- a/metadata/glsa/glsa-201603-02.xml
+++ b/metadata/glsa/glsa-201603-02.xml
@@ -5,7 +5,7 @@
   <synopsis>OSC is vulnerable to the remote execution of arbitrary code.</synopsis>
   <product type="ebuild"/>
   <announced>2016-03-06</announced>
-  <revised>2016-03-06: 1</revised>
+  <revised count="1">2016-03-06</revised>
   <bug>553606</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201603-03.xml b/metadata/glsa/glsa-201603-03.xml
index 656bfbeb9df8..1d823644f16e 100644
--- a/metadata/glsa/glsa-201603-03.xml
+++ b/metadata/glsa/glsa-201603-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">roundcube</product>
   <announced>2016-03-09</announced>
-  <revised>2016-03-09: 1</revised>
+  <revised count="1">2016-03-09</revised>
   <bug>554866</bug>
   <bug>564476</bug>
   <bug>570336</bug>
diff --git a/metadata/glsa/glsa-201603-04.xml b/metadata/glsa/glsa-201603-04.xml
index 476185733d35..21570aef0667 100644
--- a/metadata/glsa/glsa-201603-04.xml
+++ b/metadata/glsa/glsa-201603-04.xml
@@ -10,7 +10,7 @@
   </synopsis>
   <product type="ebuild">fuse</product>
   <announced>2016-03-09</announced>
-  <revised>2016-03-09: 1</revised>
+  <revised count="1">2016-03-09</revised>
   <bug>550152</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201603-05.xml b/metadata/glsa/glsa-201603-05.xml
index 32a4f5605d96..dec4901f7f94 100644
--- a/metadata/glsa/glsa-201603-05.xml
+++ b/metadata/glsa/glsa-201603-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-03-09</announced>
-  <revised>2016-03-09: 1</revised>
+  <revised count="1">2016-03-09</revised>
   <bug>521136</bug>
   <bug>522060</bug>
   <bug>528438</bug>
diff --git a/metadata/glsa/glsa-201603-06.xml b/metadata/glsa/glsa-201603-06.xml
index 718b5faf8e18..4f8fa5282687 100644
--- a/metadata/glsa/glsa-201603-06.xml
+++ b/metadata/glsa/glsa-201603-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ffmpeg</product>
   <announced>2016-03-12</announced>
-  <revised>2016-03-12: 1</revised>
+  <revised count="1">2016-03-12</revised>
   <bug>485228</bug>
   <bug>486692</bug>
   <bug>488052</bug>
diff --git a/metadata/glsa/glsa-201603-07.xml b/metadata/glsa/glsa-201603-07.xml
index 2ef738751539..f0916fbce2e0 100644
--- a/metadata/glsa/glsa-201603-07.xml
+++ b/metadata/glsa/glsa-201603-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-03-12</announced>
-  <revised>2016-03-12: 1</revised>
+  <revised count="1">2016-03-12</revised>
   <bug>574284</bug>
   <bug>576980</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201603-08.xml b/metadata/glsa/glsa-201603-08.xml
index 45603eb35592..fb4e67ba98ef 100644
--- a/metadata/glsa/glsa-201603-08.xml
+++ b/metadata/glsa/glsa-201603-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-03-12</announced>
-  <revised>2016-03-12: 1</revised>
+  <revised count="1">2016-03-12</revised>
   <bug>534532</bug>
   <bug>537154</bug>
   <bug>542222</bug>
diff --git a/metadata/glsa/glsa-201603-09.xml b/metadata/glsa/glsa-201603-09.xml
index 2fc031e292cb..89cd03304bad 100644
--- a/metadata/glsa/glsa-201603-09.xml
+++ b/metadata/glsa/glsa-201603-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-03-12</announced>
-  <revised>2016-03-12: 1</revised>
+  <revised count="1">2016-03-12</revised>
   <bug>555640</bug>
   <bug>559384</bug>
   <bug>561448</bug>
diff --git a/metadata/glsa/glsa-201603-10.xml b/metadata/glsa/glsa-201603-10.xml
index a680da42bf2b..25d2e3672b6e 100644
--- a/metadata/glsa/glsa-201603-10.xml
+++ b/metadata/glsa/glsa-201603-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-03-12</announced>
-  <revised>2016-03-12: 2</revised>
+  <revised count="2">2016-03-12</revised>
   <bug>546174</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201603-11.xml b/metadata/glsa/glsa-201603-11.xml
index 5a20f623a7e3..862278df855e 100644
--- a/metadata/glsa/glsa-201603-11.xml
+++ b/metadata/glsa/glsa-201603-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-03-12</announced>
-  <revised>2016-03-12: 1</revised>
+  <revised count="1">2016-03-12</revised>
   <bug>525472</bug>
   <bug>540054</bug>
   <bug>546678</bug>
diff --git a/metadata/glsa/glsa-201603-12.xml b/metadata/glsa/glsa-201603-12.xml
index 5f05efe4d894..4607a655d5b3 100644
--- a/metadata/glsa/glsa-201603-12.xml
+++ b/metadata/glsa/glsa-201603-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">flightgear, simgear</product>
   <announced>2016-03-12</announced>
-  <revised>2016-03-12: 1</revised>
+  <revised count="1">2016-03-12</revised>
   <bug>426502</bug>
   <bug>468106</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201603-13.xml b/metadata/glsa/glsa-201603-13.xml
index 412d0c413fe0..0d90fbd7a96f 100644
--- a/metadata/glsa/glsa-201603-13.xml
+++ b/metadata/glsa/glsa-201603-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-03-12</announced>
-  <revised>2016-03-12: 1</revised>
+  <revised count="1">2016-03-12</revised>
   <bug>550974</bug>
   <bug>558692</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201603-14.xml b/metadata/glsa/glsa-201603-14.xml
index 18283c7a019e..7cfc76badc8b 100644
--- a/metadata/glsa/glsa-201603-14.xml
+++ b/metadata/glsa/glsa-201603-14.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-03-12</announced>
-  <revised>2016-04-19: 2</revised>
+  <revised count="2">2016-04-19</revised>
   <bug>537940</bug>
   <bug>559532</bug>
   <bug>565842</bug>
diff --git a/metadata/glsa/glsa-201603-15.xml b/metadata/glsa/glsa-201603-15.xml
index e4cd79876f5d..5eb442fc4460 100644
--- a/metadata/glsa/glsa-201603-15.xml
+++ b/metadata/glsa/glsa-201603-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2016-03-20</announced>
-  <revised>2016-03-20: 1</revised>
+  <revised count="1">2016-03-20</revised>
   <bug>575548</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201604-01.xml b/metadata/glsa/glsa-201604-01.xml
index a22d9018eeaf..d20cd5e933c8 100644
--- a/metadata/glsa/glsa-201604-01.xml
+++ b/metadata/glsa/glsa-201604-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">QEMU</product>
   <announced>2016-04-02</announced>
-  <revised>2016-04-02: 1</revised>
+  <revised count="1">2016-04-02</revised>
   <bug>569118</bug>
   <bug>569300</bug>
   <bug>571560</bug>
diff --git a/metadata/glsa/glsa-201604-02.xml b/metadata/glsa/glsa-201604-02.xml
index a485d7a4e28d..f73637d7e3d9 100644
--- a/metadata/glsa/glsa-201604-02.xml
+++ b/metadata/glsa/glsa-201604-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xalan-java</product>
   <announced>2016-04-02</announced>
-  <revised>2016-04-02: 1</revised>
+  <revised count="1">2016-04-02</revised>
   <bug>505602</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201604-03.xml b/metadata/glsa/glsa-201604-03.xml
index d6730d0c1ece..8ec8de183bca 100644
--- a/metadata/glsa/glsa-201604-03.xml
+++ b/metadata/glsa/glsa-201604-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xen</product>
   <announced>2016-04-05</announced>
-  <revised>2016-04-05: 1</revised>
+  <revised count="1">2016-04-05</revised>
   <bug>445254</bug>
   <bug>513832</bug>
   <bug>547202</bug>
diff --git a/metadata/glsa/glsa-201604-04.xml b/metadata/glsa/glsa-201604-04.xml
index fa674db4cad6..679bc3ad828b 100644
--- a/metadata/glsa/glsa-201604-04.xml
+++ b/metadata/glsa/glsa-201604-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libksba</product>
   <announced>2016-04-26</announced>
-  <revised>2016-04-26: 1</revised>
+  <revised count="1">2016-04-26</revised>
   <bug>546464</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201604-05.xml b/metadata/glsa/glsa-201604-05.xml
index 9f2069111db4..179b411d40e1 100644
--- a/metadata/glsa/glsa-201604-05.xml
+++ b/metadata/glsa/glsa-201604-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-04-26</announced>
-  <revised>2016-04-26: 1</revised>
+  <revised count="1">2016-04-26</revised>
   <bug>570564</bug>
   <bug>575780</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201605-01.xml b/metadata/glsa/glsa-201605-01.xml
index dfccde7c9acf..d9dedc7c11b1 100644
--- a/metadata/glsa/glsa-201605-01.xml
+++ b/metadata/glsa/glsa-201605-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-05-02</announced>
-  <revised>2016-05-02: 1</revised>
+  <revised count="1">2016-05-02</revised>
   <bug>562884</bug>
   <bug>577482</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201605-02.xml b/metadata/glsa/glsa-201605-02.xml
index 48b35e6884fd..446d35b92ffa 100644
--- a/metadata/glsa/glsa-201605-02.xml
+++ b/metadata/glsa/glsa-201605-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-05-14</announced>
-  <revised>2016-05-14: 1</revised>
+  <revised count="1">2016-05-14</revised>
   <bug>578200</bug>
   <bug>579954</bug>
   <bug>581524</bug>
diff --git a/metadata/glsa/glsa-201605-03.xml b/metadata/glsa/glsa-201605-03.xml
index be29f33c3bbd..addc04e39f54 100644
--- a/metadata/glsa/glsa-201605-03.xml
+++ b/metadata/glsa/glsa-201605-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libfpx</product>
   <announced>2016-05-30</announced>
-  <revised>2016-05-30: 1</revised>
+  <revised count="1">2016-05-30</revised>
   <bug>395367</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201605-04.xml b/metadata/glsa/glsa-201605-04.xml
index 501217687fba..f99c5789b40e 100644
--- a/metadata/glsa/glsa-201605-04.xml
+++ b/metadata/glsa/glsa-201605-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-05-30</announced>
-  <revised>2016-05-30: 1</revised>
+  <revised count="1">2016-05-30</revised>
   <bug>519108</bug>
   <bug>540000</bug>
   <bug>569140</bug>
diff --git a/metadata/glsa/glsa-201605-05.xml b/metadata/glsa/glsa-201605-05.xml
index f8277faee3ee..812149362984 100644
--- a/metadata/glsa/glsa-201605-05.xml
+++ b/metadata/glsa/glsa-201605-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pam</product>
   <announced>2016-05-31</announced>
-  <revised>2016-05-31: 1</revised>
+  <revised count="1">2016-05-31</revised>
   <bug>493432</bug>
   <bug>505604</bug>
   <bug>553302</bug>
diff --git a/metadata/glsa/glsa-201605-06.xml b/metadata/glsa/glsa-201605-06.xml
index ae11c27354f2..8b60cbc5af4d 100644
--- a/metadata/glsa/glsa-201605-06.xml
+++ b/metadata/glsa/glsa-201605-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">firefox</product>
   <announced>2016-05-31</announced>
-  <revised>2017-01-20: 4</revised>
+  <revised count="4">2017-01-20</revised>
   <bug>549356</bug>
   <bug>550288</bug>
   <bug>557590</bug>
diff --git a/metadata/glsa/glsa-201606-01.xml b/metadata/glsa/glsa-201606-01.xml
index fb5646bcc93c..13878e8a0ed0 100644
--- a/metadata/glsa/glsa-201606-01.xml
+++ b/metadata/glsa/glsa-201606-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-06-05</announced>
-  <revised>2016-06-05: 2</revised>
+  <revised count="2">2016-06-05</revised>
   <bug>565080</bug>
   <bug>576524</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201606-02.xml b/metadata/glsa/glsa-201606-02.xml
index d3c9bf5c935a..f7e192aa460c 100644
--- a/metadata/glsa/glsa-201606-02.xml
+++ b/metadata/glsa/glsa-201606-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-06-05</announced>
-  <revised>2016-06-05: 3</revised>
+  <revised count="3">2016-06-05</revised>
   <bug>577450</bug>
   <bug>581372</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201606-03.xml b/metadata/glsa/glsa-201606-03.xml
index 41a3ca825d7b..5bd3b52c6f40 100644
--- a/metadata/glsa/glsa-201606-03.xml
+++ b/metadata/glsa/glsa-201606-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libjpeg-turbo</product>
   <announced>2016-06-05</announced>
-  <revised>2016-06-05: 2</revised>
+  <revised count="2">2016-06-05</revised>
   <bug>491150</bug>
   <bug>531418</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201606-04.xml b/metadata/glsa/glsa-201606-04.xml
index b9ab5c44fca0..9039fcdffad1 100644
--- a/metadata/glsa/glsa-201606-04.xml
+++ b/metadata/glsa/glsa-201606-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gnupg</product>
   <announced>2016-06-05</announced>
-  <revised>2016-06-10: 2</revised>
+  <revised count="2">2016-06-10</revised>
   <bug>534110</bug>
   <bug>541564</bug>
   <bug>541568</bug>
diff --git a/metadata/glsa/glsa-201606-05.xml b/metadata/glsa/glsa-201606-05.xml
index c83207b925df..8435832a49e5 100644
--- a/metadata/glsa/glsa-201606-05.xml
+++ b/metadata/glsa/glsa-201606-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-06-16</announced>
-  <revised>2016-06-16: 1</revised>
+  <revised count="1">2016-06-16</revised>
   <bug>560006</bug>
   <bug>562890</bug>
   <bug>584126</bug>
diff --git a/metadata/glsa/glsa-201606-06.xml b/metadata/glsa/glsa-201606-06.xml
index 012478a93892..79cadac4dc3d 100644
--- a/metadata/glsa/glsa-201606-06.xml
+++ b/metadata/glsa/glsa-201606-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-06-17</announced>
-  <revised>2016-06-17: 1</revised>
+  <revised count="1">2016-06-17</revised>
   <bug>560854</bug>
   <bug>573046</bug>
   <bug>584744</bug>
diff --git a/metadata/glsa/glsa-201606-07.xml b/metadata/glsa/glsa-201606-07.xml
index d17e4f6a69c7..03c69217ebb2 100644
--- a/metadata/glsa/glsa-201606-07.xml
+++ b/metadata/glsa/glsa-201606-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-06-18</announced>
-  <revised>2016-06-18: 2</revised>
+  <revised count="2">2016-06-18</revised>
   <bug>571152</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201606-08.xml b/metadata/glsa/glsa-201606-08.xml
index 57de58c66a33..179ca39a917e 100644
--- a/metadata/glsa/glsa-201606-08.xml
+++ b/metadata/glsa/glsa-201606-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-06-18</announced>
-  <revised>2016-06-18: 1</revised>
+  <revised count="1">2016-06-18</revised>
   <bug>579166</bug>
   <bug>582670</bug>
   <bug>586044</bug>
diff --git a/metadata/glsa/glsa-201606-09.xml b/metadata/glsa/glsa-201606-09.xml
index 9da90fcc9c1a..a52ed8705fcb 100644
--- a/metadata/glsa/glsa-201606-09.xml
+++ b/metadata/glsa/glsa-201606-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-06-18</announced>
-  <revised>2016-06-18: 1</revised>
+  <revised count="1">2016-06-18</revised>
   <bug>528554</bug>
   <bug>553732</bug>
   <bug>571868</bug>
diff --git a/metadata/glsa/glsa-201606-10.xml b/metadata/glsa/glsa-201606-10.xml
index bc040e51a50c..2092c6a77491 100644
--- a/metadata/glsa/glsa-201606-10.xml
+++ b/metadata/glsa/glsa-201606-10.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2016-06-19</announced>
-  <revised>2016-06-19: 2</revised>
+  <revised count="2">2016-06-19</revised>
   <bug>537586</bug>
   <bug>541098</bug>
   <bug>544186</bug>
diff --git a/metadata/glsa/glsa-201606-11.xml b/metadata/glsa/glsa-201606-11.xml
index 6659a531d4ad..ea5764b6231a 100644
--- a/metadata/glsa/glsa-201606-11.xml
+++ b/metadata/glsa/glsa-201606-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-06-26</announced>
-  <revised>2016-06-26: 1</revised>
+  <revised count="1">2016-06-26</revised>
   <bug>525588</bug>
   <bug>569010</bug>
   <bug>570692</bug>
diff --git a/metadata/glsa/glsa-201606-12.xml b/metadata/glsa/glsa-201606-12.xml
index a28afbb91765..6221493b6759 100644
--- a/metadata/glsa/glsa-201606-12.xml
+++ b/metadata/glsa/glsa-201606-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-06-26</announced>
-  <revised>2016-06-26: 1</revised>
+  <revised count="1">2016-06-26</revised>
   <bug>533366</bug>
   <bug>575474</bug>
   <bug>575484</bug>
diff --git a/metadata/glsa/glsa-201606-13.xml b/metadata/glsa/glsa-201606-13.xml
index 7872cea25c19..1900e10de9fd 100644
--- a/metadata/glsa/glsa-201606-13.xml
+++ b/metadata/glsa/glsa-201606-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-06-26</announced>
-  <revised>2017-04-17: 2</revised>
+  <revised count="2">2017-04-17</revised>
   <bug>564774</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201606-14.xml b/metadata/glsa/glsa-201606-14.xml
index 3fea6158d720..3f2bccf41be7 100644
--- a/metadata/glsa/glsa-201606-14.xml
+++ b/metadata/glsa/glsa-201606-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">imagemagick</product>
   <announced>2016-06-26</announced>
-  <revised>2016-06-26: 1</revised>
+  <revised count="1">2016-06-26</revised>
   <bug>534106</bug>
   <bug>562892</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201606-15.xml b/metadata/glsa/glsa-201606-15.xml
index cb918115254f..7a2780f45486 100644
--- a/metadata/glsa/glsa-201606-15.xml
+++ b/metadata/glsa/glsa-201606-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-06-26</announced>
-  <revised>2016-06-26: 1</revised>
+  <revised count="1">2016-06-26</revised>
   <bug>544426</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201606-16.xml b/metadata/glsa/glsa-201606-16.xml
index 5392a5a99088..5511d80238e0 100644
--- a/metadata/glsa/glsa-201606-16.xml
+++ b/metadata/glsa/glsa-201606-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-06-26</announced>
-  <revised>2016-06-26: 1</revised>
+  <revised count="1">2016-06-26</revised>
   <bug>395553</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201606-17.xml b/metadata/glsa/glsa-201606-17.xml
index fb537b335332..dca8758d6523 100644
--- a/metadata/glsa/glsa-201606-17.xml
+++ b/metadata/glsa/glsa-201606-17.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">wpa_supplicant</product>
   <announced>2016-06-27</announced>
-  <revised>2016-06-27: 1</revised>
+  <revised count="1">2016-06-27</revised>
   <bug>524928</bug>
   <bug>547492</bug>
   <bug>548742</bug>
diff --git a/metadata/glsa/glsa-201606-18.xml b/metadata/glsa/glsa-201606-18.xml
index 5ff82f4c0136..9fafb224eade 100644
--- a/metadata/glsa/glsa-201606-18.xml
+++ b/metadata/glsa/glsa-201606-18.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-06-27</announced>
-  <revised>2016-06-27: 1</revised>
+  <revised count="1">2016-06-27</revised>
   <bug>578300</bug>
   <bug>578788</bug>
   <bug>581028</bug>
diff --git a/metadata/glsa/glsa-201606-19.xml b/metadata/glsa/glsa-201606-19.xml
index 4092b0febd56..0462fb9835ab 100644
--- a/metadata/glsa/glsa-201606-19.xml
+++ b/metadata/glsa/glsa-201606-19.xml
@@ -5,7 +5,7 @@
   <synopsis>Kwalletd password stores are vulnerable to codebook attacks.</synopsis>
   <product type="ebuild">kwalletd</product>
   <announced>2016-06-27</announced>
-  <revised>2016-06-27: 1</revised>
+  <revised count="1">2016-06-27</revised>
   <bug>496768</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201607-01.xml b/metadata/glsa/glsa-201607-01.xml
index ec9197b479a5..3cc64b8e4baa 100644
--- a/metadata/glsa/glsa-201607-01.xml
+++ b/metadata/glsa/glsa-201607-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-07-09</announced>
-  <revised>2016-07-09: 1</revised>
+  <revised count="1">2016-07-09</revised>
   <bug>536276</bug>
   <bug>575542</bug>
   <bug>578970</bug>
diff --git a/metadata/glsa/glsa-201607-02.xml b/metadata/glsa/glsa-201607-02.xml
index 00adac250b93..7af7dc9010f5 100644
--- a/metadata/glsa/glsa-201607-02.xml
+++ b/metadata/glsa/glsa-201607-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-07-09</announced>
-  <revised>2016-07-09: 1</revised>
+  <revised count="1">2016-07-09</revised>
   <bug>529952</bug>
   <bug>551240</bug>
   <bug>553300</bug>
diff --git a/metadata/glsa/glsa-201607-03.xml b/metadata/glsa/glsa-201607-03.xml
index 3c6929bd4c07..31fa21a3d14d 100644
--- a/metadata/glsa/glsa-201607-03.xml
+++ b/metadata/glsa/glsa-201607-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-07-13</announced>
-  <revised>2016-07-13: 2</revised>
+  <revised count="2">2016-07-13</revised>
   <bug>588738</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201607-04.xml b/metadata/glsa/glsa-201607-04.xml
index fcd734f2c87e..7c68ab7fe62f 100644
--- a/metadata/glsa/glsa-201607-04.xml
+++ b/metadata/glsa/glsa-201607-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-07-16</announced>
-  <revised>2016-07-16: 1</revised>
+  <revised count="1">2016-07-16</revised>
   <bug>504872</bug>
   <bug>538686</bug>
   <bug>581942</bug>
diff --git a/metadata/glsa/glsa-201607-05.xml b/metadata/glsa/glsa-201607-05.xml
index 64da85913f62..6eb2d5ad7402 100644
--- a/metadata/glsa/glsa-201607-05.xml
+++ b/metadata/glsa/glsa-201607-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-07-16</announced>
-  <revised>2016-07-16: 1</revised>
+  <revised count="1">2016-07-16</revised>
   <bug>519900</bug>
   <bug>568400</bug>
   <bug>570984</bug>
diff --git a/metadata/glsa/glsa-201607-06.xml b/metadata/glsa/glsa-201607-06.xml
index c6d4cce21d62..6f9cb0d18d3e 100644
--- a/metadata/glsa/glsa-201607-06.xml
+++ b/metadata/glsa/glsa-201607-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-07-16</announced>
-  <revised>2016-07-16: 1</revised>
+  <revised count="1">2016-07-16</revised>
   <bug>539582</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201607-07.xml b/metadata/glsa/glsa-201607-07.xml
index b1b439373214..0146843d3963 100644
--- a/metadata/glsa/glsa-201607-07.xml
+++ b/metadata/glsa/glsa-201607-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-07-16</announced>
-  <revised>2016-07-16: 1</revised>
+  <revised count="1">2016-07-16</revised>
   <bug>584310</bug>
   <bug>586704</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201607-08.xml b/metadata/glsa/glsa-201607-08.xml
index 635491a7b34d..320dbbfe6918 100644
--- a/metadata/glsa/glsa-201607-08.xml
+++ b/metadata/glsa/glsa-201607-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-07-20</announced>
-  <revised>2016-07-20: 1</revised>
+  <revised count="1">2016-07-20</revised>
   <bug>577050</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201607-09.xml b/metadata/glsa/glsa-201607-09.xml
index b772c03d94bf..87a321bad0de 100644
--- a/metadata/glsa/glsa-201607-09.xml
+++ b/metadata/glsa/glsa-201607-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">commons-beanutils</product>
   <announced>2016-07-20</announced>
-  <revised>2016-07-20: 1</revised>
+  <revised count="1">2016-07-20</revised>
   <bug>534498</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201607-10.xml b/metadata/glsa/glsa-201607-10.xml
index 28fc94c6faf0..a0f78464169a 100644
--- a/metadata/glsa/glsa-201607-10.xml
+++ b/metadata/glsa/glsa-201607-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-07-20</announced>
-  <revised>2016-07-20: 1</revised>
+  <revised count="1">2016-07-20</revised>
   <bug>542886</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201607-11.xml b/metadata/glsa/glsa-201607-11.xml
index 7b8c6f108074..4ea09c8d695f 100644
--- a/metadata/glsa/glsa-201607-11.xml
+++ b/metadata/glsa/glsa-201607-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-07-20</announced>
-  <revised>2016-07-20: 1</revised>
+  <revised count="1">2016-07-20</revised>
   <bug>524316</bug>
   <bug>537448</bug>
   <bug>560406</bug>
diff --git a/metadata/glsa/glsa-201607-12.xml b/metadata/glsa/glsa-201607-12.xml
index 2106141c3110..20b32bef53df 100644
--- a/metadata/glsa/glsa-201607-12.xml
+++ b/metadata/glsa/glsa-201607-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">exim</product>
   <announced>2016-07-20</announced>
-  <revised>2016-07-20: 1</revised>
+  <revised count="1">2016-07-20</revised>
   <bug>517934</bug>
   <bug>576582</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201607-13.xml b/metadata/glsa/glsa-201607-13.xml
index 6e8193cf9df4..ba9128df72c2 100644
--- a/metadata/glsa/glsa-201607-13.xml
+++ b/metadata/glsa/glsa-201607-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-07-20</announced>
-  <revised>2016-07-20: 1</revised>
+  <revised count="1">2016-07-20</revised>
   <bug>573160</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201607-14.xml b/metadata/glsa/glsa-201607-14.xml
index 0698d5a0bbf0..e2cf29ca4feb 100644
--- a/metadata/glsa/glsa-201607-14.xml
+++ b/metadata/glsa/glsa-201607-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ansible</product>
   <announced>2016-07-20</announced>
-  <revised>2016-07-20: 2</revised>
+  <revised count="2">2016-07-20</revised>
   <bug>578814</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201607-15.xml b/metadata/glsa/glsa-201607-15.xml
index 62f1f9503d93..abcb1b1204db 100644
--- a/metadata/glsa/glsa-201607-15.xml
+++ b/metadata/glsa/glsa-201607-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ntp</product>
   <announced>2016-07-20</announced>
-  <revised>2016-07-20: 1</revised>
+  <revised count="1">2016-07-20</revised>
   <bug>563774</bug>
   <bug>572452</bug>
   <bug>581528</bug>
diff --git a/metadata/glsa/glsa-201607-16.xml b/metadata/glsa/glsa-201607-16.xml
index 422afe539092..8a434f593292 100644
--- a/metadata/glsa/glsa-201607-16.xml
+++ b/metadata/glsa/glsa-201607-16.xml
@@ -5,7 +5,7 @@
   <synopsis>arpwatch is vulnerable to the escalation of privileges.</synopsis>
   <product type="ebuild"/>
   <announced>2016-07-20</announced>
-  <revised>2016-07-20: 1</revised>
+  <revised count="1">2016-07-20</revised>
   <bug>419375</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201607-17.xml b/metadata/glsa/glsa-201607-17.xml
index 2a41ef9447f8..88640e8276ac 100644
--- a/metadata/glsa/glsa-201607-17.xml
+++ b/metadata/glsa/glsa-201607-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-07-30</announced>
-  <revised>2016-07-30: 1</revised>
+  <revised count="1">2016-07-30</revised>
   <bug>575482</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201608-01.xml b/metadata/glsa/glsa-201608-01.xml
index 91a1ebee4a44..dd779da71320 100644
--- a/metadata/glsa/glsa-201608-01.xml
+++ b/metadata/glsa/glsa-201608-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-08-11</announced>
-  <revised>2016-08-11: 1</revised>
+  <revised count="1">2016-08-11</revised>
   <bug>561882</bug>
   <bug>579030</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201609-01.xml b/metadata/glsa/glsa-201609-01.xml
index 933666290349..8fb8c720319b 100644
--- a/metadata/glsa/glsa-201609-01.xml
+++ b/metadata/glsa/glsa-201609-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">qemu</product>
   <announced>2016-09-25</announced>
-  <revised>2016-09-26: 2</revised>
+  <revised count="2">2016-09-26</revised>
   <bug>573816</bug>
   <bug>579734</bug>
   <bug>580040</bug>
diff --git a/metadata/glsa/glsa-201609-02.xml b/metadata/glsa/glsa-201609-02.xml
index 397ea52a31eb..7a6baca4dc9b 100644
--- a/metadata/glsa/glsa-201609-02.xml
+++ b/metadata/glsa/glsa-201609-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bundler</product>
   <announced>2016-09-26</announced>
-  <revised>2016-09-26: 1</revised>
+  <revised count="1">2016-09-26</revised>
   <bug>523798</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201610-01.xml b/metadata/glsa/glsa-201610-01.xml
index 3cc08c165d9d..fe7481822e7c 100644
--- a/metadata/glsa/glsa-201610-01.xml
+++ b/metadata/glsa/glsa-201610-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">groovy</product>
   <announced>2016-10-06</announced>
-  <revised>2016-10-06: 1</revised>
+  <revised count="1">2016-10-06</revised>
   <bug>555470</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201610-02.xml b/metadata/glsa/glsa-201610-02.xml
index 704998eadf7b..8e99858a1e59 100644
--- a/metadata/glsa/glsa-201610-02.xml
+++ b/metadata/glsa/glsa-201610-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-10-06</announced>
-  <revised>2016-10-13: 2</revised>
+  <revised count="2">2016-10-13</revised>
   <bug>524680</bug>
   <bug>536684</bug>
   <bug>554948</bug>
diff --git a/metadata/glsa/glsa-201610-03.xml b/metadata/glsa/glsa-201610-03.xml
index 86ff1c6664cc..1f7a8450574f 100644
--- a/metadata/glsa/glsa-201610-03.xml
+++ b/metadata/glsa/glsa-201610-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">quagga</product>
   <announced>2016-10-10</announced>
-  <revised>2016-10-10: 1</revised>
+  <revised count="1">2016-10-10</revised>
   <bug>577156</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201610-04.xml b/metadata/glsa/glsa-201610-04.xml
index a98a2c72984c..f0a558c660b9 100644
--- a/metadata/glsa/glsa-201610-04.xml
+++ b/metadata/glsa/glsa-201610-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libgcrypt</product>
   <announced>2016-10-10</announced>
-  <revised>2016-10-10: 1</revised>
+  <revised count="1">2016-10-10</revised>
   <bug>541564</bug>
   <bug>559942</bug>
   <bug>574268</bug>
diff --git a/metadata/glsa/glsa-201610-05.xml b/metadata/glsa/glsa-201610-05.xml
index c81a3a4e32bb..eced1ef92a9c 100644
--- a/metadata/glsa/glsa-201610-05.xml
+++ b/metadata/glsa/glsa-201610-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">subversion serf</product>
   <announced>2016-10-11</announced>
-  <revised>2016-10-11: 2</revised>
+  <revised count="2">2016-10-11</revised>
   <bug>500482</bug>
   <bug>518716</bug>
   <bug>519202</bug>
diff --git a/metadata/glsa/glsa-201610-06.xml b/metadata/glsa/glsa-201610-06.xml
index 0d6055b502e7..c37b610227fc 100644
--- a/metadata/glsa/glsa-201610-06.xml
+++ b/metadata/glsa/glsa-201610-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-10-11</announced>
-  <revised>2016-10-11: 1</revised>
+  <revised count="1">2016-10-11</revised>
   <bug>546724</bug>
   <bug>555478</bug>
   <bug>555480</bug>
diff --git a/metadata/glsa/glsa-201610-07.xml b/metadata/glsa/glsa-201610-07.xml
index 42afd62a0074..bf24d19fc67d 100644
--- a/metadata/glsa/glsa-201610-07.xml
+++ b/metadata/glsa/glsa-201610-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-10-11</announced>
-  <revised>2016-10-11: 1</revised>
+  <revised count="1">2016-10-11</revised>
   <bug>572414</bug>
   <bug>576902</bug>
   <bug>588652</bug>
diff --git a/metadata/glsa/glsa-201610-08.xml b/metadata/glsa/glsa-201610-08.xml
index a41921692686..afa2d6608e57 100644
--- a/metadata/glsa/glsa-201610-08.xml
+++ b/metadata/glsa/glsa-201610-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">java</product>
   <announced>2016-10-15</announced>
-  <revised>2016-10-15: 1</revised>
+  <revised count="1">2016-10-15</revised>
   <bug>578160</bug>
   <bug>580608</bug>
   <bug>589208</bug>
diff --git a/metadata/glsa/glsa-201610-09.xml b/metadata/glsa/glsa-201610-09.xml
index 2a41c47fd9d8..3496d6992d99 100644
--- a/metadata/glsa/glsa-201610-09.xml
+++ b/metadata/glsa/glsa-201610-09.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-10-29</announced>
-  <revised>2016-10-29: 1</revised>
+  <revised count="1">2016-10-29</revised>
   <bug>589278</bug>
   <bug>590420</bug>
   <bug>592630</bug>
diff --git a/metadata/glsa/glsa-201610-10.xml b/metadata/glsa/glsa-201610-10.xml
index 50a2526f986a..54baa728f6dd 100644
--- a/metadata/glsa/glsa-201610-10.xml
+++ b/metadata/glsa/glsa-201610-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-10-29</announced>
-  <revised>2016-11-01: 2</revised>
+  <revised count="2">2016-11-01</revised>
   <bug>593684</bug>
   <bug>596896</bug>
   <bug>598152</bug>
diff --git a/metadata/glsa/glsa-201610-11.xml b/metadata/glsa/glsa-201610-11.xml
index 8bbceac44098..1eeddf147972 100644
--- a/metadata/glsa/glsa-201610-11.xml
+++ b/metadata/glsa/glsa-201610-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-10-29</announced>
-  <revised>2016-10-29: 1</revised>
+  <revised count="1">2016-10-29</revised>
   <bug>560418</bug>
   <bug>585926</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201611-01.xml b/metadata/glsa/glsa-201611-01.xml
index 3ff503315fc9..82a5eb406aab 100644
--- a/metadata/glsa/glsa-201611-01.xml
+++ b/metadata/glsa/glsa-201611-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-11-01</announced>
-  <revised>2016-11-01: 1</revised>
+  <revised count="1">2016-11-01</revised>
   <bug>528082</bug>
   <bug>533748</bug>
   <bug>537424</bug>
diff --git a/metadata/glsa/glsa-201611-02.xml b/metadata/glsa/glsa-201611-02.xml
index 72ad5ffaa86e..60c59989e5c7 100644
--- a/metadata/glsa/glsa-201611-02.xml
+++ b/metadata/glsa/glsa-201611-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-11-01</announced>
-  <revised>2016-11-01: 1</revised>
+  <revised count="1">2016-11-01</revised>
   <bug>582902</bug>
   <bug>592070</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201611-03.xml b/metadata/glsa/glsa-201611-03.xml
index 9dc5e87b0b20..d546a3cc885c 100644
--- a/metadata/glsa/glsa-201611-03.xml
+++ b/metadata/glsa/glsa-201611-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-11-04</announced>
-  <revised>2017-04-17: 2</revised>
+  <revised count="2">2017-04-17</revised>
   <bug>565026</bug>
   <bug>587566</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201611-04.xml b/metadata/glsa/glsa-201611-04.xml
index e622336eff10..aa3276418720 100644
--- a/metadata/glsa/glsa-201611-04.xml
+++ b/metadata/glsa/glsa-201611-04.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-11-04</announced>
-  <revised>2016-11-04: 1</revised>
+  <revised count="1">2016-11-04</revised>
   <bug>597516</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201611-05.xml b/metadata/glsa/glsa-201611-05.xml
index 2138850c7dc6..e2136ea4489a 100644
--- a/metadata/glsa/glsa-201611-05.xml
+++ b/metadata/glsa/glsa-201611-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tnftp</product>
   <announced>2016-11-15</announced>
-  <revised>2016-11-15: 1</revised>
+  <revised count="1">2016-11-15</revised>
   <bug>527302</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201611-06.xml b/metadata/glsa/glsa-201611-06.xml
index 61ef0e94fe22..6411a5207ab0 100644
--- a/metadata/glsa/glsa-201611-06.xml
+++ b/metadata/glsa/glsa-201611-06.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in xinetd could lead to privilege escalation.</synopsis>
   <product type="ebuild">xinetd</product>
   <announced>2016-11-15</announced>
-  <revised>2016-11-15: 1</revised>
+  <revised count="1">2016-11-15</revised>
   <bug>488158</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201611-07.xml b/metadata/glsa/glsa-201611-07.xml
index 316bef1e78d2..eb490a5ede9a 100644
--- a/metadata/glsa/glsa-201611-07.xml
+++ b/metadata/glsa/glsa-201611-07.xml
@@ -5,7 +5,7 @@
   <synopsis>polkit is vulnerable to local privilege escalation.</synopsis>
   <product type="ebuild">polkit</product>
   <announced>2016-11-15</announced>
-  <revised>2016-11-15: 1</revised>
+  <revised count="1">2016-11-15</revised>
   <bug>555666</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201611-08.xml b/metadata/glsa/glsa-201611-08.xml
index a1e0ba353c31..bcc9620bd993 100644
--- a/metadata/glsa/glsa-201611-08.xml
+++ b/metadata/glsa/glsa-201611-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2016-11-15</announced>
-  <revised>2016-11-15: 1</revised>
+  <revised count="1">2016-11-15</revised>
   <bug>564244</bug>
   <bug>565678</bug>
   <bug>568216</bug>
diff --git a/metadata/glsa/glsa-201611-09.xml b/metadata/glsa/glsa-201611-09.xml
index 5d330ae7fac9..7f1ee85db399 100644
--- a/metadata/glsa/glsa-201611-09.xml
+++ b/metadata/glsa/glsa-201611-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xen</product>
   <announced>2016-11-15</announced>
-  <revised>2016-11-15: 1</revised>
+  <revised count="1">2016-11-15</revised>
   <bug>588780</bug>
   <bug>593198</bug>
   <bug>594850</bug>
diff --git a/metadata/glsa/glsa-201611-10.xml b/metadata/glsa/glsa-201611-10.xml
index 9cdacea8e283..cd15f3ad4623 100644
--- a/metadata/glsa/glsa-201611-10.xml
+++ b/metadata/glsa/glsa-201611-10.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in libuv could lead to privilege escalation.</synopsis>
   <product type="ebuild"/>
   <announced>2016-11-17</announced>
-  <revised>2016-11-17: 1</revised>
+  <revised count="1">2016-11-17</revised>
   <bug>540826</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201611-11.xml b/metadata/glsa/glsa-201611-11.xml
index d314d8815a3a..0b482d1cbfc1 100644
--- a/metadata/glsa/glsa-201611-11.xml
+++ b/metadata/glsa/glsa-201611-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-11-18</announced>
-  <revised>2017-01-02: 2</revised>
+  <revised count="2">2017-01-02</revised>
   <bug>594368</bug>
   <bug>594520</bug>
   <bug>595192</bug>
diff --git a/metadata/glsa/glsa-201611-12.xml b/metadata/glsa/glsa-201611-12.xml
index e339fd30586a..caf358e444b8 100644
--- a/metadata/glsa/glsa-201611-12.xml
+++ b/metadata/glsa/glsa-201611-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">imlib2</product>
   <announced>2016-11-20</announced>
-  <revised>2016-11-20: 1</revised>
+  <revised count="1">2016-11-20</revised>
   <bug>572884</bug>
   <bug>578810</bug>
   <bug>580038</bug>
diff --git a/metadata/glsa/glsa-201611-13.xml b/metadata/glsa/glsa-201611-13.xml
index 5633941b0700..c4b6a2dd4173 100644
--- a/metadata/glsa/glsa-201611-13.xml
+++ b/metadata/glsa/glsa-201611-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mongodb</product>
   <announced>2016-11-20</announced>
-  <revised>2016-11-20: 1</revised>
+  <revised count="1">2016-11-20</revised>
   <bug>542880</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201611-14.xml b/metadata/glsa/glsa-201611-14.xml
index fa8b2cbf1f7e..ca87a0e1e4fe 100644
--- a/metadata/glsa/glsa-201611-14.xml
+++ b/metadata/glsa/glsa-201611-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mit-krb5</product>
   <announced>2016-11-20</announced>
-  <revised>2016-11-20: 1</revised>
+  <revised count="1">2016-11-20</revised>
   <bug>564304</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201611-15.xml b/metadata/glsa/glsa-201611-15.xml
index 1ba5ff394fca..e8ee0578a24b 100644
--- a/metadata/glsa/glsa-201611-15.xml
+++ b/metadata/glsa/glsa-201611-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">poppler</product>
   <announced>2016-11-22</announced>
-  <revised>2016-11-22: 3</revised>
+  <revised count="3">2016-11-22</revised>
   <bug>542220</bug>
   <bug>579752</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201611-16.xml b/metadata/glsa/glsa-201611-16.xml
index c199ce74eafa..f7e595e7b818 100644
--- a/metadata/glsa/glsa-201611-16.xml
+++ b/metadata/glsa/glsa-201611-16.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2016-11-22</announced>
-  <revised>2016-11-22: 3</revised>
+  <revised count="3">2016-11-22</revised>
   <bug>599416</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201611-17.xml b/metadata/glsa/glsa-201611-17.xml
index 608418dcda57..0b744a3719ed 100644
--- a/metadata/glsa/glsa-201611-17.xml
+++ b/metadata/glsa/glsa-201611-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">rpcbind</product>
   <announced>2016-11-22</announced>
-  <revised>2016-11-22: 2</revised>
+  <revised count="2">2016-11-22</revised>
   <bug>560990</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201611-18.xml b/metadata/glsa/glsa-201611-18.xml
index 0438e1d27987..06f0fb7487a8 100644
--- a/metadata/glsa/glsa-201611-18.xml
+++ b/metadata/glsa/glsa-201611-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2016-11-22</announced>
-  <revised>2016-11-22: 2</revised>
+  <revised count="2">2016-11-22</revised>
   <bug>599204</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201611-19.xml b/metadata/glsa/glsa-201611-19.xml
index e44b7c07bbfa..346d55be7314 100644
--- a/metadata/glsa/glsa-201611-19.xml
+++ b/metadata/glsa/glsa-201611-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tar</product>
   <announced>2016-11-22</announced>
-  <revised>2016-11-22: 2</revised>
+  <revised count="2">2016-11-22</revised>
   <bug>598334</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201611-20.xml b/metadata/glsa/glsa-201611-20.xml
index 0107493100c8..fe680dbfc206 100644
--- a/metadata/glsa/glsa-201611-20.xml
+++ b/metadata/glsa/glsa-201611-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">testdisk</product>
   <announced>2016-11-22</announced>
-  <revised>2016-11-22: 2</revised>
+  <revised count="2">2016-11-22</revised>
   <bug>548258</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201611-21.xml b/metadata/glsa/glsa-201611-21.xml
index d532b1f26b5a..f7acae70457f 100644
--- a/metadata/glsa/glsa-201611-21.xml
+++ b/metadata/glsa/glsa-201611-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">imagemagick</product>
   <announced>2016-11-30</announced>
-  <revised>2016-11-30: 1</revised>
+  <revised count="1">2016-11-30</revised>
   <bug>581990</bug>
   <bug>593526</bug>
   <bug>593530</bug>
diff --git a/metadata/glsa/glsa-201611-22.xml b/metadata/glsa/glsa-201611-22.xml
index 888ff9ce5518..170d217efc97 100644
--- a/metadata/glsa/glsa-201611-22.xml
+++ b/metadata/glsa/glsa-201611-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2016-11-30</announced>
-  <revised>2016-11-30: 1</revised>
+  <revised count="1">2016-11-30</revised>
   <bug>578734</bug>
   <bug>581834</bug>
   <bug>584204</bug>
diff --git a/metadata/glsa/glsa-201612-01.xml b/metadata/glsa/glsa-201612-01.xml
index e2d2ffa174da..e13dc9a9d6c8 100644
--- a/metadata/glsa/glsa-201612-01.xml
+++ b/metadata/glsa/glsa-201612-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gnupg</product>
   <announced>2016-12-02</announced>
-  <revised>2016-12-02: 1</revised>
+  <revised count="1">2016-12-02</revised>
   <bug>591536</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-02.xml b/metadata/glsa/glsa-201612-02.xml
index e3782917cd23..978da950b49a 100644
--- a/metadata/glsa/glsa-201612-02.xml
+++ b/metadata/glsa/glsa-201612-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">davfs2</product>
   <announced>2016-12-02</announced>
-  <revised>2016-12-02: 1</revised>
+  <revised count="1">2016-12-02</revised>
   <bug>485232</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-03.xml b/metadata/glsa/glsa-201612-03.xml
index 8535ebbce0ba..f3e5b7aa4b72 100644
--- a/metadata/glsa/glsa-201612-03.xml
+++ b/metadata/glsa/glsa-201612-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libsndfile</product>
   <announced>2016-12-03</announced>
-  <revised>2016-12-03: 1</revised>
+  <revised count="1">2016-12-03</revised>
   <bug>533750</bug>
   <bug>566682</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201612-04.xml b/metadata/glsa/glsa-201612-04.xml
index ab102ec5a2e9..a6065ef8dedb 100644
--- a/metadata/glsa/glsa-201612-04.xml
+++ b/metadata/glsa/glsa-201612-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">busybox</product>
   <announced>2016-12-04</announced>
-  <revised>2016-12-04: 1</revised>
+  <revised count="1">2016-12-04</revised>
   <bug>564246</bug>
   <bug>577610</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201612-05.xml b/metadata/glsa/glsa-201612-05.xml
index 97513c6e7322..1fd80b8ec0af 100644
--- a/metadata/glsa/glsa-201612-05.xml
+++ b/metadata/glsa/glsa-201612-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pygments</product>
   <announced>2016-12-04</announced>
-  <revised>2016-12-04: 1</revised>
+  <revised count="1">2016-12-04</revised>
   <bug>564478</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-06.xml b/metadata/glsa/glsa-201612-06.xml
index 622ca21573a8..97ea1606401a 100644
--- a/metadata/glsa/glsa-201612-06.xml
+++ b/metadata/glsa/glsa-201612-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nghttp2</product>
   <announced>2016-12-04</announced>
-  <revised>2016-12-04: 1</revised>
+  <revised count="1">2016-12-04</revised>
   <bug>569518</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-07.xml b/metadata/glsa/glsa-201612-07.xml
index 1cc9d1d843e5..d03075017706 100644
--- a/metadata/glsa/glsa-201612-07.xml
+++ b/metadata/glsa/glsa-201612-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dpkg</product>
   <announced>2016-12-04</announced>
-  <revised>2016-12-04: 1</revised>
+  <revised count="1">2016-12-04</revised>
   <bug>567258</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-08.xml b/metadata/glsa/glsa-201612-08.xml
index a1caf1d1690d..b2227150a52c 100644
--- a/metadata/glsa/glsa-201612-08.xml
+++ b/metadata/glsa/glsa-201612-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cifs-utils</product>
   <announced>2016-12-04</announced>
-  <revised>2016-12-04: 1</revised>
+  <revised count="1">2016-12-04</revised>
   <bug>552634</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-09.xml b/metadata/glsa/glsa-201612-09.xml
index b8616d3b74c5..7b8515194124 100644
--- a/metadata/glsa/glsa-201612-09.xml
+++ b/metadata/glsa/glsa-201612-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gd</product>
   <announced>2016-12-04</announced>
-  <revised>2016-12-04: 1</revised>
+  <revised count="1">2016-12-04</revised>
   <bug>587662</bug>
   <bug>587968</bug>
   <bug>592720</bug>
diff --git a/metadata/glsa/glsa-201612-10.xml b/metadata/glsa/glsa-201612-10.xml
index 155d5df48ab3..e473d8ea152a 100644
--- a/metadata/glsa/glsa-201612-10.xml
+++ b/metadata/glsa/glsa-201612-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libvirt</product>
   <announced>2016-12-04</announced>
-  <revised>2016-12-04: 1</revised>
+  <revised count="1">2016-12-04</revised>
   <bug>568870</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-11.xml b/metadata/glsa/glsa-201612-11.xml
index cdba7e82304a..e1a96713bf35 100644
--- a/metadata/glsa/glsa-201612-11.xml
+++ b/metadata/glsa/glsa-201612-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2016-12-05</announced>
-  <revised>2016-12-05: 1</revised>
+  <revised count="1">2016-12-05</revised>
   <bug>601486</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-12.xml b/metadata/glsa/glsa-201612-12.xml
index fb99408e4fb5..7c87051e4ada 100644
--- a/metadata/glsa/glsa-201612-12.xml
+++ b/metadata/glsa/glsa-201612-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">patch</product>
   <announced>2016-12-05</announced>
-  <revised>2016-12-05: 1</revised>
+  <revised count="1">2016-12-05</revised>
   <bug>538658</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-13.xml b/metadata/glsa/glsa-201612-13.xml
index 6829274bec5c..2a94b8945daf 100644
--- a/metadata/glsa/glsa-201612-13.xml
+++ b/metadata/glsa/glsa-201612-13.xml
@@ -5,7 +5,7 @@
   <synopsis>Nghttp2 is vulnerable to a Denial of Service attack.</synopsis>
   <product type="ebuild">nghttp2</product>
   <announced>2016-12-05</announced>
-  <revised>2016-12-05: 1</revised>
+  <revised count="1">2016-12-05</revised>
   <bug>574780</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-14.xml b/metadata/glsa/glsa-201612-14.xml
index a1658091455b..f98068a2d576 100644
--- a/metadata/glsa/glsa-201612-14.xml
+++ b/metadata/glsa/glsa-201612-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">util-linux</product>
   <announced>2016-12-06</announced>
-  <revised>2016-12-06: 1</revised>
+  <revised count="1">2016-12-06</revised>
   <bug>530844</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-15.xml b/metadata/glsa/glsa-201612-15.xml
index ecf602863187..d7c8790af605 100644
--- a/metadata/glsa/glsa-201612-15.xml
+++ b/metadata/glsa/glsa-201612-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">arj</product>
   <announced>2016-12-06</announced>
-  <revised>2016-12-06: 1</revised>
+  <revised count="1">2016-12-06</revised>
   <bug>535708</bug>
   <bug>541500</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201612-16.xml b/metadata/glsa/glsa-201612-16.xml
index fa8e1ecd85b1..b8c00f5ccf2e 100644
--- a/metadata/glsa/glsa-201612-16.xml
+++ b/metadata/glsa/glsa-201612-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2016-12-07</announced>
-  <revised>2016-12-07: 1</revised>
+  <revised count="1">2016-12-07</revised>
   <bug>581234</bug>
   <bug>585142</bug>
   <bug>585276</bug>
diff --git a/metadata/glsa/glsa-201612-17.xml b/metadata/glsa/glsa-201612-17.xml
index bbaa254398a1..f2f6bda83412 100644
--- a/metadata/glsa/glsa-201612-17.xml
+++ b/metadata/glsa/glsa-201612-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pecl_http</product>
   <announced>2016-12-07</announced>
-  <revised>2016-12-07: 1</revised>
+  <revised count="1">2016-12-07</revised>
   <bug>587466</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-18.xml b/metadata/glsa/glsa-201612-18.xml
index 23c0a5b7f1b5..8dd9ba6ed4e7 100644
--- a/metadata/glsa/glsa-201612-18.xml
+++ b/metadata/glsa/glsa-201612-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-12-07</announced>
-  <revised>2016-12-07: 1</revised>
+  <revised count="1">2016-12-07</revised>
   <bug>576954</bug>
   <bug>580410</bug>
   <bug>589088</bug>
diff --git a/metadata/glsa/glsa-201612-19.xml b/metadata/glsa/glsa-201612-19.xml
index 1a68035bc030..f703cd2d53e0 100644
--- a/metadata/glsa/glsa-201612-19.xml
+++ b/metadata/glsa/glsa-201612-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mercurial</product>
   <announced>2016-12-07</announced>
-  <revised>2016-12-07: 1</revised>
+  <revised count="1">2016-12-07</revised>
   <bug>533008</bug>
   <bug>544332</bug>
   <bug>578546</bug>
diff --git a/metadata/glsa/glsa-201612-20.xml b/metadata/glsa/glsa-201612-20.xml
index 28e9a34258ae..52f2897a4fbd 100644
--- a/metadata/glsa/glsa-201612-20.xml
+++ b/metadata/glsa/glsa-201612-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">jq</product>
   <announced>2016-12-08</announced>
-  <revised>2016-12-08: 1</revised>
+  <revised count="1">2016-12-08</revised>
   <bug>580606</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-21.xml b/metadata/glsa/glsa-201612-21.xml
index f55dff0bb577..94e81b4c40ff 100644
--- a/metadata/glsa/glsa-201612-21.xml
+++ b/metadata/glsa/glsa-201612-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sqlite</product>
   <announced>2016-12-08</announced>
-  <revised>2016-12-08: 1</revised>
+  <revised count="1">2016-12-08</revised>
   <bug>549258</bug>
   <bug>574420</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201612-22.xml b/metadata/glsa/glsa-201612-22.xml
index 89854571a0d0..68fd11fda33d 100644
--- a/metadata/glsa/glsa-201612-22.xml
+++ b/metadata/glsa/glsa-201612-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">coreutils</product>
   <announced>2016-12-08</announced>
-  <revised>2016-12-08: 1</revised>
+  <revised count="1">2016-12-08</revised>
   <bug>530514</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-23.xml b/metadata/glsa/glsa-201612-23.xml
index e86398f200d8..323f43af94ce 100644
--- a/metadata/glsa/glsa-201612-23.xml
+++ b/metadata/glsa/glsa-201612-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">socat</product>
   <announced>2016-12-08</announced>
-  <revised>2016-12-08: 1</revised>
+  <revised count="1">2016-12-08</revised>
   <bug>573602</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-24.xml b/metadata/glsa/glsa-201612-24.xml
index a16db62e0454..5ccca049c757 100644
--- a/metadata/glsa/glsa-201612-24.xml
+++ b/metadata/glsa/glsa-201612-24.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">binutils</product>
   <announced>2016-12-08</announced>
-  <revised>2016-12-08: 1</revised>
+  <revised count="1">2016-12-08</revised>
   <bug>526626</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-25.xml b/metadata/glsa/glsa-201612-25.xml
index 15a4a3d5f748..141d6379cf35 100644
--- a/metadata/glsa/glsa-201612-25.xml
+++ b/metadata/glsa/glsa-201612-25.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cracklib</product>
   <announced>2016-12-08</announced>
-  <revised>2016-12-08: 1</revised>
+  <revised count="1">2016-12-08</revised>
   <bug>591456</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-26.xml b/metadata/glsa/glsa-201612-26.xml
index 5755d0b22759..62f40195121b 100644
--- a/metadata/glsa/glsa-201612-26.xml
+++ b/metadata/glsa/glsa-201612-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openjpeg</product>
   <announced>2016-12-08</announced>
-  <revised>2016-12-08: 1</revised>
+  <revised count="1">2016-12-08</revised>
   <bug>560632</bug>
   <bug>572430</bug>
   <bug>577608</bug>
diff --git a/metadata/glsa/glsa-201612-27.xml b/metadata/glsa/glsa-201612-27.xml
index 095a71321ee4..3c3f12b80e2f 100644
--- a/metadata/glsa/glsa-201612-27.xml
+++ b/metadata/glsa/glsa-201612-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">virtualbox</product>
   <announced>2016-12-11</announced>
-  <revised>2016-12-11: 2</revised>
+  <revised count="2">2016-12-11</revised>
   <bug>505274</bug>
   <bug>537218</bug>
   <bug>550964</bug>
diff --git a/metadata/glsa/glsa-201612-28.xml b/metadata/glsa/glsa-201612-28.xml
index 468381d59a7f..bf5549836791 100644
--- a/metadata/glsa/glsa-201612-28.xml
+++ b/metadata/glsa/glsa-201612-28.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-12-11</announced>
-  <revised>2016-12-11: 1</revised>
+  <revised count="1">2016-12-11</revised>
   <bug>581236</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-29.xml b/metadata/glsa/glsa-201612-29.xml
index 09b19c255c25..9350c89cd6c9 100644
--- a/metadata/glsa/glsa-201612-29.xml
+++ b/metadata/glsa/glsa-201612-29.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libmms</product>
   <announced>2016-12-11</announced>
-  <revised>2016-12-11: 1</revised>
+  <revised count="1">2016-12-11</revised>
   <bug>507822</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-30.xml b/metadata/glsa/glsa-201612-30.xml
index 8b8e841b50ba..73a16b2f3d01 100644
--- a/metadata/glsa/glsa-201612-30.xml
+++ b/metadata/glsa/glsa-201612-30.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">sox</product>
   <announced>2016-12-11</announced>
-  <revised>2016-12-11: 1</revised>
+  <revised count="1">2016-12-11</revised>
   <bug>533296</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-31.xml b/metadata/glsa/glsa-201612-31.xml
index a5b6f068ad50..86bd953b1a9d 100644
--- a/metadata/glsa/glsa-201612-31.xml
+++ b/metadata/glsa/glsa-201612-31.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild"/>
   <announced>2016-12-12</announced>
-  <revised>2016-12-12: 1</revised>
+  <revised count="1">2016-12-12</revised>
   <bug>563936</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-32.xml b/metadata/glsa/glsa-201612-32.xml
index 3f920b958a23..c02270863416 100644
--- a/metadata/glsa/glsa-201612-32.xml
+++ b/metadata/glsa/glsa-201612-32.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">elfutils</product>
   <announced>2016-12-13</announced>
-  <revised>2016-12-13: 2</revised>
+  <revised count="2">2016-12-13</revised>
   <bug>507246</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-33.xml b/metadata/glsa/glsa-201612-33.xml
index 8f0f258922a4..4b5e994731ec 100644
--- a/metadata/glsa/glsa-201612-33.xml
+++ b/metadata/glsa/glsa-201612-33.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ghostscript-gpl</product>
   <announced>2016-12-13</announced>
-  <revised>2016-12-13: 2</revised>
+  <revised count="2">2016-12-13</revised>
   <bug>556316</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-34.xml b/metadata/glsa/glsa-201612-34.xml
index 69a25a6547dd..44b45188a6cf 100644
--- a/metadata/glsa/glsa-201612-34.xml
+++ b/metadata/glsa/glsa-201612-34.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">systemd</product>
   <announced>2016-12-13</announced>
-  <revised>2016-12-13: 2</revised>
+  <revised count="2">2016-12-13</revised>
   <bug>486904</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-35.xml b/metadata/glsa/glsa-201612-35.xml
index f72075129dfc..60f7a0108c01 100644
--- a/metadata/glsa/glsa-201612-35.xml
+++ b/metadata/glsa/glsa-201612-35.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xstream</product>
   <announced>2016-12-13</announced>
-  <revised>2016-12-13: 2</revised>
+  <revised count="2">2016-12-13</revised>
   <bug>497652</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-36.xml b/metadata/glsa/glsa-201612-36.xml
index 756e2df7e356..47e4377b16fe 100644
--- a/metadata/glsa/glsa-201612-36.xml
+++ b/metadata/glsa/glsa-201612-36.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">tigervnc</product>
   <announced>2016-12-13</announced>
-  <revised>2016-12-13: 2</revised>
+  <revised count="2">2016-12-13</revised>
   <bug>534714</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-37.xml b/metadata/glsa/glsa-201612-37.xml
index b5bfe47079dd..fa0c99ee3b16 100644
--- a/metadata/glsa/glsa-201612-37.xml
+++ b/metadata/glsa/glsa-201612-37.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pixman</product>
   <announced>2016-12-13</announced>
-  <revised>2016-12-13: 2</revised>
+  <revised count="2">2016-12-13</revised>
   <bug>561526</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-38.xml b/metadata/glsa/glsa-201612-38.xml
index 7d78338462e3..536c19d3f08f 100644
--- a/metadata/glsa/glsa-201612-38.xml
+++ b/metadata/glsa/glsa-201612-38.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">botan</product>
   <announced>2016-12-13</announced>
-  <revised>2016-12-13: 2</revised>
+  <revised count="2">2016-12-13</revised>
   <bug>574034</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-39.xml b/metadata/glsa/glsa-201612-39.xml
index e4a5292a48a8..0de7128fb700 100644
--- a/metadata/glsa/glsa-201612-39.xml
+++ b/metadata/glsa/glsa-201612-39.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bash</product>
   <announced>2016-12-13</announced>
-  <revised>2016-12-13: 2</revised>
+  <revised count="2">2016-12-13</revised>
   <bug>594496</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-40.xml b/metadata/glsa/glsa-201612-40.xml
index d9d1eafd009e..10e35dbf6dbd 100644
--- a/metadata/glsa/glsa-201612-40.xml
+++ b/metadata/glsa/glsa-201612-40.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">squashfs-tools</product>
   <announced>2016-12-13</announced>
-  <revised>2016-12-14: 3</revised>
+  <revised count="3">2016-12-14</revised>
   <bug>427356</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-41.xml b/metadata/glsa/glsa-201612-41.xml
index d152691518cb..bd3ebba71b09 100644
--- a/metadata/glsa/glsa-201612-41.xml
+++ b/metadata/glsa/glsa-201612-41.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">webkit-gtk</product>
   <announced>2016-12-13</announced>
-  <revised>2016-12-13: 3</revised>
+  <revised count="3">2016-12-13</revised>
   <bug>570034</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-42.xml b/metadata/glsa/glsa-201612-42.xml
index 9dd2338a14b0..f8b02b1f6651 100644
--- a/metadata/glsa/glsa-201612-42.xml
+++ b/metadata/glsa/glsa-201612-42.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">zabbix</product>
   <announced>2016-12-13</announced>
-  <revised>2016-12-13: 1</revised>
+  <revised count="1">2016-12-13</revised>
   <bug>582536</bug>
   <bug>598762</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201612-43.xml b/metadata/glsa/glsa-201612-43.xml
index 571cd30ceb7d..7f9be8c6037d 100644
--- a/metadata/glsa/glsa-201612-43.xml
+++ b/metadata/glsa/glsa-201612-43.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nodejs</product>
   <announced>2016-12-13</announced>
-  <revised>2016-12-13: 1</revised>
+  <revised count="1">2016-12-13</revised>
   <bug>568900</bug>
   <bug>586084</bug>
   <bug>595256</bug>
diff --git a/metadata/glsa/glsa-201612-44.xml b/metadata/glsa/glsa-201612-44.xml
index bd983d9e40d0..a8462bee0db5 100644
--- a/metadata/glsa/glsa-201612-44.xml
+++ b/metadata/glsa/glsa-201612-44.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">roundcube</product>
   <announced>2016-12-24</announced>
-  <revised>2016-12-24: 1</revised>
+  <revised count="1">2016-12-24</revised>
   <bug>601410</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-45.xml b/metadata/glsa/glsa-201612-45.xml
index cdb19a99081f..b8f482328991 100644
--- a/metadata/glsa/glsa-201612-45.xml
+++ b/metadata/glsa/glsa-201612-45.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tor</product>
   <announced>2016-12-24</announced>
-  <revised>2016-12-24: 1</revised>
+  <revised count="1">2016-12-24</revised>
   <bug>591008</bug>
   <bug>597394</bug>
   <bug>597524</bug>
diff --git a/metadata/glsa/glsa-201612-46.xml b/metadata/glsa/glsa-201612-46.xml
index 584362007b6a..6e02cb85b6c1 100644
--- a/metadata/glsa/glsa-201612-46.xml
+++ b/metadata/glsa/glsa-201612-46.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xerces-c</product>
   <announced>2016-12-24</announced>
-  <revised>2016-12-24: 1</revised>
+  <revised count="1">2016-12-24</revised>
   <bug>575700</bug>
   <bug>584506</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201612-47.xml b/metadata/glsa/glsa-201612-47.xml
index 9c16ff51ea90..c7a6b9449fcf 100644
--- a/metadata/glsa/glsa-201612-47.xml
+++ b/metadata/glsa/glsa-201612-47.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">samba</product>
   <announced>2016-12-24</announced>
-  <revised>2016-12-24: 1</revised>
+  <revised count="1">2016-12-24</revised>
   <bug>568432</bug>
   <bug>578004</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201612-48.xml b/metadata/glsa/glsa-201612-48.xml
index d57ba28bce97..6b43fffcaa30 100644
--- a/metadata/glsa/glsa-201612-48.xml
+++ b/metadata/glsa/glsa-201612-48.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">firejail</product>
   <announced>2016-12-27</announced>
-  <revised>2016-12-27: 1</revised>
+  <revised count="1">2016-12-27</revised>
   <bug>601994</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-49.xml b/metadata/glsa/glsa-201612-49.xml
index 37e57f823d28..05f6ebd824e5 100644
--- a/metadata/glsa/glsa-201612-49.xml
+++ b/metadata/glsa/glsa-201612-49.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in mod_wsgi could lead to privilege escalation.</synopsis>
   <product type="ebuild">mod_wsgi</product>
   <announced>2016-12-30</announced>
-  <revised>2016-12-30: 1</revised>
+  <revised count="1">2016-12-30</revised>
   <bug>536270</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-50.xml b/metadata/glsa/glsa-201612-50.xml
index beb69dd13dd6..0cf829c57da3 100644
--- a/metadata/glsa/glsa-201612-50.xml
+++ b/metadata/glsa/glsa-201612-50.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openfire</product>
   <announced>2016-12-31</announced>
-  <revised>2016-12-31: 1</revised>
+  <revised count="1">2016-12-31</revised>
   <bug>603604</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-51.xml b/metadata/glsa/glsa-201612-51.xml
index 223aa72f98ef..17a8201f4ee5 100644
--- a/metadata/glsa/glsa-201612-51.xml
+++ b/metadata/glsa/glsa-201612-51.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in Icinga could lead to privilege escalation.</synopsis>
   <product type="ebuild">icinga</product>
   <announced>2016-12-31</announced>
-  <revised>2016-12-31: 1</revised>
+  <revised count="1">2016-12-31</revised>
   <bug>603534</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-52.xml b/metadata/glsa/glsa-201612-52.xml
index 4b82b26e0cea..90321a68340c 100644
--- a/metadata/glsa/glsa-201612-52.xml
+++ b/metadata/glsa/glsa-201612-52.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pillow</product>
   <announced>2016-12-31</announced>
-  <revised>2016-12-31: 1</revised>
+  <revised count="1">2016-12-31</revised>
   <bug>507982</bug>
   <bug>573958</bug>
   <bug>599608</bug>
diff --git a/metadata/glsa/glsa-201612-53.xml b/metadata/glsa/glsa-201612-53.xml
index f048b5ad56a1..a459b2f4ff8b 100644
--- a/metadata/glsa/glsa-201612-53.xml
+++ b/metadata/glsa/glsa-201612-53.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cyassl</product>
   <announced>2016-12-31</announced>
-  <revised>2016-12-31: 1</revised>
+  <revised count="1">2016-12-31</revised>
   <bug>507418</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-54.xml b/metadata/glsa/glsa-201612-54.xml
index 938744a39807..f6d3d7b96c68 100644
--- a/metadata/glsa/glsa-201612-54.xml
+++ b/metadata/glsa/glsa-201612-54.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chicken</product>
   <announced>2016-12-31</announced>
-  <revised>2016-12-31: 1</revised>
+  <revised count="1">2016-12-31</revised>
   <bug>467966</bug>
   <bug>486350</bug>
   <bug>510712</bug>
diff --git a/metadata/glsa/glsa-201612-55.xml b/metadata/glsa/glsa-201612-55.xml
index d2050d6de37b..7cdd17a73e45 100644
--- a/metadata/glsa/glsa-201612-55.xml
+++ b/metadata/glsa/glsa-201612-55.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libjpeg-turbo</product>
   <announced>2016-12-31</announced>
-  <revised>2016-12-31: 1</revised>
+  <revised count="1">2016-12-31</revised>
   <bug>585782</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201612-56.xml b/metadata/glsa/glsa-201612-56.xml
index ee20e9bbfee3..731137fb51ba 100644
--- a/metadata/glsa/glsa-201612-56.xml
+++ b/metadata/glsa/glsa-201612-56.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xen</product>
   <announced>2016-12-31</announced>
-  <revised>2017-01-03: 2</revised>
+  <revised count="2">2017-01-03</revised>
   <bug>600382</bug>
   <bug>600662</bug>
   <bug>601248</bug>
diff --git a/metadata/glsa/glsa-201701-01.xml b/metadata/glsa/glsa-201701-01.xml
index 185bab892839..35d3eababc52 100644
--- a/metadata/glsa/glsa-201701-01.xml
+++ b/metadata/glsa/glsa-201701-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mysql, mariadb</product>
   <announced>2017-01-01</announced>
-  <revised>2017-01-01: 2</revised>
+  <revised count="2">2017-01-01</revised>
   <bug>593584</bug>
   <bug>593608</bug>
   <bug>593614</bug>
diff --git a/metadata/glsa/glsa-201701-02.xml b/metadata/glsa/glsa-201701-02.xml
index d06a75886a42..35de6fc88b65 100644
--- a/metadata/glsa/glsa-201701-02.xml
+++ b/metadata/glsa/glsa-201701-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bash</product>
   <announced>2017-01-01</announced>
-  <revised>2017-01-01: 1</revised>
+  <revised count="1">2017-01-01</revised>
   <bug>595268</bug>
   <bug>600174</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201701-03.xml b/metadata/glsa/glsa-201701-03.xml
index bf039ace6164..17a9c833f1cf 100644
--- a/metadata/glsa/glsa-201701-03.xml
+++ b/metadata/glsa/glsa-201701-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libarchive</product>
   <announced>2017-01-01</announced>
-  <revised>2017-01-01: 1</revised>
+  <revised count="1">2017-01-01</revised>
   <bug>548110</bug>
   <bug>552646</bug>
   <bug>582526</bug>
diff --git a/metadata/glsa/glsa-201701-04.xml b/metadata/glsa/glsa-201701-04.xml
index c552a2d5d5e2..1c0f8545941b 100644
--- a/metadata/glsa/glsa-201701-04.xml
+++ b/metadata/glsa/glsa-201701-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mutt</product>
   <announced>2017-01-01</announced>
-  <revised>2017-01-01: 1</revised>
+  <revised count="1">2017-01-01</revised>
   <bug>530842</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-05.xml b/metadata/glsa/glsa-201701-05.xml
index bcba592f9e1c..86c9150d5b4c 100644
--- a/metadata/glsa/glsa-201701-05.xml
+++ b/metadata/glsa/glsa-201701-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">busybox</product>
   <announced>2017-01-01</announced>
-  <revised>2017-01-01: 1</revised>
+  <revised count="1">2017-01-01</revised>
   <bug>590478</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-06.xml b/metadata/glsa/glsa-201701-06.xml
index 944068757dca..906cf6a707fb 100644
--- a/metadata/glsa/glsa-201701-06.xml
+++ b/metadata/glsa/glsa-201701-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">e2fsprogs</product>
   <announced>2017-01-01</announced>
-  <revised>2017-01-01: 1</revised>
+  <revised count="1">2017-01-01</revised>
   <bug>538930</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-07.xml b/metadata/glsa/glsa-201701-07.xml
index a303cddb6150..82cb51f2d41e 100644
--- a/metadata/glsa/glsa-201701-07.xml
+++ b/metadata/glsa/glsa-201701-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openvswitch</product>
   <announced>2017-01-01</announced>
-  <revised>2017-01-01: 2</revised>
+  <revised count="2">2017-01-01</revised>
   <bug>577568</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-08.xml b/metadata/glsa/glsa-201701-08.xml
index 192d507c4f5b..bb198141e59d 100644
--- a/metadata/glsa/glsa-201701-08.xml
+++ b/metadata/glsa/glsa-201701-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">w3m</product>
   <announced>2017-01-01</announced>
-  <revised>2017-01-01: 1</revised>
+  <revised count="1">2017-01-01</revised>
   <bug>579312</bug>
   <bug>600176</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201701-09.xml b/metadata/glsa/glsa-201701-09.xml
index bb7a61f74c3e..bd878eeca82c 100644
--- a/metadata/glsa/glsa-201701-09.xml
+++ b/metadata/glsa/glsa-201701-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xdg-utils</product>
   <announced>2017-01-01</announced>
-  <revised>2017-01-01: 1</revised>
+  <revised count="1">2017-01-01</revised>
   <bug>472888</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-10.xml b/metadata/glsa/glsa-201701-10.xml
index 8920b83578cc..7805cc14beb4 100644
--- a/metadata/glsa/glsa-201701-10.xml
+++ b/metadata/glsa/glsa-201701-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libotr, pidgin-otr</product>
   <announced>2017-01-02</announced>
-  <revised>2017-01-02: 1</revised>
+  <revised count="1">2017-01-02</revised>
   <bug>576914</bug>
   <bug>576916</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201701-11.xml b/metadata/glsa/glsa-201701-11.xml
index 3159e10d2d16..09dc2a24cb38 100644
--- a/metadata/glsa/glsa-201701-11.xml
+++ b/metadata/glsa/glsa-201701-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">musl</product>
   <announced>2017-01-02</announced>
-  <revised>2017-01-02: 1</revised>
+  <revised count="1">2017-01-02</revised>
   <bug>597498</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-12.xml b/metadata/glsa/glsa-201701-12.xml
index 24dc452ef6ce..baccd3426c72 100644
--- a/metadata/glsa/glsa-201701-12.xml
+++ b/metadata/glsa/glsa-201701-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">memcached</product>
   <announced>2017-01-02</announced>
-  <revised>2017-01-02: 1</revised>
+  <revised count="1">2017-01-02</revised>
   <bug>598836</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-13.xml b/metadata/glsa/glsa-201701-13.xml
index 646eb834f4e5..d9d8ae425aa9 100644
--- a/metadata/glsa/glsa-201701-13.xml
+++ b/metadata/glsa/glsa-201701-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">hdf5</product>
   <announced>2017-01-02</announced>
-  <revised>2017-01-02: 1</revised>
+  <revised count="1">2017-01-02</revised>
   <bug>601404</bug>
   <bug>601408</bug>
   <bug>601414</bug>
diff --git a/metadata/glsa/glsa-201701-14.xml b/metadata/glsa/glsa-201701-14.xml
index 0fed1ef14bda..0ef110bafb99 100644
--- a/metadata/glsa/glsa-201701-14.xml
+++ b/metadata/glsa/glsa-201701-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">lzo</product>
   <announced>2017-01-02</announced>
-  <revised>2017-01-02: 1</revised>
+  <revised count="1">2017-01-02</revised>
   <bug>515238</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-15.xml b/metadata/glsa/glsa-201701-15.xml
index 0d6e503a530d..5370da49cb04 100644
--- a/metadata/glsa/glsa-201701-15.xml
+++ b/metadata/glsa/glsa-201701-15.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">firefox, thunderbird</product>
   <announced>2017-01-03</announced>
-  <revised>2017-01-04: 2</revised>
+  <revised count="2">2017-01-04</revised>
   <bug>581326</bug>
   <bug>590330</bug>
   <bug>594616</bug>
diff --git a/metadata/glsa/glsa-201701-16.xml b/metadata/glsa/glsa-201701-16.xml
index 446048c75af4..b77224b5cb42 100644
--- a/metadata/glsa/glsa-201701-16.xml
+++ b/metadata/glsa/glsa-201701-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tiff</product>
   <announced>2017-01-09</announced>
-  <revised>2017-01-09: 2</revised>
+  <revised count="2">2017-01-09</revised>
   <bug>484542</bug>
   <bug>534108</bug>
   <bug>538318</bug>
diff --git a/metadata/glsa/glsa-201701-17.xml b/metadata/glsa/glsa-201701-17.xml
index 7393d5c83dd1..d06ac3aac8ac 100644
--- a/metadata/glsa/glsa-201701-17.xml
+++ b/metadata/glsa/glsa-201701-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2017-01-10</announced>
-  <revised>2017-01-10: 1</revised>
+  <revised count="1">2017-01-10</revised>
   <bug>602546</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-18.xml b/metadata/glsa/glsa-201701-18.xml
index 41eb8081e40b..4f558ed96312 100644
--- a/metadata/glsa/glsa-201701-18.xml
+++ b/metadata/glsa/glsa-201701-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">python</product>
   <announced>2017-01-10</announced>
-  <revised>2017-02-24: 2</revised>
+  <revised count="2">2017-02-24</revised>
   <bug>531002</bug>
   <bug>585910</bug>
   <bug>585946</bug>
diff --git a/metadata/glsa/glsa-201701-19.xml b/metadata/glsa/glsa-201701-19.xml
index 7e2eba8f7391..3fa8ee00af1e 100644
--- a/metadata/glsa/glsa-201701-19.xml
+++ b/metadata/glsa/glsa-201701-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ntfs3g</product>
   <announced>2017-01-11</announced>
-  <revised>2017-01-11: 1</revised>
+  <revised count="1">2017-01-11</revised>
   <bug>550970</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-20.xml b/metadata/glsa/glsa-201701-20.xml
index bde89f1982d5..c20d60be2f82 100644
--- a/metadata/glsa/glsa-201701-20.xml
+++ b/metadata/glsa/glsa-201701-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dbus</product>
   <announced>2017-01-11</announced>
-  <revised>2017-01-11: 1</revised>
+  <revised count="1">2017-01-11</revised>
   <bug>596772</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-21.xml b/metadata/glsa/glsa-201701-21.xml
index 5b20a7f38653..8c62edcc681e 100644
--- a/metadata/glsa/glsa-201701-21.xml
+++ b/metadata/glsa/glsa-201701-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">expat</product>
   <announced>2017-01-11</announced>
-  <revised>2017-01-11: 1</revised>
+  <revised count="1">2017-01-11</revised>
   <bug>458742</bug>
   <bug>555642</bug>
   <bug>577928</bug>
diff --git a/metadata/glsa/glsa-201701-22.xml b/metadata/glsa/glsa-201701-22.xml
index 4614faf3eedf..150ddf5af5be 100644
--- a/metadata/glsa/glsa-201701-22.xml
+++ b/metadata/glsa/glsa-201701-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nginx</product>
   <announced>2017-01-11</announced>
-  <revised>2017-01-11: 1</revised>
+  <revised count="1">2017-01-11</revised>
   <bug>605008</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-23.xml b/metadata/glsa/glsa-201701-23.xml
index c0802a92b078..fcfad15126b6 100644
--- a/metadata/glsa/glsa-201701-23.xml
+++ b/metadata/glsa/glsa-201701-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">botan</product>
   <announced>2017-01-11</announced>
-  <revised>2017-01-11: 1</revised>
+  <revised count="1">2017-01-11</revised>
   <bug>581324</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-24.xml b/metadata/glsa/glsa-201701-24.xml
index 8288b2826bd9..922c053c1fc7 100644
--- a/metadata/glsa/glsa-201701-24.xml
+++ b/metadata/glsa/glsa-201701-24.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pgbouncer</product>
   <announced>2017-01-11</announced>
-  <revised>2017-01-11: 1</revised>
+  <revised count="1">2017-01-11</revised>
   <bug>550124</bug>
   <bug>600184</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201701-25.xml b/metadata/glsa/glsa-201701-25.xml
index c5ab53e691e6..e0badeacf665 100644
--- a/metadata/glsa/glsa-201701-25.xml
+++ b/metadata/glsa/glsa-201701-25.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">phpBB</product>
   <announced>2017-01-11</announced>
-  <revised>2017-01-11: 1</revised>
+  <revised count="1">2017-01-11</revised>
   <bug>538360</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-26.xml b/metadata/glsa/glsa-201701-26.xml
index 616ef6d13471..8004eafa664f 100644
--- a/metadata/glsa/glsa-201701-26.xml
+++ b/metadata/glsa/glsa-201701-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bind</product>
   <announced>2017-01-11</announced>
-  <revised>2017-01-11: 1</revised>
+  <revised count="1">2017-01-11</revised>
   <bug>598750</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-27.xml b/metadata/glsa/glsa-201701-27.xml
index f3cbbe48f3ca..6ad0a2d1f143 100644
--- a/metadata/glsa/glsa-201701-27.xml
+++ b/metadata/glsa/glsa-201701-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">7zip</product>
   <announced>2017-01-11</announced>
-  <revised>2017-01-11: 1</revised>
+  <revised count="1">2017-01-11</revised>
   <bug>582832</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-28.xml b/metadata/glsa/glsa-201701-28.xml
index df6c758b977b..dcd73edbaaec 100644
--- a/metadata/glsa/glsa-201701-28.xml
+++ b/metadata/glsa/glsa-201701-28.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">c-ares</product>
   <announced>2017-01-11</announced>
-  <revised>2017-01-11: 1</revised>
+  <revised count="1">2017-01-11</revised>
   <bug>595536</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-29.xml b/metadata/glsa/glsa-201701-29.xml
index aa84589e7f16..43a5c34c21ea 100644
--- a/metadata/glsa/glsa-201701-29.xml
+++ b/metadata/glsa/glsa-201701-29.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">vim, gvim</product>
   <announced>2017-01-11</announced>
-  <revised>2017-01-11: 1</revised>
+  <revised count="1">2017-01-11</revised>
   <bug>600650</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-30.xml b/metadata/glsa/glsa-201701-30.xml
index 9d9da36aba6b..afb52bb3a8bf 100644
--- a/metadata/glsa/glsa-201701-30.xml
+++ b/metadata/glsa/glsa-201701-30.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">vzctl</product>
   <announced>2017-01-11</announced>
-  <revised>2017-01-11: 1</revised>
+  <revised count="1">2017-01-11</revised>
   <bug>560522</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-31.xml b/metadata/glsa/glsa-201701-31.xml
index dff98ff152e6..57860d847a23 100644
--- a/metadata/glsa/glsa-201701-31.xml
+++ b/metadata/glsa/glsa-201701-31.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">flex</product>
   <announced>2017-01-11</announced>
-  <revised>2017-01-11: 1</revised>
+  <revised count="1">2017-01-11</revised>
   <bug>589820</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-32.xml b/metadata/glsa/glsa-201701-32.xml
index 5e59bc4e9102..c752f69ed720 100644
--- a/metadata/glsa/glsa-201701-32.xml
+++ b/metadata/glsa/glsa-201701-32.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">phpMyAdmin</product>
   <announced>2017-01-11</announced>
-  <revised>2017-01-11: 1</revised>
+  <revised count="1">2017-01-11</revised>
   <bug>586964</bug>
   <bug>593582</bug>
   <bug>600814</bug>
diff --git a/metadata/glsa/glsa-201701-33.xml b/metadata/glsa/glsa-201701-33.xml
index a481c57c883a..c934ec19ed21 100644
--- a/metadata/glsa/glsa-201701-33.xml
+++ b/metadata/glsa/glsa-201701-33.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">postgres</product>
   <announced>2017-01-12</announced>
-  <revised>2017-01-12: 4</revised>
+  <revised count="4">2017-01-12</revised>
   <bug>562586</bug>
   <bug>574456</bug>
   <bug>602130</bug>
diff --git a/metadata/glsa/glsa-201701-34.xml b/metadata/glsa/glsa-201701-34.xml
index 8a0167229212..59c71593f9c1 100644
--- a/metadata/glsa/glsa-201701-34.xml
+++ b/metadata/glsa/glsa-201701-34.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in runC could lead to privilege escalation.</synopsis>
   <product type="ebuild">runc</product>
   <announced>2017-01-12</announced>
-  <revised>2017-01-12: 1</revised>
+  <revised count="1">2017-01-12</revised>
   <bug>605378</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-35.xml b/metadata/glsa/glsa-201701-35.xml
index c1a46851ee92..3f6a9fb89d41 100644
--- a/metadata/glsa/glsa-201701-35.xml
+++ b/metadata/glsa/glsa-201701-35.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">seamonkey</product>
   <announced>2017-01-13</announced>
-  <revised>2017-01-13: 3</revised>
+  <revised count="3">2017-01-13</revised>
   <bug>539242</bug>
   <bug>541506</bug>
   <bug>574968</bug>
diff --git a/metadata/glsa/glsa-201701-36.xml b/metadata/glsa/glsa-201701-36.xml
index 53a4e2e9b61f..5ff07a59562d 100644
--- a/metadata/glsa/glsa-201701-36.xml
+++ b/metadata/glsa/glsa-201701-36.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">apache</product>
   <announced>2017-01-15</announced>
-  <revised>2017-01-17: 02</revised>
+  <revised count="02">2017-01-17</revised>
   <bug>529130</bug>
   <bug>589226</bug>
   <bug>601736</bug>
diff --git a/metadata/glsa/glsa-201701-37.xml b/metadata/glsa/glsa-201701-37.xml
index 7dd4606942c2..fd9f8eedafa1 100644
--- a/metadata/glsa/glsa-201701-37.xml
+++ b/metadata/glsa/glsa-201701-37.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libxml2</product>
   <announced>2017-01-16</announced>
-  <revised>2017-01-16: 01</revised>
+  <revised count="01">2017-01-16</revised>
   <bug>564776</bug>
   <bug>566374</bug>
   <bug>572878</bug>
diff --git a/metadata/glsa/glsa-201701-38.xml b/metadata/glsa/glsa-201701-38.xml
index 3a497e8de45c..f3b07b313147 100644
--- a/metadata/glsa/glsa-201701-38.xml
+++ b/metadata/glsa/glsa-201701-38.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pidgin</product>
   <announced>2017-01-17</announced>
-  <revised>2017-01-17: 01</revised>
+  <revised count="01">2017-01-17</revised>
   <bug>586698</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-39.xml b/metadata/glsa/glsa-201701-39.xml
index 8300800022f9..c38822187e7d 100644
--- a/metadata/glsa/glsa-201701-39.xml
+++ b/metadata/glsa/glsa-201701-39.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">vlc</product>
   <announced>2017-01-17</announced>
-  <revised>2017-01-17: 01</revised>
+  <revised count="01">2017-01-17</revised>
   <bug>584510</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-40.xml b/metadata/glsa/glsa-201701-40.xml
index eb502930f09b..0b3807cbf402 100644
--- a/metadata/glsa/glsa-201701-40.xml
+++ b/metadata/glsa/glsa-201701-40.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xdelta</product>
   <announced>2017-01-17</announced>
-  <revised>2017-01-17: 01</revised>
+  <revised count="01">2017-01-17</revised>
   <bug>574408</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-41.xml b/metadata/glsa/glsa-201701-41.xml
index 0a9ddd6a3254..7891231bfb79 100644
--- a/metadata/glsa/glsa-201701-41.xml
+++ b/metadata/glsa/glsa-201701-41.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">miniupnpc</product>
   <announced>2017-01-17</announced>
-  <revised>2017-01-17: 01</revised>
+  <revised count="01">2017-01-17</revised>
   <bug>512666</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-42.xml b/metadata/glsa/glsa-201701-42.xml
index 2f337fd45ef0..d549793a079b 100644
--- a/metadata/glsa/glsa-201701-42.xml
+++ b/metadata/glsa/glsa-201701-42.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">file</product>
   <announced>2017-01-17</announced>
-  <revised>2017-01-17: 01</revised>
+  <revised count="01">2017-01-17</revised>
   <bug>526544</bug>
   <bug>538660</bug>
   <bug>539106</bug>
diff --git a/metadata/glsa/glsa-201701-43.xml b/metadata/glsa/glsa-201701-43.xml
index 75c5d8b2cb55..85e0d28f1602 100644
--- a/metadata/glsa/glsa-201701-43.xml
+++ b/metadata/glsa/glsa-201701-43.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">icedtea, java</product>
   <announced>2017-01-19</announced>
-  <revised>2017-01-19: 01</revised>
+  <revised count="01">2017-01-19</revised>
   <bug>590590</bug>
   <bug>600224</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201701-44.xml b/metadata/glsa/glsa-201701-44.xml
index 653d4ce77347..e87cef4dfdda 100644
--- a/metadata/glsa/glsa-201701-44.xml
+++ b/metadata/glsa/glsa-201701-44.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">cvs</product>
   <announced>2017-01-19</announced>
-  <revised>2017-01-19: 01</revised>
+  <revised count="01">2017-01-19</revised>
   <bug>402593</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-45.xml b/metadata/glsa/glsa-201701-45.xml
index 8282b5428609..1b450aae06ac 100644
--- a/metadata/glsa/glsa-201701-45.xml
+++ b/metadata/glsa/glsa-201701-45.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">irssi</product>
   <announced>2017-01-19</announced>
-  <revised>2017-01-19: 01</revised>
+  <revised count="01">2017-01-19</revised>
   <bug>604772</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-46.xml b/metadata/glsa/glsa-201701-46.xml
index 152bd8941e27..53f0f0798b62 100644
--- a/metadata/glsa/glsa-201701-46.xml
+++ b/metadata/glsa/glsa-201701-46.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mozilla, nss</product>
   <announced>2017-01-19</announced>
-  <revised>2017-01-19: 01</revised>
+  <revised count="01">2017-01-19</revised>
   <bug>550288</bug>
   <bug>571086</bug>
   <bug>604916</bug>
diff --git a/metadata/glsa/glsa-201701-47.xml b/metadata/glsa/glsa-201701-47.xml
index 395f6320f525..bf2b45a0bb4d 100644
--- a/metadata/glsa/glsa-201701-47.xml
+++ b/metadata/glsa/glsa-201701-47.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">curl</product>
   <announced>2017-01-19</announced>
-  <revised>2017-01-19: 01</revised>
+  <revised count="01">2017-01-19</revised>
   <bug>536014</bug>
   <bug>573102</bug>
   <bug>583394</bug>
diff --git a/metadata/glsa/glsa-201701-48.xml b/metadata/glsa/glsa-201701-48.xml
index c96b85b88927..1f2f527e7615 100644
--- a/metadata/glsa/glsa-201701-48.xml
+++ b/metadata/glsa/glsa-201701-48.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">quagga</product>
   <announced>2017-01-21</announced>
-  <revised>2017-01-21: 1</revised>
+  <revised count="1">2017-01-21</revised>
   <bug>581526</bug>
   <bug>597410</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201701-49.xml b/metadata/glsa/glsa-201701-49.xml
index b5749bf9c458..3951728a015c 100644
--- a/metadata/glsa/glsa-201701-49.xml
+++ b/metadata/glsa/glsa-201701-49.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">qemu</product>
   <announced>2017-01-23</announced>
-  <revised>2017-01-23: 1</revised>
+  <revised count="1">2017-01-23</revised>
   <bug>598330</bug>
   <bug>601450</bug>
   <bug>601824</bug>
diff --git a/metadata/glsa/glsa-201701-50.xml b/metadata/glsa/glsa-201701-50.xml
index 0c461ad37df4..69f904761062 100644
--- a/metadata/glsa/glsa-201701-50.xml
+++ b/metadata/glsa/glsa-201701-50.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ppp</product>
   <announced>2017-01-23</announced>
-  <revised>2017-01-23: 1</revised>
+  <revised count="1">2017-01-23</revised>
   <bug>546554</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-51.xml b/metadata/glsa/glsa-201701-51.xml
index 3b4ca79b38f9..ec13c02e1614 100644
--- a/metadata/glsa/glsa-201701-51.xml
+++ b/metadata/glsa/glsa-201701-51.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dbd,mysql</product>
   <announced>2017-01-23</announced>
-  <revised>2017-01-23: 2</revised>
+  <revised count="2">2017-01-23</revised>
   <bug>589818</bug>
   <bug>596424</bug>
   <bug>600180</bug>
diff --git a/metadata/glsa/glsa-201701-52.xml b/metadata/glsa/glsa-201701-52.xml
index 91eede396792..9a8a2832fe2e 100644
--- a/metadata/glsa/glsa-201701-52.xml
+++ b/metadata/glsa/glsa-201701-52.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libupnp</product>
   <announced>2017-01-23</announced>
-  <revised>2017-01-23: 1</revised>
+  <revised count="1">2017-01-23</revised>
   <bug>589136</bug>
   <bug>598202</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201701-53.xml b/metadata/glsa/glsa-201701-53.xml
index 85a4c30953f5..e56844dd4e5c 100644
--- a/metadata/glsa/glsa-201701-53.xml
+++ b/metadata/glsa/glsa-201701-53.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">lua</product>
   <announced>2017-01-23</announced>
-  <revised>2017-01-23: 1</revised>
+  <revised count="1">2017-01-23</revised>
   <bug>520480</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-54.xml b/metadata/glsa/glsa-201701-54.xml
index 1cb8d785feff..b4edd4cab9be 100644
--- a/metadata/glsa/glsa-201701-54.xml
+++ b/metadata/glsa/glsa-201701-54.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dcraw</product>
   <announced>2017-01-23</announced>
-  <revised>2017-01-23: 1</revised>
+  <revised count="1">2017-01-23</revised>
   <bug>549336</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-55.xml b/metadata/glsa/glsa-201701-55.xml
index f5669454c884..6051775e456c 100644
--- a/metadata/glsa/glsa-201701-55.xml
+++ b/metadata/glsa/glsa-201701-55.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">directfb</product>
   <announced>2017-01-23</announced>
-  <revised>2017-01-23: 1</revised>
+  <revised count="1">2017-01-23</revised>
   <bug>510472</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-56.xml b/metadata/glsa/glsa-201701-56.xml
index 3cd908a397b6..c2b5d37e71d0 100644
--- a/metadata/glsa/glsa-201701-56.xml
+++ b/metadata/glsa/glsa-201701-56.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">zlib</product>
   <announced>2017-01-23</announced>
-  <revised>2017-01-23: 1</revised>
+  <revised count="1">2017-01-23</revised>
   <bug>601828</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-57.xml b/metadata/glsa/glsa-201701-57.xml
index 3495ac7874b9..60f54bf99999 100644
--- a/metadata/glsa/glsa-201701-57.xml
+++ b/metadata/glsa/glsa-201701-57.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">t1lib</product>
   <announced>2017-01-23</announced>
-  <revised>2017-01-23: 1</revised>
+  <revised count="1">2017-01-23</revised>
   <bug>358667</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-58.xml b/metadata/glsa/glsa-201701-58.xml
index d0982f2b915b..a435e49357e1 100644
--- a/metadata/glsa/glsa-201701-58.xml
+++ b/metadata/glsa/glsa-201701-58.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">icu</product>
   <announced>2017-01-24</announced>
-  <revised>2017-01-24: 1</revised>
+  <revised count="1">2017-01-24</revised>
   <bug>589814</bug>
   <bug>594494</bug>
   <bug>601396</bug>
diff --git a/metadata/glsa/glsa-201701-59.xml b/metadata/glsa/glsa-201701-59.xml
index 4e6646d9a988..e95c7ab9ffb5 100644
--- a/metadata/glsa/glsa-201701-59.xml
+++ b/metadata/glsa/glsa-201701-59.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adodb</product>
   <announced>2017-01-24</announced>
-  <revised>2017-01-24: 1</revised>
+  <revised count="1">2017-01-24</revised>
   <bug>604714</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-60.xml b/metadata/glsa/glsa-201701-60.xml
index 847905cc23ec..4614c1f70fa9 100644
--- a/metadata/glsa/glsa-201701-60.xml
+++ b/metadata/glsa/glsa-201701-60.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libraw</product>
   <announced>2017-01-24</announced>
-  <revised>2017-04-30: 2</revised>
+  <revised count="2">2017-04-30</revised>
   <bug>549338</bug>
   <bug>567254</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201701-61.xml b/metadata/glsa/glsa-201701-61.xml
index d97ed7578804..968bb9830dc0 100644
--- a/metadata/glsa/glsa-201701-61.xml
+++ b/metadata/glsa/glsa-201701-61.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">webp</product>
   <announced>2017-01-24</announced>
-  <revised>2017-01-24: 3</revised>
+  <revised count="3">2017-01-24</revised>
   <bug>598208</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-62.xml b/metadata/glsa/glsa-201701-62.xml
index 2bfdf8cf60e7..929967e87dee 100644
--- a/metadata/glsa/glsa-201701-62.xml
+++ b/metadata/glsa/glsa-201701-62.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">firejail</product>
   <announced>2017-01-24</announced>
-  <revised>2017-01-31: 2</revised>
+  <revised count="2">2017-01-31</revised>
   <bug>604758</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-63.xml b/metadata/glsa/glsa-201701-63.xml
index f193a72e63cf..9232730e0422 100644
--- a/metadata/glsa/glsa-201701-63.xml
+++ b/metadata/glsa/glsa-201701-63.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">graphite</product>
   <announced>2017-01-24</announced>
-  <revised>2017-01-24: 1</revised>
+  <revised count="1">2017-01-24</revised>
   <bug>574276</bug>
   <bug>576864</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201701-64.xml b/metadata/glsa/glsa-201701-64.xml
index 8a53cfd87a9e..571344272467 100644
--- a/metadata/glsa/glsa-201701-64.xml
+++ b/metadata/glsa/glsa-201701-64.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xorg-server</product>
   <announced>2017-01-25</announced>
-  <revised>2017-01-25: 1</revised>
+  <revised count="1">2017-01-25</revised>
   <bug>493294</bug>
   <bug>548002</bug>
   <bug>551680</bug>
diff --git a/metadata/glsa/glsa-201701-65.xml b/metadata/glsa/glsa-201701-65.xml
index 713317d4b9d8..bb5755927603 100644
--- a/metadata/glsa/glsa-201701-65.xml
+++ b/metadata/glsa/glsa-201701-65.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">jre,jdk,oracle</product>
   <announced>2017-01-25</announced>
-  <revised>2017-01-25: 1</revised>
+  <revised count="1">2017-01-25</revised>
   <bug>606118</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-66.xml b/metadata/glsa/glsa-201701-66.xml
index 82067959fd3d..d2abbb68b113 100644
--- a/metadata/glsa/glsa-201701-66.xml
+++ b/metadata/glsa/glsa-201701-66.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2017-01-29</announced>
-  <revised>2017-01-29: 1</revised>
+  <revised count="1">2017-01-29</revised>
   <bug>607276</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-67.xml b/metadata/glsa/glsa-201701-67.xml
index 291841a5a2ed..9ae27ec661ce 100644
--- a/metadata/glsa/glsa-201701-67.xml
+++ b/metadata/glsa/glsa-201701-67.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">a2ps</product>
   <announced>2017-01-29</announced>
-  <revised>2017-01-29: 1</revised>
+  <revised count="1">2017-01-29</revised>
   <bug>506352</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-68.xml b/metadata/glsa/glsa-201701-68.xml
index 7dc063032a4f..b3fbd87b2fbd 100644
--- a/metadata/glsa/glsa-201701-68.xml
+++ b/metadata/glsa/glsa-201701-68.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">freeimage</product>
   <announced>2017-01-29</announced>
-  <revised>2017-01-29: 1</revised>
+  <revised count="1">2017-01-29</revised>
   <bug>559006</bug>
   <bug>596350</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201701-69.xml b/metadata/glsa/glsa-201701-69.xml
index 3dd82eaeccc6..d7b22b3457ea 100644
--- a/metadata/glsa/glsa-201701-69.xml
+++ b/metadata/glsa/glsa-201701-69.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ark</product>
   <announced>2017-01-29</announced>
-  <revised>2017-01-29: 1</revised>
+  <revised count="1">2017-01-29</revised>
   <bug>604846</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-70.xml b/metadata/glsa/glsa-201701-70.xml
index 8ffcf0f786dd..4d198253f5e1 100644
--- a/metadata/glsa/glsa-201701-70.xml
+++ b/metadata/glsa/glsa-201701-70.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">firewalld</product>
   <announced>2017-01-29</announced>
-  <revised>2017-01-29: 1</revised>
+  <revised count="1">2017-01-29</revised>
   <bug>591458</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-71.xml b/metadata/glsa/glsa-201701-71.xml
index a758c35b7c54..fa4bf6dcdf19 100644
--- a/metadata/glsa/glsa-201701-71.xml
+++ b/metadata/glsa/glsa-201701-71.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ffmpeg</product>
   <announced>2017-01-29</announced>
-  <revised>2017-01-29: 1</revised>
+  <revised count="1">2017-01-29</revised>
   <bug>596760</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-72.xml b/metadata/glsa/glsa-201701-72.xml
index 521693e0f301..3eaad2a1d131 100644
--- a/metadata/glsa/glsa-201701-72.xml
+++ b/metadata/glsa/glsa-201701-72.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libxpm</product>
   <announced>2017-01-29</announced>
-  <revised>2017-01-29: 1</revised>
+  <revised count="1">2017-01-29</revised>
   <bug>602782</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-73.xml b/metadata/glsa/glsa-201701-73.xml
index 2cf658257c44..4829edd6b258 100644
--- a/metadata/glsa/glsa-201701-73.xml
+++ b/metadata/glsa/glsa-201701-73.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">squashfs</product>
   <announced>2017-01-29</announced>
-  <revised>2017-01-29: 1</revised>
+  <revised count="1">2017-01-29</revised>
   <bug>552484</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-74.xml b/metadata/glsa/glsa-201701-74.xml
index c72bc9ff83ef..1e78425acae3 100644
--- a/metadata/glsa/glsa-201701-74.xml
+++ b/metadata/glsa/glsa-201701-74.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libpng</product>
   <announced>2017-01-29</announced>
-  <revised>2017-01-29: 1</revised>
+  <revised count="1">2017-01-29</revised>
   <bug>604082</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-75.xml b/metadata/glsa/glsa-201701-75.xml
index 2d59364ef0cc..c2cff29a36e5 100644
--- a/metadata/glsa/glsa-201701-75.xml
+++ b/metadata/glsa/glsa-201701-75.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">perl</product>
   <announced>2017-01-29</announced>
-  <revised>2017-06-01: 2</revised>
+  <revised count="2">2017-06-01</revised>
   <bug>580612</bug>
   <bug>588592</bug>
   <bug>589680</bug>
diff --git a/metadata/glsa/glsa-201701-76.xml b/metadata/glsa/glsa-201701-76.xml
index ebe27219f423..70f5a763d6bd 100644
--- a/metadata/glsa/glsa-201701-76.xml
+++ b/metadata/glsa/glsa-201701-76.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">harfbuzz</product>
   <announced>2017-01-31</announced>
-  <revised>2017-01-31: 1</revised>
+  <revised count="1">2017-01-31</revised>
   <bug>572856</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201701-77.xml b/metadata/glsa/glsa-201701-77.xml
index e70f0e6f1ee5..7bb75b8c76d5 100644
--- a/metadata/glsa/glsa-201701-77.xml
+++ b/metadata/glsa/glsa-201701-77.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ansible</product>
   <announced>2017-01-31</announced>
-  <revised>2017-01-31: 1</revised>
+  <revised count="1">2017-01-31</revised>
   <bug>605342</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-01.xml b/metadata/glsa/glsa-201702-01.xml
index 574a1ba75ed7..c3c155acac87 100644
--- a/metadata/glsa/glsa-201702-01.xml
+++ b/metadata/glsa/glsa-201702-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">PCSC-Lite</product>
   <announced>2017-02-01</announced>
-  <revised>2017-02-01: 1</revised>
+  <revised count="1">2017-02-01</revised>
   <bug>604574</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-02.xml b/metadata/glsa/glsa-201702-02.xml
index 6914b0caaea8..0850b4ed655e 100644
--- a/metadata/glsa/glsa-201702-02.xml
+++ b/metadata/glsa/glsa-201702-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">rtmpdump</product>
   <announced>2017-02-06</announced>
-  <revised>2017-02-06: 1</revised>
+  <revised count="1">2017-02-06</revised>
   <bug>570242</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-03.xml b/metadata/glsa/glsa-201702-03.xml
index a2e01995058a..443e7dc30829 100644
--- a/metadata/glsa/glsa-201702-03.xml
+++ b/metadata/glsa/glsa-201702-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">firejail</product>
   <announced>2017-02-09</announced>
-  <revised>2017-02-09: 1</revised>
+  <revised count="1">2017-02-09</revised>
   <bug>607382</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-04.xml b/metadata/glsa/glsa-201702-04.xml
index 47918d9346b8..64ef714f129d 100644
--- a/metadata/glsa/glsa-201702-04.xml
+++ b/metadata/glsa/glsa-201702-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gnutls</product>
   <announced>2017-02-10</announced>
-  <revised>2017-02-10: 1</revised>
+  <revised count="1">2017-02-10</revised>
   <bug>605238</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-05.xml b/metadata/glsa/glsa-201702-05.xml
index fbb7d90b41c6..e02d7708145d 100644
--- a/metadata/glsa/glsa-201702-05.xml
+++ b/metadata/glsa/glsa-201702-05.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in Lsyncd allows execution of arbitrary code.</synopsis>
   <product type="ebuild">lsyncd</product>
   <announced>2017-02-10</announced>
-  <revised>2017-02-10: 1</revised>
+  <revised count="1">2017-02-10</revised>
   <bug>529678</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-06.xml b/metadata/glsa/glsa-201702-06.xml
index 78ceefb534ed..deb10f2cc5b1 100644
--- a/metadata/glsa/glsa-201702-06.xml
+++ b/metadata/glsa/glsa-201702-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">graphviz</product>
   <announced>2017-02-10</announced>
-  <revised>2017-02-10: 1</revised>
+  <revised count="1">2017-02-10</revised>
   <bug>497274</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-07.xml b/metadata/glsa/glsa-201702-07.xml
index a065dfd2679a..aefe04bd3391 100644
--- a/metadata/glsa/glsa-201702-07.xml
+++ b/metadata/glsa/glsa-201702-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2017-02-14</announced>
-  <revised>2017-02-14: 1</revised>
+  <revised count="1">2017-02-14</revised>
   <bug>607318</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-08.xml b/metadata/glsa/glsa-201702-08.xml
index acd38bb2ce30..fe66ec086c4f 100644
--- a/metadata/glsa/glsa-201702-08.xml
+++ b/metadata/glsa/glsa-201702-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">virtualbox</product>
   <announced>2017-02-14</announced>
-  <revised>2017-02-14: 1</revised>
+  <revised count="1">2017-02-14</revised>
   <bug>607674</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-09.xml b/metadata/glsa/glsa-201702-09.xml
index e5033cc4797f..fee8f8c0a1ef 100644
--- a/metadata/glsa/glsa-201702-09.xml
+++ b/metadata/glsa/glsa-201702-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">imagemagick</product>
   <announced>2017-02-17</announced>
-  <revised>2017-02-17: 2</revised>
+  <revised count="2">2017-02-17</revised>
   <bug>599744</bug>
   <bug>606654</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201702-10.xml b/metadata/glsa/glsa-201702-10.xml
index 8d98b2c5c420..94bf833238b5 100644
--- a/metadata/glsa/glsa-201702-10.xml
+++ b/metadata/glsa/glsa-201702-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ntfs-3g</product>
   <announced>2017-02-19</announced>
-  <revised>2017-02-19: 1</revised>
+  <revised count="1">2017-02-19</revised>
   <bug>607912</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-11.xml b/metadata/glsa/glsa-201702-11.xml
index 06b17eed4d41..c729dd4c526e 100644
--- a/metadata/glsa/glsa-201702-11.xml
+++ b/metadata/glsa/glsa-201702-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">glibc</product>
   <announced>2017-02-19</announced>
-  <revised>2017-02-19: 1</revised>
+  <revised count="1">2017-02-19</revised>
   <bug>560420</bug>
   <bug>560526</bug>
   <bug>572416</bug>
diff --git a/metadata/glsa/glsa-201702-12.xml b/metadata/glsa/glsa-201702-12.xml
index a2459fc935f0..e5da6ea8b8d3 100644
--- a/metadata/glsa/glsa-201702-12.xml
+++ b/metadata/glsa/glsa-201702-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mupdf</product>
   <announced>2017-02-19</announced>
-  <revised>2017-02-19: 1</revised>
+  <revised count="1">2017-02-19</revised>
   <bug>589826</bug>
   <bug>590480</bug>
   <bug>608702</bug>
diff --git a/metadata/glsa/glsa-201702-13.xml b/metadata/glsa/glsa-201702-13.xml
index 52e6b51881e4..90bae4123a6d 100644
--- a/metadata/glsa/glsa-201702-13.xml
+++ b/metadata/glsa/glsa-201702-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">thunderbird</product>
   <announced>2017-02-20</announced>
-  <revised>2017-02-20: 1</revised>
+  <revised count="1">2017-02-20</revised>
   <bug>607310</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-14.xml b/metadata/glsa/glsa-201702-14.xml
index 723fea7bc5e5..fb1f487f6add 100644
--- a/metadata/glsa/glsa-201702-14.xml
+++ b/metadata/glsa/glsa-201702-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pycrypto</product>
   <announced>2017-02-20</announced>
-  <revised>2017-02-20: 1</revised>
+  <revised count="1">2017-02-20</revised>
   <bug>576494</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-15.xml b/metadata/glsa/glsa-201702-15.xml
index a7eb0bd92eca..78189a4907a1 100644
--- a/metadata/glsa/glsa-201702-15.xml
+++ b/metadata/glsa/glsa-201702-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ocaml</product>
   <announced>2017-02-20</announced>
-  <revised>2017-02-20: 1</revised>
+  <revised count="1">2017-02-20</revised>
   <bug>581946</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-16.xml b/metadata/glsa/glsa-201702-16.xml
index 672a49a04dbf..f61b614981cd 100644
--- a/metadata/glsa/glsa-201702-16.xml
+++ b/metadata/glsa/glsa-201702-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">redis</product>
   <announced>2017-02-20</announced>
-  <revised>2017-02-20: 1</revised>
+  <revised count="1">2017-02-20</revised>
   <bug>551274</bug>
   <bug>565188</bug>
   <bug>595730</bug>
diff --git a/metadata/glsa/glsa-201702-17.xml b/metadata/glsa/glsa-201702-17.xml
index d2ed6076e478..7ac9017a45cd 100644
--- a/metadata/glsa/glsa-201702-17.xml
+++ b/metadata/glsa/glsa-201702-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mysql</product>
   <announced>2017-02-20</announced>
-  <revised>2017-02-20: 1</revised>
+  <revised count="1">2017-02-20</revised>
   <bug>606254</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-18.xml b/metadata/glsa/glsa-201702-18.xml
index f0ab3c6961b0..8b0e795d6c63 100644
--- a/metadata/glsa/glsa-201702-18.xml
+++ b/metadata/glsa/glsa-201702-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mariadb</product>
   <announced>2017-02-20</announced>
-  <revised>2017-02-20: 1</revised>
+  <revised count="1">2017-02-20</revised>
   <bug>606258</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-19.xml b/metadata/glsa/glsa-201702-19.xml
index 0a3c0fcc10c8..ad85e0b4876c 100644
--- a/metadata/glsa/glsa-201702-19.xml
+++ b/metadata/glsa/glsa-201702-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tigervnc</product>
   <announced>2017-02-20</announced>
-  <revised>2017-02-20: 1</revised>
+  <revised count="1">2017-02-20</revised>
   <bug>606998</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-20.xml b/metadata/glsa/glsa-201702-20.xml
index 73ca0dd69c31..2f1816097a61 100644
--- a/metadata/glsa/glsa-201702-20.xml
+++ b/metadata/glsa/glsa-201702-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">flash</product>
   <announced>2017-02-20</announced>
-  <revised>2017-02-20: 1</revised>
+  <revised count="1">2017-02-20</revised>
   <bug>605314</bug>
   <bug>609330</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201702-21.xml b/metadata/glsa/glsa-201702-21.xml
index 24f3ab7293f0..630e6bc3b284 100644
--- a/metadata/glsa/glsa-201702-21.xml
+++ b/metadata/glsa/glsa-201702-21.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in Opus could cause memory corruption.</synopsis>
   <product type="ebuild">opus</product>
   <announced>2017-02-20</announced>
-  <revised>2017-02-20: 1</revised>
+  <revised count="1">2017-02-20</revised>
   <bug>605894</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-22.xml b/metadata/glsa/glsa-201702-22.xml
index 4cb137bc9ad8..94f8d0571257 100644
--- a/metadata/glsa/glsa-201702-22.xml
+++ b/metadata/glsa/glsa-201702-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">firefox</product>
   <announced>2017-02-20</announced>
-  <revised>2017-02-20: 1</revised>
+  <revised count="1">2017-02-20</revised>
   <bug>607138</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-23.xml b/metadata/glsa/glsa-201702-23.xml
index 9fe21292ec70..90c81f87b734 100644
--- a/metadata/glsa/glsa-201702-23.xml
+++ b/metadata/glsa/glsa-201702-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">dropbear</product>
   <announced>2017-02-20</announced>
-  <revised>2017-02-20: 1</revised>
+  <revised count="1">2017-02-20</revised>
   <bug>605560</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-24.xml b/metadata/glsa/glsa-201702-24.xml
index 51946bf05eb8..23f8f9172d3b 100644
--- a/metadata/glsa/glsa-201702-24.xml
+++ b/metadata/glsa/glsa-201702-24.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libvncserver</product>
   <announced>2017-02-20</announced>
-  <revised>2017-02-20: 1</revised>
+  <revised count="1">2017-02-20</revised>
   <bug>605326</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-25.xml b/metadata/glsa/glsa-201702-25.xml
index 3824c1d4d4c0..7b4b9805887a 100644
--- a/metadata/glsa/glsa-201702-25.xml
+++ b/metadata/glsa/glsa-201702-25.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libass</product>
   <announced>2017-02-20</announced>
-  <revised>2017-02-20: 1</revised>
+  <revised count="1">2017-02-20</revised>
   <bug>596422</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-26.xml b/metadata/glsa/glsa-201702-26.xml
index 5dfa551d33f2..405f14fe4318 100644
--- a/metadata/glsa/glsa-201702-26.xml
+++ b/metadata/glsa/glsa-201702-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nagios</product>
   <announced>2017-02-21</announced>
-  <revised>2017-02-21: 1</revised>
+  <revised count="1">2017-02-21</revised>
   <bug>595194</bug>
   <bug>598104</bug>
   <bug>600864</bug>
diff --git a/metadata/glsa/glsa-201702-27.xml b/metadata/glsa/glsa-201702-27.xml
index b09594b36193..19af85a70b84 100644
--- a/metadata/glsa/glsa-201702-27.xml
+++ b/metadata/glsa/glsa-201702-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xen</product>
   <announced>2017-02-21</announced>
-  <revised>2017-02-21: 1</revised>
+  <revised count="1">2017-02-21</revised>
   <bug>607840</bug>
   <bug>609160</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201702-28.xml b/metadata/glsa/glsa-201702-28.xml
index b7f513617621..de090c04e2ed 100644
--- a/metadata/glsa/glsa-201702-28.xml
+++ b/metadata/glsa/glsa-201702-28.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">qemu</product>
   <announced>2017-02-21</announced>
-  <revised>2017-02-21: 1</revised>
+  <revised count="1">2017-02-21</revised>
   <bug>606264</bug>
   <bug>606720</bug>
   <bug>606722</bug>
diff --git a/metadata/glsa/glsa-201702-29.xml b/metadata/glsa/glsa-201702-29.xml
index e5fbed59bc34..041cd1edb79e 100644
--- a/metadata/glsa/glsa-201702-29.xml
+++ b/metadata/glsa/glsa-201702-29.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2017-02-21</announced>
-  <revised>2017-02-21: 1</revised>
+  <revised count="1">2017-02-21</revised>
   <bug>604776</bug>
   <bug>606626</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201702-30.xml b/metadata/glsa/glsa-201702-30.xml
index f831214f95a6..291149a3abf2 100644
--- a/metadata/glsa/glsa-201702-30.xml
+++ b/metadata/glsa/glsa-201702-30.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tcpdump</product>
   <announced>2017-02-21</announced>
-  <revised>2017-02-21: 1</revised>
+  <revised count="1">2017-02-21</revised>
   <bug>606516</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201702-31.xml b/metadata/glsa/glsa-201702-31.xml
index 80178bb59ed0..b93c2539abe4 100644
--- a/metadata/glsa/glsa-201702-31.xml
+++ b/metadata/glsa/glsa-201702-31.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ghostscript</product>
   <announced>2017-02-22</announced>
-  <revised>2017-02-22: 1</revised>
+  <revised count="1">2017-02-22</revised>
   <bug>596576</bug>
   <bug>607190</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201702-32.xml b/metadata/glsa/glsa-201702-32.xml
index 38c9a049f93a..544689f5c9eb 100644
--- a/metadata/glsa/glsa-201702-32.xml
+++ b/metadata/glsa/glsa-201702-32.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">archive-tar-minitar</product>
   <announced>2017-02-22</announced>
-  <revised>2017-02-22: 1</revised>
+  <revised count="1">2017-02-22</revised>
   <bug>607110</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201703-01.xml b/metadata/glsa/glsa-201703-01.xml
index 1a5481475084..3b93b498f790 100644
--- a/metadata/glsa/glsa-201703-01.xml
+++ b/metadata/glsa/glsa-201703-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openoffice</product>
   <announced>2017-03-19</announced>
-  <revised>2017-03-19: 1</revised>
+  <revised count="1">2017-03-19</revised>
   <bug>597080</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201703-02.xml b/metadata/glsa/glsa-201703-02.xml
index 1894cc549ee7..d20df80e4e89 100644
--- a/metadata/glsa/glsa-201703-02.xml
+++ b/metadata/glsa/glsa-201703-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2017-03-19</announced>
-  <revised>2017-03-19: 1</revised>
+  <revised count="1">2017-03-19</revised>
   <bug>612588</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201703-03.xml b/metadata/glsa/glsa-201703-03.xml
index e9c4576149d9..0b10e3313ace 100644
--- a/metadata/glsa/glsa-201703-03.xml
+++ b/metadata/glsa/glsa-201703-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">PuTTY</product>
   <announced>2017-03-19</announced>
-  <revised>2017-03-19: 1</revised>
+  <revised count="1">2017-03-19</revised>
   <bug>610552</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201703-04.xml b/metadata/glsa/glsa-201703-04.xml
index f62acea4f6d8..d702529b3866 100644
--- a/metadata/glsa/glsa-201703-04.xml
+++ b/metadata/glsa/glsa-201703-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">curl</product>
   <announced>2017-03-28</announced>
-  <revised>2017-03-28: 1</revised>
+  <revised count="1">2017-03-28</revised>
   <bug>610572</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201703-05.xml b/metadata/glsa/glsa-201703-05.xml
index c817f87bd155..e1637abc9d05 100644
--- a/metadata/glsa/glsa-201703-05.xml
+++ b/metadata/glsa/glsa-201703-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libtasn1</product>
   <announced>2017-03-28</announced>
-  <revised>2017-03-28: 1</revised>
+  <revised count="1">2017-03-28</revised>
   <bug>579748</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201703-06.xml b/metadata/glsa/glsa-201703-06.xml
index 1ff9b93da829..a4e15aa66c95 100644
--- a/metadata/glsa/glsa-201703-06.xml
+++ b/metadata/glsa/glsa-201703-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">deluge</product>
   <announced>2017-03-28</announced>
-  <revised>2017-03-28: 1</revised>
+  <revised count="1">2017-03-28</revised>
   <bug>612144</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201703-07.xml b/metadata/glsa/glsa-201703-07.xml
index fd22590378b9..715195a47297 100644
--- a/metadata/glsa/glsa-201703-07.xml
+++ b/metadata/glsa/glsa-201703-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xen</product>
   <announced>2017-03-28</announced>
-  <revised>2017-03-28: 1</revised>
+  <revised count="1">2017-03-28</revised>
   <bug>609120</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201704-01.xml b/metadata/glsa/glsa-201704-01.xml
index 8a63051e638b..bb2c3def80da 100644
--- a/metadata/glsa/glsa-201704-01.xml
+++ b/metadata/glsa/glsa-201704-01.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">QEMU</product>
   <announced>2017-04-10</announced>
-  <revised>2017-04-10: 1</revised>
+  <revised count="1">2017-04-10</revised>
   <bug>606088</bug>
   <bug>609206</bug>
   <bug>609334</bug>
diff --git a/metadata/glsa/glsa-201704-02.xml b/metadata/glsa/glsa-201704-02.xml
index 5c5a804c45e8..59f6b781abb5 100644
--- a/metadata/glsa/glsa-201704-02.xml
+++ b/metadata/glsa/glsa-201704-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2017-04-10</announced>
-  <revised>2017-04-14: 2</revised>
+  <revised count="2">2017-04-14</revised>
   <bug>612190</bug>
   <bug>614276</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201704-03.xml b/metadata/glsa/glsa-201704-03.xml
index d37b9e454335..3b138dcfb2d8 100644
--- a/metadata/glsa/glsa-201704-03.xml
+++ b/metadata/glsa/glsa-201704-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">xorg-server</product>
   <announced>2017-04-10</announced>
-  <revised>2017-04-10: 1</revised>
+  <revised count="1">2017-04-10</revised>
   <bug>596182</bug>
   <bug>611350</bug>
   <bug>611352</bug>
diff --git a/metadata/glsa/glsa-201704-04.xml b/metadata/glsa/glsa-201704-04.xml
index bb245d684c68..0f4b31ce51d7 100644
--- a/metadata/glsa/glsa-201704-04.xml
+++ b/metadata/glsa/glsa-201704-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2017-04-27</announced>
-  <revised>2017-04-27: 2</revised>
+  <revised count="2">2017-04-27</revised>
   <bug>615244</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201705-01.xml b/metadata/glsa/glsa-201705-01.xml
index d1213affbb06..f52485e8615e 100644
--- a/metadata/glsa/glsa-201705-01.xml
+++ b/metadata/glsa/glsa-201705-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libevent</product>
   <announced>2017-05-07</announced>
-  <revised>2017-05-07: 1</revised>
+  <revised count="1">2017-05-07</revised>
   <bug>608042</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201705-02.xml b/metadata/glsa/glsa-201705-02.xml
index 59a9c801db83..0ed6210c2ab5 100644
--- a/metadata/glsa/glsa-201705-02.xml
+++ b/metadata/glsa/glsa-201705-02.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2017-05-07</announced>
-  <revised>2017-05-07: 1</revised>
+  <revised count="1">2017-05-07</revised>
   <bug>616048</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201705-03.xml b/metadata/glsa/glsa-201705-03.xml
index 7420037b5d99..26cf1d257cb0 100644
--- a/metadata/glsa/glsa-201705-03.xml
+++ b/metadata/glsa/glsa-201705-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">jre,jdk,oracle</product>
   <announced>2017-05-07</announced>
-  <revised>2017-05-07: 1</revised>
+  <revised count="1">2017-05-07</revised>
   <bug>616050</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201705-04.xml b/metadata/glsa/glsa-201705-04.xml
index 65c6aee49830..2d8db6a2576c 100644
--- a/metadata/glsa/glsa-201705-04.xml
+++ b/metadata/glsa/glsa-201705-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nss</product>
   <announced>2017-05-07</announced>
-  <revised>2017-05-07: 1</revised>
+  <revised count="1">2017-05-07</revised>
   <bug>616032</bug>
   <bug>616036</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201705-05.xml b/metadata/glsa/glsa-201705-05.xml
index e8cb5bdd2b11..f0c8f246dd45 100644
--- a/metadata/glsa/glsa-201705-05.xml
+++ b/metadata/glsa/glsa-201705-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ffmpeg</product>
   <announced>2017-05-09</announced>
-  <revised>2017-05-09: 1</revised>
+  <revised count="1">2017-05-09</revised>
   <bug>608868</bug>
   <bug>610810</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201705-06.xml b/metadata/glsa/glsa-201705-06.xml
index ef54bb21ce59..8b4805d6f95a 100644
--- a/metadata/glsa/glsa-201705-06.xml
+++ b/metadata/glsa/glsa-201705-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">firefox</product>
   <announced>2017-05-09</announced>
-  <revised>2017-05-09: 1</revised>
+  <revised count="1">2017-05-09</revised>
   <bug>611976</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201705-07.xml b/metadata/glsa/glsa-201705-07.xml
index f050b1d4ecaf..ac8aa6c8b550 100644
--- a/metadata/glsa/glsa-201705-07.xml
+++ b/metadata/glsa/glsa-201705-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">thunderbird,mozilla</product>
   <announced>2017-05-09</announced>
-  <revised>2017-05-09: 1</revised>
+  <revised count="1">2017-05-09</revised>
   <bug>611954</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201705-08.xml b/metadata/glsa/glsa-201705-08.xml
index 1ed0ff1fb5b7..9846c308adc2 100644
--- a/metadata/glsa/glsa-201705-08.xml
+++ b/metadata/glsa/glsa-201705-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libav</product>
   <announced>2017-05-09</announced>
-  <revised>2017-05-09: 1</revised>
+  <revised count="1">2017-05-09</revised>
   <bug>552320</bug>
   <bug>571870</bug>
   <bug>600706</bug>
diff --git a/metadata/glsa/glsa-201705-09.xml b/metadata/glsa/glsa-201705-09.xml
index 11ea71c14df6..a69adf959584 100644
--- a/metadata/glsa/glsa-201705-09.xml
+++ b/metadata/glsa/glsa-201705-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tomcat</product>
   <announced>2017-05-18</announced>
-  <revised>2017-05-18: 1</revised>
+  <revised count="1">2017-05-18</revised>
   <bug>575796</bug>
   <bug>586966</bug>
   <bug>595978</bug>
diff --git a/metadata/glsa/glsa-201705-10.xml b/metadata/glsa/glsa-201705-10.xml
index c54cbb15254e..8f66cab3afa3 100644
--- a/metadata/glsa/glsa-201705-10.xml
+++ b/metadata/glsa/glsa-201705-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gstreamer,gst-plugins</product>
   <announced>2017-05-18</announced>
-  <revised>2017-05-18: 1</revised>
+  <revised count="1">2017-05-18</revised>
   <bug>600142</bug>
   <bug>601354</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201705-11.xml b/metadata/glsa/glsa-201705-11.xml
index 0575962f833f..11160623465b 100644
--- a/metadata/glsa/glsa-201705-11.xml
+++ b/metadata/glsa/glsa-201705-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xen</product>
   <announced>2017-05-26</announced>
-  <revised>2017-05-26: 1</revised>
+  <revised count="1">2017-05-26</revised>
   <bug>615980</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201705-12.xml b/metadata/glsa/glsa-201705-12.xml
index 8b8fc3da4cb5..9c1a3d785ede 100644
--- a/metadata/glsa/glsa-201705-12.xml
+++ b/metadata/glsa/glsa-201705-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2017-05-26</announced>
-  <revised>2017-05-26: 1</revised>
+  <revised count="1">2017-05-26</revised>
   <bug>617968</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201705-13.xml b/metadata/glsa/glsa-201705-13.xml
index b7df66ba55b7..b48328b8b606 100644
--- a/metadata/glsa/glsa-201705-13.xml
+++ b/metadata/glsa/glsa-201705-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">teeworlds</product>
   <announced>2017-05-26</announced>
-  <revised>2017-05-26: 2</revised>
+  <revised count="2">2017-05-26</revised>
   <bug>600178</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201705-14.xml b/metadata/glsa/glsa-201705-14.xml
index e1ed975a15db..21a3d9766b1a 100644
--- a/metadata/glsa/glsa-201705-14.xml
+++ b/metadata/glsa/glsa-201705-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">smb4k</product>
   <announced>2017-05-26</announced>
-  <revised>2017-05-26: 2</revised>
+  <revised count="2">2017-05-26</revised>
   <bug>618106</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201705-15.xml b/metadata/glsa/glsa-201705-15.xml
index 88217e6cdff4..bbe749e94191 100644
--- a/metadata/glsa/glsa-201705-15.xml
+++ b/metadata/glsa/glsa-201705-15.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in sudo allows local users to gain root privileges.</synopsis>
   <product type="ebuild">sudo,privilege</product>
   <announced>2017-05-30</announced>
-  <revised>2017-10-10: 4</revised>
+  <revised count="4">2017-10-10</revised>
   <bug>620182</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-01.xml b/metadata/glsa/glsa-201706-01.xml
index 52668f780fd9..89062f70008d 100644
--- a/metadata/glsa/glsa-201706-01.xml
+++ b/metadata/glsa/glsa-201706-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">munge</product>
   <announced>2017-06-06</announced>
-  <revised>2017-06-06: 1</revised>
+  <revised count="1">2017-06-06</revised>
   <bug>602596</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-02.xml b/metadata/glsa/glsa-201706-02.xml
index e1d3f85898d9..01623f77be78 100644
--- a/metadata/glsa/glsa-201706-02.xml
+++ b/metadata/glsa/glsa-201706-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">shadow</product>
   <announced>2017-06-06</announced>
-  <revised>2017-06-06: 1</revised>
+  <revised count="1">2017-06-06</revised>
   <bug>610804</bug>
   <bug>620510</bug>
   <access>local</access>
diff --git a/metadata/glsa/glsa-201706-03.xml b/metadata/glsa/glsa-201706-03.xml
index 7c718080c41b..42d4bbf90370 100644
--- a/metadata/glsa/glsa-201706-03.xml
+++ b/metadata/glsa/glsa-201706-03.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">qemu</product>
   <announced>2017-06-06</announced>
-  <revised>2017-06-06: 1</revised>
+  <revised count="1">2017-06-06</revised>
   <bug>614744</bug>
   <bug>615874</bug>
   <bug>616460</bug>
diff --git a/metadata/glsa/glsa-201706-04.xml b/metadata/glsa/glsa-201706-04.xml
index d2ba84a5323e..c2d574253fb4 100644
--- a/metadata/glsa/glsa-201706-04.xml
+++ b/metadata/glsa/glsa-201706-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">git</product>
   <announced>2017-06-06</announced>
-  <revised>2017-06-06: 1</revised>
+  <revised count="1">2017-06-06</revised>
   <bug>618126</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-05.xml b/metadata/glsa/glsa-201706-05.xml
index dc91daa63cb5..0f9791b9a6c2 100644
--- a/metadata/glsa/glsa-201706-05.xml
+++ b/metadata/glsa/glsa-201706-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dbus</product>
   <announced>2017-06-06</announced>
-  <revised>2017-06-06: 1</revised>
+  <revised count="1">2017-06-06</revised>
   <bug>611392</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-06.xml b/metadata/glsa/glsa-201706-06.xml
index 2664a3209a5f..717836d81621 100644
--- a/metadata/glsa/glsa-201706-06.xml
+++ b/metadata/glsa/glsa-201706-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ImageWorsener</product>
   <announced>2017-06-06</announced>
-  <revised>2017-06-06: 1</revised>
+  <revised count="1">2017-06-06</revised>
   <bug>618014</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-07.xml b/metadata/glsa/glsa-201706-07.xml
index b6a3b62513f2..f273307c04bd 100644
--- a/metadata/glsa/glsa-201706-07.xml
+++ b/metadata/glsa/glsa-201706-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">RPCBind,Libtirpc</product>
   <announced>2017-06-06</announced>
-  <revised>2017-06-06: 2</revised>
+  <revised count="2">2017-06-06</revised>
   <bug>617472</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-08.xml b/metadata/glsa/glsa-201706-08.xml
index e996de219454..8a5779766b2b 100644
--- a/metadata/glsa/glsa-201706-08.xml
+++ b/metadata/glsa/glsa-201706-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">mupdf</product>
   <announced>2017-06-06</announced>
-  <revised>2017-06-06: 1</revised>
+  <revised count="1">2017-06-06</revised>
   <bug>611444</bug>
   <bug>614044</bug>
   <bug>614852</bug>
diff --git a/metadata/glsa/glsa-201706-09.xml b/metadata/glsa/glsa-201706-09.xml
index 79c6f3affa49..9b13a1c3e693 100644
--- a/metadata/glsa/glsa-201706-09.xml
+++ b/metadata/glsa/glsa-201706-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">filezilla</product>
   <announced>2017-06-06</announced>
-  <revised>2017-06-06: 1</revised>
+  <revised count="1">2017-06-06</revised>
   <bug>610554</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-10.xml b/metadata/glsa/glsa-201706-10.xml
index b1e971eb9d3c..e16aa55cc849 100644
--- a/metadata/glsa/glsa-201706-10.xml
+++ b/metadata/glsa/glsa-201706-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pidgin</product>
   <announced>2017-06-06</announced>
-  <revised>2017-06-06: 1</revised>
+  <revised count="1">2017-06-06</revised>
   <bug>612188</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-11.xml b/metadata/glsa/glsa-201706-11.xml
index a8d394f8a4ed..48a4c273b816 100644
--- a/metadata/glsa/glsa-201706-11.xml
+++ b/metadata/glsa/glsa-201706-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">PCRE</product>
   <announced>2017-06-06</announced>
-  <revised>2017-06-06: 1</revised>
+  <revised count="1">2017-06-06</revised>
   <bug>609592</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-12.xml b/metadata/glsa/glsa-201706-12.xml
index 4e3a08e5311a..458e043e8ad2 100644
--- a/metadata/glsa/glsa-201706-12.xml
+++ b/metadata/glsa/glsa-201706-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wireshark</product>
   <announced>2017-06-06</announced>
-  <revised>2017-06-06: 1</revised>
+  <revised count="1">2017-06-06</revised>
   <bug>609646</bug>
   <bug>615462</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201706-13.xml b/metadata/glsa/glsa-201706-13.xml
index a93bb37e27ff..ca4eef03336e 100644
--- a/metadata/glsa/glsa-201706-13.xml
+++ b/metadata/glsa/glsa-201706-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">minicom</product>
   <announced>2017-06-06</announced>
-  <revised>2017-06-06: 1</revised>
+  <revised count="1">2017-06-06</revised>
   <bug>615996</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-14.xml b/metadata/glsa/glsa-201706-14.xml
index 6a208aaa4e67..f406e48f4ff8 100644
--- a/metadata/glsa/glsa-201706-14.xml
+++ b/metadata/glsa/glsa-201706-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">freetype </product>
   <announced>2017-06-06</announced>
-  <revised>2017-06-06: 1</revised>
+  <revised count="1">2017-06-06</revised>
   <bug>612192</bug>
   <bug>616730</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201706-15.xml b/metadata/glsa/glsa-201706-15.xml
index 7543eef7095d..897eaa694dad 100644
--- a/metadata/glsa/glsa-201706-15.xml
+++ b/metadata/glsa/glsa-201706-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">webkit-gtk</product>
   <announced>2017-06-07</announced>
-  <revised>2017-06-07: 1</revised>
+  <revised count="1">2017-06-07</revised>
   <bug>543650</bug>
   <bug>573656</bug>
   <bug>577068</bug>
diff --git a/metadata/glsa/glsa-201706-16.xml b/metadata/glsa/glsa-201706-16.xml
index 6c72435eb20d..8d9f27a2d16a 100644
--- a/metadata/glsa/glsa-201706-16.xml
+++ b/metadata/glsa/glsa-201706-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wget</product>
   <announced>2017-06-20</announced>
-  <revised>2017-06-20: 1</revised>
+  <revised count="1">2017-06-20</revised>
   <bug>612326</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-17.xml b/metadata/glsa/glsa-201706-17.xml
index 7909b2b48f9f..8fef81ffedbb 100644
--- a/metadata/glsa/glsa-201706-17.xml
+++ b/metadata/glsa/glsa-201706-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">kodi</product>
   <announced>2017-06-20</announced>
-  <revised>2017-06-20: 1</revised>
+  <revised count="1">2017-06-20</revised>
   <bug>549342</bug>
   <bug>619492</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201706-18.xml b/metadata/glsa/glsa-201706-18.xml
index c527af9f36cf..238964603b07 100644
--- a/metadata/glsa/glsa-201706-18.xml
+++ b/metadata/glsa/glsa-201706-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mbedtls</product>
   <announced>2017-06-20</announced>
-  <revised>2017-06-20: 1</revised>
+  <revised count="1">2017-06-20</revised>
   <bug>562608</bug>
   <bug>571102</bug>
   <bug>618824</bug>
diff --git a/metadata/glsa/glsa-201706-19.xml b/metadata/glsa/glsa-201706-19.xml
index 537ce903b1c8..f7043d0988b9 100644
--- a/metadata/glsa/glsa-201706-19.xml
+++ b/metadata/glsa/glsa-201706-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">glibc</product>
   <announced>2017-06-20</announced>
-  <revised>2017-06-20: 2</revised>
+  <revised count="2">2017-06-20</revised>
   <bug>608698</bug>
   <bug>608706</bug>
   <bug>622220</bug>
diff --git a/metadata/glsa/glsa-201706-20.xml b/metadata/glsa/glsa-201706-20.xml
index e4f6e71c762e..a36169ed34fe 100644
--- a/metadata/glsa/glsa-201706-20.xml
+++ b/metadata/glsa/glsa-201706-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">Chromium</product>
   <announced>2017-06-20</announced>
-  <revised>2017-06-20: 1</revised>
+  <revised count="1">2017-06-20</revised>
   <bug>617504</bug>
   <bug>620956</bug>
   <bug>621886</bug>
diff --git a/metadata/glsa/glsa-201706-21.xml b/metadata/glsa/glsa-201706-21.xml
index 630365e6a5d5..742106706ce4 100644
--- a/metadata/glsa/glsa-201706-21.xml
+++ b/metadata/glsa/glsa-201706-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nettle</product>
   <announced>2017-06-22</announced>
-  <revised>2017-06-22: 1</revised>
+  <revised count="1">2017-06-22</revised>
   <bug>590484</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-22.xml b/metadata/glsa/glsa-201706-22.xml
index 613cd43ba5f1..8f3dc1c06fb0 100644
--- a/metadata/glsa/glsa-201706-22.xml
+++ b/metadata/glsa/glsa-201706-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libksba</product>
   <announced>2017-06-22</announced>
-  <revised>2017-06-22: 1</revised>
+  <revised count="1">2017-06-22</revised>
   <bug>592078</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-23.xml b/metadata/glsa/glsa-201706-23.xml
index 572f924a5f59..6e4e8e5e68c1 100644
--- a/metadata/glsa/glsa-201706-23.xml
+++ b/metadata/glsa/glsa-201706-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">UrbanTerror</product>
   <announced>2017-06-22</announced>
-  <revised>2017-06-22: 1</revised>
+  <revised count="1">2017-06-22</revised>
   <bug>606702</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-24.xml b/metadata/glsa/glsa-201706-24.xml
index 71b4cf5dcfdd..1d192754bd78 100644
--- a/metadata/glsa/glsa-201706-24.xml
+++ b/metadata/glsa/glsa-201706-24.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">jbig2dec</product>
   <announced>2017-06-22</announced>
-  <revised>2017-06-22: 1</revised>
+  <revised count="1">2017-06-22</revised>
   <bug>545234</bug>
   <bug>607188</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201706-25.xml b/metadata/glsa/glsa-201706-25.xml
index e05213392a83..20c72ead8e7a 100644
--- a/metadata/glsa/glsa-201706-25.xml
+++ b/metadata/glsa/glsa-201706-25.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">graphite</product>
   <announced>2017-06-22</announced>
-  <revised>2017-06-22: 1</revised>
+  <revised count="1">2017-06-22</revised>
   <bug>616034</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-26.xml b/metadata/glsa/glsa-201706-26.xml
index 815c661e7170..ebba96d1f398 100644
--- a/metadata/glsa/glsa-201706-26.xml
+++ b/metadata/glsa/glsa-201706-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">vim,gvim</product>
   <announced>2017-06-22</announced>
-  <revised>2017-06-22: 1</revised>
+  <revised count="1">2017-06-22</revised>
   <bug>609150</bug>
   <bug>611386</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201706-27.xml b/metadata/glsa/glsa-201706-27.xml
index 197bd34308b2..83f3b8f85752 100644
--- a/metadata/glsa/glsa-201706-27.xml
+++ b/metadata/glsa/glsa-201706-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">freeradius</product>
   <announced>2017-06-27</announced>
-  <revised>2017-06-27: 1</revised>
+  <revised count="1">2017-06-27</revised>
   <bug>620186</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-28.xml b/metadata/glsa/glsa-201706-28.xml
index 8f891d743d28..48fc132a6594 100644
--- a/metadata/glsa/glsa-201706-28.xml
+++ b/metadata/glsa/glsa-201706-28.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libreoffice</product>
   <announced>2017-06-27</announced>
-  <revised>2017-06-27: 1</revised>
+  <revised count="1">2017-06-27</revised>
   <bug>616472</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201706-29.xml b/metadata/glsa/glsa-201706-29.xml
index 736ad4df2fd3..fc18b9223015 100644
--- a/metadata/glsa/glsa-201706-29.xml
+++ b/metadata/glsa/glsa-201706-29.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">kauth,kdelibs</product>
   <announced>2017-06-27</announced>
-  <revised>2017-06-27: 1</revised>
+  <revised count="1">2017-06-27</revised>
   <bug>618108</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201707-01.xml b/metadata/glsa/glsa-201707-01.xml
index 93ce07446160..fb852432617f 100644
--- a/metadata/glsa/glsa-201707-01.xml
+++ b/metadata/glsa/glsa-201707-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">icedtea</product>
   <announced>2017-07-05</announced>
-  <revised>2017-07-05: 1</revised>
+  <revised count="1">2017-07-05</revised>
   <bug>607676</bug>
   <bug>609562</bug>
   <bug>618874</bug>
diff --git a/metadata/glsa/glsa-201707-02.xml b/metadata/glsa/glsa-201707-02.xml
index 4778cde3f160..195a8a40f865 100644
--- a/metadata/glsa/glsa-201707-02.xml
+++ b/metadata/glsa/glsa-201707-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">game-music-emu</product>
   <announced>2017-07-08</announced>
-  <revised>2017-08-06: 2</revised>
+  <revised count="2">2017-08-06</revised>
   <bug>603092</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201707-03.xml b/metadata/glsa/glsa-201707-03.xml
index 0ed67cc4cc06..64c44c93e7a7 100644
--- a/metadata/glsa/glsa-201707-03.xml
+++ b/metadata/glsa/glsa-201707-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">phpmyadmin</product>
   <announced>2017-07-08</announced>
-  <revised>2017-08-06: 2</revised>
+  <revised count="2">2017-08-06</revised>
   <bug>614522</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201707-04.xml b/metadata/glsa/glsa-201707-04.xml
index 3f22c0a87dd0..661341bd5746 100644
--- a/metadata/glsa/glsa-201707-04.xml
+++ b/metadata/glsa/glsa-201707-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libsndfile</product>
   <announced>2017-07-08</announced>
-  <revised>2017-08-06: 2</revised>
+  <revised count="2">2017-08-06</revised>
   <bug>618010</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201707-05.xml b/metadata/glsa/glsa-201707-05.xml
index 8409a8589b20..89c451bc6df1 100644
--- a/metadata/glsa/glsa-201707-05.xml
+++ b/metadata/glsa/glsa-201707-05.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">OpenSLP</product>
   <announced>2017-07-08</announced>
-  <revised>2017-08-06: 3</revised>
+  <revised count="3">2017-08-06</revised>
   <bug>360061</bug>
   <bug>434918</bug>
   <bug>583396</bug>
diff --git a/metadata/glsa/glsa-201707-06.xml b/metadata/glsa/glsa-201707-06.xml
index 768c54d4ad8a..625288b2f541 100644
--- a/metadata/glsa/glsa-201707-06.xml
+++ b/metadata/glsa/glsa-201707-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">virglrenderer</product>
   <announced>2017-07-08</announced>
-  <revised>2017-08-06: 2</revised>
+  <revised count="2">2017-08-06</revised>
   <bug>606996</bug>
   <bug>607022</bug>
   <bug>608734</bug>
diff --git a/metadata/glsa/glsa-201707-07.xml b/metadata/glsa/glsa-201707-07.xml
index 2fb929cc056a..4fb4c82b3a86 100644
--- a/metadata/glsa/glsa-201707-07.xml
+++ b/metadata/glsa/glsa-201707-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">JasPer</product>
   <announced>2017-07-08</announced>
-  <revised>2017-08-06: 2</revised>
+  <revised count="2">2017-08-06</revised>
   <bug>559164</bug>
   <bug>559168</bug>
   <bug>571256</bug>
diff --git a/metadata/glsa/glsa-201707-08.xml b/metadata/glsa/glsa-201707-08.xml
index 7e1bd106be8b..d2b1478d5691 100644
--- a/metadata/glsa/glsa-201707-08.xml
+++ b/metadata/glsa/glsa-201707-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">feh</product>
   <announced>2017-07-08</announced>
-  <revised>2017-08-06: 2</revised>
+  <revised count="2">2017-08-06</revised>
   <bug>616470</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201707-09.xml b/metadata/glsa/glsa-201707-09.xml
index bb1e20056cce..19ed1df6f664 100644
--- a/metadata/glsa/glsa-201707-09.xml
+++ b/metadata/glsa/glsa-201707-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nm-applet</product>
   <announced>2017-07-08</announced>
-  <revised>2017-08-06: 2</revised>
+  <revised count="2">2017-08-06</revised>
   <bug>613768</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201707-10.xml b/metadata/glsa/glsa-201707-10.xml
index d2d9c613f794..de1c47bee596 100644
--- a/metadata/glsa/glsa-201707-10.xml
+++ b/metadata/glsa/glsa-201707-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">vlc</product>
   <announced>2017-07-08</announced>
-  <revised>2017-07-08: 1</revised>
+  <revised count="1">2017-07-08</revised>
   <bug>619494</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201707-11.xml b/metadata/glsa/glsa-201707-11.xml
index ddb1ee86a55e..3ad5a2a32a87 100644
--- a/metadata/glsa/glsa-201707-11.xml
+++ b/metadata/glsa/glsa-201707-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">roundcube</product>
   <announced>2017-07-08</announced>
-  <revised>2017-07-08: 1</revised>
+  <revised count="1">2017-07-08</revised>
   <bug>618322</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201707-12.xml b/metadata/glsa/glsa-201707-12.xml
index bbedad24a7d1..1ef7787eb02c 100644
--- a/metadata/glsa/glsa-201707-12.xml
+++ b/metadata/glsa/glsa-201707-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">man-db</product>
   <announced>2017-07-09</announced>
-  <revised>2017-08-06: 2</revised>
+  <revised count="2">2017-08-06</revised>
   <bug>602588</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201707-13.xml b/metadata/glsa/glsa-201707-13.xml
index 5c6785905c21..dda2df5595e6 100644
--- a/metadata/glsa/glsa-201707-13.xml
+++ b/metadata/glsa/glsa-201707-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libcroco</product>
   <announced>2017-07-09</announced>
-  <revised>2017-08-06: 3</revised>
+  <revised count="3">2017-08-06</revised>
   <bug>618012</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201707-14.xml b/metadata/glsa/glsa-201707-14.xml
index 98a8fcfa4d24..ba4e8ef4a235 100644
--- a/metadata/glsa/glsa-201707-14.xml
+++ b/metadata/glsa/glsa-201707-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gajim</product>
   <announced>2017-07-10</announced>
-  <revised>2017-07-10: 1</revised>
+  <revised count="1">2017-07-10</revised>
   <bug>620146</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201707-15.xml b/metadata/glsa/glsa-201707-15.xml
index 83b4156ee38c..9c6215716976 100644
--- a/metadata/glsa/glsa-201707-15.xml
+++ b/metadata/glsa/glsa-201707-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobeflashplayer</product>
   <announced>2017-07-21</announced>
-  <revised>2017-07-21: 1</revised>
+  <revised count="1">2017-07-21</revised>
   <bug>621680</bug>
   <bug>624620</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201708-01.xml b/metadata/glsa/glsa-201708-01.xml
index edbd0a99795f..63b94844e5c0 100644
--- a/metadata/glsa/glsa-201708-01.xml
+++ b/metadata/glsa/glsa-201708-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bind</product>
   <announced>2017-08-17</announced>
-  <revised>2017-08-17: 1</revised>
+  <revised count="1">2017-08-17</revised>
   <bug>605454</bug>
   <bug>608740</bug>
   <bug>615420</bug>
diff --git a/metadata/glsa/glsa-201708-02.xml b/metadata/glsa/glsa-201708-02.xml
index 4364855a2b20..feae06e43313 100644
--- a/metadata/glsa/glsa-201708-02.xml
+++ b/metadata/glsa/glsa-201708-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tnef</product>
   <announced>2017-08-17</announced>
-  <revised>2017-08-17: 1</revised>
+  <revised count="1">2017-08-17</revised>
   <bug>611426</bug>
   <bug>618658</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201708-04.xml b/metadata/glsa/glsa-201708-04.xml
index ef51b7621591..69c6e762e429 100644
--- a/metadata/glsa/glsa-201708-04.xml
+++ b/metadata/glsa/glsa-201708-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">kedpm</product>
   <announced>2017-08-21</announced>
-  <revised>2017-08-26: 3</revised>
+  <revised count="3">2017-08-26</revised>
   <bug>616690</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201708-05.xml b/metadata/glsa/glsa-201708-05.xml
index da12d4e199bf..2af512abac2b 100644
--- a/metadata/glsa/glsa-201708-05.xml
+++ b/metadata/glsa/glsa-201708-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">rar,unrar</product>
   <announced>2017-08-21</announced>
-  <revised>2017-08-21: 1</revised>
+  <revised count="1">2017-08-21</revised>
   <bug>622342</bug>
   <bug>622382</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201708-06.xml b/metadata/glsa/glsa-201708-06.xml
index 7ec22131fd0f..c4a223d488cb 100644
--- a/metadata/glsa/glsa-201708-06.xml
+++ b/metadata/glsa/glsa-201708-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ghostscriptgpl</product>
   <announced>2017-08-21</announced>
-  <revised>2017-08-21: 1</revised>
+  <revised count="1">2017-08-21</revised>
   <bug>616814</bug>
   <bug>617016</bug>
   <bug>617018</bug>
diff --git a/metadata/glsa/glsa-201708-07.xml b/metadata/glsa/glsa-201708-07.xml
index 82a0c3974db5..00364d8b84db 100644
--- a/metadata/glsa/glsa-201708-07.xml
+++ b/metadata/glsa/glsa-201708-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">evilvte</product>
   <announced>2017-08-21</announced>
-  <revised>2017-08-26: 2</revised>
+  <revised count="2">2017-08-26</revised>
   <bug>611290</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201708-08.xml b/metadata/glsa/glsa-201708-08.xml
index 0484af4b6abc..1ca006521ced 100644
--- a/metadata/glsa/glsa-201708-08.xml
+++ b/metadata/glsa/glsa-201708-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">bzip2</product>
   <announced>2017-08-21</announced>
-  <revised>2017-08-21: 1</revised>
+  <revised count="1">2017-08-21</revised>
   <bug>620466</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201708-09.xml b/metadata/glsa/glsa-201708-09.xml
index b2956f444222..7919098d3e93 100644
--- a/metadata/glsa/glsa-201708-09.xml
+++ b/metadata/glsa/glsa-201708-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">autotrace</product>
   <announced>2017-08-26</announced>
-  <revised>2017-08-26: 1</revised>
+  <revised count="1">2017-08-26</revised>
   <bug>613992</bug>
   <bug>619040</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201708-10.xml b/metadata/glsa/glsa-201708-10.xml
index b901b3c112d7..e2c9688c130f 100644
--- a/metadata/glsa/glsa-201708-10.xml
+++ b/metadata/glsa/glsa-201708-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">jbig2dec</product>
   <announced>2017-08-26</announced>
-  <revised>2017-08-26: 1</revised>
+  <revised count="1">2017-08-26</revised>
   <bug>616464</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-01.xml b/metadata/glsa/glsa-201709-01.xml
index 385529096e61..3976bced275d 100644
--- a/metadata/glsa/glsa-201709-01.xml
+++ b/metadata/glsa/glsa-201709-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mcollective</product>
   <announced>2017-09-04</announced>
-  <revised>2017-09-04: 1</revised>
+  <revised count="1">2017-09-04</revised>
   <bug>624704</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-02.xml b/metadata/glsa/glsa-201709-02.xml
index 9a5f02e50182..49a6314f5c8f 100644
--- a/metadata/glsa/glsa-201709-02.xml
+++ b/metadata/glsa/glsa-201709-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">binutils</product>
   <announced>2017-09-17</announced>
-  <revised>2017-09-17: 1</revised>
+  <revised count="1">2017-09-17</revised>
   <bug>618006</bug>
   <bug>618514</bug>
   <bug>618516</bug>
diff --git a/metadata/glsa/glsa-201709-03.xml b/metadata/glsa/glsa-201709-03.xml
index 0ffee333d04b..9494b906bfab 100644
--- a/metadata/glsa/glsa-201709-03.xml
+++ b/metadata/glsa/glsa-201709-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">webkit-gtk</product>
   <announced>2017-09-17</announced>
-  <revised>2017-09-17: 1</revised>
+  <revised count="1">2017-09-17</revised>
   <bug>622442</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-04.xml b/metadata/glsa/glsa-201709-04.xml
index d64934455429..0809d1471a18 100644
--- a/metadata/glsa/glsa-201709-04.xml
+++ b/metadata/glsa/glsa-201709-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mod_gnutls</product>
   <announced>2017-09-17</announced>
-  <revised>2017-09-17: 1</revised>
+  <revised count="1">2017-09-17</revised>
   <bug>541038</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-05.xml b/metadata/glsa/glsa-201709-05.xml
index 771f0cdc9cd3..243bba352c32 100644
--- a/metadata/glsa/glsa-201709-05.xml
+++ b/metadata/glsa/glsa-201709-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chkrootkit</product>
   <announced>2017-09-17</announced>
-  <revised>2017-09-17: 1</revised>
+  <revised count="1">2017-09-17</revised>
   <bug>512356</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-06.xml b/metadata/glsa/glsa-201709-06.xml
index e7fa1c162310..cae827678bd6 100644
--- a/metadata/glsa/glsa-201709-06.xml
+++ b/metadata/glsa/glsa-201709-06.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">supervisor</product>
   <announced>2017-09-17</announced>
-  <revised>2017-09-17: 1</revised>
+  <revised count="1">2017-09-17</revised>
   <bug>626100</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-07.xml b/metadata/glsa/glsa-201709-07.xml
index aebd775ed1fa..044c0f88131a 100644
--- a/metadata/glsa/glsa-201709-07.xml
+++ b/metadata/glsa/glsa-201709-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">kpathsea</product>
   <announced>2017-09-17</announced>
-  <revised>2017-09-17: 1</revised>
+  <revised count="1">2017-09-17</revised>
   <bug>612328</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-08.xml b/metadata/glsa/glsa-201709-08.xml
index 4ae457a5b5bc..71e7a2e2f363 100644
--- a/metadata/glsa/glsa-201709-08.xml
+++ b/metadata/glsa/glsa-201709-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gdk-pixbuf</product>
   <announced>2017-09-17</announced>
-  <revised>2017-09-17: 1</revised>
+  <revised count="1">2017-09-17</revised>
   <bug>592976</bug>
   <bug>611390</bug>
   <bug>630026</bug>
diff --git a/metadata/glsa/glsa-201709-09.xml b/metadata/glsa/glsa-201709-09.xml
index b0fb60e8ed49..9767716e16b1 100644
--- a/metadata/glsa/glsa-201709-09.xml
+++ b/metadata/glsa/glsa-201709-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">subversion</product>
   <announced>2017-09-17</announced>
-  <revised>2017-09-17: 1</revised>
+  <revised count="1">2017-09-17</revised>
   <bug>627480</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-10.xml b/metadata/glsa/glsa-201709-10.xml
index 1583ae4cf440..0cc40127fedf 100644
--- a/metadata/glsa/glsa-201709-10.xml
+++ b/metadata/glsa/glsa-201709-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">git</product>
   <announced>2017-09-17</announced>
-  <revised>2017-09-17: 1</revised>
+  <revised count="1">2017-09-17</revised>
   <bug>627488</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-11.xml b/metadata/glsa/glsa-201709-11.xml
index c9bbbce3d8fa..e5c1522106b4 100644
--- a/metadata/glsa/glsa-201709-11.xml
+++ b/metadata/glsa/glsa-201709-11.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">gimps</product>
   <announced>2017-09-17</announced>
-  <revised>2017-09-17: 1</revised>
+  <revised count="1">2017-09-17</revised>
   <bug>603408</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-12.xml b/metadata/glsa/glsa-201709-12.xml
index ccad06cd7594..cde15f17bf6f 100644
--- a/metadata/glsa/glsa-201709-12.xml
+++ b/metadata/glsa/glsa-201709-12.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">perl</product>
   <announced>2017-09-17</announced>
-  <revised>2017-09-17: 1</revised>
+  <revised count="1">2017-09-17</revised>
   <bug>620304</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-13.xml b/metadata/glsa/glsa-201709-13.xml
index 74eb4cdfb8d5..4f2ab544ae9a 100644
--- a/metadata/glsa/glsa-201709-13.xml
+++ b/metadata/glsa/glsa-201709-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">squirrelmail</product>
   <announced>2017-09-17</announced>
-  <revised>2017-09-17: 1</revised>
+  <revised count="1">2017-09-17</revised>
   <bug>616700</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-14.xml b/metadata/glsa/glsa-201709-14.xml
index 4ad84f00b993..06590f8d674f 100644
--- a/metadata/glsa/glsa-201709-14.xml
+++ b/metadata/glsa/glsa-201709-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">curl</product>
   <announced>2017-09-17</announced>
-  <revised>2017-09-17: 1</revised>
+  <revised count="1">2017-09-17</revised>
   <bug>615870</bug>
   <bug>615994</bug>
   <bug>626776</bug>
diff --git a/metadata/glsa/glsa-201709-15.xml b/metadata/glsa/glsa-201709-15.xml
index d22fe0ca8c17..7382426379b7 100644
--- a/metadata/glsa/glsa-201709-15.xml
+++ b/metadata/glsa/glsa-201709-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium</product>
   <announced>2017-09-24</announced>
-  <revised>2017-09-24: 1</revised>
+  <revised count="1">2017-09-24</revised>
   <bug>626382</bug>
   <bug>630068</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201709-16.xml b/metadata/glsa/glsa-201709-16.xml
index 417d37bed9d6..36ffb4f42591 100644
--- a/metadata/glsa/glsa-201709-16.xml
+++ b/metadata/glsa/glsa-201709-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2017-09-24</announced>
-  <revised>2017-09-24: 1</revised>
+  <revised count="1">2017-09-24</revised>
   <bug>627336</bug>
   <bug>630964</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201709-17.xml b/metadata/glsa/glsa-201709-17.xml
index 403eda337db2..447c5041cc9b 100644
--- a/metadata/glsa/glsa-201709-17.xml
+++ b/metadata/glsa/glsa-201709-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cvs</product>
   <announced>2017-09-24</announced>
-  <revised>2017-09-24: 1</revised>
+  <revised count="1">2017-09-24</revised>
   <bug>627498</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-18.xml b/metadata/glsa/glsa-201709-18.xml
index b5a70c99d2a8..8c11708c0d59 100644
--- a/metadata/glsa/glsa-201709-18.xml
+++ b/metadata/glsa/glsa-201709-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mercurial</product>
   <announced>2017-09-24</announced>
-  <revised>2017-09-24: 1</revised>
+  <revised count="1">2017-09-24</revised>
   <bug>621068</bug>
   <bug>627484</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201709-19.xml b/metadata/glsa/glsa-201709-19.xml
index 6f7bb814c399..48d8d9c94e27 100644
--- a/metadata/glsa/glsa-201709-19.xml
+++ b/metadata/glsa/glsa-201709-19.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">exim</product>
   <announced>2017-09-24</announced>
-  <revised>2017-09-24: 1</revised>
+  <revised count="1">2017-09-24</revised>
   <bug>622212</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-20.xml b/metadata/glsa/glsa-201709-20.xml
index 2a5880076a51..daac50fddbe3 100644
--- a/metadata/glsa/glsa-201709-20.xml
+++ b/metadata/glsa/glsa-201709-20.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">postfix</product>
   <announced>2017-09-24</announced>
-  <revised>2017-09-24: 1</revised>
+  <revised count="1">2017-09-24</revised>
   <bug>621882</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-21.xml b/metadata/glsa/glsa-201709-21.xml
index 222dce25f4de..175094991203 100644
--- a/metadata/glsa/glsa-201709-21.xml
+++ b/metadata/glsa/glsa-201709-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">php</product>
   <announced>2017-09-24</announced>
-  <revised>2017-09-25: 2</revised>
+  <revised count="2">2017-09-25</revised>
   <bug>624054</bug>
   <bug>626460</bug>
   <bug>629452</bug>
diff --git a/metadata/glsa/glsa-201709-22.xml b/metadata/glsa/glsa-201709-22.xml
index 07d405d01e45..6375fe8a8e26 100644
--- a/metadata/glsa/glsa-201709-22.xml
+++ b/metadata/glsa/glsa-201709-22.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">oracle-jdk-bin,oracle-jre-bin,icedtea-bin</product>
   <announced>2017-09-24</announced>
-  <revised>2017-09-25: 2</revised>
+  <revised count="2">2017-09-25</revised>
   <bug>625602</bug>
   <bug>626088</bug>
   <bug>627682</bug>
diff --git a/metadata/glsa/glsa-201709-23.xml b/metadata/glsa/glsa-201709-23.xml
index 77588a847884..8106edb06175 100644
--- a/metadata/glsa/glsa-201709-23.xml
+++ b/metadata/glsa/glsa-201709-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tcpdump</product>
   <announced>2017-09-25</announced>
-  <revised>2017-09-25: 1</revised>
+  <revised count="1">2017-09-25</revised>
   <bug>624652</bug>
   <bug>626462</bug>
   <bug>630110</bug>
diff --git a/metadata/glsa/glsa-201709-24.xml b/metadata/glsa/glsa-201709-24.xml
index ec851070877d..d5492103fa41 100644
--- a/metadata/glsa/glsa-201709-24.xml
+++ b/metadata/glsa/glsa-201709-24.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">rar,unrar</product>
   <announced>2017-09-25</announced>
-  <revised>2017-09-25: 1</revised>
+  <revised count="1">2017-09-25</revised>
   <bug>622342</bug>
   <bug>628182</bug>
   <bug>628184</bug>
diff --git a/metadata/glsa/glsa-201709-25.xml b/metadata/glsa/glsa-201709-25.xml
index 7fd255daa553..49d0bc1b23ef 100644
--- a/metadata/glsa/glsa-201709-25.xml
+++ b/metadata/glsa/glsa-201709-25.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium, google-chrome</product>
   <announced>2017-09-25</announced>
-  <revised>2017-09-25: 1</revised>
+  <revised count="1">2017-09-25</revised>
   <bug>631784</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-26.xml b/metadata/glsa/glsa-201709-26.xml
index f88d9811d24e..e507655a3722 100644
--- a/metadata/glsa/glsa-201709-26.xml
+++ b/metadata/glsa/glsa-201709-26.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libsoup</product>
   <announced>2017-09-26</announced>
-  <revised>2017-09-26: 1</revised>
+  <revised count="1">2017-09-26</revised>
   <bug>627466</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201709-27.xml b/metadata/glsa/glsa-201709-27.xml
index e920730851cb..1b69d1aeb06d 100644
--- a/metadata/glsa/glsa-201709-27.xml
+++ b/metadata/glsa/glsa-201709-27.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tiff</product>
   <announced>2017-09-26</announced>
-  <revised>2017-09-26: 2</revised>
+  <revised count="2">2017-09-26</revised>
   <bug>610330</bug>
   <bug>614020</bug>
   <bug>614022</bug>
diff --git a/metadata/glsa/glsa-201710-01.xml b/metadata/glsa/glsa-201710-01.xml
index 4d79ea91fdf5..09228d027bf3 100644
--- a/metadata/glsa/glsa-201710-01.xml
+++ b/metadata/glsa/glsa-201710-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">rubygems</product>
   <announced>2017-10-08</announced>
-  <revised>2017-10-08: 1</revised>
+  <revised count="1">2017-10-08</revised>
   <bug>629230</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-02.xml b/metadata/glsa/glsa-201710-02.xml
index f44b167e6225..a17282b66b3d 100644
--- a/metadata/glsa/glsa-201710-02.xml
+++ b/metadata/glsa/glsa-201710-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">file</product>
   <announced>2017-10-08</announced>
-  <revised>2017-10-08: 1</revised>
+  <revised count="1">2017-10-08</revised>
   <bug>629872</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-03.xml b/metadata/glsa/glsa-201710-03.xml
index d55c1d1f47e1..fe881e3228dc 100644
--- a/metadata/glsa/glsa-201710-03.xml
+++ b/metadata/glsa/glsa-201710-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">icu</product>
   <announced>2017-10-08</announced>
-  <revised>2017-10-08: 1</revised>
+  <revised count="1">2017-10-08</revised>
   <bug>616468</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-04.xml b/metadata/glsa/glsa-201710-04.xml
index a6ad46e9216e..23bce111d1e3 100644
--- a/metadata/glsa/glsa-201710-04.xml
+++ b/metadata/glsa/glsa-201710-04.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in sudo allows local users to gain root privileges.</synopsis>
   <product type="ebuild">sudo</product>
   <announced>2017-10-08</announced>
-  <revised>2017-10-08: 1</revised>
+  <revised count="1">2017-10-08</revised>
   <bug>620482</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-05.xml b/metadata/glsa/glsa-201710-05.xml
index 9fc4492741e0..c2ebeda43015 100644
--- a/metadata/glsa/glsa-201710-05.xml
+++ b/metadata/glsa/glsa-201710-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">munin</product>
   <announced>2017-10-08</announced>
-  <revised>2017-10-08: 1</revised>
+  <revised count="1">2017-10-08</revised>
   <bug>610602</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-06.xml b/metadata/glsa/glsa-201710-06.xml
index 2ffbb73c66e3..b0fed3e53b35 100644
--- a/metadata/glsa/glsa-201710-06.xml
+++ b/metadata/glsa/glsa-201710-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">postgresql</product>
   <announced>2017-10-08</announced>
-  <revised>2017-10-08: 1</revised>
+  <revised count="1">2017-10-08</revised>
   <bug>618462</bug>
   <bug>627462</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201710-07.xml b/metadata/glsa/glsa-201710-07.xml
index 8f01fb85b89f..2ab58e0c712d 100644
--- a/metadata/glsa/glsa-201710-07.xml
+++ b/metadata/glsa/glsa-201710-07.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">ocaml</product>
   <announced>2017-10-08</announced>
-  <revised>2017-10-08: 1</revised>
+  <revised count="1">2017-10-08</revised>
   <bug>622544</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-08.xml b/metadata/glsa/glsa-201710-08.xml
index ea0a9f6277de..a4f53783b5d7 100644
--- a/metadata/glsa/glsa-201710-08.xml
+++ b/metadata/glsa/glsa-201710-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">pacemaker</product>
   <announced>2017-10-08</announced>
-  <revised>2017-10-08: 1</revised>
+  <revised count="1">2017-10-08</revised>
   <bug>546550</bug>
   <bug>599194</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201710-09.xml b/metadata/glsa/glsa-201710-09.xml
index 09e2c7dce9f2..a5efceb961ea 100644
--- a/metadata/glsa/glsa-201710-09.xml
+++ b/metadata/glsa/glsa-201710-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libpcre2</product>
   <announced>2017-10-08</announced>
-  <revised>2017-10-08: 1</revised>
+  <revised count="1">2017-10-08</revised>
   <bug>614050</bug>
   <bug>617942</bug>
   <bug>617944</bug>
diff --git a/metadata/glsa/glsa-201710-10.xml b/metadata/glsa/glsa-201710-10.xml
index dd52a7ddc0f6..400b5def8661 100644
--- a/metadata/glsa/glsa-201710-10.xml
+++ b/metadata/glsa/glsa-201710-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">elfutils</product>
   <announced>2017-10-13</announced>
-  <revised>2017-10-13: 1</revised>
+  <revised count="1">2017-10-13</revised>
   <bug>614002</bug>
   <bug>614004</bug>
   <bug>618004</bug>
diff --git a/metadata/glsa/glsa-201710-11.xml b/metadata/glsa/glsa-201710-11.xml
index bfaf72daf2ec..0471b9057c53 100644
--- a/metadata/glsa/glsa-201710-11.xml
+++ b/metadata/glsa/glsa-201710-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libtasn1</product>
   <announced>2017-10-13</announced>
-  <revised>2017-10-13: 1</revised>
+  <revised count="1">2017-10-13</revised>
   <bug>619686</bug>
   <bug>627014</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201710-12.xml b/metadata/glsa/glsa-201710-12.xml
index a8e08cdda1a6..64ab81d008af 100644
--- a/metadata/glsa/glsa-201710-12.xml
+++ b/metadata/glsa/glsa-201710-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">puppetagent</product>
   <announced>2017-10-13</announced>
-  <revised>2017-10-13: 1</revised>
+  <revised count="1">2017-10-13</revised>
   <bug>597684</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-13.xml b/metadata/glsa/glsa-201710-13.xml
index 3e94863a037b..dc85dfe9d9b1 100644
--- a/metadata/glsa/glsa-201710-13.xml
+++ b/metadata/glsa/glsa-201710-13.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">graphite2</product>
   <announced>2017-10-13</announced>
-  <revised>2017-10-13: 1</revised>
+  <revised count="1">2017-10-13</revised>
   <bug>621724</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-14.xml b/metadata/glsa/glsa-201710-14.xml
index f5e253bc8fc5..6af98a641d66 100644
--- a/metadata/glsa/glsa-201710-14.xml
+++ b/metadata/glsa/glsa-201710-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">webkit-gtk</product>
   <announced>2017-10-13</announced>
-  <revised>2017-10-13: 1</revised>
+  <revised count="1">2017-10-13</revised>
   <bug>626142</bug>
   <access>remote</access>
   <affected>
@@ -51,21 +51,21 @@
     </p>
   </resolution>
   <references>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7006">CVE-2017-7006</uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7011">CVE-2017-7011</uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7012">CVE-2017-7012</uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7018">CVE-2017-7018</uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7019">CVE-2017-7019</uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7020">CVE-2017-7020</uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7030">CVE-2017-7030</uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7034">CVE-2017-7034</uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7037">CVE-2017-7037</uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7038">CVE-2017-7038</uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7039">CVE-2017-7039</uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7040">CVE-2017-7040</uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7041">CVE-2017-7041</uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7042">CVE-2017-7042</uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7043">CVE-2017-7043</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7006">CVE-2017-7006</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7011">CVE-2017-7011</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7012">CVE-2017-7012</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7018">CVE-2017-7018</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7019">CVE-2017-7019</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7020">CVE-2017-7020</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7030">CVE-2017-7030</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7034">CVE-2017-7034</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7037">CVE-2017-7037</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7038">CVE-2017-7038</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7039">CVE-2017-7039</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7040">CVE-2017-7040</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7041">CVE-2017-7041</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7042">CVE-2017-7042</uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-7043">CVE-2017-7043</uri>
   </references>
   <metadata tag="requester" timestamp="2017-04-30T20:06:21Z">BlueKnight</metadata>
   <metadata tag="submitter" timestamp="2017-10-13T23:53:44Z">chrisadr</metadata>
diff --git a/metadata/glsa/glsa-201710-15.xml b/metadata/glsa/glsa-201710-15.xml
index 60c2f5ccd17d..3955bb67f151 100644
--- a/metadata/glsa/glsa-201710-15.xml
+++ b/metadata/glsa/glsa-201710-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">gnutls</product>
   <announced>2017-10-15</announced>
-  <revised>2017-10-15: 1</revised>
+  <revised count="1">2017-10-15</revised>
   <bug>622038</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-16.xml b/metadata/glsa/glsa-201710-16.xml
index 2328ec60a129..ee7f172541f3 100644
--- a/metadata/glsa/glsa-201710-16.xml
+++ b/metadata/glsa/glsa-201710-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">shadow</product>
   <announced>2017-10-15</announced>
-  <revised>2017-10-15: 1</revised>
+  <revised count="1">2017-10-15</revised>
   <bug>627044</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-17.xml b/metadata/glsa/glsa-201710-17.xml
index 4aaef6b68378..48716488b7c9 100644
--- a/metadata/glsa/glsa-201710-17.xml
+++ b/metadata/glsa/glsa-201710-17.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xen</product>
   <announced>2017-10-18</announced>
-  <revised>2017-10-18: 1</revised>
+  <revised count="1">2017-10-18</revised>
   <bug>624112</bug>
   <bug>624116</bug>
   <bug>624118</bug>
diff --git a/metadata/glsa/glsa-201710-18.xml b/metadata/glsa/glsa-201710-18.xml
index e06ac6f879dc..e80d043a353e 100644
--- a/metadata/glsa/glsa-201710-18.xml
+++ b/metadata/glsa/glsa-201710-18.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">ruby</product>
   <announced>2017-10-18</announced>
-  <revised>2017-10-18: 1</revised>
+  <revised count="1">2017-10-18</revised>
   <bug>605536</bug>
   <bug>629484</bug>
   <bug>631034</bug>
diff --git a/metadata/glsa/glsa-201710-19.xml b/metadata/glsa/glsa-201710-19.xml
index 26dcefc9ce44..99204736f714 100644
--- a/metadata/glsa/glsa-201710-19.xml
+++ b/metadata/glsa/glsa-201710-19.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libarchive</product>
   <announced>2017-10-18</announced>
-  <revised>2017-10-18: 1</revised>
+  <revised count="1">2017-10-18</revised>
   <bug>618026</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-20.xml b/metadata/glsa/glsa-201710-20.xml
index d7af0c0ae9c4..0a2621bcd372 100644
--- a/metadata/glsa/glsa-201710-20.xml
+++ b/metadata/glsa/glsa-201710-20.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">nagios</product>
   <announced>2017-10-18</announced>
-  <revised>2017-10-18: 1</revised>
+  <revised count="1">2017-10-18</revised>
   <bug>602216</bug>
   <bug>628086</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201710-21.xml b/metadata/glsa/glsa-201710-21.xml
index adb110274d67..c4a7e668890f 100644
--- a/metadata/glsa/glsa-201710-21.xml
+++ b/metadata/glsa/glsa-201710-21.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">kodi</product>
   <announced>2017-10-22</announced>
-  <revised>2017-10-22: 1</revised>
+  <revised count="1">2017-10-22</revised>
   <bug>622384</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-22.xml b/metadata/glsa/glsa-201710-22.xml
index c676b3f4addb..bbb65430180f 100644
--- a/metadata/glsa/glsa-201710-22.xml
+++ b/metadata/glsa/glsa-201710-22.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobeflash</product>
   <announced>2017-10-22</announced>
-  <revised>2017-10-22: 1</revised>
+  <revised count="1">2017-10-22</revised>
   <bug>634456</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-23.xml b/metadata/glsa/glsa-201710-23.xml
index cc6aa8ba3a3b..380cf2f5fe08 100644
--- a/metadata/glsa/glsa-201710-23.xml
+++ b/metadata/glsa/glsa-201710-23.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">go</product>
   <announced>2017-10-23</announced>
-  <revised>2017-10-23: 1</revised>
+  <revised count="1">2017-10-23</revised>
   <bug>632408</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-24.xml b/metadata/glsa/glsa-201710-24.xml
index 4be2b2d87b5b..7ad9e7e0f6ab 100644
--- a/metadata/glsa/glsa-201710-24.xml
+++ b/metadata/glsa/glsa-201710-24.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium,chrome</product>
   <announced>2017-10-23</announced>
-  <revised>2017-10-23: 1</revised>
+  <revised count="1">2017-10-23</revised>
   <bug>634664</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-25.xml b/metadata/glsa/glsa-201710-25.xml
index b21d81a00256..1b8cde7db347 100644
--- a/metadata/glsa/glsa-201710-25.xml
+++ b/metadata/glsa/glsa-201710-25.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libpcre</product>
   <announced>2017-10-23</announced>
-  <revised>2017-10-23: 1</revised>
+  <revised count="1">2017-10-23</revised>
   <bug>614048</bug>
   <bug>614052</bug>
   <bug>614054</bug>
diff --git a/metadata/glsa/glsa-201710-26.xml b/metadata/glsa/glsa-201710-26.xml
index ecbdd99167f3..4c308a0d3bae 100644
--- a/metadata/glsa/glsa-201710-26.xml
+++ b/metadata/glsa/glsa-201710-26.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openjpeg</product>
   <announced>2017-10-23</announced>
-  <revised>2017-10-23: 1</revised>
+  <revised count="1">2017-10-23</revised>
   <bug>602180</bug>
   <bug>606618</bug>
   <bug>628504</bug>
diff --git a/metadata/glsa/glsa-201710-27.xml b/metadata/glsa/glsa-201710-27.xml
index 489a0d9e00e0..61745f463547 100644
--- a/metadata/glsa/glsa-201710-27.xml
+++ b/metadata/glsa/glsa-201710-27.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">dnsmasq</product>
   <announced>2017-10-23</announced>
-  <revised>2017-10-23: 1</revised>
+  <revised count="1">2017-10-23</revised>
   <bug>632692</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-28.xml b/metadata/glsa/glsa-201710-28.xml
index 1324e48c3901..5070b67a7daa 100644
--- a/metadata/glsa/glsa-201710-28.xml
+++ b/metadata/glsa/glsa-201710-28.xml
@@ -6,7 +6,7 @@
   </synopsis>
   <product type="ebuild">Jython</product>
   <announced>2017-10-29</announced>
-  <revised>2017-10-29: 1</revised>
+  <revised count="1">2017-10-29</revised>
   <bug>621876</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-29.xml b/metadata/glsa/glsa-201710-29.xml
index a2dfda779ecf..3a9d3fdf1606 100644
--- a/metadata/glsa/glsa-201710-29.xml
+++ b/metadata/glsa/glsa-201710-29.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">asterisk</product>
   <announced>2017-10-29</announced>
-  <revised>2017-10-29: 1</revised>
+  <revised count="1">2017-10-29</revised>
   <bug>629682</bug>
   <bug>629692</bug>
   <bug>633856</bug>
diff --git a/metadata/glsa/glsa-201710-30.xml b/metadata/glsa/glsa-201710-30.xml
index 67af29cd0fc6..21951e08d43c 100644
--- a/metadata/glsa/glsa-201710-30.xml
+++ b/metadata/glsa/glsa-201710-30.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">X.Org Server</product>
   <announced>2017-10-29</announced>
-  <revised>2017-10-29: 1</revised>
+  <revised count="1">2017-10-29</revised>
   <bug>493294</bug>
   <bug>611350</bug>
   <bug>633910</bug>
diff --git a/metadata/glsa/glsa-201710-31.xml b/metadata/glsa/glsa-201710-31.xml
index b6e438df406f..5faa2070fb29 100644
--- a/metadata/glsa/glsa-201710-31.xml
+++ b/metadata/glsa/glsa-201710-31.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">oracle,jdk,jre</product>
   <announced>2017-10-29</announced>
-  <revised>2017-10-29: 1</revised>
+  <revised count="1">2017-10-29</revised>
   <bug>635030</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201710-32.xml b/metadata/glsa/glsa-201710-32.xml
index 61324a61d421..1ec37a589889 100644
--- a/metadata/glsa/glsa-201710-32.xml
+++ b/metadata/glsa/glsa-201710-32.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Apache</product>
   <announced>2017-10-29</announced>
-  <revised>2017-10-29: 1</revised>
+  <revised count="1">2017-10-29</revised>
   <bug>622240</bug>
   <bug>624868</bug>
   <bug>631308</bug>
diff --git a/metadata/glsa/glsa-201711-01.xml b/metadata/glsa/glsa-201711-01.xml
index 7ca8635c8541..140bcc8d82e0 100644
--- a/metadata/glsa/glsa-201711-01.xml
+++ b/metadata/glsa/glsa-201711-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">libxml2</product>
   <announced>2017-11-10</announced>
-  <revised>2017-11-10: 2</revised>
+  <revised count="2">2017-11-10</revised>
   <bug>599192</bug>
   <bug>605208</bug>
   <bug>618604</bug>
diff --git a/metadata/glsa/glsa-201711-02.xml b/metadata/glsa/glsa-201711-02.xml
index 5b92f5baab49..635e7c4c284a 100644
--- a/metadata/glsa/glsa-201711-02.xml
+++ b/metadata/glsa/glsa-201711-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium,google-chrome</product>
   <announced>2017-11-10</announced>
-  <revised>2017-11-10: 2</revised>
+  <revised count="2">2017-11-10</revised>
   <bug>635556</bug>
   <bug>636800</bug>
   <access>remote</access>
@@ -68,10 +68,10 @@
     <uri link="https://chromereleases.googleblog.com/2017/11/stable-channel-update-for-desktop.html">
       Google Chrome Releases
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15398">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15398">
       CVE-2017-15398
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15399">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15399">
       CVE-2017-15399
     </uri>
   </references>
diff --git a/metadata/glsa/glsa-201711-03.xml b/metadata/glsa/glsa-201711-03.xml
index f66a488b6950..5c3abd9ee7f0 100644
--- a/metadata/glsa/glsa-201711-03.xml
+++ b/metadata/glsa/glsa-201711-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">hostapd,wpa_supplicant</product>
   <announced>2017-11-10</announced>
-  <revised>2017-11-10: 1</revised>
+  <revised count="1">2017-11-10</revised>
   <bug>634436</bug>
   <bug>634438</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201711-04.xml b/metadata/glsa/glsa-201711-04.xml
index 146b32e40cb1..c1d40fab8471 100644
--- a/metadata/glsa/glsa-201711-04.xml
+++ b/metadata/glsa/glsa-201711-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">mariadb,mysql</product>
   <announced>2017-11-10</announced>
-  <revised>2017-11-10: 1</revised>
+  <revised count="1">2017-11-10</revised>
   <bug>635704</bug>
   <bug>635706</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201711-05.xml b/metadata/glsa/glsa-201711-05.xml
index de0fba5f460c..d425384a9024 100644
--- a/metadata/glsa/glsa-201711-05.xml
+++ b/metadata/glsa/glsa-201711-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">xorg-server</product>
   <announced>2017-11-10</announced>
-  <revised>2017-11-10: 1</revised>
+  <revised count="1">2017-11-10</revised>
   <bug>635974</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201711-06.xml b/metadata/glsa/glsa-201711-06.xml
index d03d850a7c94..a9fc557362dd 100644
--- a/metadata/glsa/glsa-201711-06.xml
+++ b/metadata/glsa/glsa-201711-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">wget</product>
   <announced>2017-11-11</announced>
-  <revised>2017-11-11: 1</revised>
+  <revised count="1">2017-11-11</revised>
   <bug>635496</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201711-07.xml b/metadata/glsa/glsa-201711-07.xml
index dda1ff9a47fe..a4c7257f655f 100644
--- a/metadata/glsa/glsa-201711-07.xml
+++ b/metadata/glsa/glsa-201711-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">imagemagick</product>
   <announced>2017-11-11</announced>
-  <revised>2017-11-11: 1</revised>
+  <revised count="1">2017-11-11</revised>
   <bug>626454</bug>
   <bug>626906</bug>
   <bug>627036</bug>
diff --git a/metadata/glsa/glsa-201711-08.xml b/metadata/glsa/glsa-201711-08.xml
index b02d041603ad..216e12fa4788 100644
--- a/metadata/glsa/glsa-201711-08.xml
+++ b/metadata/glsa/glsa-201711-08.xml
@@ -8,7 +8,7 @@
   </synopsis>
   <product type="ebuild">libxfont,libxfont2</product>
   <announced>2017-11-11</announced>
-  <revised>2017-11-11: 1</revised>
+  <revised count="1">2017-11-11</revised>
   <bug>634044</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201711-09.xml b/metadata/glsa/glsa-201711-09.xml
index 74aeece40ac9..fe0019a46178 100644
--- a/metadata/glsa/glsa-201711-09.xml
+++ b/metadata/glsa/glsa-201711-09.xml
@@ -5,7 +5,7 @@
   <synopsis>A vulnerability in LXC may lead to an unauthorized security bypass.</synopsis>
   <product type="ebuild">lxc</product>
   <announced>2017-11-11</announced>
-  <revised>2017-11-11: 1</revised>
+  <revised count="1">2017-11-11</revised>
   <bug>636386</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201711-10.xml b/metadata/glsa/glsa-201711-10.xml
index 20a92dda7718..717a6c115832 100644
--- a/metadata/glsa/glsa-201711-10.xml
+++ b/metadata/glsa/glsa-201711-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">cacti</product>
   <announced>2017-11-11</announced>
-  <revised>2017-11-11: 1</revised>
+  <revised count="1">2017-11-11</revised>
   <bug>607732</bug>
   <bug>626828</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201711-11.xml b/metadata/glsa/glsa-201711-11.xml
index edc046f07599..29f3f0e9daa6 100644
--- a/metadata/glsa/glsa-201711-11.xml
+++ b/metadata/glsa/glsa-201711-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">vde</product>
   <announced>2017-11-12</announced>
-  <revised>2017-11-12: 1</revised>
+  <revised count="1">2017-11-12</revised>
   <bug>603382</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201711-12.xml b/metadata/glsa/glsa-201711-12.xml
index fa5e74e6e95e..e9685c9c009a 100644
--- a/metadata/glsa/glsa-201711-12.xml
+++ b/metadata/glsa/glsa-201711-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">egroupware</product>
   <announced>2017-11-12</announced>
-  <revised>2017-11-13: 2</revised>
+  <revised count="2">2017-11-13</revised>
   <bug>501908</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201711-13.xml b/metadata/glsa/glsa-201711-13.xml
index a1d554d6d45a..86843d838290 100644
--- a/metadata/glsa/glsa-201711-13.xml
+++ b/metadata/glsa/glsa-201711-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">adobe-flash</product>
   <announced>2017-11-19</announced>
-  <revised>2017-11-19: 1</revised>
+  <revised count="1">2017-11-19</revised>
   <bug>637630</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201711-14.xml b/metadata/glsa/glsa-201711-14.xml
index f84b84306c48..3cb0ce84d071 100644
--- a/metadata/glsa/glsa-201711-14.xml
+++ b/metadata/glsa/glsa-201711-14.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">icedtea</product>
   <announced>2017-11-19</announced>
-  <revised>2017-11-19: 1</revised>
+  <revised count="1">2017-11-19</revised>
   <bug>636522</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201711-15.xml b/metadata/glsa/glsa-201711-15.xml
index eb77bec4c008..21018511621c 100644
--- a/metadata/glsa/glsa-201711-15.xml
+++ b/metadata/glsa/glsa-201711-15.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">PHPUnit</product>
   <announced>2017-11-19</announced>
-  <revised>2017-11-19: 1</revised>
+  <revised count="1">2017-11-19</revised>
   <bug>635356</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201711-16.xml b/metadata/glsa/glsa-201711-16.xml
index 69401136336a..2aba69ec60fc 100644
--- a/metadata/glsa/glsa-201711-16.xml
+++ b/metadata/glsa/glsa-201711-16.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">couchdb</product>
   <announced>2017-11-19</announced>
-  <revised>2017-11-19: 1</revised>
+  <revised count="1">2017-11-19</revised>
   <bug>637516</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201712-01.xml b/metadata/glsa/glsa-201712-01.xml
index 31391d02a59e..05c6677138c4 100644
--- a/metadata/glsa/glsa-201712-01.xml
+++ b/metadata/glsa/glsa-201712-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">WebkitGTK</product>
   <announced>2017-12-14</announced>
-  <revised>2017-12-14: 1</revised>
+  <revised count="1">2017-12-14</revised>
   <bug>637076</bug>
   <access>remote</access>
   <affected>
@@ -45,43 +45,43 @@
     </code>
   </resolution>
   <references>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13783">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13783">
       CVE-2017-13783
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13784">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13784">
       CVE-2017-13784
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13785">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13785">
       CVE-2017-13785
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13788">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13788">
       CVE-2017-13788
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13791">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13791">
       CVE-2017-13791
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13792">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13792">
       CVE-2017-13792
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13793">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13793">
       CVE-2017-13793
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13794">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13794">
       CVE-2017-13794
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13795">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13795">
       CVE-2017-13795
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13796">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13796">
       CVE-2017-13796
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13798">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13798">
       CVE-2017-13798
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13802">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13802">
       CVE-2017-13802
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13803">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-13803">
       CVE-2017-13803
     </uri>
   </references>
diff --git a/metadata/glsa/glsa-201712-02.xml b/metadata/glsa/glsa-201712-02.xml
index f0f2f8bc37f9..be070b6284e1 100644
--- a/metadata/glsa/glsa-201712-02.xml
+++ b/metadata/glsa/glsa-201712-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">OpenCV</product>
   <announced>2017-12-14</announced>
-  <revised>2017-12-14: 1</revised>
+  <revised count="1">2017-12-14</revised>
   <bug>627230</bug>
   <bug>627958</bug>
   <access>remote</access>
@@ -44,46 +44,46 @@
     </code>
   </resolution>
   <references>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12597">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12597">
       CVE-2017-12597
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12598">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12598">
       CVE-2017-12598
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12599">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12599">
       CVE-2017-12599
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12600">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12600">
       CVE-2017-12600
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12601">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12601">
       CVE-2017-12601
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12602">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12602">
       CVE-2017-12602
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12603">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12603">
       CVE-2017-12603
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12604">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12604">
       CVE-2017-12604
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12605">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12605">
       CVE-2017-12605
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12606">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12606">
       CVE-2017-12606
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12862">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12862">
       CVE-2017-12862
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12863">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12863">
       CVE-2017-12863
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12864">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12864">
       CVE-2017-12864
     </uri>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-14136">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-14136">
       CVE-2017-14136
     </uri>
   </references>
diff --git a/metadata/glsa/glsa-201712-03.xml b/metadata/glsa/glsa-201712-03.xml
index 2f08599410ad..406f8a6b3287 100644
--- a/metadata/glsa/glsa-201712-03.xml
+++ b/metadata/glsa/glsa-201712-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">openssl</product>
   <announced>2017-12-14</announced>
-  <revised>2017-12-14: 1</revised>
+  <revised count="1">2017-12-14</revised>
   <bug>629290</bug>
   <bug>636264</bug>
   <bug>640172</bug>
diff --git a/metadata/glsa/glsa-201712-04.xml b/metadata/glsa/glsa-201712-04.xml
index ba252c674eb0..012a4e427ba5 100644
--- a/metadata/glsa/glsa-201712-04.xml
+++ b/metadata/glsa/glsa-201712-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">curl</product>
   <announced>2017-12-14</announced>
-  <revised>2017-12-14: 1</revised>
+  <revised count="1">2017-12-14</revised>
   <bug>633430</bug>
   <bug>635140</bug>
   <bug>638734</bug>
diff --git a/metadata/glsa/glsa-201801-01.xml b/metadata/glsa/glsa-201801-01.xml
index edcda87e98f8..4502159b306c 100644
--- a/metadata/glsa/glsa-201801-01.xml
+++ b/metadata/glsa/glsa-201801-01.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">binutils</product>
   <announced>2018-01-07</announced>
-  <revised>2018-01-07: 1</revised>
+  <revised count="1">2018-01-07</revised>
   <bug>624700</bug>
   <bug>627516</bug>
   <bug>628538</bug>
diff --git a/metadata/glsa/glsa-201801-02.xml b/metadata/glsa/glsa-201801-02.xml
index 1e7fbff303a9..b250da295fbe 100644
--- a/metadata/glsa/glsa-201801-02.xml
+++ b/metadata/glsa/glsa-201801-02.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">optipng</product>
   <announced>2018-01-07</announced>
-  <revised>2018-01-07: 1</revised>
+  <revised count="1">2018-01-07</revised>
   <bug>637936</bug>
   <bug>639690</bug>
   <access>remote</access>
diff --git a/metadata/glsa/glsa-201801-03.xml b/metadata/glsa/glsa-201801-03.xml
index 67a86a6d1886..da4b274b74c7 100644
--- a/metadata/glsa/glsa-201801-03.xml
+++ b/metadata/glsa/glsa-201801-03.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">chromium,google-chrome</product>
   <announced>2018-01-07</announced>
-  <revised>2018-01-07: 1</revised>
+  <revised count="1">2018-01-07</revised>
   <bug>640334</bug>
   <bug>641376</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201801-04.xml b/metadata/glsa/glsa-201801-04.xml
index e49cf9f43606..32a4cab196a5 100644
--- a/metadata/glsa/glsa-201801-04.xml
+++ b/metadata/glsa/glsa-201801-04.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">LibXcursor</product>
   <announced>2018-01-07</announced>
-  <revised>2018-01-07: 1</revised>
+  <revised count="1">2018-01-07</revised>
   <bug>639062</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201801-05.xml b/metadata/glsa/glsa-201801-05.xml
index 0522284c6ea3..8f95eebaff0f 100644
--- a/metadata/glsa/glsa-201801-05.xml
+++ b/metadata/glsa/glsa-201801-05.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">OpenSSH</product>
   <announced>2018-01-07</announced>
-  <revised>2018-01-07: 1</revised>
+  <revised count="1">2018-01-07</revised>
   <bug>633428</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201801-06.xml b/metadata/glsa/glsa-201801-06.xml
index a0725d7cc0f7..e83ad16bf2cb 100644
--- a/metadata/glsa/glsa-201801-06.xml
+++ b/metadata/glsa/glsa-201801-06.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">backintime</product>
   <announced>2018-01-07</announced>
-  <revised>2018-01-07: 1</revised>
+  <revised count="1">2018-01-07</revised>
   <bug>636974</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201801-07.xml b/metadata/glsa/glsa-201801-07.xml
index 48b58e98c066..249096ef09c9 100644
--- a/metadata/glsa/glsa-201801-07.xml
+++ b/metadata/glsa/glsa-201801-07.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">Emacs</product>
   <announced>2018-01-07</announced>
-  <revised>2018-01-08: 2</revised>
+  <revised count="2">2018-01-08</revised>
   <bug>630680</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201801-08.xml b/metadata/glsa/glsa-201801-08.xml
index 71a3eac590d4..f8f19a598c9e 100644
--- a/metadata/glsa/glsa-201801-08.xml
+++ b/metadata/glsa/glsa-201801-08.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">MiniUPnP</product>
   <announced>2018-01-07</announced>
-  <revised>2018-01-07: 1</revised>
+  <revised count="1">2018-01-07</revised>
   <bug>562684</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201801-09.xml b/metadata/glsa/glsa-201801-09.xml
index e76b2d50287a..3e99f3e4e977 100644
--- a/metadata/glsa/glsa-201801-09.xml
+++ b/metadata/glsa/glsa-201801-09.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">WebkitGTK+</product>
   <announced>2018-01-07</announced>
-  <revised>2018-01-07: 1</revised>
+  <revised count="1">2018-01-07</revised>
   <bug>641752</bug>
   <access>remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201801-10.xml b/metadata/glsa/glsa-201801-10.xml
index 329c01883b89..3c8cf840f083 100644
--- a/metadata/glsa/glsa-201801-10.xml
+++ b/metadata/glsa/glsa-201801-10.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">LibXfont, LibXfont2</product>
   <announced>2018-01-08</announced>
-  <revised>2018-01-08: 1</revised>
+  <revised count="1">2018-01-08</revised>
   <bug>639064</bug>
   <access>local</access>
   <affected>
diff --git a/metadata/glsa/glsa-201801-11.xml b/metadata/glsa/glsa-201801-11.xml
index 7359c3c04a81..89c05bbd2841 100644
--- a/metadata/glsa/glsa-201801-11.xml
+++ b/metadata/glsa/glsa-201801-11.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">PySAML2</product>
   <announced>2018-01-11</announced>
-  <revised>2018-01-12: 2</revised>
+  <revised count="2">2018-01-12</revised>
   <bug>644016</bug>
   <access>remote</access>
   <affected>
@@ -51,7 +51,7 @@
     
   </resolution>
   <references>
-    <uri link="http://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-1000433">
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-1000433">
       CVE-2017-1000433
     </uri>
   </references>
diff --git a/metadata/glsa/glsa-201801-12.xml b/metadata/glsa/glsa-201801-12.xml
index f97629b7f436..5171c50eb47c 100644
--- a/metadata/glsa/glsa-201801-12.xml
+++ b/metadata/glsa/glsa-201801-12.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">icoutils</product>
   <announced>2018-01-11</announced>
-  <revised>2018-01-11: 1</revised>
+  <revised count="1">2018-01-11</revised>
   <bug>605138</bug>
   <access>local, remote</access>
   <affected>
diff --git a/metadata/glsa/glsa-201801-13.xml b/metadata/glsa/glsa-201801-13.xml
index e744cfc54c4c..ca541b8c772f 100644
--- a/metadata/glsa/glsa-201801-13.xml
+++ b/metadata/glsa/glsa-201801-13.xml
@@ -7,7 +7,7 @@
   </synopsis>
   <product type="ebuild">tigervnc</product>
   <announced>2018-01-11</announced>
-  <revised>2018-01-11: 1</revised>
+  <revised count="1">2018-01-11</revised>
   <bug>614742</bug>
   <bug>636396</bug>
   <access>local, remote</access>
diff --git a/metadata/glsa/glsa-201801-14.xml b/metadata/glsa/glsa-201801-14.xml
new file mode 100644
index 000000000000..14031c5a890c
--- /dev/null
+++ b/metadata/glsa/glsa-201801-14.xml
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201801-14">
+  <title>Xen: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in Xen, the worst of which
+    could allow for privilege escalation.
+  </synopsis>
+  <product type="ebuild">xen</product>
+  <announced>2018-01-14</announced>
+  <revised count="1">2018-01-14</revised>
+  <bug>627962</bug>
+  <bug>634668</bug>
+  <bug>637540</bug>
+  <bug>637542</bug>
+  <bug>639688</bug>
+  <bug>641566</bug>
+  <access>local</access>
+  <affected>
+    <package name="app-emulation/xen" auto="yes" arch="*">
+      <unaffected range="ge">4.9.1-r1</unaffected>
+      <vulnerable range="lt">4.9.1-r1</vulnerable>
+    </package>
+    <package name="app-emulation/xen-tools" auto="yes" arch="*">
+      <unaffected range="ge">4.9.1-r1</unaffected>
+      <vulnerable range="lt">4.9.1-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>Xen is a bare-metal hypervisor.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in Xen. Please review the
+      referenced CVE identifiers for details.
+    </p>
+  </description>
+  <impact type="high">
+    <p>A local attacker could potentially execute arbitrary code with the
+      privileges of the Xen (QEMU) process on the host, gain privileges on the
+      host system, or cause a Denial of Service condition.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>All Xen users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose "&gt;=app-emulation/xen-4.9.1-r1"
+    </code>
+    
+    <p>All Xen tools users should upgrade to the latest version:</p>
+    
+    <code>
+      # emerge --sync
+      # emerge --ask --oneshot --verbose
+      "&gt;=app-emulation/xen-tools-4.9.1-r1"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12134">
+      CVE-2017-12134
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12135">
+      CVE-2017-12135
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12136">
+      CVE-2017-12136
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-12137">
+      CVE-2017-12137
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15588">
+      CVE-2017-15588
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15589">
+      CVE-2017-15589
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15590">
+      CVE-2017-15590
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15591">
+      CVE-2017-15591
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15592">
+      CVE-2017-15592
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15593">
+      CVE-2017-15593
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15594">
+      CVE-2017-15594
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-15595">
+      CVE-2017-15595
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-17044">
+      CVE-2017-17044
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-17045">
+      CVE-2017-17045
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-17046">
+      CVE-2017-17046
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-17563">
+      CVE-2017-17563
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-17564">
+      CVE-2017-17564
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-17565">
+      CVE-2017-17565
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2017-17566">
+      CVE-2017-17566
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2017-11-30T07:36:44Z">BlueKnight</metadata>
+  <metadata tag="submitter" timestamp="2018-01-14T23:31:54Z">b-man</metadata>
+</glsa>
diff --git a/metadata/glsa/glsa-201801-15.xml b/metadata/glsa/glsa-201801-15.xml
new file mode 100644
index 000000000000..6e5669c87459
--- /dev/null
+++ b/metadata/glsa/glsa-201801-15.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE glsa SYSTEM "http://www.gentoo.org/dtd/glsa.dtd">
+<glsa id="201801-15">
+  <title>PolarSSL: Multiple vulnerabilities</title>
+  <synopsis>Multiple vulnerabilities have been found in PolarSSL, the worst of
+    which may allow remote attackers to execute arbitrary code.
+  </synopsis>
+  <product type="ebuild">polarssl</product>
+  <announced>2018-01-15</announced>
+  <revised count="1">2018-01-15</revised>
+  <bug>537108</bug>
+  <bug>620504</bug>
+  <access>remote</access>
+  <affected>
+    <package name="net-libs/polarssl" auto="yes" arch="*">
+      <vulnerable range="lt">1.3.9-r1</vulnerable>
+    </package>
+  </affected>
+  <background>
+    <p>PolarSSL is a cryptographic library for embedded systems.</p>
+  </background>
+  <description>
+    <p>Multiple vulnerabilities have been discovered in PolarSSL. Please review
+      the CVE identifiers referenced below for details.
+    </p>
+  </description>
+  <impact type="normal">
+    <p>A remote attacker might be able to execute arbitrary code, cause Denial
+      of Service condition or obtain sensitive information.
+    </p>
+  </impact>
+  <workaround>
+    <p>There is no known workaround at this time.</p>
+  </workaround>
+  <resolution>
+    <p>Gentoo has discontinued support for PolarSSL and recommends that users
+      unmerge the package:
+    </p>
+    
+    <code>
+      # emerge --unmerge "net-libs/polarssl"
+    </code>
+  </resolution>
+  <references>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-1182">
+      CVE-2015-1182
+    </uri>
+    <uri link="https://nvd.nist.gov/nvd.cfm?cvename=CVE-2015-7575">
+      CVE-2015-7575
+    </uri>
+  </references>
+  <metadata tag="requester" timestamp="2017-10-19T20:10:49Z">jmbailey</metadata>
+  <metadata tag="submitter" timestamp="2018-01-15T04:24:40Z">jmbailey</metadata>
+</glsa>
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 749c873f8b58..f124a8652ca5 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Jan 2018 05:38:53 +0000
+Tue, 16 Jan 2018 16:39:18 +0000
diff --git a/metadata/glsa/timestamp.commit b/metadata/glsa/timestamp.commit
index bad538a8fc07..185f121a6f0f 100644
--- a/metadata/glsa/timestamp.commit
+++ b/metadata/glsa/timestamp.commit
@@ -1 +1 @@
-8dca4027f96f539f3d11cd618e9a606c9597dbca 1515720256 2018-01-12T01:24:16+00:00
+bda98067f603838195635d005adb1554327dd24e 1515990330 2018-01-15T04:25:30+00:00
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 9ca4c3a3b88f..cff13adf9b4d 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 84f1522f23f2..5a5c03fb2fc8 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/at-spi2-atk-2.24.1 b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1
index beffda2252a9..a03401f3ec9a 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-atk-2.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=Gtk module for bridging AT-SPI to Atk
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 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 test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=>=app-accessibility/at-spi2-core-2.17.90[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/atk-2.15.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.32:2[abi_x86_32(-)?,abi_x86_64(-)?,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.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(-)?] !<gnome-extra/at-spi-1.32.0-r1
 SLOT=2
 SRC_URI=mirror://gnome/sources/at-spi2-atk/2.24/at-spi2-atk-2.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9fe3244ffa7cbd438d037bdfacd553fd
+_md5_=b7d7f7e6dd095a8f9d95da74618e1de1
diff --git a/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1 b/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1
index 27803762e8bf..ce09f377033c 100644
--- a/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1
+++ b/metadata/md5-cache/app-accessibility/at-spi2-core-2.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=D-Bus accessibility specifications and registration daemon
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=X +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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.36:2[abi_x86_32(-)?,abi_x86_64(-)?,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[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,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.6:= ) 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/libXi[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXtst[abi_x86_32(-)?,abi_x86_64(-)?,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/at-spi2-core/2.24/at-spi2-core-2.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dbd790e56b0563afe197be2b7f50f3dd
+_md5_=a08ad942312ec9b644ccdffb6a4f61b3
diff --git a/metadata/md5-cache/app-accessibility/simon-9999 b/metadata/md5-cache/app-accessibility/simon-9999
index 9f04f6d83a2b..d35ae071f544 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.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/okular-14.12.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtx11extras-5.7.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=61b42c57cadead483bba8a6a8d8e05cb
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7
index 5bacc83edbec..53ab15b990fc 100644
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7
+++ b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.8.7
@@ -4,11 +4,11 @@ DESCRIPTION=Speech synthesis interface
 EAPI=6
 HOMEPAGE=http://www.freebsoft.org/speechd
 IUSE=alsa ao +espeak flite nas pulseaudio python static-libs python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=python? ( python_targets_python3_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-libs/dotconf-1.3 >=dev-libs/glib-2.28:2 dev-libs/libltdl:0 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) dev-python/pyxdg
 REQUIRED_USE=python? ( || ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=http://www.freebsoft.org/pub/projects/speechd/speech-dispatcher-0.8.7.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=055e9edee002c5602936ddd100460ede
+_md5_=96a3a60f18f03ba43b0f148b9750efbb
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 4ec730aa907e..b5895928843e 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.11 b/metadata/md5-cache/app-admin/calamares-3.1.11
index 956093797d2b..c18e0225d874 100644
--- a/metadata/md5-cache/app-admin/calamares-3.1.11
+++ b/metadata/md5-cache/app-admin/calamares-3.1.11
@@ -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.11/calamares-3.1.11.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=672693808a4ff0c04fd8137a35214825
diff --git a/metadata/md5-cache/app-admin/calamares-3.1.7 b/metadata/md5-cache/app-admin/calamares-3.1.7
index 208e9d622aa9..598ddee35372 100644
--- a/metadata/md5-cache/app-admin/calamares-3.1.7
+++ b/metadata/md5-cache/app-admin/calamares-3.1.7
@@ -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.7/calamares-3.1.7.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=672693808a4ff0c04fd8137a35214825
diff --git a/metadata/md5-cache/app-admin/eselect-1.4.11 b/metadata/md5-cache/app-admin/eselect-1.4.11
index 48bad205bf91..27657c3ec29b 100644
--- a/metadata/md5-cache/app-admin/eselect-1.4.11
+++ b/metadata/md5-cache/app-admin/eselect-1.4.11
@@ -4,11 +4,11 @@ DESCRIPTION=Gentoo's multi-purpose configuration and management tool
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Eselect
 IUSE=doc emacs vim-syntax
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+ || ( GPL-2+ CC-BY-SA-3.0 )
 PDEPEND=emacs? ( app-emacs/eselect-mode ) vim-syntax? ( app-vim/eselect-syntax )
 RDEPEND=sys-apps/sed || ( sys-apps/coreutils sys-freebsd/freebsd-bin app-misc/realpath ) sys-apps/file sys-libs/ncurses:0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~ulm/eselect/eselect-1.4.11.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=16f8d28cd191dd32eb902a4ae7f78ddb
+_md5_=9b7b6c80a6e50a70fe93869909aaf998
diff --git a/metadata/md5-cache/app-admin/mongo-tools-3.2.17 b/metadata/md5-cache/app-admin/mongo-tools-3.2.17
index 9704ad876b5e..4aed014928ac 100644
--- a/metadata/md5-cache/app-admin/mongo-tools-3.2.17
+++ b/metadata/md5-cache/app-admin/mongo-tools-3.2.17
@@ -4,9 +4,9 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=6
 HOMEPAGE=https://www.mongodb.org
 IUSE=sasl ssl
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=Apache-2.0
 RDEPEND=!<dev-db/mongodb-3.0.0
 SLOT=0
 SRC_URI=https://github.com/mongodb/mongo-tools/archive/r3.2.17.tar.gz -> mongo-tools-3.2.17.tar.gz
-_md5_=8dea81fdb5e20fec7b1e829282debca5
+_md5_=e04037b2c5b8cc3e5d4a276ca284d857
diff --git a/metadata/md5-cache/app-admin/puppet-agent-5.3.3-r1 b/metadata/md5-cache/app-admin/puppet-agent-5.3.3-r1
deleted file mode 100644
index 5791402c2304..000000000000
--- a/metadata/md5-cache/app-admin/puppet-agent-5.3.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install setup unpack
-DEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what virtual/pkgconfig
-DESCRIPTION=general puppet client utils along with mcollective hiera and facter
-EAPI=5
-HOMEPAGE=https://puppetlabs.com/
-IUSE=puppetdb selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what app-portage/eix sys-apps/dmidecode sys-libs/glibc sys-libs/readline:0/7 sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/jessie/puppet5/p/puppet-agent/puppet-agent_5.3.3-1jessie_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/jessie/puppet5/p/puppet-agent/puppet-agent_5.3.3-1jessie_i386.deb )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=ac2a22062a5b021b96d9a17e849d3f6a
diff --git a/metadata/md5-cache/app-admin/puppet-agent-5.3.3-r2 b/metadata/md5-cache/app-admin/puppet-agent-5.3.3-r2
new file mode 100644
index 000000000000..2338af425528
--- /dev/null
+++ b/metadata/md5-cache/app-admin/puppet-agent-5.3.3-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install setup unpack
+DEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what virtual/pkgconfig
+DESCRIPTION=general puppet client utils along with mcollective hiera and facter
+EAPI=5
+HOMEPAGE=https://puppetlabs.com/
+IUSE=puppetdb selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=!app-admin/augeas !app-admin/mcollective !app-admin/puppet !dev-ruby/hiera !dev-ruby/facter !app-emulation/virt-what app-portage/eix sys-apps/dmidecode sys-libs/glibc sys-libs/readline:0/7 sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 )
+RESTRICT=strip
+SLOT=0
+SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.3.3-1stretch_amd64.deb ) x86? ( http://apt.puppetlabs.com/pool/stretch/puppet5/p/puppet-agent/puppet-agent_5.3.3-1stretch_i386.deb )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=52a912cb8187c48053147caa0f39f6ce
diff --git a/metadata/md5-cache/app-admin/rasdaemon-0.6.0-r1 b/metadata/md5-cache/app-admin/rasdaemon-0.6.0-r1
new file mode 100644
index 000000000000..fbc5fedfdffc
--- /dev/null
+++ b/metadata/md5-cache/app-admin/rasdaemon-0.6.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Reliability, Availability and Serviceability logging tool
+EAPI=6
+HOMEPAGE=http://www.infradead.org/~mchehab/rasdaemon/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-devel/gettext dev-db/sqlite sys-apps/dmidecode
+SLOT=0
+SRC_URI=http://www.infradead.org/~mchehab/rasdaemon/rasdaemon-0.6.0.tar.bz2
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=80cf1dd4948e254307b5e5dc3e923266
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.22_beta3 b/metadata/md5-cache/app-admin/sudo-1.8.22_beta3
deleted file mode 100644
index 5e9a63d7bc14..000000000000
--- a/metadata/md5-cache/app-admin/sudo-1.8.22_beta3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison >=app-portage/elt-patches-20170422
-DESCRIPTION=Allows users or groups to run commands as other users
-EAPI=6
-HOMEPAGE=http://www.sudo.ws/
-IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey
-LICENSE=ISC BSD
-RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
-REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
-SLOT=0
-SRC_URI=http://www.sudo.ws/sudo/dist/beta/sudo-1.8.22b3.tar.gz ftp://ftp.sudo.ws/pub/sudo/beta/sudo-1.8.22b3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9656a781a3206e5773dbcaa1578490df
diff --git a/metadata/md5-cache/app-admin/sudo-1.8.22_rc1 b/metadata/md5-cache/app-admin/sudo-1.8.22_rc1
new file mode 100644
index 000000000000..43cc3c2ac703
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sudo-1.8.22_rc1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib sys-devel/bison >=app-portage/elt-patches-20170422
+DESCRIPTION=Allows users or groups to run commands as other users
+EAPI=6
+HOMEPAGE=http://www.sudo.ws/
+IUSE=gcrypt ldap nls pam offensive openssl sasl selinux +sendmail skey
+LICENSE=ISC BSD
+RDEPEND=gcrypt? ( dev-libs/libgcrypt:= ) openssl? ( dev-libs/openssl:0= ) pam? ( virtual/pam ) sasl? ( dev-libs/cyrus-sasl ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ldap? ( >=net-nds/openldap-2.1.30-r1 dev-libs/cyrus-sasl ) sys-libs/zlib selinux? ( sec-policy/selinux-sudo ) ldap? ( dev-lang/perl ) pam? ( sys-auth/pambase ) >=app-misc/editor-wrapper-3 virtual/editor sendmail? ( virtual/mta )
+REQUIRED_USE=pam? ( !skey ) skey? ( !pam ) ?? ( gcrypt openssl )
+SLOT=0
+SRC_URI=http://www.sudo.ws/sudo/dist/beta/sudo-1.8.22rc1.tar.gz ftp://ftp.sudo.ws/pub/sudo/beta/sudo-1.8.22rc1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=9656a781a3206e5773dbcaa1578490df
diff --git a/metadata/md5-cache/app-admin/syslog-ng-3.13.2 b/metadata/md5-cache/app-admin/syslog-ng-3.13.2
index ed2c061b5cf1..0abb0a674c56 100644
--- a/metadata/md5-cache/app-admin/syslog-ng-3.13.2
+++ b/metadata/md5-cache/app-admin/syslog-ng-3.13.2
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/balabit/syslog-ng/releases/download/syslog-ng-3.13.2/syslog-ng-3.13.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f4a1824cf1ec28fad0b8737a1582643e
+_md5_=c8281bebf698e42eb06d089da15bf597
diff --git a/metadata/md5-cache/app-admin/sysstat-11.6.0 b/metadata/md5-cache/app-admin/sysstat-11.6.0
deleted file mode 100644
index 9e241ba3b12f..000000000000
--- a/metadata/md5-cache/app-admin/sysstat-11.6.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
-DESCRIPTION=System performance tools for Linux
-EAPI=6
-HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
-IUSE=debug nls lm_sensors selinux static
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
-SLOT=0
-SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.6.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=75fd9cac1b98a4a8a5000fb3587df35a
diff --git a/metadata/md5-cache/app-admin/sysstat-11.6.2 b/metadata/md5-cache/app-admin/sysstat-11.6.2
new file mode 100644
index 000000000000..60976506fb5c
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysstat-11.6.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=System performance tools for Linux
+EAPI=6
+HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
+IUSE=debug nls lm_sensors selinux static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
+SLOT=0
+SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.6.2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=933ab29b17cc1914e51b80aa503da485
diff --git a/metadata/md5-cache/app-admin/sysstat-11.7.1 b/metadata/md5-cache/app-admin/sysstat-11.7.1
new file mode 100644
index 000000000000..25306e3d2d9f
--- /dev/null
+++ b/metadata/md5-cache/app-admin/sysstat-11.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=System performance tools for Linux
+EAPI=6
+HOMEPAGE=http://pagesperso-orange.fr/sebastien.godard/
+IUSE=debug nls lm_sensors selinux static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) lm_sensors? ( sys-apps/lm_sensors ) selinux? ( sec-policy/selinux-sysstat )
+SLOT=0
+SRC_URI=http://pagesperso-orange.fr/sebastien.godard/sysstat-11.7.1.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=933ab29b17cc1914e51b80aa503da485
diff --git a/metadata/md5-cache/app-admin/systemdgenie-0.99.0 b/metadata/md5-cache/app-admin/systemdgenie-0.99.0
index f87766ed3fc3..d2a3ff1bb647 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.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-apps/systemd >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/systemdgenie/systemdgenie-0.99.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=97be443413edb83c2e757af010023e96
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 0ebb98d685f4..71bb2ebb30a6 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/defluff-0.3.2 b/metadata/md5-cache/app-arch/defluff-0.3.2
deleted file mode 100644
index 9c593f1b62db..000000000000
--- a/metadata/md5-cache/app-arch/defluff-0.3.2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=app-arch/unzip
-DESCRIPTION=deflate huffman optimizer
-EAPI=5
-HOMEPAGE=http://j-o.users.sourceforge.net/ http://encode.ru/threads/1214-defluff-a-deflate-huffman-optimizer
-KEYWORDS=~amd64 ~x86 -*
-LICENSE=all-rights-reserved
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( http://encode.ru/attachment.php?attachmentid=1523 -> defluff-0.3.2-linux-x86_64.zip ) x86? ( http://encode.ru/attachment.php?attachmentid=1522 -> defluff-0.3.2-linux-i686.zip )
-_md5_=50ed26f5c3917ea2f5e792fd8f074f8a
diff --git a/metadata/md5-cache/app-arch/engrampa-1.16.0-r2 b/metadata/md5-cache/app-arch/engrampa-1.16.0-r2
deleted file mode 100644
index 03d60a5c03b9..000000000000
--- a/metadata/md5-cache/app-arch/engrampa-1.16.0-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.1.0 ) >=x11-libs/gtk+-3.14:3[X] magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=Engrampa archive manager for MATE
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=caja magic packagekit
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.1.0 ) >=x11-libs/gtk+-3.14:3[X] magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/engrampa-1.16.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00a69cd9bd579380c1461ce0c6e2a665
diff --git a/metadata/md5-cache/app-arch/engrampa-1.16.1 b/metadata/md5-cache/app-arch/engrampa-1.16.1
new file mode 100644
index 000000000000..cfc793d3e0f2
--- /dev/null
+++ b/metadata/md5-cache/app-arch/engrampa-1.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.1.0 ) >=x11-libs/gtk+-3.14:3[X] magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver app-text/yelp-tools >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=Engrampa archive manager for MATE
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=caja magic packagekit
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.32.0:2 >=dev-libs/json-glib-0.14:0 x11-libs/gdk-pixbuf:2 x11-libs/pango:0 virtual/libintl:0 caja? ( >=mate-base/caja-1.1.0 ) >=x11-libs/gtk+-3.14:3[X] magic? ( sys-apps/file ) packagekit? ( app-admin/packagekit-base ) !!app-arch/mate-file-archiver
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/engrampa-1.16.1.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cc04cab3fb60ef8c8a85e7edf20be506
diff --git a/metadata/md5-cache/app-arch/wimlib-1.12.0 b/metadata/md5-cache/app-arch/wimlib-1.12.0
new file mode 100644
index 000000000000..0ab294fe57a2
--- /dev/null
+++ b/metadata/md5-cache/app-arch/wimlib-1.12.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 ) cpu_flags_x86_ssse3? ( yasm? ( dev-lang/yasm ) !yasm? ( dev-lang/nasm ) ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=The open source Windows Imaging (WIM) library
+EAPI=6
+HOMEPAGE=https://wimlib.net/
+IUSE=cpu_flags_x86_ssse3 fuse 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 )
+REQUIRED_USE=cpu_flags_x86_ssse3? ( !openssl )
+RESTRICT=primaryuri
+SLOT=0
+SRC_URI=https://wimlib.net/downloads/wimlib-1.12.0.tar.gz -> wimlib-1.12.0.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
+_md5_=99cd7c89ad58a5c306a5ffffc40ef2e9
diff --git a/metadata/md5-cache/app-backup/Manifest.gz b/metadata/md5-cache/app-backup/Manifest.gz
index 8a45ff8051a0..c284fd737b51 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/kbackup-1.0 b/metadata/md5-cache/app-backup/kbackup-1.0
index 6a76431ec34c..6cc967df584e 100644
--- a/metadata/md5-cache/app-backup/kbackup-1.0
+++ b/metadata/md5-cache/app-backup/kbackup-1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=http://members.aon.at/m.koller/kbackup-1.0.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=08dcc27bf0ee872a46ca8f87a5ab484f
diff --git a/metadata/md5-cache/app-backup/kbackup-1.0.1 b/metadata/md5-cache/app-backup/kbackup-1.0.1
index adbc04a01f1b..728a09987514 100644
--- a/metadata/md5-cache/app-backup/kbackup-1.0.1
+++ b/metadata/md5-cache/app-backup/kbackup-1.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !app-backup/kbackup:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=http://members.aon.at/m.koller/kbackup-1.0.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6d5bf21c1a40aa7ed23a1f3eff29ab4d
diff --git a/metadata/md5-cache/app-backup/kfoldersync-3.4.1 b/metadata/md5-cache/app-backup/kfoldersync-3.4.1
index fa3d1bdb0723..203be082574d 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.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1485353737/kfoldersync-3.4.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=385cf950f892f1ef07dbe0557526c425
diff --git a/metadata/md5-cache/app-benchmarks/Manifest.gz b/metadata/md5-cache/app-benchmarks/Manifest.gz
index b4d696da16bf..690d2df9ae7e 100644
--- a/metadata/md5-cache/app-benchmarks/Manifest.gz
+++ b/metadata/md5-cache/app-benchmarks/Manifest.gz
diff --git a/metadata/md5-cache/app-benchmarks/sysbench-1.0.10 b/metadata/md5-cache/app-benchmarks/sysbench-1.0.10
index f29e38a8a045..7a6d19a397b6 100644
--- a/metadata/md5-cache/app-benchmarks/sysbench-1.0.10
+++ b/metadata/md5-cache/app-benchmarks/sysbench-1.0.10
@@ -4,10 +4,10 @@ DESCRIPTION=System performance benchmark
 EAPI=6
 HOMEPAGE=https://github.com/akopytov/sysbench
 IUSE=aio mysql postgres test
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=aio? ( dev-libs/libaio ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:= )
 SLOT=0
 SRC_URI=https://github.com/akopytov/sysbench/archive/1.0.10.tar.gz -> sysbench-1.0.10.tar.gz
 _eclasses_=pax-utils	4f95120230a315c8caaabeb2307b7eee
-_md5_=70ef708f19eea6626d66e08e1e67bb8c
+_md5_=77220d9b074c51edf0b1e8b6d8ea197c
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 5c9617d6461c..9b89ffc0b5a1 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/kcdemu-0.7.2 b/metadata/md5-cache/app-cdr/kcdemu-0.7.2
index 6788efb21193..2fc300bea434 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.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-cdr/cdemu-2.0.0[cdemu-daemon] !app-cdr/kcdemu:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=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	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dbdbdd49b9d5072e2d3840475d87d785
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index 0299d6ae0941..0d122728533d 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 840816ec33c8..05512c5e9383 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.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !app-dicts/dikt:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://bitbucket.org/dikt/code/downloads/dikt-2s1.txz -> dikt-2s1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d4efbd95f33a9395d2ab4da70f8b13e7
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 6879bf572d9a..f31b07ca48b0 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/kile-2.9.91_p20171209 b/metadata/md5-cache/app-editors/kile-2.9.91_p20171209
index 56178173a05f..e129fce27be3 100644
--- a/metadata/md5-cache/app-editors/kile-2.9.91_p20171209
+++ b/metadata/md5-cache/app-editors/kile-2.9.91_p20171209
@@ -9,5 +9,5 @@ LICENSE=FDL-1.2 GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/okular-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 pdf? ( app-text/poppler[qt5] ) !app-editors/kile:4 >=kde-apps/konsole-14.12.0:5 >=kde-apps/okular-14.12.0:5[pdf?] virtual/latex-base virtual/tex-base pdf? ( || ( app-text/dvipdfmx >=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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/KDE/kile/archive/dab0507f1df74ee66f88bdb4b294179605df60f4.tar.gz -> kile-2.9.91_p20171209.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0f0dd343667d1b3af7830a11b1cd2729
diff --git a/metadata/md5-cache/app-editors/leo-5.6 b/metadata/md5-cache/app-editors/leo-5.6
new file mode 100644
index 000000000000..10cd17afca8c
--- /dev/null
+++ b/metadata/md5-cache/app-editors/leo-5.6
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=app-text/silvercity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[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=Leo: Literate Editor with Outlines
+EAPI=6
+HOMEPAGE=https://github.com/leo-editor/leo-editor/
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-text/silvercity[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[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/leo-editor/leo-editor/archive/5.6.tar.gz -> leo-5.6.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9ba141f020a6d71b3fef14d20f9b556d
diff --git a/metadata/md5-cache/app-editors/pluma-1.16.0-r1 b/metadata/md5-cache/app-editors/pluma-1.16.0-r1
deleted file mode 100644
index c2cb3304c786..000000000000
--- a/metadata/md5-cache/app-editors/pluma-1.16.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor ~app-text/docbook-xml-dtd-4.1.2 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* >=sys-devel/libtool-2.2.6:2 >=sys-devel/gettext-0.17:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Pluma text editor for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 python spell python_targets_python2_7 test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[gtk3(-)=]
-REQUIRED_USE=gtk3? ( !python ) python? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/pluma-1.16.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=839e12f11005f22b72be0af4b499ce6e
diff --git a/metadata/md5-cache/app-editors/pluma-1.16.2 b/metadata/md5-cache/app-editors/pluma-1.16.2
new file mode 100644
index 000000000000..48578704c7ea
--- /dev/null
+++ b/metadata/md5-cache/app-editors/pluma-1.16.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor ~app-text/docbook-xml-dtd-4.1.2 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* >=sys-devel/libtool-2.2.6:2 >=sys-devel/gettext-0.17:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Pluma text editor for the MATE desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=gtk3 python spell python_targets_python2_7 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.5:2 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libX11:0 >=x11-libs/libSM-1.0 x11-libs/pango:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 >=x11-libs/gtksourceview-2.9.7:2.0 ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=x11-libs/gtksourceview-2.9.7:3.0 ) spell? ( >=app-text/enchant-1.2:0 >=app-text/iso-codes-0.35:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.12:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtksourceview-2.9.2:2 ) !!app-editors/mate-text-editor >=mate-base/mate-desktop-1.9[gtk3(-)=]
+REQUIRED_USE=gtk3? ( !python ) python? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/pluma-1.16.2.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=35d32634098bef51cb8614e0551e86b9
diff --git a/metadata/md5-cache/app-editors/xemacs-21.4.24-r1 b/metadata/md5-cache/app-editors/xemacs-21.4.24-r1
index c4a6f6606bbf..cfb038bff8d0 100644
--- a/metadata/md5-cache/app-editors/xemacs-21.4.24-r1
+++ b/metadata/md5-cache/app-editors/xemacs-21.4.24-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=configure install postinst postrm prepare unpack
-DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15 >=sys-apps/texinfo-5 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
+DEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15 >=sys-apps/texinfo-5 >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
 DESCRIPTION=highly customizable open source text editor and application development system
 EAPI=5
 HOMEPAGE=http://www.xemacs.org/
@@ -7,8 +7,8 @@ IUSE=eolconv gif gpm pop postgres ldap xface nas dnd X jpeg tiff png mule motif
 KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2+
 PDEPEND=app-xemacs/xemacs-base mule? ( app-xemacs/mule-base )
-RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3 ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
+RDEPEND=berkdb? ( sys-libs/db:= ) gdbm? ( >=sys-libs/gdbm-1.8.3[berkdb] ) >=sys-libs/zlib-1.1.4 >=dev-libs/openssl-0.9.6:0 >=media-libs/audiofile-0.2.3 gpm? ( >=sys-libs/gpm-1.19.6 ) postgres? ( dev-db/postgresql:= ) ldap? ( net-nds/openldap ) nas? ( media-libs/nas ) X? ( x11-libs/libXt x11-libs/libXmu x11-libs/libXext x11-misc/xbitmaps !Xaw3d? ( !neXt? ( x11-libs/libXaw ) ) ) dnd? ( x11-libs/dnd ) motif? ( >=x11-libs/motif-2.3:0 ) athena? ( x11-libs/libXaw ) Xaw3d? ( x11-libs/libXaw3d ) neXt? ( x11-libs/neXtaw ) xface? ( media-libs/compface ) tiff? ( media-libs/tiff:0 ) png? ( >=media-libs/libpng-1.2:0 ) jpeg? ( virtual/jpeg:0 ) canna? ( app-i18n/canna ) !amd64? ( freewnn? ( app-i18n/freewnn ) ) >=sys-libs/ncurses-5.2:= >=app-eselect/eselect-emacs-1.15
 SLOT=0
 SRC_URI=http://ftp.xemacs.org/xemacs-21.4/xemacs-21.4.24.tar.gz http://www.malfunction.de/afterstep/files/NeXT_XEmacs.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d4ac2de9840e91d73486d1c178c06433
+_md5_=8ad5eb80a4fdad5d26c0092fc8eac344
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index 32a9cce963b6..8292ba1f93cc 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/pariemacs-3.14 b/metadata/md5-cache/app-emacs/pariemacs-3.14
new file mode 100644
index 000000000000..1b8faa44649e
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/pariemacs-3.14
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=sci-mathematics/pari >=virtual/emacs-23
+DESCRIPTION=sci-mathematics/pari emacs mode
+EAPI=6
+HOMEPAGE=http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sci-mathematics/pari >=virtual/emacs-23
+SLOT=0
+SRC_URI=http://iml.univ-mrs.fr/~ramare/ServeurPerso/GP-PARI/latest-pari-distrib/pariemacs-3.14.tar.gz
+_eclasses_=elisp	8a9eaaa38b2345593b1cbc5315dde83c	elisp-common	23f47b2e1de7abf387105eddd1318738
+_md5_=8ee143a7579375bbf2417a32b2dce359
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 26cd0686bd27..3ba23fb4329d 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/free42-2.0.10 b/metadata/md5-cache/app-emulation/free42-2.0.10
new file mode 100644
index 000000000000..f282c6d6be0d
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/free42-2.0.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib )
+DESCRIPTION=An HP-42S Calculator Simulator
+EAPI=6
+HOMEPAGE=http://thomasokken.com/free42/
+IUSE=alsa
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/pango alsa? ( media-libs/alsa-lib ) x11-libs/libX11 x11-libs/libXmu
+SLOT=0
+SRC_URI=http://thomasokken.com/free42/upstream/free42-nologo-2.0.10.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=c8beedcadf6cb6d57dc7623570c9ea7f
diff --git a/metadata/md5-cache/app-emulation/xen-4.9.1-r1 b/metadata/md5-cache/app-emulation/xen-4.9.1-r1
index 1f521766530f..d5e2bf8c7e10 100644
--- a/metadata/md5-cache/app-emulation/xen-4.9.1-r1
+++ b/metadata/md5-cache/app-emulation/xen-4.9.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=The Xen virtual machine monitor
 EAPI=6
 HOMEPAGE=https://www.xenproject.org
 IUSE=custom-cflags debug efi flask
-KEYWORDS=~amd64 ~arm -x86
+KEYWORDS=amd64 ~arm -x86
 LICENSE=GPL-2
 PDEPEND=~app-emulation/xen-tools-4.9.1
 REQUIRED_USE=arm? ( debug )
@@ -12,4 +12,4 @@ RESTRICT=test splitdebug strip
 SLOT=0
 SRC_URI=https://downloads.xenproject.org/release/xen/4.9.1/xen-4.9.1.tar.gz https://dev.gentoo.org/~dlan/distfiles/xen-4.9.1-upstream-patches-1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=485062dc2fffb2e71e5fb3df512d51bb
+_md5_=7c3923e478d56606c4a951b0b4910a92
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r1 b/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r1
index a0aebd2d727e..911138f6189c 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r1
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.9.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Xen tools including QEMU and xl
 EAPI=6
 HOMEPAGE=https://www.xenproject.org
 IUSE=api custom-cflags debug doc flask hvm ocaml ovmf +pam pygrub python +qemu +qemu-traditional screen sdl static-libs system-qemu system-seabios python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/pciutils dev-libs/lzo:2 dev-libs/glib:2 dev-libs/yajl dev-libs/libaio dev-libs/libgcrypt:0 sys-libs/zlib python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses,xml,threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate )
 REQUIRED_USE=python_targets_python2_7 pygrub? ( python ) ovmf? ( hvm ) ^^ ( qemu system-qemu )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0/4.9
 SRC_URI=https://downloads.xenproject.org/release/xen/4.9.1/xen-4.9.1.tar.gz http://code.coreboot.org/p/seabios/downloads/get/seabios-1.10.0.tar.gz https://dev.gentoo.org/~dlan/distfiles/seabios-1.10.0.tar.gz ovmf? ( https://dev.gentoo.org/~dlan/distfiles/ovmf-20170321.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-ovmf-patches-3.tar.xz ) https://dev.gentoo.org/~dlan/distfiles/xen-4.9.1-upstream-patches-1.tar.xz https://dev.gentoo.org/~dlan/distfiles/xen-gentoo-patches-10.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=04a4d3b69d613b158030093c78c09cb6
+_md5_=249028c1ac8432c1a83e41e4f69811aa
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 4bee2822faf2..a9d498caefca 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.0 b/metadata/md5-cache/app-eselect/eselect-postgresql-2.0
deleted file mode 100644
index c86a1255a3a4..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-postgresql-2.0
+++ /dev/null
@@ -1,11 +0,0 @@
-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 ~sparc-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.0.tbz2
-_md5_=bb712cff387782ab6b2f9729680d0b4b
diff --git a/metadata/md5-cache/app-eselect/eselect-postgresql-2.1 b/metadata/md5-cache/app-eselect/eselect-postgresql-2.1
deleted file mode 100644
index bfd80184dd8e..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-postgresql-2.1
+++ /dev/null
@@ -1,11 +0,0 @@
-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 ~sparc-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.1.tbz2
-_md5_=2078cebd16817ab92fbd54598a37f4b0
diff --git a/metadata/md5-cache/app-eselect/eselect-postgresql-2.3 b/metadata/md5-cache/app-eselect/eselect-postgresql-2.3
new file mode 100644
index 000000000000..c0699a90d1be
--- /dev/null
+++ b/metadata/md5-cache/app-eselect/eselect-postgresql-2.3
@@ -0,0 +1,11 @@
+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 ~sparc-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_=56c2672b70783f95b2d5a0c9bf518d45
diff --git a/metadata/md5-cache/app-eselect/eselect-rails-0.21 b/metadata/md5-cache/app-eselect/eselect-rails-0.21
deleted file mode 100644
index 06715aef01d0..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-rails-0.21
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Manages Ruby on Rails symlinks
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~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-admin/eselect-1.2.0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~flameeyes/ruby-team/eselect-rails-0.21.tar.xz
-_md5_=e7dd3e94d8b6ad72b1bb7f16e4cd214c
diff --git a/metadata/md5-cache/app-eselect/eselect-rails-0.22 b/metadata/md5-cache/app-eselect/eselect-rails-0.22
deleted file mode 100644
index 72b17b0201d8..000000000000
--- a/metadata/md5-cache/app-eselect/eselect-rails-0.22
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Manages Ruby on Rails symlinks
-EAPI=6
-HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~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-admin/eselect-1.2.0
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~flameeyes/ruby-team/eselect-rails-0.22.tar.xz
-_md5_=d57c62401eb7622c4c30da12e9ae7b7b
diff --git a/metadata/md5-cache/app-eselect/eselect-rails-0.23 b/metadata/md5-cache/app-eselect/eselect-rails-0.23
index 2658a1732ce2..096377cde64e 100644
--- a/metadata/md5-cache/app-eselect/eselect-rails-0.23
+++ b/metadata/md5-cache/app-eselect/eselect-rails-0.23
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=Manages Ruby on Rails symlinks
 EAPI=6
 HOMEPAGE=https://www.gentoo.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~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-admin/eselect-1.2.0
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~graaff/ruby-team/eselect-rails-0.23.tar.xz
-_md5_=6ee731d555a496bce4b0898ec8730c8c
+_md5_=a46a77985dd46a6e44e04abb098abccd
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 08e6f1bbe4a4..6559122d8aec 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/cbview-0.06-r1 b/metadata/md5-cache/app-misc/cbview-0.06-r1
index ddd063ace4bd..600249522c9e 100644
--- a/metadata/md5-cache/app-misc/cbview-0.06-r1
+++ b/metadata/md5-cache/app-misc/cbview-0.06-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=install
 DEPEND=dev-perl/Gtk2 dev-perl/String-ShellQuote app-arch/unrar app-arch/unzip
 DESCRIPTION=viewer/converter for CBR/CBZ comic book archives
 EAPI=6
-HOMEPAGE=http://elvine.org/code/cbview/
+HOMEPAGE=https://web.archive.org/web/20061108214126/http://elvine.org:80/code/cbview/
 KEYWORDS=~x86 ~ppc ~amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://elvine.org/code/cbview/cbview-0.06.tar.gz
-_md5_=4de4b4153ba7a84b4072de47f8b18514
+_md5_=1e2808ccd8974476d7f444785c74920a
diff --git a/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1 b/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1
index 282d3bd5f3bc..8f170d8bceb1 100644
--- a/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1
+++ b/metadata/md5-cache/app-misc/hachoir-metadata-1.3.3-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=>=dev-python/hachoir-core-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] gtk? ( >=dev-python/pygtk-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome? ( gnome-base/nautilus gnome-extra/zenity ) qt4? ( dev-python/PyQt4[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=Program to extract metadata using Hachoir library
 EAPI=5
-HOMEPAGE=https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.python.org/pypi/hachoir-metadata
+HOMEPAGE=https://web.archive.org/web/20161220105023/https://bitbucket.org/haypo/hachoir/wiki/hachoir-metadata https://pypi.python.org/pypi/hachoir-metadata
 IUSE=gnome gtk qt4 python_targets_python2_7
 KEYWORDS=amd64 ~ppc x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hachoir-metadata/hachoir-metadata-1.3.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bd662af1b1b33dff41d2ca4b392932ee
+_md5_=ae81392afebd9e9161c7e34481a02266
diff --git a/metadata/md5-cache/app-misc/hachoir-subfile-0.5.3-r1 b/metadata/md5-cache/app-misc/hachoir-subfile-0.5.3-r1
index 1d4ffe463568..83ffad6d9bb4 100644
--- a/metadata/md5-cache/app-misc/hachoir-subfile-0.5.3-r1
+++ b/metadata/md5-cache/app-misc/hachoir-subfile-0.5.3-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/hachoir-core-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-regex-1.0.1[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=Find subfile in any binary stream
 EAPI=5
-HOMEPAGE=https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.python.org/pypi/hachoir-subfile
+HOMEPAGE=https://web.archive.org/web/20170502140945/https://bitbucket.org/haypo/hachoir/wiki/hachoir-subfile https://pypi.python.org/pypi/hachoir-subfile
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hachoir-subfile/hachoir-subfile-0.5.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b9e1a79e2d218a03d07fd2a55242fee8
+_md5_=28f48dd7c714145138b4b152c00a2498
diff --git a/metadata/md5-cache/app-misc/hachoir-urwid-1.1-r1 b/metadata/md5-cache/app-misc/hachoir-urwid-1.1-r1
index 27fa9de5a9a8..2a6712913298 100644
--- a/metadata/md5-cache/app-misc/hachoir-urwid-1.1-r1
+++ b/metadata/md5-cache/app-misc/hachoir-urwid-1.1-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install prepare test
 DEPEND=>=dev-python/hachoir-core-1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/hachoir-parser-1.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/urwid-0.9.4[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[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Binary file explorer using Hachoir and urwid libraries
 EAPI=5
-HOMEPAGE=https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.python.org/pypi/hachoir-urwid
+HOMEPAGE=https://web.archive.org/web/20161220110246/https://bitbucket.org/haypo/hachoir/wiki/hachoir-urwid https://pypi.python.org/pypi/hachoir-urwid
 IUSE=python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=mirror://pypi/h/hachoir-urwid/hachoir-urwid-1.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2151489075e247a67adb7172d03b58a6
+_md5_=e16a99bccf8c6da3a83d510aaa19af93
diff --git a/metadata/md5-cache/app-misc/lsx-0.1-r1 b/metadata/md5-cache/app-misc/lsx-0.1-r1
index a7acbc291a6b..8039f0d494f3 100644
--- a/metadata/md5-cache/app-misc/lsx-0.1-r1
+++ b/metadata/md5-cache/app-misc/lsx-0.1-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install postinst prepare
 DESCRIPTION=list executables
 EAPI=6
-HOMEPAGE=https://tools.suckless.org/lsx
+HOMEPAGE=https://web.archive.org/web/20160104002819/http://tools.suckless.org:80/lsx
 KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://dl.suckless.org/tools/lsx-0.1.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b2b7534bc23633029ef850ac5ebac4a8
+_md5_=65d36db04e3bba28fa950a377318b6b5
diff --git a/metadata/md5-cache/app-misc/mc-4.8.20-r1 b/metadata/md5-cache/app-misc/mc-4.8.20-r1
index ef3db4bee3b5..4036c9f33ce7 100644
--- a/metadata/md5-cache/app-misc/mc-4.8.20-r1
+++ b/metadata/md5-cache/app-misc/mc-4.8.20-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Midnight Commander is a text based file manager
 EAPI=6
 HOMEPAGE=https://www.midnight-commander.org
 IUSE=+edit gpm mclib nls samba sftp +slang spell test X +xdg
-KEYWORDS=~alpha ~amd64 ~arm ~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
+KEYWORDS=~alpha amd64 ~arm ~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= ) 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.20.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ed10cfbfbc1acad3c4640c735369ddd6
+_md5_=b64b996c0735bc4693c725d30adab51a
diff --git a/metadata/md5-cache/app-misc/mepl-0.45 b/metadata/md5-cache/app-misc/mepl-0.45
index 5a95c1902b9f..1a1e96a45102 100644
--- a/metadata/md5-cache/app-misc/mepl-0.45
+++ b/metadata/md5-cache/app-misc/mepl-0.45
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install unpack
 DESCRIPTION=Self-employed-mode software for 3COM/USR message modems
 EAPI=0
-HOMEPAGE=http://www.hof-berlin.de/mepl/
+HOMEPAGE=https://web.archive.org/web/20031204100644/http://www.hof-berlin.de:80/mepl/
 KEYWORDS=~amd64 ~ppc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.hof-berlin.de/mepl/mepl0.45.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=861b5aea5ddb447c94866ca37770ebd0
+_md5_=726aa8f51fe0ddc7325fbd4e4f057dcc
diff --git a/metadata/md5-cache/app-misc/mepl-0.45-r1 b/metadata/md5-cache/app-misc/mepl-0.45-r1
index 5594a1301f52..cedb9861496d 100644
--- a/metadata/md5-cache/app-misc/mepl-0.45-r1
+++ b/metadata/md5-cache/app-misc/mepl-0.45-r1
@@ -1,10 +1,10 @@
 DEFINED_PHASES=compile install
 DESCRIPTION=Self-employed-mode software for 3COM/USR message modems
 EAPI=6
-HOMEPAGE=http://www.hof-berlin.de/mepl/
+HOMEPAGE=https://web.archive.org/web/20031204100644/http://www.hof-berlin.de:80/mepl/
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://www.hof-berlin.de/mepl/mepl0.45.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9c0d5b20719aee5f584896054f8a205f
+_md5_=76ad7d5bb7522d0fc3bdcf23a27bd8b1
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index ae426fee7a4a..1ab7831adbce 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.0.1 b/metadata/md5-cache/app-office/calligra-3.0.1
index 94e6e3c70d93..d3d2cd8dcfce 100644
--- a/metadata/md5-cache/app-office/calligra-3.0.1
+++ b/metadata/md5-cache/app-office/calligra-3.0.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/calligra/3.0.1/calligra-3.0.1.tar.xz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=45c732c36b0d8571a00b8370f8f0b5a7
diff --git a/metadata/md5-cache/app-office/gnucash-2.7.3 b/metadata/md5-cache/app-office/gnucash-2.7.3
new file mode 100644
index 000000000000..b56ad4a65c40
--- /dev/null
+++ b/metadata/md5-cache/app-office/gnucash-2.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=dev-scheme/guile-2.0.0:12=[regex] >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-3.14.0:3 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) 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_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) 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 ( dev-cpp/gmock dev-cpp/gtest ) ) dev-lang/perl dev-perl/XML-Parser dev-util/intltool gnome-base/gnome-common sys-devel/libtool virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A personal finance manager
+EAPI=6
+HOMEPAGE=http://www.gnucash.org/
+IUSE=aqbanking chipcard debug gnome-keyring mysql nls ofx postgres python quotes -register2 sqlite python_targets_python2_7
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.7.0:2 >=dev-scheme/guile-2.0.0:12=[regex] >=sys-libs/zlib-1.1.4 >=x11-libs/gtk+-3.14.0:3 dev-libs/boost:=[icu,nls] dev-libs/icu:= dev-libs/libxslt gnome-base/dconf net-libs/webkit-gtk:4= aqbanking? ( >=net-libs/aqbanking-5[gtk,ofx?] sys-libs/gwenhywfar[gtk] chipcard? ( sys-libs/libchipcard ) ) gnome-keyring? ( >=app-crypt/libsecret-0.18 ) 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_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) 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_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://sourceforge/gnucash/gnucash-2.7.3.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ef9390d284cc16a479a307712839a28f
diff --git a/metadata/md5-cache/app-office/kexi-3.0.2 b/metadata/md5-cache/app-office/kexi-3.0.2
index c18cfd7d7f02..340ed662e5b8 100644
--- a/metadata/md5-cache/app-office/kexi-3.0.2
+++ b/metadata/md5-cache/app-office/kexi-3.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-db/kdb-3.0.2[mysql?,postgres?,sqlite?] dev-libs/kproperty dev-libs/kreport marble? ( >=kde-apps/marble-14.12.0:5 ) mdb? ( dev-libs/glib:2 virtual/libiconv ) mysql? ( virtual/libmysqlclient ) postgres? ( dev-db/postgresql:* dev-libs/libpqxx ) webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) >=kde-frameworks/breeze-icons-rcc-5.40.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kexi/src/kexi-3.0.2.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=98421e59861e535bf7f403e246d76a4e
diff --git a/metadata/md5-cache/app-office/kraft-0.80_beta3 b/metadata/md5-cache/app-office/kraft-0.80_beta3
deleted file mode 100644
index d72a093b2812..000000000000
--- a/metadata/md5-cache/app-office/kraft-0.80_beta3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/kcontacts-14.12.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-cpp/ctemplate pim? ( >=kde-apps/akonadi-14.12.0:5 >=kde-apps/akonadi-contacts-14.12.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Software to manage quotes and invoices in small enterprises
-EAPI=6
-HOMEPAGE=http://www.volle-kraft-voraus.de/
-IUSE=pim debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/kcontacts-14.12.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-cpp/ctemplate pim? ( >=kde-apps/akonadi-14.12.0:5 >=kde-apps/akonadi-contacts-14.12.0:5 ) !app-office/kraft:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
-SLOT=5
-SRC_URI=https://github.com/dragotin/kraft/archive/0.80beta3.tar.gz -> kraft-0.80_beta3.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7282cfc56e699fc556a075e78bc27a1a
diff --git a/metadata/md5-cache/app-office/kraft-0.80_beta5 b/metadata/md5-cache/app-office/kraft-0.80_beta5
new file mode 100644
index 000000000000..ea0486aa11c2
--- /dev/null
+++ b/metadata/md5-cache/app-office/kraft-0.80_beta5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/kcontacts-14.12.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-cpp/ctemplate pim? ( >=kde-apps/akonadi-14.12.0:5 >=kde-apps/akonadi-contacts-14.12.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Software to manage quotes and invoices in small enterprises
+EAPI=6
+HOMEPAGE=http://www.volle-kraft-voraus.de/
+IUSE=pim debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/kcontacts-14.12.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-cpp/ctemplate pim? ( >=kde-apps/akonadi-14.12.0:5 >=kde-apps/akonadi-contacts-14.12.0:5 ) !app-office/kraft:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=https://github.com/dragotin/kraft/archive/0.80beta5.tar.gz -> kraft-0.80_beta5.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9fdc2440331039e99a7fd0a22e08a2b0
diff --git a/metadata/md5-cache/app-office/scribus-1.5.3-r1 b/metadata/md5-cache/app-office/scribus-1.5.3-r1
index 2d1dba859270..22564d25c2ce 100644
--- a/metadata/md5-cache/app-office/scribus-1.5.3-r1
+++ b/metadata/md5-cache/app-office/scribus-1.5.3-r1
@@ -4,11 +4,11 @@ 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
-KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~hppa ~ppc ~ppc64 ~x86
 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_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/qtquickcontrols: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_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_python2_7(+)] ) app-text/ghostscript-gpl
 REQUIRED_USE=python_targets_python2_7 tk? ( scripts )
 SLOT=0
 SRC_URI=mirror://sourceforge/project/scribus/scribus-devel/1.5.3/scribus-1.5.3.tar.xz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d855790eb3c41afb3c4e0de228beda05
+_md5_=3481f7760505ed82717e7ef49823d783
diff --git a/metadata/md5-cache/app-office/skrooge-2.10.5 b/metadata/md5-cache/app-office/skrooge-2.10.5
index 7b3ca2c1c4c4..9706c66193bb 100644
--- a/metadata/md5-cache/app-office/skrooge-2.10.5
+++ b/metadata/md5-cache/app-office/skrooge-2.10.5
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( designer )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/skrooge/skrooge-2.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f8703914b898e533573a65744ea3647e
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index e3e0810dfd4e..49eb3907d569 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/cpuid2cpuflags-5 b/metadata/md5-cache/app-portage/cpuid2cpuflags-5
index 7142996dc86c..07fc60c334d5 100644
--- a/metadata/md5-cache/app-portage/cpuid2cpuflags-5
+++ b/metadata/md5-cache/app-portage/cpuid2cpuflags-5
@@ -2,8 +2,8 @@ DEFINED_PHASES=postinst
 DESCRIPTION=Tool to guess CPU_FLAGS_X86 flags for the host
 EAPI=6
 HOMEPAGE=https://github.com/mgorny/cpuid2cpuflags
-KEYWORDS=~amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~x86 ~amd64-fbsd ~x86-fbsd ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD-2
 SLOT=0
 SRC_URI=https://github.com/mgorny/cpuid2cpuflags/releases/download/v5/cpuid2cpuflags-5.tar.bz2
-_md5_=75c54698f9f416ccfcd5c9ca62ed35da
+_md5_=f29b5f09c84fc1229546ff24fdfb3444
diff --git a/metadata/md5-cache/app-portage/gemato-9.3 b/metadata/md5-cache/app-portage/gemato-9.3
new file mode 100644
index 000000000000..e37dd5a91b14
--- /dev/null
+++ b/metadata/md5-cache/app-portage/gemato-9.3
@@ -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? ( blake2? ( python_targets_python2_7? ( dev-python/pyblake2[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_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_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_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-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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=Stand-alone Manifest generation & verification tool
+EAPI=6
+HOMEPAGE=https://github.com/mgorny/gemato
+IUSE=+blake2 bzip2 +gpg lzma +portage-postsync sha3 test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=BSD-2
+RDEPEND=blake2? ( python_targets_python2_7? ( dev-python/pyblake2[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_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_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) bzip2? ( python_targets_python2_7? ( dev-python/bz2file[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) gpg? ( app-crypt/gnupg ) lzma? ( python_targets_python2_7? ( dev-python/backports-lzma[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) sha3? ( python_targets_python2_7? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) python_targets_python3_5? ( dev-python/pysha3[python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_4(-)?,-python_single_target_python3_4(-),python_targets_python3_5(-)?,-python_single_target_python3_5(-)] ) ) dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] portage-postsync? ( app-crypt/gentoo-keys ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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/gemato/gemato-9.3.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f226c569baafdaf2120880c85d4fb41f
diff --git a/metadata/md5-cache/app-portage/grs-0.6 b/metadata/md5-cache/app-portage/grs-0.6
index 6abb5586e61a..b9ed79038b72 100644
--- a/metadata/md5-cache/app-portage/grs-0.6
+++ b/metadata/md5-cache/app-portage/grs-0.6
@@ -4,11 +4,11 @@ DESCRIPTION=Suite to build Gentoo Reference Systems
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~blueness/grs
 IUSE=server python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools virtual/cdrtools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) python_targets_python3_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://dev.gentoo.org/~blueness/grs/grs-0.6.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a2074f2081015d6697e326fcbdf89cfb
+_md5_=29cfc6630e66518eac4b9fdf67210003
diff --git a/metadata/md5-cache/app-portage/grs-9999 b/metadata/md5-cache/app-portage/grs-9999
index e9137e533ec6..25328f130d29 100644
--- a/metadata/md5-cache/app-portage/grs-9999
+++ b/metadata/md5-cache/app-portage/grs-9999
@@ -8,5 +8,6 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/portage server? ( app-arch/tar[xattr] app-crypt/md5deep dev-libs/libcgroup dev-vcs/git net-misc/rsync sys-fs/squashfs-tools virtual/cdrtools || ( sys-kernel/genkernel sys-kernel/genkernel-next ) ) python_targets_python3_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://dev.gentoo.org/~blueness/grs/ISO-1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7c18256646ff176807f594b70400c431
+_md5_=b769e20ed062ad4965d9c1a5a6d9f2c8
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 23117235129e..a4d6faae85f0 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-4.4_p12-r1 b/metadata/md5-cache/app-shells/bash-4.4_p12-r1
new file mode 100644
index 000000000000..9abb7ef51a72
--- /dev/null
+++ b/metadata/md5-cache/app-shells/bash-4.4_p12-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
+DEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-7.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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-7.0:0= ) nls? ( virtual/libintl ) !<sys-apps/portage-2.1.6.7_p1 !<sys-apps/paludis-0.26.0_alpha5
+SLOT=0
+SRC_URI=mirror://gnu/bash/bash-4.4.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-001 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-002 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-003 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-004 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-005 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-006 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-007 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-008 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-009 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-010 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-011 ftp://ftp.cwru.edu/pub/bash/bash-4.4-patches/bash44-012 mirror://gnu/bash/bash-4.4-patches/bash44-001 mirror://gnu/bash/bash-4.4-patches/bash44-002 mirror://gnu/bash/bash-4.4-patches/bash44-003 mirror://gnu/bash/bash-4.4-patches/bash44-004 mirror://gnu/bash/bash-4.4-patches/bash44-005 mirror://gnu/bash/bash-4.4-patches/bash44-006 mirror://gnu/bash/bash-4.4-patches/bash44-007 mirror://gnu/bash/bash-4.4-patches/bash44-008 mirror://gnu/bash/bash-4.4-patches/bash44-009 mirror://gnu/bash/bash-4.4-patches/bash44-010 mirror://gnu/bash/bash-4.4-patches/bash44-011 mirror://gnu/bash/bash-4.4-patches/bash44-012
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a100e72c6376a89685cd8fb31ce4963e
diff --git a/metadata/md5-cache/app-shells/hstr-1.24 b/metadata/md5-cache/app-shells/hstr-1.24
new file mode 100644
index 000000000000..d57e24078964
--- /dev/null
+++ b/metadata/md5-cache/app-shells/hstr-1.24
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=sys-libs/ncurses:0= virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Shell history suggest box
+EAPI=6
+HOMEPAGE=https://github.com/dvorka/hstr http://www.mindforger.com
+KEYWORDS=~amd64 ~x86 ~amd64-fbsd
+LICENSE=Apache-2.0
+RDEPEND=sys-libs/ncurses:0=
+SLOT=0
+SRC_URI=https://github.com/dvorka/hstr/archive/1.24.tar.gz -> hstr-1.24.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=b08b848df8595373b39566761809ff58
diff --git a/metadata/md5-cache/app-shells/mksh-56c b/metadata/md5-cache/app-shells/mksh-56c
new file mode 100644
index 000000000000..bdb8e928c020
--- /dev/null
+++ b/metadata/md5-cache/app-shells/mksh-56c
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst test
+DEPEND=static? ( dev-libs/klibc )
+DESCRIPTION=MirBSD KSH Shell
+EAPI=5
+HOMEPAGE=http://mirbsd.de/mksh
+IUSE=static
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+SLOT=0
+SRC_URI=http://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R56c.tgz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=022ba5b8a725a306aed67ecf3ec9abd5
diff --git a/metadata/md5-cache/app-shells/zsh-5.3.1 b/metadata/md5-cache/app-shells/zsh-5.3.1
index 467d5b014c8a..11c004304274 100644
--- a/metadata/md5-cache/app-shells/zsh-5.3.1
+++ b/metadata/md5-cache/app-shells/zsh-5.3.1
@@ -4,11 +4,11 @@ DESCRIPTION=UNIX Shell similar to the Korn shell
 EAPI=6
 HOMEPAGE=http://www.zsh.org/
 IUSE=caps debug doc examples gdbm maildir pcre static unicode
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=ZSH gdbm? ( GPL-2 )
 PDEPEND=examples? ( app-doc/zsh-lovers )
 RDEPEND=>=sys-libs/ncurses-5.1:0= static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] ) caps? ( sys-libs/libcap ) pcre? ( >=dev-libs/libpcre-3.9 static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= )
 SLOT=0
 SRC_URI=http://www.zsh.org/pub/zsh-5.3.1.tar.xz doc? ( http://www.zsh.org/pub/zsh-5.3.1-doc.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=31e2f44d127e574618cc878fc944ee39
+_md5_=604438d16331bf278f2e285bd4886bd8
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index c2b5a3b8ba4b..dd26a0ede0cc 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/cedilla-0.7 b/metadata/md5-cache/app-text/cedilla-0.7
new file mode 100644
index 000000000000..471b2f8c0f37
--- /dev/null
+++ b/metadata/md5-cache/app-text/cedilla-0.7
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-lisp/clisp
+DESCRIPTION=UTF-8 to postscript converter
+EAPI=6
+HOMEPAGE=http://www.pps.jussieu.fr/~jch/software/cedilla/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lisp/clisp
+SLOT=0
+SRC_URI=http://www.pps.jussieu.fr/~jch/software/files/cedilla-0.7.tar.gz
+_md5_=98df181a2f7edf930262e16e6867c528
diff --git a/metadata/md5-cache/app-text/dvisvgm-2.3.1 b/metadata/md5-cache/app-text/dvisvgm-2.3.1
new file mode 100644
index 000000000000..6d61209143a5
--- /dev/null
+++ b/metadata/md5-cache/app-text/dvisvgm-2.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure
+DEPEND=virtual/tex-base app-text/ghostscript-gpl dev-libs/kpathsea:= >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib app-text/xmlto app-text/asciidoc dev-libs/libxslt virtual/pkgconfig test? ( dev-cpp/gtest )
+DESCRIPTION=Converts DVI files to SVG
+EAPI=6
+HOMEPAGE=http://dvisvgm.bplaced.net/
+IUSE=test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=GPL-3
+RDEPEND=virtual/tex-base app-text/ghostscript-gpl dev-libs/kpathsea:= >=media-gfx/potrace-1.10-r1 media-libs/freetype:2 dev-libs/kpathsea sys-libs/zlib
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/mgieseki/dvisvgm/releases/download/2.3.1/dvisvgm-2.3.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e8339358563ad9113d5d8980e4dacd37
diff --git a/metadata/md5-cache/app-text/html401-19991224-r3 b/metadata/md5-cache/app-text/html401-19991224-r3
index ee931c07a92c..5848287c5171 100644
--- a/metadata/md5-cache/app-text/html401-19991224-r3
+++ b/metadata/md5-cache/app-text/html401-19991224-r3
@@ -3,9 +3,9 @@ DEPEND=app-text/sgml-common >=app-text/sgml-common-0.6.3-r2
 DESCRIPTION=DTDs for the HyperText Markup Language 4.01
 EAPI=5
 HOMEPAGE=http://www.w3.org/TR/html401/
-KEYWORDS=~amd64 ~ppc ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=amd64 ppc ~s390 ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=W3C
 SLOT=0
 SRC_URI=http://www.w3.org/TR/html401/html40.tgz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	sgml-catalog	1ca36a4ae32c67b390f310dd6d7b1189	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0c98835c5e6b55eb4b790257ebc7d8eb
+_md5_=7f13ac87b410a4481b54a8b61a698bc6
diff --git a/metadata/md5-cache/app-text/iso-codes-3.76 b/metadata/md5-cache/app-text/iso-codes-3.76
index 251983f0eb3d..17af6bc157b0 100644
--- a/metadata/md5-cache/app-text/iso-codes-3.76
+++ b/metadata/md5-cache/app-text/iso-codes-3.76
@@ -3,10 +3,10 @@ DEPEND=|| ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 ) app-ar
 DESCRIPTION=ISO language, territory, currency, script codes and their translations
 EAPI=6
 HOMEPAGE=http://pkg-isocodes.alioth.debian.org/
-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 ~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 ~x86-solaris
 LICENSE=LGPL-2.1+
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=http://pkg-isocodes.alioth.debian.org/downloads/iso-codes-3.76.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=914fd455b34ea6cafd7e0852829eaab4
+_md5_=360631a9155aba7915b184e24b71dc59
diff --git a/metadata/md5-cache/app-text/jabref-bin-3.8.2 b/metadata/md5-cache/app-text/jabref-bin-3.8.2
index 68c48bb4e644..60f2ad7d1058 100644
--- a/metadata/md5-cache/app-text/jabref-bin-3.8.2
+++ b/metadata/md5-cache/app-text/jabref-bin-3.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=Java GUI for managing BibTeX and other bibliographies
 EAPI=6
 HOMEPAGE=http://www.jabref.org/
 IUSE=elibc_FreeBSD
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=https://github.com/JabRef/jabref/releases/download/v3.8.2/JabRef-3.8.2.jar
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=936e1919f01b8f410de2a4c86971aa2e
+_md5_=6ff9004bdcd2cd1b252abf2159fd19ad
diff --git a/metadata/md5-cache/app-text/kbibtex-0.8_pre20171110 b/metadata/md5-cache/app-text/kbibtex-0.8_pre20171110
index 3421aad3f586..72c5b2675e35 100644
--- a/metadata/md5-cache/app-text/kbibtex-0.8_pre20171110
+++ b/metadata/md5-cache/app-text/kbibtex-0.8_pre20171110
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( webengine webkit )
 RESTRICT=test
 SLOT=5
 SRC_URI=https://github.com/KDE/kbibtex/archive/4ce7c51f163508f293c3fd39a716770cbb14ef7d.tar.gz -> kbibtex-0.8_pre20171110.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=294dab84d51ec7eac6375e0ee23e9d83
diff --git a/metadata/md5-cache/app-text/nfoview-1.15.1 b/metadata/md5-cache/app-text/nfoview-1.15.1
deleted file mode 100644
index d7d1650cf75c..000000000000
--- a/metadata/md5-cache/app-text/nfoview-1.15.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst 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
-EAPI=6
-HOMEPAGE=http://home.gna.org/nfoview/
-IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
-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=http://download.gna.org/nfoview/1.15/nfoview-1.15.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b1e0c5467111db9e82e3c32fd7da3eee
diff --git a/metadata/md5-cache/app-text/qpdf-7.1.0 b/metadata/md5-cache/app-text/qpdf-7.1.0
new file mode 100644
index 000000000000..17e29dd7f52e
--- /dev/null
+++ b/metadata/md5-cache/app-text/qpdf-7.1.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install
+DEPEND=sys-libs/zlib virtual/jpeg:0= test? ( sys-apps/diffutils media-libs/tiff app-text/ghostscript-gpl[tiff] )
+DESCRIPTION=Command-line tool for structural, content-preserving transformation of PDF files
+EAPI=6
+HOMEPAGE=http://qpdf.sourceforge.net/
+IUSE=doc examples perl static-libs test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint ~sparc-solaris
+LICENSE=|| ( Apache-2.0 Artistic-2 )
+RDEPEND=sys-libs/zlib virtual/jpeg:0= perl? ( >=dev-lang/perl-5.8 )
+SLOT=0/18
+SRC_URI=mirror://sourceforge/qpdf/qpdf-7.1.0.tar.gz
+_md5_=8bfad828538f35b500d673a15e600e6a
diff --git a/metadata/md5-cache/app-text/searchmonkey-2.0.0-r1 b/metadata/md5-cache/app-text/searchmonkey-2.0.0-r1
index 7c3663544ea0..2fa88cbe0ba7 100644
--- a/metadata/md5-cache/app-text/searchmonkey-2.0.0-r1
+++ b/metadata/md5-cache/app-text/searchmonkey-2.0.0-r1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install
+DEFINED_PHASES=configure install
 DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 app-arch/unzip
 DESCRIPTION=Powerful text searches using regular expressions
 EAPI=6
@@ -8,5 +8,5 @@ LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4
 SLOT=2
 SRC_URI=mirror://sourceforge/project/searchmonkey/Searchmonkey2/2.0.0%20%5Bstable%5D/searchmonkey_v2.0.0.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=17f493900f55f3030d81405800fe894b
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=7189d6389334473791a61630ad5cc2d9
diff --git a/metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1 b/metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
index 2a02caed9d50..a60e2495ff0e 100644
--- a/metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
+++ b/metadata/md5-cache/app-text/ttf2pt1-3.4.4-r1
@@ -9,4 +9,4 @@ RDEPEND=>=media-libs/freetype-2.5.1:2
 SLOT=0
 SRC_URI=mirror://sourceforge/ttf2pt1/ttf2pt1-3.4.4.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=54d63760ff6ef38c25190bcf9ff503bb
+_md5_=9b08c56327fb9591fcda117b79f7e899
diff --git a/metadata/md5-cache/app-vim/Manifest.gz b/metadata/md5-cache/app-vim/Manifest.gz
index a0684a9849ff..a496f41be2fb 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/ctx-1.17-r1 b/metadata/md5-cache/app-vim/ctx-1.17-r1
index 3451dcf952a3..cd1cb05056e4 100644
--- a/metadata/md5-cache/app-vim/ctx-1.17-r1
+++ b/metadata/md5-cache/app-vim/ctx-1.17-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=install postinst postrm
-DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DEPEND=app-editors/vim[perl] || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: display current scope context in a C file
 EAPI=6
 HOMEPAGE=http://www.bluweb.com/us/chouser/proj/ctx/
@@ -9,4 +9,4 @@ RDEPEND=!app-vim/enhancedcommentify || ( >=app-editors/vim-7.3 >=app-editors/gvi
 SLOT=0
 SRC_URI=mirror://gentoo/ctx-1.17.tar.bz2 https://dev.gentoo.org/~radhermit/vim/ctx-1.17.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=d666ce197e73006a08c6e899e1155ae9
+_md5_=3d14ede93e637afa99431a731523d3f8
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20160530 b/metadata/md5-cache/app-vim/gentoo-syntax-20160530
index f75f874f9c52..1f7a03cfd6ce 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20160530
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20160530
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Gentoo and portage related syntax highlighting, filetype, and indent settings
+DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/gentoo-syntax
 IUSE=ignore-glep31
@@ -10,4 +10,4 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/gentoo-syntax/archive/20160530.tar.gz -> gentoo-syntax-20160530.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=7ed0364d4b7e4358a3491b375b6afbe5
+_md5_=d74bed9bb2a7043de346dea5e1ab3b5b
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-20170225 b/metadata/md5-cache/app-vim/gentoo-syntax-20170225
index 4d87bfe7e851..575bc9be761b 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-20170225
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-20170225
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm prepare
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
-DESCRIPTION=Gentoo and portage related syntax highlighting, filetype, and indent settings
+DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/gentoo-syntax
 IUSE=ignore-glep31
@@ -10,4 +10,4 @@ RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=https://github.com/gentoo/gentoo-syntax/archive/20170225.tar.gz -> gentoo-syntax-20170225.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=b0a426f5c217ff18aa02dd080b755562
+_md5_=7340c254a478cb4c6eda193b8c466247
diff --git a/metadata/md5-cache/app-vim/gentoo-syntax-99999999 b/metadata/md5-cache/app-vim/gentoo-syntax-99999999
index 3d3e95559918..2120370753fd 100644
--- a/metadata/md5-cache/app-vim/gentoo-syntax-99999999
+++ b/metadata/md5-cache/app-vim/gentoo-syntax-99999999
@@ -1,6 +1,6 @@
 DEFINED_PHASES=install postinst postrm prepare unpack
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 ) >=dev-vcs/git-1.8.2.1
-DESCRIPTION=Gentoo and portage related syntax highlighting, filetype, and indent settings
+DESCRIPTION=vim plugin: Gentoo and Portage syntax highlighting
 EAPI=6
 HOMEPAGE=https://github.com/gentoo/gentoo-syntax
 IUSE=ignore-glep31
@@ -8,4 +8,4 @@ LICENSE=vim
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=c55c0d49dddc5e19abdb8bf8a1f8767b
+_md5_=f8a6cd85ed215434d5c604e4a5ab2f7d
diff --git a/metadata/md5-cache/app-vim/haskellmode-20101118-r1 b/metadata/md5-cache/app-vim/haskellmode-20101118-r1
new file mode 100644
index 000000000000..179446efd86b
--- /dev/null
+++ b/metadata/md5-cache/app-vim/haskellmode-20101118-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install postinst postrm
+DEPEND=|| ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
+DESCRIPTION=vim plugin: Provides IDE-like features for Haskell development
+EAPI=6
+HOMEPAGE=http://projects.haskell.org/haskellmode-vim
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-lang/ghc[doc] net-misc/wget || ( >=app-editors/vim-7.1 >=app-editors/gvim-7.1 )
+SLOT=0
+SRC_URI=http://code.haskell.org/~wwolff/haskellmode/haskellmode-20101118.tar.bz2
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=f63d0cec323bc2d2a4afaeb5e2065a25
diff --git a/metadata/md5-cache/app-vim/slimv-0.9.13_p20170910 b/metadata/md5-cache/app-vim/slimv-0.9.13_p20170910
new file mode 100644
index 000000000000..72e197ae3918
--- /dev/null
+++ b/metadata/md5-cache/app-vim/slimv-0.9.13_p20170910
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst postrm prepare setup unpack
+DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+DESCRIPTION=vim plugin: aid Lisp development by providing a SLIME-like Lisp and Clojure REPL
+EAPI=6
+HOMEPAGE=https://github.com/kovisoft/slimv
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=|| ( app-editors/vim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-editors/gvim[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] || ( dev-lisp/abcl dev-lisp/ecls dev-lisp/sbcl dev-lisp/clisp dev-lang/clojure dev-lisp/clozurecl ) || ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/kovisoft/slimv/archive/acf9b30be71c54db4f4875d257b905941ca69ed8.tar.gz -> slimv-0.9.13_p20170910.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
+_md5_=ec031533f610477b3bfec9662d6d2360
diff --git a/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1 b/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1
index a32f72678a96..5b148625d241 100644
--- a/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1
+++ b/metadata/md5-cache/app-vim/wikipedia-syntax-20101113-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=install postinst postrm
 DEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 DESCRIPTION=vim plugin: Wikipedia syntax highlighting
 EAPI=6
-HOMEPAGE=http://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim
+HOMEPAGE=https://en.wikipedia.org/wiki/Wikipedia:Text_editor_support#Vim
 KEYWORDS=amd64 hppa ~mips ppc ppc64 x86
 LICENSE=CC-BY-SA-3.0
 RDEPEND=|| ( >=app-editors/vim-7.3 >=app-editors/gvim-7.3 )
 SLOT=0
 SRC_URI=mirror://gentoo/wikipedia-syntax-20101113.tar.bz2 https://dev.gentoo.org/~radhermit/vim/wikipedia-syntax-20101113.tar.bz2
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	vim-doc	af2c81a1feeb0a99e91bee3e20769edb	vim-plugin	3160d9cb05ef44497be1485db0fe7590
-_md5_=cc384482735aaf499c09c1373bbfd8c6
+_md5_=32bdb07cac9f3ff7ced3507b8d82b824
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 94094b86b22b..8e569e3e9ab5 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/glibmm-2.52.1 b/metadata/md5-cache/dev-cpp/glibmm-2.52.1
index 9735310ae4b5..3dd06f7382d1 100644
--- a/metadata/md5-cache/dev-cpp/glibmm-2.52.1
+++ b/metadata/md5-cache/dev-cpp/glibmm-2.52.1
@@ -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.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	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e72159a7f45ec6f12eb14ef3ec38062
+_md5_=55f04b6edb71b859fbba7dd6d4ad1939
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 882887ff0b14..1efd6708ffb9 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/etcd-3.2.12 b/metadata/md5-cache/dev-db/etcd-3.2.12
deleted file mode 100644
index 2cb665d14a1b..000000000000
--- a/metadata/md5-cache/dev-db/etcd-3.2.12
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.8:= virtual/pkgconfig >=dev-lang/go-1.8
-DESCRIPTION=Highly-available key value store for shared configuration and service discovery
-EAPI=6
-HOMEPAGE=https://github.com/coreos/etcd
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!dev-db/etcdctl
-SLOT=0
-SRC_URI=https://github.com/coreos/etcd/archive/v3.2.12.tar.gz -> etcd-3.2.12.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=a55077d655eb023044c4ed2b73cb59b9
diff --git a/metadata/md5-cache/dev-db/etcd-3.2.14 b/metadata/md5-cache/dev-db/etcd-3.2.14
new file mode 100644
index 000000000000..56522847793f
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.2.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.8:= virtual/pkgconfig >=dev-lang/go-1.8
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=6
+HOMEPAGE=https://github.com/coreos/etcd
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!dev-db/etcdctl
+SLOT=0
+SRC_URI=https://github.com/coreos/etcd/archive/v3.2.14.tar.gz -> etcd-3.2.14.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=a7e9bc1848cba8c0b59489ab05158782
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.0_rc1 b/metadata/md5-cache/dev-db/etcd-3.3.0_rc1
deleted file mode 100644
index c0704102a57c..000000000000
--- a/metadata/md5-cache/dev-db/etcd-3.3.0_rc1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=>=dev-lang/go-1.9:= virtual/pkgconfig >=dev-lang/go-1.8
-DESCRIPTION=Highly-available key value store for shared configuration and service discovery
-EAPI=6
-HOMEPAGE=https://github.com/coreos/etcd
-IUSE=doc
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=!dev-db/etcdctl
-SLOT=0
-SRC_URI=https://github.com/coreos/etcd/archive/v3.3.0-rc.1.tar.gz -> etcd-3.3.0_rc1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=9b68da08bd584eed044d331959fcf0c2
diff --git a/metadata/md5-cache/dev-db/etcd-3.3.0_rc2 b/metadata/md5-cache/dev-db/etcd-3.3.0_rc2
new file mode 100644
index 000000000000..44594a771c39
--- /dev/null
+++ b/metadata/md5-cache/dev-db/etcd-3.3.0_rc2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9:= virtual/pkgconfig >=dev-lang/go-1.8
+DESCRIPTION=Highly-available key value store for shared configuration and service discovery
+EAPI=6
+HOMEPAGE=https://github.com/coreos/etcd
+IUSE=doc
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=!dev-db/etcdctl
+SLOT=0
+SRC_URI=https://github.com/coreos/etcd/archive/v3.3.0-rc.2.tar.gz -> etcd-3.3.0_rc2.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=9b68da08bd584eed044d331959fcf0c2
diff --git a/metadata/md5-cache/dev-db/kdb-3.0.2 b/metadata/md5-cache/dev-db/kdb-3.0.2
index 5a93a8f88ee7..f2aee9624379 100644
--- a/metadata/md5-cache/dev-db/kdb-3.0.2
+++ b/metadata/md5-cache/dev-db/kdb-3.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/icu:= mysql? ( virtual/mysql ) postgres? ( >=dev-qt/qtnetwork-5.7.1:5 dev-db/postgresql:* ) sqlite? ( dev-db/sqlite:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdb/src/kdb-3.0.2.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f4d4f724454c549225f608876121ecc7
diff --git a/metadata/md5-cache/dev-db/mongodb-3.2.17 b/metadata/md5-cache/dev-db/mongodb-3.2.17
index b501f2bbb67c..c31a57824de7 100644
--- a/metadata/md5-cache/dev-db/mongodb-3.2.17
+++ b/metadata/md5-cache/dev-db/mongodb-3.2.17
@@ -4,11 +4,11 @@ DESCRIPTION=A high-performance, open source, schema-free document-oriented datab
 EAPI=6
 HOMEPAGE=http://www.mongodb.org
 IUSE=debug kerberos libressl mms-agent ssl test +tools
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=AGPL-3 Apache-2.0
 PDEPEND=tools? ( >=app-admin/mongo-tools-3.2.17 )
 RDEPEND=>=app-arch/snappy-1.1.2 >=dev-cpp/yaml-cpp-0.5.1 >=dev-libs/boost-1.57:=[threads(+)] >=dev-libs/libpcre-8.39[cxx] dev-libs/snowball-stemmer net-libs/libpcap >=sys-libs/zlib-1.2.8:= mms-agent? ( app-admin/mms-agent ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.1g:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r3.2.17.tar.gz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=32468c8d1438d2c1961f0ba07808f2cd
+_md5_=05db0b017fcb81d63bf3d078d8d364ce
diff --git a/metadata/md5-cache/dev-db/pgadmin4-2.0-r1 b/metadata/md5-cache/dev-db/pgadmin4-2.0-r1
index 850a22c593dd..d28ab8ebef17 100644
--- a/metadata/md5-cache/dev-db/pgadmin4-2.0-r1
+++ b/metadata/md5-cache/dev-db/pgadmin4-2.0-r1
@@ -4,7 +4,7 @@ DESCRIPTION=GUI administration and development platform for PostgreSQL
 EAPI=6
 HOMEPAGE=http://www.pgadmin.org/
 IUSE=doc python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=POSTGRESQL
 RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4[sqlite] ) python_single_target_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-qt/qtwidgets:5 dev-qt/qtwebkit:5 dev-qt/qtwebengine:5[widgets] >=app-text/htmlmin-0.1.10[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/Babel-2.3.4[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/beautifulsoup-4.4.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/blinker-1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/click-6.6[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/extras-0.0.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/fixtures-2.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-0.11.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-babel-0.11.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-gravatar-0.4.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-htmlmin-1.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-login-0.3.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-mail-0.9.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-migrate-2.0.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-paranoid-0.1.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-principal-0.4.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-security-1.7.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-sqlalchemy-2.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/flask-wtf-0.12[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/html5lib-0.9999999[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/itsdangerous-0.24[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/jinja-2.7.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/linecache2-1.0.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/markupsafe-0.23[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/mimeparse-1.5.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/passlib-1.6.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pbr-1.9.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/psycopg-2.7.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pycrypto-2.6.1[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pyrsistent-0.11.13[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/python-dateutil-2.5.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/python-sqlparse-0.1.19[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/pytz-2014.10[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/simplejson-3.6.5[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/six-1.9.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/speaklater-1.3[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/sqlalchemy-1.0.14[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/werkzeug-0.9.6[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] >=dev-python/wtforms-2.0.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://postgresql/pgadmin/pgadmin4/v2.0/source/pgadmin4-2.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c7f9bc817079f74b7bc3014c7a88f164
+_md5_=4ccab4e732b86f4899cf9c85fee3d3bd
diff --git a/metadata/md5-cache/dev-db/pgbadger-9.2 b/metadata/md5-cache/dev-db/pgbadger-9.2
index a50c73607e09..ae6631bc33f5 100644
--- a/metadata/md5-cache/dev-db/pgbadger-9.2
+++ b/metadata/md5-cache/dev-db/pgbadger-9.2
@@ -3,10 +3,10 @@ DEPEND=dev-perl/JSON-XS dev-perl/Text-CSV_XS dev-lang/perl:=
 DESCRIPTION=pgBadger is a PostgreSQL log analyzer.
 EAPI=6
 HOMEPAGE=http://dalibo.github.io/pgbadger/
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=BSD
 RDEPEND=dev-perl/JSON-XS dev-perl/Text-CSV_XS dev-lang/perl:=
 SLOT=0
 SRC_URI=https://github.com/dalibo/pgbadger/archive/v9.2.tar.gz -> pgbadger-9.2.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=62f81bca357641d0f61479f7003be849
+_md5_=36a00f224179a16b06a7836fd47b0f9d
diff --git a/metadata/md5-cache/dev-db/phppgadmin-5.1 b/metadata/md5-cache/dev-db/phppgadmin-5.1
deleted file mode 100644
index 485d445e3147..000000000000
--- a/metadata/md5-cache/dev-db/phppgadmin-5.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=Web-based administration for Postgres database in php
-EAPI=4
-HOMEPAGE=http://phppgadmin.sourceforge.net/
-IUSE=vhosts
-KEYWORDS=amd64 hppa ppc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=dev-lang/php[postgres,session] || ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) >=app-admin/webapp-config-1.50.15
-SLOT=5.1
-SRC_URI=mirror://sourceforge/phppgadmin/phpPgAdmin-5.1.tar.bz2
-_eclasses_=webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=c02321e87f74b35e1df2e5d5348afbfb
diff --git a/metadata/md5-cache/dev-db/phppgadmin-9999 b/metadata/md5-cache/dev-db/phppgadmin-9999
deleted file mode 100644
index c668ebecceb2..000000000000
--- a/metadata/md5-cache/dev-db/phppgadmin-9999
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install postinst prerm setup unpack
-DEPEND=>=app-admin/webapp-config-1.50.15 >=dev-vcs/git-1.8.2.1
-DESCRIPTION=Web-based administration for Postgres database in php
-EAPI=2
-HOMEPAGE=http://phppgadmin.sourceforge.net/
-IUSE=vhosts
-LICENSE=GPL-2
-RDEPEND=|| ( <dev-lang/php-5.3[pcre] >=dev-lang/php-5.3 ) dev-lang/php[postgres,session] >=app-admin/webapp-config-1.50.15
-SLOT=9999
-_eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=e9318cdf5ff5fb7f6faaa1dfa145718b
diff --git a/metadata/md5-cache/dev-db/pspg-0.8.0 b/metadata/md5-cache/dev-db/pspg-0.8.0
index 89b39bcb378b..80777394dddb 100644
--- a/metadata/md5-cache/dev-db/pspg-0.8.0
+++ b/metadata/md5-cache/dev-db/pspg-0.8.0
@@ -3,9 +3,9 @@ DEPEND=sys-libs/ncurses:*
 DESCRIPTION=A better pager for psql and mysql
 EAPI=6
 HOMEPAGE=https://github.com/okbob/pspg
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=sys-libs/ncurses:*
 SLOT=0
 SRC_URI=https://github.com/okbob/pspg/archive/0.8.0.tar.gz -> pspg-0.8.0.tar.gz
-_md5_=75e5ccdab485d29355aec94437f7cd32
+_md5_=b10e378b4aa3261a94d6a9a3c0c5bdbe
diff --git a/metadata/md5-cache/dev-db/pspg-0.9.2 b/metadata/md5-cache/dev-db/pspg-0.9.2
new file mode 100644
index 000000000000..f37ebef47c67
--- /dev/null
+++ b/metadata/md5-cache/dev-db/pspg-0.9.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=sys-libs/ncurses:*
+DESCRIPTION=A better pager for psql and mysql
+EAPI=6
+HOMEPAGE=https://github.com/okbob/pspg
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=sys-libs/ncurses:*
+SLOT=0
+SRC_URI=https://github.com/okbob/pspg/archive/0.9.2.tar.gz -> pspg-0.9.2.tar.gz
+_md5_=584f8a3d3cb871e00337361288a09afa
diff --git a/metadata/md5-cache/dev-db/psqlodbc-10.00.0000 b/metadata/md5-cache/dev-db/psqlodbc-10.00.0000
index ec07d8f41ceb..84b7a60be809 100644
--- a/metadata/md5-cache/dev-db/psqlodbc-10.00.0000
+++ b/metadata/md5-cache/dev-db/psqlodbc-10.00.0000
@@ -4,9 +4,9 @@ DESCRIPTION=Official ODBC driver for PostgreSQL
 EAPI=6
 HOMEPAGE=http://www.postgresql.org/
 IUSE=doc iodbc ssl threads
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2
 RDEPEND=dev-db/postgresql:*[ssl?] !iodbc? ( dev-db/unixODBC ) iodbc? ( dev-db/libiodbc )
 SLOT=0
 SRC_URI=mirror://postgresql/odbc/versions/src/psqlodbc-10.00.0000.tar.gz
-_md5_=a9c0ca240b3b46be6bb03882c407ada1
+_md5_=9ddd3c05cac84fb59f03ff2132ed38ff
diff --git a/metadata/md5-cache/dev-db/sqlite-3.20.1-r1 b/metadata/md5-cache/dev-db/sqlite-3.20.1-r1
index 5d519bc4fe1b..b57835f922ab 100644
--- a/metadata/md5-cache/dev-db/sqlite-3.20.1-r1
+++ b/metadata/md5-cache/dev-db/sqlite-3.20.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A SQL Database Engine in a C Library
 EAPI=6
 HOMEPAGE=https://sqlite.org/
 IUSE=debug doc icu +readline secure-delete static-libs tcl test tools abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=public-domain
 RDEPEND=icu? ( dev-libs/icu:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) readline? ( sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tcl? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tools? ( dev-lang/tcl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=3
 SRC_URI=doc? ( https://sqlite.org/2017/sqlite-doc-3200100.zip ) tcl? ( https://sqlite.org/2017/sqlite-src-3200100.zip ) test? ( https://sqlite.org/2017/sqlite-src-3200100.zip ) tools? ( https://sqlite.org/2017/sqlite-src-3200100.zip ) !tcl? ( !test? ( !tools? ( https://sqlite.org/2017/sqlite-autoconf-3200100.tar.gz ) ) )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=48684e5fc7ebc018484cdcc81720a957
+_md5_=f5060ae7ebbbc161ae5e8fb630644c11
diff --git a/metadata/md5-cache/dev-db/sqlitestudio-3.0.7 b/metadata/md5-cache/dev-db/sqlitestudio-3.0.7
index 45ae8cb90b79..778a71dd542b 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.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/designer-5.7.1:5 cups? ( >=dev-qt/qtprintsupport-5.7.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_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	kde5-functions	25992fae542d6ffb06a9da87653236e7	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=fc2f77dbbe74577381921ae89a30e315
diff --git a/metadata/md5-cache/dev-db/unixODBC-2.3.4 b/metadata/md5-cache/dev-db/unixODBC-2.3.4
deleted file mode 100644
index 8a1e9dc2f51e..000000000000
--- a/metadata/md5-cache/dev-db/unixODBC-2.3.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=|| ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,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/libtool-2.4.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-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(-)?] >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] ) sys-devel/flex >=app-portage/elt-patches-20170422
-DESCRIPTION=A complete ODBC driver manager
-EAPI=6
-HOMEPAGE=http://www.unixodbc.org/
-IUSE=+minimal odbcmanual static-libs unicode abi_x86_32 abi_x86_64 abi_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 ~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 LGPL-2.1
-RDEPEND=|| ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,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/libtool-2.4.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-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(-)?] >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-db[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.4.tar.gz
-_eclasses_=libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=25d9557fb5184630b02335711a2c26e6
diff --git a/metadata/md5-cache/dev-db/unixODBC-2.3.5 b/metadata/md5-cache/dev-db/unixODBC-2.3.5
new file mode 100644
index 000000000000..9cec27e1e5b3
--- /dev/null
+++ b/metadata/md5-cache/dev-db/unixODBC-2.3.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=|| ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,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/libtool-2.4.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-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(-)?] >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] sys-devel/flex >=app-portage/elt-patches-20170422
+DESCRIPTION=A complete ODBC driver manager
+EAPI=6
+HOMEPAGE=http://www.unixodbc.org/
+IUSE=+minimal odbcmanual static-libs unicode abi_x86_32 abi_x86_64 abi_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=GPL-2 LGPL-2.1
+RDEPEND=|| ( dev-libs/libltdl:0[abi_x86_32(-)?,abi_x86_64(-)?,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/libtool-2.4.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-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(-)?] >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,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=ftp://ftp.unixodbc.org/pub/unixODBC/unixODBC-2.3.5.tar.gz
+_eclasses_=libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=41ecd4b875119c977d936667856a97b9
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index e585d7e2f056..250acd1bf75d 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/vamos-0.8.2 b/metadata/md5-cache/dev-games/vamos-0.8.2
index 724bbb7bccdc..e8b06f228627 100644
--- a/metadata/md5-cache/dev-games/vamos-0.8.2
+++ b/metadata/md5-cache/dev-games/vamos-0.8.2
@@ -4,11 +4,11 @@ DESCRIPTION=An automotive simulation framework
 EAPI=6
 HOMEPAGE=http://vamos.sourceforge.net/
 IUSE=test python_targets_python3_4 python_targets_python3_5 python_single_target_python3_4 python_single_target_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] dev-libs/boost:=[python,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_6(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] media-libs/freealut media-libs/freeglut media-libs/libpng:0= media-libs/libsdl[joystick,video] media-libs/openal virtual/glu virtual/opengl
 REQUIRED_USE=^^ ( python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://sourceforge/vamos/vamos-0.8.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=27eacc2ae7e2fa3cf3ad1a2cd5c28617
+_md5_=d37e6a816267f1823f8cc7387b5a3ecc
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index b3b09c97bd22..6dfeb08bf3ae 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/moarvm-2017.12.1 b/metadata/md5-cache/dev-lang/moarvm-2017.12.1
new file mode 100644
index 000000000000..2d33cd40db18
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/moarvm-2017.12.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/libatomic_ops dev-libs/libuv dev-lang/lua:0[deprecated] dev-lua/LuaBitOp virtual/libffi clang? ( >=sys-devel/clang-3.1 ) dev-lang/perl
+DESCRIPTION=A 6model-based VM for NQP and Rakudo Perl 6
+EAPI=6
+HOMEPAGE=http://moarvm.org
+IUSE=asan clang debug doc +jit static-libs optimize ubsan
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=dev-libs/libatomic_ops dev-libs/libuv dev-lang/lua:0[deprecated] dev-lua/LuaBitOp virtual/libffi
+RESTRICT=test
+SLOT=0
+SRC_URI=http://moarvm.org/releases/MoarVM-2017.12.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=fad9e8a58d3d7a29021014b6e73ae10c
diff --git a/metadata/md5-cache/dev-lang/nqp-2017.12 b/metadata/md5-cache/dev-lang/nqp-2017.12
new file mode 100644
index 000000000000..64674f8454a8
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nqp-2017.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
+DEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2017.12.1[clang=] ) clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) dev-lang/perl java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Not Quite Perl, a Perl 6 bootstrapping compiler
+EAPI=5
+HOMEPAGE=http://rakudo.org/
+IUSE=doc clang java +moar test elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=java? ( dev-java/asm:4 dev-java/jline:0 dev-java/jna:4 ) moar? ( ~dev-lang/moarvm-2017.12.1[clang=] ) java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( java moar )
+SLOT=0
+SRC_URI=https://github.com/perl6/nqp/tarball/2017.12 -> nqp-2017.12.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=a576b9484711c8e3e5190735fbbea639
diff --git a/metadata/md5-cache/dev-lang/rakudo-2017.12 b/metadata/md5-cache/dev-lang/rakudo-2017.12
new file mode 100644
index 000000000000..1ed8e13456ad
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rakudo-2017.12
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=~dev-lang/nqp-2017.12:0=[java?,moar?,clang=] clang? ( sys-devel/clang ) java? ( >=virtual/jdk-1.7 ) >=dev-lang/perl-5.10 java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=A compiler for the Perl 6 programming language
+EAPI=5
+HOMEPAGE=http://rakudo.org
+IUSE=clang java +moar test elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=Artistic-2
+RDEPEND=~dev-lang/nqp-2017.12:0=[java?,moar?,clang=] java? ( >=virtual/jre-1.7 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( java moar )
+SLOT=0
+SRC_URI=https://rakudo.perl6.org/downloads/rakudo/rakudo-2017.12.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=75d1d3c0e7efb9a79e4f0b1b9bbabac6
diff --git a/metadata/md5-cache/dev-lang/vala-0.36.7 b/metadata/md5-cache/dev-lang/vala-0.36.7
index af89636bfc7f..fd6981a100f1 100644
--- a/metadata/md5-cache/dev-lang/vala-0.36.7
+++ b/metadata/md5-cache/dev-lang/vala-0.36.7
@@ -4,10 +4,10 @@ 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 ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/glib-2.32:2 >=dev-libs/vala-common-0.36.7
 SLOT=0.36
 SRC_URI=mirror://gnome/sources/vala/0.36/vala-0.36.7.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5b0376700dd221d0d4db7650e6d3cb48
+_md5_=e1bba5afb2bcb4e1fc98453316a0340c
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 6adea729de6f..7086362b9350 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/atk-2.24.0 b/metadata/md5-cache/dev-libs/atk-2.24.0
index 03a542ce272a..7c095a7d31b0 100644
--- a/metadata/md5-cache/dev-libs/atk-2.24.0
+++ b/metadata/md5-cache/dev-libs/atk-2.24.0
@@ -4,10 +4,10 @@ DESCRIPTION=GTK+ & GNOME Accessibility Toolkit
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=+introspection nls test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=LGPL-2+
 RDEPEND=>=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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=0
 SRC_URI=mirror://gnome/sources/atk/2.24/atk-2.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ccd6f1ea52a743c9c3d854602c9bf882
+_md5_=a48b9c7cb0fb98051381dd7410867f16
diff --git a/metadata/md5-cache/dev-libs/boehm-gc-7.6.2 b/metadata/md5-cache/dev-libs/boehm-gc-7.6.2
new file mode 100644
index 000000000000..f8645f3aed74
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/boehm-gc-7.6.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/libatomic_ops-7.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(-)?] virtual/pkgconfig
+DESCRIPTION=The Boehm-Demers-Weiser conservative garbage collector
+EAPI=6
+HOMEPAGE=http://www.hboehm.info/gc/
+IUSE=cxx static-libs threads abi_x86_32 abi_x86_64 abi_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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=boehm-gc
+SLOT=0/2.1
+SRC_URI=http://www.hboehm.info/gc/gc_source/gc-7.6.2.tar.gz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=72cfe1d039d29d2c3af92066fc2c8c34
diff --git a/metadata/md5-cache/dev-libs/check-0.12.0 b/metadata/md5-cache/dev-libs/check-0.12.0
index 3a38e11b044b..603d6a80080a 100644
--- a/metadata/md5-cache/dev-libs/check-0.12.0
+++ b/metadata/md5-cache/dev-libs/check-0.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=A unit test framework for C
 EAPI=6
 HOMEPAGE=https://libcheck.github.io/check/
 IUSE=static-libs subunit abi_x86_32 abi_x86_64 abi_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 ~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 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=subunit? ( >=dev-python/subunit-0.0.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(-)?] )
 SLOT=0
 SRC_URI=https://github.com/libcheck/check/archive/0.12.0.tar.gz -> check-0.12.0-github.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5372261cb19c4af1cbfcbe1028da276d
+_md5_=eaba20e7b93e3382c992293b7c793d60
diff --git a/metadata/md5-cache/dev-libs/glib-2.52.3 b/metadata/md5-cache/dev-libs/glib-2.52.3
index c1ac5c7e2e99..7e612944adb6 100644
--- a/metadata/md5-cache/dev-libs/glib-2.52.3
+++ b/metadata/md5-cache/dev-libs/glib-2.52.3
@@ -4,7 +4,7 @@ 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 abi_x86_32 abi_x86_64 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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=LGPL-2.1+
 PDEPEND=!<gnome-base/gvfs-1.6.4-r990 dbus? ( gnome-base/dconf ) mime? ( x11-misc/shared-mime-info )
 RDEPEND=!<dev-util/gdbus-codegen-2.52.3 >=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? ( python_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/gdbus-codegen-2.52.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/libelf:0= )
@@ -12,4 +12,4 @@ REQUIRED_USE=utils? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targ
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.52/glib-2.52.3.tar.xz https://pkgconfig.freedesktop.org/releases/pkg-config-0.28.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	epunt-cxx	e99babeaa7d98c1caaa6a61a79902210	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6b3489b3ad7c546a3bfd2dcf1c19f54c
+_md5_=44ae10e7f5b415fb1e9fdeff797e3e7c
diff --git a/metadata/md5-cache/dev-libs/gmp-6.1.2 b/metadata/md5-cache/dev-libs/gmp-6.1.2
index 5d6e12956af7..73d129e62307 100644
--- a/metadata/md5-cache/dev-libs/gmp-6.1.2
+++ b/metadata/md5-cache/dev-libs/gmp-6.1.2
@@ -4,9 +4,9 @@ DESCRIPTION=Library for arbitrary-precision arithmetic on different type of numb
 EAPI=5
 HOMEPAGE=http://gmplib.org/
 IUSE=+asm doc cxx pgo 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( LGPL-3+ GPL-2+ )
 SLOT=0/10.4
 SRC_URI=ftp://ftp.gmplib.org/pub/gmp-6.1.2/gmp-6.1.2.tar.xz mirror://gnu/gmp/gmp-6.1.2.tar.xz doc? ( http://gmplib.org/gmp-man-6.1.2.pdf )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=6b86a40168c569d504c418922593f482
+_md5_=09edde7bfdd19b80ad612afb8fff7fa4
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-1.50.0 b/metadata/md5-cache/dev-libs/gobject-introspection-1.50.0
index 5593055461df..e2b4ae08fc70 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-1.50.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-1.50.0
@@ -4,7 +4,7 @@ DESCRIPTION=Introspection system for GObject-based libraries
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
 IUSE=cairo doctool test python_targets_python2_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=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ GPL-2+
 PDEPEND=cairo? ( x11-libs/cairo[glib] )
 RDEPEND=>=dev-libs/gobject-introspection-common-1.50.0 >=dev-libs/glib-2.50:2 doctool? ( dev-python/mako[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) virtual/libffi:= virtual/pkgconfig !<dev-lang/vala-0.20.0 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] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?]
@@ -12,4 +12,4 @@ REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.50/gobject-introspection-1.50.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a84ade86164ee5460a5037b6e627cb12
+_md5_=5f9e67e5022f0dde86d40ef83c944d94
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.50.0 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.50.0
index b0875cf7b03a..46722d17c738 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.50.0
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.50.0
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.50.0
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.50/gobject-introspection-1.50.0.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2a8dd90c69eb79e2e33f215ff412bb15
+_md5_=a9679957740392e931ed992280528f12
diff --git a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.52.1 b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.52.1
index 2b458902697a..8721954ee720 100644
--- a/metadata/md5-cache/dev-libs/gobject-introspection-common-1.52.1
+++ b/metadata/md5-cache/dev-libs/gobject-introspection-common-1.52.1
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Build infrastructure for GObject Introspection
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GObjectIntrospection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=HPND
 RDEPEND=!<dev-libs/gobject-introspection-1.52.1
 SLOT=0
 SRC_URI=mirror://gnome/sources/gobject-introspection/1.52/gobject-introspection-1.52.1.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9aa566a4577054c0f98d36f94b580bcc
+_md5_=280000aafb54066fbd2b424635614488
diff --git a/metadata/md5-cache/dev-libs/ivykis-0.42.2 b/metadata/md5-cache/dev-libs/ivykis-0.42.2
index c4e1c0e895d7..6a29a05774c7 100644
--- a/metadata/md5-cache/dev-libs/ivykis-0.42.2
+++ b/metadata/md5-cache/dev-libs/ivykis-0.42.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Library for asynchronous I/O readiness notification
 EAPI=6
 HOMEPAGE=https://github.com/buytenh/ivykis
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=LGPL-2.1
 SLOT=0
 SRC_URI=https://github.com/buytenh/ivykis/archive/v0.42.2.tar.gz -> ivykis-0.42.2.tar.gz
-_md5_=baffb1763e1009ed3a73aed24e98e785
+_md5_=c646da122dcec2c8713ffea4d7b9c01b
diff --git a/metadata/md5-cache/dev-libs/kasync-0.2.0 b/metadata/md5-cache/dev-libs/kasync-0.2.0
index 976986513807..68cbce3dd8ca 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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kasync/0.2.0/src/kasync-0.2.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=82624b9e928c29220ad8738c147c1973
diff --git a/metadata/md5-cache/dev-libs/kdiagram-2.6.0 b/metadata/md5-cache/dev-libs/kdiagram-2.6.0
index 6161db0ad0d7..b284dcdfe504 100644
--- a/metadata/md5-cache/dev-libs/kdiagram-2.6.0
+++ b/metadata/md5-cache/dev-libs/kdiagram-2.6.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.
 REQUIRED_USE=test? ( examples )
 SLOT=5
 SRC_URI=mirror://kde/stable/kdiagram/2.6.0/src/kdiagram-2.6.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8ff524b4f8ceb51cd1f15e9d6400bac5
diff --git a/metadata/md5-cache/dev-libs/kproperty-3.0.2 b/metadata/md5-cache/dev-libs/kproperty-3.0.2
index b3f6b41a7473..bca0b3d7b37f 100644
--- a/metadata/md5-cache/dev-libs/kproperty-3.0.2
+++ b/metadata/md5-cache/dev-libs/kproperty-3.0.2
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kproperty/src/kproperty-3.0.2.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9c2a037697dd9e17dcb6d84c762905ee
diff --git a/metadata/md5-cache/dev-libs/kreport-3.0.2 b/metadata/md5-cache/dev-libs/kreport-3.0.2
index 2e224bb885e7..b7967151cf8a 100644
--- a/metadata/md5-cache/dev-libs/kreport-3.0.2
+++ b/metadata/md5-cache/dev-libs/kreport-3.0.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kreport/src/kreport-3.0.2.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8d5682c4a2fff9377bf240fe7f30be1e
diff --git a/metadata/md5-cache/dev-libs/libatomic_ops-7.6.2 b/metadata/md5-cache/dev-libs/libatomic_ops-7.6.2
new file mode 100644
index 000000000000..d3bddcf57cee
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libatomic_ops-7.6.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install test
+DESCRIPTION=Implementation for atomic memory update operations
+EAPI=6
+HOMEPAGE=https://github.com/ivmai/libatomic_ops/
+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 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT boehm-gc GPL-2+
+SLOT=0
+SRC_URI=https://github.com/ivmai/libatomic_ops/releases/download/v7.6.2/libatomic_ops-7.6.2.tar.gz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=4e016f55e9d0e7482e72e05f50986876
diff --git a/metadata/md5-cache/dev-libs/libcec-4.0.2-r1 b/metadata/md5-cache/dev-libs/libcec-4.0.2-r1
new file mode 100644
index 000000000000..73b705a4258f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libcec-4.0.2-r1
@@ -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 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) python? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+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 python_targets_python2_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_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	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3b0ea7f1b580473a169e32e5660cabda
diff --git a/metadata/md5-cache/dev-libs/libelf-0.8.13-r2 b/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
index 3aa1f1334d2e..d05e02d9fb24 100644
--- a/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
+++ b/metadata/md5-cache/dev-libs/libelf-0.8.13-r2
@@ -4,10 +4,10 @@ DESCRIPTION=A ELF object file access library
 EAPI=5
 HOMEPAGE=http://www.mr511.de/software/
 IUSE=debug nls elibc_FreeBSD abi_x86_32 abi_x86_64 abi_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 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -sparc-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2
 RDEPEND=!dev-libs/elfutils abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r11 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 SLOT=0
 SRC_URI=http://www.mr511.de/software/libelf-0.8.13.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dd21b0078e6d97feaee699e81238df7a
+_md5_=e888741917ce63f449852c25b0d11282
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.8.2-r1 b/metadata/md5-cache/dev-libs/libgcrypt-1.8.2-r1
new file mode 100644
index 000000000000..cc7023e55434
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.8.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] ) doc? ( virtual/texi2dvi ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=General purpose crypto library based on the code used in GnuPG
+EAPI=6
+HOMEPAGE=http://www.gnupg.org/
+IUSE=doc o-flag-munging 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 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1 MIT
+RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r19 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] )
+SLOT=0/20
+SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.8.2.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=bda969ec8dd65b007cae187636628c23
diff --git a/metadata/md5-cache/dev-libs/libinput-1.9.4 b/metadata/md5-cache/dev-libs/libinput-1.9.4
index e2e3d22aff3e..2750546bdeab 100644
--- a/metadata/md5-cache/dev-libs/libinput-1.9.4
+++ b/metadata/md5-cache/dev-libs/libinput-1.9.4
@@ -4,11 +4,11 @@ DESCRIPTION=Library to handle input devices in Wayland
 EAPI=6
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/libinput/
 IUSE=doc input_devices_wacom test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86
 LICENSE=MIT
 RDEPEND=input_devices_wacom? ( >=dev-libs/libwacom-0.20 ) >=dev-libs/libevdev-1.3 >=sys-libs/mtdev-1.1 virtual/libudev
 RESTRICT=test
 SLOT=0/10
 SRC_URI=https://www.freedesktop.org/software/libinput/libinput-1.9.4.tar.xz
 _eclasses_=meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182
-_md5_=4b877ddf6042dd634f26b54a37292920
+_md5_=5f509a2d0d62bd6b24810d7470ed8ff1
diff --git a/metadata/md5-cache/dev-libs/libmowgli-1.0.0-r1 b/metadata/md5-cache/dev-libs/libmowgli-1.0.0-r1
new file mode 100644
index 000000000000..c94f1d5b2f32
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libmowgli-1.0.0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Useful set of performance and usability-oriented extensions to C
+EAPI=6
+HOMEPAGE=http://atheme.org/projects/libmowgli.html
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=http://distfiles.atheme.org/libmowgli-1.0.0.tar.bz2
+_md5_=004f600990c72e8af3bfcd68d4519609
diff --git a/metadata/md5-cache/dev-libs/libmowgli-9999 b/metadata/md5-cache/dev-libs/libmowgli-9999
index 19dde3b60264..ac65bcc6695a 100644
--- a/metadata/md5-cache/dev-libs/libmowgli-9999
+++ b/metadata/md5-cache/dev-libs/libmowgli-9999
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure unpack
 DEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Useful set of performance and usability-oriented extensions to C
 EAPI=6
-HOMEPAGE=http://atheme.org/projects/libmowgli.html
+HOMEPAGE=https://github.com/atheme/libmowgli-2
 IUSE=libressl ssl
 LICENSE=BSD-2
 RDEPEND=ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=2
 _eclasses_=git-r3	fec09a83ae965b041b47f5ff7c8ba29a
-_md5_=736bb457c94b6952c5b8760dd1f2c1df
+_md5_=c3b38b5572c2ad78fb590aa1c531b8f4
diff --git a/metadata/md5-cache/dev-libs/libunibreak-4.0 b/metadata/md5-cache/dev-libs/libunibreak-4.0
index 5fd984e70a0f..df3392a5cf16 100644
--- a/metadata/md5-cache/dev-libs/libunibreak-4.0
+++ b/metadata/md5-cache/dev-libs/libunibreak-4.0
@@ -7,7 +7,8 @@ IUSE=doc +man static-libs
 KEYWORDS=~amd64 ~arm ~ppc ~x86
 LICENSE=ZLIB
 RDEPEND=!dev-libs/liblinebreak
+RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/adah1972/libunibreak/releases/download/libunibreak_4_0/libunibreak-4.0.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2a1021f04ca3f9e344eff788f709e342
+_md5_=72958aeef52fa85be9fefcadf1d34933
diff --git a/metadata/md5-cache/dev-libs/libxml2-2.9.7 b/metadata/md5-cache/dev-libs/libxml2-2.9.7
index cb7ea2991af8..50a064ebfa16 100644
--- a/metadata/md5-cache/dev-libs/libxml2-2.9.7
+++ b/metadata/md5-cache/dev-libs/libxml2-2.9.7
@@ -4,11 +4,11 @@ DESCRIPTION=Version 2 of the library to manipulate XML files
 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 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=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] ) >=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(-)] ) readline? ( sys-libs/readline:= )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
 SLOT=2
 SRC_URI=ftp://xmlsoft.org/libxml2/libxml2-2.9.7.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	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c30b4cdf80f17c29d7374a4b43dd46fc
+_md5_=28752c02aa793739b59dd37633089a10
diff --git a/metadata/md5-cache/dev-libs/log4cplus-1.1.3_rc7 b/metadata/md5-cache/dev-libs/log4cplus-1.1.3_rc7
deleted file mode 100644
index d38e5675b87d..000000000000
--- a/metadata/md5-cache/dev-libs/log4cplus-1.1.3_rc7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=virtual/pkgconfig iconv? ( virtual/libiconv ) qt4? ( dev-qt/qtcore:4 )
-DESCRIPTION=C++ port of the Log for Java (log4j) logging library
-EAPI=6
-HOMEPAGE=http://log4cplus.sourceforge.net/
-IUSE=iconv test threads working-locale working-c-locale qt4
-KEYWORDS=~amd64 ~x86
-LICENSE=|| ( Apache-2.0 BSD-2 )
-RDEPEND=iconv? ( virtual/libiconv ) qt4? ( dev-qt/qtcore:4 )
-REQUIRED_USE=?? ( iconv working-locale working-c-locale )
-SLOT=0/1.1-9
-SRC_URI=mirror://sourceforge/project/log4cplus/log4cplus-stable/1.1.3/log4cplus-1.1.3-rc7.tar.bz2
-_md5_=0bc8edeb165b146259cc54c1ef10fa6e
diff --git a/metadata/md5-cache/dev-libs/mpc-1.1.0 b/metadata/md5-cache/dev-libs/mpc-1.1.0
deleted file mode 100644
index 10944d8a3464..000000000000
--- a/metadata/md5-cache/dev-libs/mpc-1.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
-DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
-EAPI=6
-HOMEPAGE=http://mpc.multiprecision.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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
-SLOT=0/3
-SRC_URI=https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
-_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=c04a7cf91c72ef635c29bfe77fe151f0
diff --git a/metadata/md5-cache/dev-libs/mpc-1.1.0-r1 b/metadata/md5-cache/dev-libs/mpc-1.1.0-r1
new file mode 100644
index 000000000000..689bffda59d8
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mpc-1.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install test
+DEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
+DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
+EAPI=6
+HOMEPAGE=http://mpc.multiprecision.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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-3.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?]
+SLOT=0/3
+SRC_URI=https://ftp.gnu.org/gnu/mpc/mpc-1.1.0.tar.gz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=542b749a8fba05dc31af2996c6dc45ed
diff --git a/metadata/md5-cache/dev-libs/mpfr-3.1.6 b/metadata/md5-cache/dev-libs/mpfr-3.1.6
index ffa73d3f8b06..72b174142e70 100644
--- a/metadata/md5-cache/dev-libs/mpfr-3.1.6
+++ b/metadata/md5-cache/dev-libs/mpfr-3.1.6
@@ -4,10 +4,10 @@ DESCRIPTION=library for multiple-precision floating-point computations with exac
 EAPI=5
 HOMEPAGE=http://www.mpfr.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 ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-libs/gmp-4.1.4-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(-)?,static-libs?]
 SLOT=0/4
 SRC_URI=http://www.mpfr.org/mpfr-3.1.6/mpfr-3.1.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=dd6532d8ae3bdf19d47e639129a049dc
+_md5_=104f393beadb76e93819f28c1d447e45
diff --git a/metadata/md5-cache/dev-libs/purpose-1.2.1 b/metadata/md5-cache/dev-libs/purpose-1.2.1
index d2ae4db8453b..de5626449a1a 100644
--- a/metadata/md5-cache/dev-libs/purpose-1.2.1
+++ b/metadata/md5-cache/dev-libs/purpose-1.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/purpose/purpose-1.2.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0570cb98c6ccb671228c940addfc001d
diff --git a/metadata/md5-cache/dev-libs/sink-0.3.0-r1 b/metadata/md5-cache/dev-libs/sink-0.3.0-r1
index d8bff0aa6483..f3ae91a2f9b5 100644
--- a/metadata/md5-cache/dev-libs/sink-0.3.0-r1
+++ b/metadata/md5-cache/dev-libs/sink-0.3.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-apps/kcontacts-14.12.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/sink/0.3.0/src/sink-0.3.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8ad3364b6a498cd7163e6a3005897c6a
diff --git a/metadata/md5-cache/dev-libs/sway-0.14.0 b/metadata/md5-cache/dev-libs/sway-0.14.0
deleted file mode 100644
index 009febc65052..000000000000
--- a/metadata/md5-cache/dev-libs/sway-0.14.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/wlc-0.0.8[systemd=] dev-libs/json-c:= dev-libs/libpcre dev-libs/libinput x11-libs/libxkbcommon dev-libs/wayland sys-libs/libcap x11-libs/pango x11-libs/cairo swaylock? ( virtual/pam ) tray? ( sys-apps/dbus ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] ) virtual/pkgconfig app-text/asciidoc sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=i3-compatible Wayland window manager
-EAPI=6
-HOMEPAGE=http://swaywm.org/
-IUSE=+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wallpapers systemd +tray
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/wlc-0.0.8[systemd=] dev-libs/json-c:= dev-libs/libpcre dev-libs/libinput x11-libs/libxkbcommon dev-libs/wayland sys-libs/libcap x11-libs/pango x11-libs/cairo swaylock? ( virtual/pam ) tray? ( sys-apps/dbus ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )
-REQUIRED_USE=tray? ( swaybar )
-SLOT=0
-SRC_URI=https://github.com/swaywm/sway/archive/0.14.0.tar.gz -> sway-0.14.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=da786049bb226765672bbf1c33a13595
diff --git a/metadata/md5-cache/dev-libs/sway-0.15.0 b/metadata/md5-cache/dev-libs/sway-0.15.0
deleted file mode 100644
index 4568e46c3168..000000000000
--- a/metadata/md5-cache/dev-libs/sway-0.15.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-libs/wlc-0.0.8[systemd=] >=dev-libs/json-c-0.12.1:= dev-libs/libpcre dev-libs/libinput x11-libs/libxkbcommon dev-libs/wayland sys-libs/libcap x11-libs/pango x11-libs/cairo swaylock? ( virtual/pam ) tray? ( sys-apps/dbus ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] ) virtual/pkgconfig app-text/asciidoc sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=i3-compatible Wayland window manager
-EAPI=6
-HOMEPAGE=http://swaywm.org/
-IUSE=+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wallpapers systemd +tray
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/wlc-0.0.8[systemd=] >=dev-libs/json-c-0.12.1:= dev-libs/libpcre dev-libs/libinput x11-libs/libxkbcommon dev-libs/wayland sys-libs/libcap x11-libs/pango x11-libs/cairo swaylock? ( virtual/pam ) tray? ( sys-apps/dbus ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )
-REQUIRED_USE=tray? ( swaybar )
-SLOT=0
-SRC_URI=https://github.com/swaywm/sway/archive/0.15.0.tar.gz -> sway-0.15.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2ca154b9f39ed5e21bfaf28f2bd51cdc
diff --git a/metadata/md5-cache/dev-libs/sway-0.15.1 b/metadata/md5-cache/dev-libs/sway-0.15.1
new file mode 100644
index 000000000000..064e25a85a7f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/sway-0.15.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/wlc-0.0.8[systemd=] dev-libs/json-c:0= dev-libs/libpcre dev-libs/libinput dev-libs/wayland sys-libs/libcap x11-libs/libxkbcommon x11-libs/cairo x11-libs/pango gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] ) swaylock? ( virtual/pam ) tray? ( sys-apps/dbus ) app-text/asciidoc virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=i3-compatible Wayland window manager
+EAPI=6
+HOMEPAGE=http://swaywm.org/
+IUSE=+gdk-pixbuf +swaybar +swaybg swaygrab swaylock +swaymsg systemd +tray wallpapers zsh-completion
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/wlc-0.0.8[systemd=] dev-libs/json-c:0= dev-libs/libpcre dev-libs/libinput dev-libs/wayland sys-libs/libcap x11-libs/libxkbcommon x11-libs/cairo x11-libs/pango gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] ) swaylock? ( virtual/pam ) tray? ( sys-apps/dbus )
+REQUIRED_USE=tray? ( swaybar )
+SLOT=0
+SRC_URI=https://github.com/swaywm/sway/archive/0.15.1.tar.gz -> sway-0.15.1.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=311a859454297b8c8e50908b1585993a
diff --git a/metadata/md5-cache/dev-libs/sway-9999 b/metadata/md5-cache/dev-libs/sway-9999
index 708d3d16d97d..d6f026f79047 100644
--- a/metadata/md5-cache/dev-libs/sway-9999
+++ b/metadata/md5-cache/dev-libs/sway-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND==dev-libs/wlc-9999[systemd=] >=dev-libs/json-c-0.12.1:= dev-libs/libpcre dev-libs/libinput x11-libs/libxkbcommon dev-libs/wayland sys-libs/libcap x11-libs/pango x11-libs/cairo swaylock? ( virtual/pam ) tray? ( sys-apps/dbus ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] ) virtual/pkgconfig app-text/asciidoc >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND==dev-libs/wlc-9999[systemd=] dev-libs/json-c:0= dev-libs/libpcre dev-libs/libinput dev-libs/wayland sys-libs/libcap x11-libs/libxkbcommon x11-libs/cairo x11-libs/pango gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] ) swaylock? ( virtual/pam ) tray? ( sys-apps/dbus ) app-text/asciidoc virtual/pkgconfig >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=i3-compatible Wayland window manager
 EAPI=6
 HOMEPAGE=http://swaywm.org/
-IUSE=+swaybg +swaybar +swaymsg swaygrab swaylock +gdk-pixbuf zsh-completion wallpapers systemd +tray
+IUSE=+gdk-pixbuf +swaybar +swaybg swaygrab swaylock +swaymsg systemd +tray wallpapers zsh-completion
 LICENSE=MIT
-RDEPEND==dev-libs/wlc-9999[systemd=] >=dev-libs/json-c-0.12.1:= dev-libs/libpcre dev-libs/libinput x11-libs/libxkbcommon dev-libs/wayland sys-libs/libcap x11-libs/pango x11-libs/cairo swaylock? ( virtual/pam ) tray? ( sys-apps/dbus ) gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] )
+RDEPEND==dev-libs/wlc-9999[systemd=] dev-libs/json-c:0= dev-libs/libpcre dev-libs/libinput dev-libs/wayland sys-libs/libcap x11-libs/libxkbcommon x11-libs/cairo x11-libs/pango gdk-pixbuf? ( x11-libs/gdk-pixbuf[jpeg] ) swaylock? ( virtual/pam ) tray? ( sys-apps/dbus )
 REQUIRED_USE=tray? ( swaybar )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=63b380963fb95f79313e17ffb8ce8df8
+_md5_=c21278187d764958939f0ebdae8d658f
diff --git a/metadata/md5-cache/dev-libs/vala-common-0.36.7 b/metadata/md5-cache/dev-libs/vala-common-0.36.7
index 39ee0e7ea234..832fda9477cd 100644
--- a/metadata/md5-cache/dev-libs/vala-common-0.36.7
+++ b/metadata/md5-cache/dev-libs/vala-common-0.36.7
@@ -3,10 +3,10 @@ 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 ~arm-linux ~x86-linux ~x64-macos ~x64-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~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.7.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bce72484c589d3975846abcd8a56bebf
+_md5_=1b4c0eeef95a81bef7464ed0819300f7
diff --git a/metadata/md5-cache/dev-perl/B-Utils-0.270.0 b/metadata/md5-cache/dev-perl/B-Utils-0.270.0
index 8e4ad3f5799a..e3425b1fa83e 100644
--- a/metadata/md5-cache/dev-perl/B-Utils-0.270.0
+++ b/metadata/md5-cache/dev-perl/B-Utils-0.270.0
@@ -4,10 +4,10 @@ DESCRIPTION=Helper functions for op tree manipulation
 EAPI=5
 HOMEPAGE=http://search.cpan.org/dist/B-Utils/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm hppa ppc ppc64 x86
+KEYWORDS=~alpha amd64 ~arm hppa ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Exporter virtual/perl-Scalar-List-Utils dev-perl/Task-Weaken dev-lang/perl:=[-build(-)]
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/E/ET/ETHER/B-Utils-0.27.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=4bd60b8054a4175794fe58ab2b262e10
+_md5_=c36255e3521f2e067f0adecb25e9e95c
diff --git a/metadata/md5-cache/dev-perl/File-ShareDir-1.104.0 b/metadata/md5-cache/dev-perl/File-ShareDir-1.104.0
index 3e7040f53842..32eb19c91189 100644
--- a/metadata/md5-cache/dev-perl/File-ShareDir-1.104.0
+++ b/metadata/md5-cache/dev-perl/File-ShareDir-1.104.0
@@ -4,10 +4,10 @@ DESCRIPTION=Locate per-dist and per-module shared files
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/File-ShareDir/
 IUSE=test
-KEYWORDS=~alpha ~amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-solaris
+KEYWORDS=~alpha amd64 hppa ~ia64 ~ppc ~ppc64 ~sparc x86 ~ppc-aix ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Carp >=dev-perl/Class-Inspector-1.120.0 >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/File-ShareDir-1.104.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=810f1acf9dca820ff3740fcf02559a27
+_md5_=e703920d611eadc4b14b9bab2f9b5e7d
diff --git a/metadata/md5-cache/dev-perl/IO-All-0.870.0 b/metadata/md5-cache/dev-perl/IO-All-0.870.0
index 249ad0d590ee..16545ed2c51f 100644
--- a/metadata/md5-cache/dev-perl/IO-All-0.870.0
+++ b/metadata/md5-cache/dev-perl/IO-All-0.870.0
@@ -3,10 +3,10 @@ DEPEND=virtual/perl-Scalar-List-Utils dev-lang/perl:=
 DESCRIPTION=unified IO operations
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/IO-All/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ppc ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ppc ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-Scalar-List-Utils virtual/perl-ExtUtils-MakeMaker dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/F/FR/FREW/IO-All-0.87.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=2555aff074850741dbcc6b4f235d19b1
+_md5_=09b0938f60c5cfd5e9e9622f54cd270b
diff --git a/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2 b/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
index 02ae38987d8c..549976fd45ce 100644
--- a/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
+++ b/metadata/md5-cache/dev-perl/LWP-Online-1.80.0-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Does your process have access to the web
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/LWP-Online/
 IUSE=test
-KEYWORDS=~alpha ~amd64 ~arm hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/libwww-perl-5.805.0 >=dev-perl/URI-1.350.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/A/AD/ADAMK/LWP-Online-1.08.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=63acb0e5e0dadaa284f88eed4b3984d6
+_md5_=6a978da846894d8405d95c83a5eced92
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index 90130a008e95..1b59ec60919c 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/Module-Info-0.370.0-r1 b/metadata/md5-cache/dev-perl/Module-Info-0.370.0-r1
index 0bb65e5f84a3..6facadfc8cb0 100644
--- a/metadata/md5-cache/dev-perl/Module-Info-0.370.0-r1
+++ b/metadata/md5-cache/dev-perl/Module-Info-0.370.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Information about Perl modules
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Module-Info/
 IUSE=test
-KEYWORDS=~alpha ~amd64 hppa ~mips ppc ppc64 x86
+KEYWORDS=~alpha amd64 hppa ~mips ppc ppc64 x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=>=dev-perl/B-Utils-0.270.0 virtual/perl-Carp >=virtual/perl-File-Spec-0.800.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NE/NEILB/Module-Info-0.37.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=57c1cc78a736c6093e04be69f54f9cbc
+_md5_=c471be2bf0234b4c64b21f36fc7e25ad
diff --git a/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0 b/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0
index 78d64a6e3627..4a0b2391c475 100644
--- a/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0
+++ b/metadata/md5-cache/dev-perl/Module-Runtime-0.16.0
@@ -4,10 +4,10 @@ DESCRIPTION=Runtime module handling
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Module-Runtime/
 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 ~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 ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/Z/ZE/ZEFRAM/Module-Runtime-0.016.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=5c8dbc8986277a502d9e34b4b714766b
+_md5_=76115a464b47c92616ac2bca55a29c68
diff --git a/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.40.0 b/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.40.0
index 508a3d145467..6585e524ef21 100644
--- a/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.40.0
+++ b/metadata/md5-cache/dev-perl/MusicBrainz-DiscID-0.40.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl interface for the MusicBrainz libdiscid library
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/MusicBrainz-DiscID/
 IUSE=test examples
-KEYWORDS=~amd64 ppc ppc64 x86
+KEYWORDS=amd64 ppc ppc64 x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libdiscid-0.2.2 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/N/NJ/NJH/MusicBrainz-DiscID-0.04.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=f4911f0eba60b741c260c362d798a04f
+_md5_=4500c6c5862c3dab38277ddde6ecfe32
diff --git a/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r2 b/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r2
index 6e571b6b89f3..0bd135584575 100644
--- a/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r2
+++ b/metadata/md5-cache/dev-perl/Net-Daemon-0.480.0-r2
@@ -3,10 +3,10 @@ DEPEND=dev-lang/perl:=
 DESCRIPTION=Abstract base class for portable servers
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-Daemon/
-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/M/MN/MNOONING/Net-Daemon-0.48.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=75f7055e63fc45e28237c6cb19a7e097
+_md5_=cf5dc1e7a963ac3d719d5fe5e8e5d365
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.820.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.820.0
index 07a07a25dcd4..5ced85e5b8d1 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.820.0
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.820.0
@@ -4,10 +4,10 @@ DESCRIPTION=Perl extension for using OpenSSL
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=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.82.tar.gz
 _eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b73ae17bd57a722dcab6c6b6c1f94e37
+_md5_=1dd821624758d2d759701eeda7e96d29
diff --git a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0 b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0
index a251c269df14..6e62f9f9f2f2 100644
--- a/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0
+++ b/metadata/md5-cache/dev-perl/Net-XMPP-1.50.0
@@ -4,10 +4,10 @@ DESCRIPTION=XMPP Perl Library
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Net-XMPP/
 IUSE=test examples
-KEYWORDS=~alpha ~amd64 ~arm hppa ia64 ppc ppc64 sparc x86
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=LGPL-2.1
 RDEPEND=>=dev-perl/Authen-SASL-2.120.0 virtual/perl-Digest-SHA virtual/perl-Scalar-List-Utils >=dev-perl/XML-Stream-1.240.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DA/DAPATRICK/Net-XMPP-1.05.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=59e0e684c317407fa3e27b5a9983460c
+_md5_=f42e32559f9c78406af1b8b16fc74983
diff --git a/metadata/md5-cache/dev-perl/Specio-0.420.0 b/metadata/md5-cache/dev-perl/Specio-0.420.0
index 159f081ff431..c19088b2e6e2 100644
--- a/metadata/md5-cache/dev-perl/Specio-0.420.0
+++ b/metadata/md5-cache/dev-perl/Specio-0.420.0
@@ -4,10 +4,10 @@ DESCRIPTION=Type constraints and coercions for Perl
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Specio/
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!minimal? ( >=dev-perl/Ref-Util-0.112.0 ) virtual/perl-Carp dev-perl/Devel-StackTrace dev-perl/Eval-Closure virtual/perl-Exporter virtual/perl-IO dev-perl/MRO-Compat dev-perl/Module-Runtime >=dev-perl/Role-Tiny-1.3.3 >=virtual/perl-Scalar-List-Utils-1.330.0 virtual/perl-Storable dev-perl/Sub-Quote dev-perl/Test-Fatal >=virtual/perl-Test-Simple-0.960.0 dev-perl/Try-Tiny virtual/perl-parent >=virtual/perl-version-0.830.0 dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/D/DR/DROLSKY/Specio-0.42.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=621bc73d2d57c56aa7cb013741f22cab
+_md5_=7ac283241eff0c5a484d900c21fe242b
diff --git a/metadata/md5-cache/dev-perl/Sub-Quote-2.3.1 b/metadata/md5-cache/dev-perl/Sub-Quote-2.3.1
index a9e270275e62..586120c23ead 100644
--- a/metadata/md5-cache/dev-perl/Sub-Quote-2.3.1
+++ b/metadata/md5-cache/dev-perl/Sub-Quote-2.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=efficient generation of subroutines via string eval
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Sub-Quote/
 IUSE=test minimal
-KEYWORDS=amd64 ~arm hppa ppc ~ppc64 ~sparc x86
+KEYWORDS=amd64 ~arm hppa ~ia64 ppc ~ppc64 ~sparc x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Moo-2.3.0 !minimal? ( >=dev-perl/Sub-Name-0.80.0 ) virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.003001.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=fd19a737cb1d047007992c06bb9f258b
+_md5_=18048606d00a268884911b56923f8896
diff --git a/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0 b/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0
index b09d8f2a8ee1..51b671017d6d 100644
--- a/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0
+++ b/metadata/md5-cache/dev-perl/Sub-Quote-2.4.0
@@ -4,10 +4,10 @@ DESCRIPTION=Efficient generation of subroutines via string eval
 EAPI=6
 HOMEPAGE=http://search.cpan.org/dist/Sub-Quote/
 IUSE=test minimal
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=!<dev-perl/Moo-2.3.0 !minimal? ( >=dev-perl/Sub-Name-0.80.0 ) virtual/perl-Scalar-List-Utils dev-lang/perl:=
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/H/HA/HAARG/Sub-Quote-2.004000.tar.gz
 _eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
-_md5_=501aca75aae02e3890eb0de7bbe9f78e
+_md5_=9fd4ed27498a7090be9b8a4e1da4bfc8
diff --git a/metadata/md5-cache/dev-perl/Template-DBI-2.650.0-r2 b/metadata/md5-cache/dev-perl/Template-DBI-2.650.0-r2
new file mode 100644
index 000000000000..1ed29107d29c
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Template-DBI-2.650.0-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-perl/DBI-1.612 >=dev-perl/Template-Toolkit-2.22 test? ( dev-perl/MLDBM >=dev-perl/SQL-Statement-1.28 ) dev-lang/perl:=
+DESCRIPTION=DBI plugin for the Template Toolkit
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Template-DBI/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+RDEPEND=>=dev-perl/DBI-1.612 >=dev-perl/Template-Toolkit-2.22 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/R/RE/REHSACK/Template-DBI-2.65.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=fcfeff0e2702b72de2845a822096d334
diff --git a/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1 b/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1
new file mode 100644
index 000000000000..27308450bc27
--- /dev/null
+++ b/metadata/md5-cache/dev-perl/Template-Toolkit-2.270.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-perl/Text-Autoformat mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) >=dev-perl/AppConfig-1.56 test? ( dev-perl/CGI ) dev-lang/perl:=
+DESCRIPTION=The Template Toolkit
+EAPI=6
+HOMEPAGE=http://search.cpan.org/dist/Template-Toolkit/
+IUSE=xml gd mysql postgres latex vim-syntax test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~ppc-aix ~x86-fbsd ~x86-solaris
+LICENSE=|| ( Artistic GPL-1+ )
+PDEPEND=dev-perl/Text-Autoformat vim-syntax? ( app-vim/tt2-syntax ) xml? ( dev-perl/Template-XML ) gd? ( dev-perl/Template-GD ) mysql? ( dev-perl/Template-DBI ) latex? ( dev-perl/Template-Plugin-Latex ) postgres? ( dev-perl/Template-DBI )
+RDEPEND=dev-perl/Text-Autoformat mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) >=dev-perl/AppConfig-1.56 dev-lang/perl:=
+SLOT=0
+SRC_URI=mirror://cpan/authors/id/A/AB/ABW/Template-Toolkit-2.27.tar.gz
+_eclasses_=multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011
+_md5_=f8cabc384565f740de3d4c382883d999
diff --git a/metadata/md5-cache/dev-php/File_Iterator-1.4.3 b/metadata/md5-cache/dev-php/File_Iterator-1.4.3
new file mode 100644
index 000000000000..4da39fcc3cca
--- /dev/null
+++ b/metadata/md5-cache/dev-php/File_Iterator-1.4.3
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install postinst
+DESCRIPTION=FilterIterator implementation that filters files based on criteria
+EAPI=6
+HOMEPAGE=https://phpunit.de
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=BSD
+RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
+SLOT=0
+SRC_URI=https://github.com/sebastianbergmann/php-file-iterator/archive/1.4.3.tar.gz -> File_Iterator-1.4.3.tar.gz
+_md5_=5d34510ebf07b76208d3876fa49dfc2b
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 899e83f4bc2f..5fb2381d36d7 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.1 b/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.1
new file mode 100644
index 000000000000..187e24643fe6
--- /dev/null
+++ b/metadata/md5-cache/dev-php/myclabs-deepcopy-1.6.1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=install
+DESCRIPTION=Create deep copies (clones) of your objects
+EAPI=6
+HOMEPAGE=https://github.com/myclabs/DeepCopy
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-php/fedora-autoloader >=dev-lang/php-5.6:*
+SLOT=0
+SRC_URI=https://github.com/myclabs/DeepCopy/archive/1.6.1.tar.gz -> myclabs-deepcopy-1.6.1.tar.gz
+_md5_=008aec94cfec4f2d761892124db00148
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 7dd3a8b5a9b1..00694ec480ee 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/aiohttp-0.21.5 b/metadata/md5-cache/dev-python/aiohttp-0.21.5
deleted file mode 100644
index dbb0b2c8a9aa..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-0.21.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-raisesregexp[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] www-servers/gunicorn[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=http client/server for asyncio
-EAPI=5
-HOMEPAGE=https://github.com/KeepSafe/aiohttp https://pypi.python.org/pypi/aiohttp
-IUSE=doc examples test python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp/aiohttp-0.21.5.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=847dff50c47608a7e802a43b1e3493f6
diff --git a/metadata/md5-cache/dev-python/aiohttp-1.0.3 b/metadata/md5-cache/dev-python/aiohttp-1.0.3
deleted file mode 100644
index 11d3790a7cce..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-1.0.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/aiodns[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/async_timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multidict-2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] www-servers/gunicorn[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/aiohttp
-IUSE=doc examples test python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/aiodns[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/async_timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multidict-2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp/aiohttp-1.0.3.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5e4312b657b298b82cda85eb895cc524
diff --git a/metadata/md5-cache/dev-python/aiohttp-1.0.4 b/metadata/md5-cache/dev-python/aiohttp-1.0.4
deleted file mode 100644
index 3f3fe3135bd9..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-1.0.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/async_timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multidict-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] www-servers/gunicorn[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/aiohttp
-IUSE=doc test python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/async_timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multidict-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/KeepSafe/aiohttp/archive/v1.0.4.tar.gz -> aiohttp-1.0.4.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4c15788c8dbca09a9138cc62410e7f0f
diff --git a/metadata/md5-cache/dev-python/aiohttp-1.0.5 b/metadata/md5-cache/dev-python/aiohttp-1.0.5
deleted file mode 100644
index e54f844dd872..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-1.0.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/async_timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multidict-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] www-servers/gunicorn[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/aiohttp
-IUSE=doc test python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/async_timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multidict-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/KeepSafe/aiohttp/archive/v1.0.5.tar.gz -> aiohttp-1.0.5.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4c15788c8dbca09a9138cc62410e7f0f
diff --git a/metadata/md5-cache/dev-python/aiohttp-1.1.1 b/metadata/md5-cache/dev-python/aiohttp-1.1.1
deleted file mode 100644
index 4c18760c0895..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-1.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/async_timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multidict-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/yarl[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] www-servers/gunicorn[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/aiohttp
-IUSE=doc test python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/async_timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multidict-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/yarl[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/KeepSafe/aiohttp/archive/v1.1.1.tar.gz -> aiohttp-1.1.1.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c81b28b907484b15e7b33c645dba9ed6
diff --git a/metadata/md5-cache/dev-python/aiohttp-1.1.2 b/metadata/md5-cache/dev-python/aiohttp-1.1.2
deleted file mode 100644
index 00b54129a9ce..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-1.1.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/async_timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multidict-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/yarl[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] www-servers/gunicorn[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/aiohttp
-IUSE=doc test python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/async_timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multidict-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/yarl[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/KeepSafe/aiohttp/archive/v1.1.2.tar.gz -> aiohttp-1.1.2.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c81b28b907484b15e7b33c645dba9ed6
diff --git a/metadata/md5-cache/dev-python/aiohttp-1.1.5 b/metadata/md5-cache/dev-python/aiohttp-1.1.5
deleted file mode 100644
index d7994cd713d1..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-1.1.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/setuptools[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( >=dev-python/alabaster-0.6.2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/async_timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multidict-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/yarl[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-mock[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest-timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] www-servers/gunicorn[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/aiohttp
-IUSE=doc test python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/async_timeout[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/chardet[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multidict-2.0[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/yarl[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=https://github.com/KeepSafe/aiohttp/archive/v1.1.5.tar.gz -> aiohttp-1.1.5.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c81b28b907484b15e7b33c645dba9ed6
diff --git a/metadata/md5-cache/dev-python/aiohttp-1.2.0 b/metadata/md5-cache/dev-python/aiohttp-1.2.0
deleted file mode 100644
index d6ef8438de87..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-1.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] 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(-)] doc? ( >=dev-python/alabaster-0.6.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/sphinxcontrib-asyncio[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/sphinxcontrib-newsfeed[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/sphinxcontrib-spelling[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(-)] ) test? ( dev-python/async_timeout[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/chardet[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/multidict-2.1.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/yarl[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[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/pytest-timeout[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(-)] www-servers/gunicorn[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=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/aiohttp
-IUSE=doc test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/async_timeout[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/chardet[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/multidict-2.1.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/yarl[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/KeepSafe/aiohttp/archive/v1.2.0.tar.gz -> aiohttp-1.2.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c8a043b19455cfa443d26fdaf06da151
diff --git a/metadata/md5-cache/dev-python/aiohttp-2.1.0 b/metadata/md5-cache/dev-python/aiohttp-2.1.0
deleted file mode 100644
index 66bd8022b4e2..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-2.1.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] 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(-)] doc? ( >=dev-python/alabaster-0.6.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/sphinxcontrib-asyncio[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/sphinxcontrib-newsfeed[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/sphinxcontrib-spelling[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(-)] ) test? ( dev-python/async_timeout[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/chardet[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/multidict-2.1.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/yarl-0.10[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[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/pytest-timeout[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(-)] www-servers/gunicorn[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=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/aiohttp
-IUSE=doc test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/async_timeout[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/chardet[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/multidict-2.1.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/yarl-0.10[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp/aiohttp-2.1.0.tar.gz -> aiohttp-2.1.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6bfc1d31cc5c841e3d782b3f0228348
diff --git a/metadata/md5-cache/dev-python/aiohttp-2.2.0 b/metadata/md5-cache/dev-python/aiohttp-2.2.0
deleted file mode 100644
index 997932da4b40..000000000000
--- a/metadata/md5-cache/dev-python/aiohttp-2.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-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(-)] 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(-)] doc? ( >=dev-python/alabaster-0.6.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/sphinxcontrib-asyncio[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/sphinxcontrib-newsfeed[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/sphinxcontrib-spelling[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(-)] ) test? ( dev-python/async_timeout[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/chardet[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/multidict-2.1.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/yarl-0.10[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[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/pytest-timeout[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(-)] www-servers/gunicorn[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=http client/server for asyncio
-EAPI=6
-HOMEPAGE=https://pypi.python.org/pypi/aiohttp
-IUSE=doc test python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/async_timeout[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/chardet[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/multidict-2.1.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/yarl-0.10[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/a/aiohttp/aiohttp-2.2.0.tar.gz -> aiohttp-2.2.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d6bfc1d31cc5c841e3d782b3f0228348
diff --git a/metadata/md5-cache/dev-python/ansi2html-1.3.0 b/metadata/md5-cache/dev-python/ansi2html-1.3.0
new file mode 100644
index 000000000000..54645c8b2918
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ansi2html-1.3.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-text/asciidoc ) test? ( dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.7.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( 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/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Convert text with ANSI color codes to HTML
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/ansi2html https://github.com/ralphbean/ansi2html
+IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-3+
+RDEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/six-1.7.3[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/a/ansi2html/ansi2html-1.3.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1605352c3259547167bb6697aa0cdb20
diff --git a/metadata/md5-cache/dev-python/cheroot-6.0.0 b/metadata/md5-cache/dev-python/cheroot-6.0.0
index 78b9953b896a..01332015cd10 100644
--- a/metadata/md5-cache/dev-python/cheroot-6.0.0
+++ b/metadata/md5-cache/dev-python/cheroot-6.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Cheroot is the high-performance, pure-Python HTTP server used by Che
 EAPI=6
 HOMEPAGE=http://www.cherrypy.org/ https://pypi.python.org/pypi/Cheroot https://github.com/cherrypy/cheroot
 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 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/six-1.11.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/more-itertools-2.6[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/C/Cheroot/cheroot-6.0.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d9cb87ef246754c59394b2166ee8806
+_md5_=cd42610176c56bc4a09591c5118b2655
diff --git a/metadata/md5-cache/dev-python/cherrypy-13.1.0 b/metadata/md5-cache/dev-python/cherrypy-13.1.0
index 026b889771ec..079bf4052f79 100644
--- a/metadata/md5-cache/dev-python/cherrypy-13.1.0
+++ b/metadata/md5-cache/dev-python/cherrypy-13.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=CherryPy is a pythonic, object-oriented HTTP framework
 EAPI=6
 HOMEPAGE=http://www.cherrypy.org/ https://pypi.python.org/pypi/CherryPy
 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 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/cheroot-5.9.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/portend-2.1.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/six-1.11.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/C/CherryPy/CherryPy-13.1.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cba6b740936f39e0f883be88631eb67d
+_md5_=6352b8291d90fe1bb8c441cacdab6c35
diff --git a/metadata/md5-cache/dev-python/fields-5.0.0 b/metadata/md5-cache/dev-python/fields-5.0.0
index 0b4434ee8188..2dbde256dcfb 100644
--- a/metadata/md5-cache/dev-python/fields-5.0.0
+++ b/metadata/md5-cache/dev-python/fields-5.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=Container class boilerplate killer
 EAPI=6
 HOMEPAGE=https://github.com/ionelmc/python-fields
 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 ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 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 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/f/fields/fields-5.0.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9cbc6c22776f3d3df91319b5740d6353
+_md5_=56cf8d3faeca62c68c5a9be9ad003430
diff --git a/metadata/md5-cache/dev-python/mako-1.0.3 b/metadata/md5-cache/dev-python/mako-1.0.3
index 718b17dc4bd9..ba219c7d9345 100644
--- a/metadata/md5-cache/dev-python/mako-1.0.3
+++ b/metadata/md5-cache/dev-python/mako-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=A Python templating language
 EAPI=5
 HOMEPAGE=http://www.makotemplates.org/ https://pypi.python.org/pypi/Mako
 IUSE=doc 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 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=MIT
 RDEPEND=>=dev-python/markupsafe-0.9.2[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_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/Mako/Mako-1.0.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dfd6140cdbb5c4982845263854209714
+_md5_=93fcaf726d16f0e4f17d16939092d746
diff --git a/metadata/md5-cache/dev-python/matplotlib-2.1.0-r1 b/metadata/md5-cache/dev-python/matplotlib-2.1.0-r1
index 7da2b9447f3a..4205a1b755d2 100644
--- a/metadata/md5-cache/dev-python/matplotlib-2.1.0-r1
+++ b/metadata/md5-cache/dev-python/matplotlib-2.1.0-r1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-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/python-dateutil: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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=media-libs/qhull-2013 cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/versioneer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] virtual/pkgconfig doc? ( app-text/dvipng dev-python/colorspacious[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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_single_target_python2_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) 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(-)] >=dev-python/nose-0.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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-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/python-dateutil: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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/versioneer[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] virtual/pkgconfig doc? ( app-text/dvipng dev-python/colorspacious[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ipython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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_single_target_python2_7(-)] dev-python/numpydoc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-texlive/texlive-latexextra dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexrecommended media-gfx/graphviz[cairo] ) 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(-)] >=dev-python/nose-0.11.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) 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(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Pure python plotting library with matlab like syntax
 EAPI=6
 HOMEPAGE=http://matplotlib.org/
 IUSE=cairo doc excel examples gtk2 gtk3 latex pyside qt5 test tk wxwidgets python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
 KEYWORDS=amd64 ~arm64 x86
 LICENSE=BitstreamVera BSD matplotlib MIT OFL-1.1
-RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-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/python-dateutil: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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=media-libs/qhull-2013 cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.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(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk3? ( 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(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) pyside? ( dev-python/pyside[X,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-python/PyQt5[gui,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(-)] ) 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(+)] ) >=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(-)]
+RDEPEND=dev-python/cycler[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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-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/python-dateutil: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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-fonts/stix-fonts media-libs/freetype:2 media-libs/libpng:0 >=media-libs/qhull-2013 cairo? ( dev-python/cairocffi[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk2? ( dev-libs/glib:2= x11-libs/gdk-pixbuf x11-libs/gtk+:2 dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) wxwidgets? ( >=dev-python/wxpython-2.8:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/functools32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/subprocess32[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( dev-python/backports-functools-lru-cache[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) >=dev-python/pyparsing-1.5.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(-)] excel? ( dev-python/xlwt[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) gtk3? ( 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(-)] x11-libs/gtk+:3[introspection] ) latex? ( virtual/latex-base app-text/ghostscript-gpl app-text/dvipng app-text/poppler[utils] dev-texlive/texlive-fontsrecommended dev-texlive/texlive-latexextra dev-texlive/texlive-xetex ) pyside? ( dev-python/pyside[X,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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-python/PyQt5[gui,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(-)] ) 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(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=doc? ( || ( python_targets_python2_7 ) ) excel? ( || ( python_targets_python2_7 ) ) gtk2? ( || ( python_targets_python2_7 ) ) wxwidgets? ( || ( python_targets_python2_7 ) ) test? ( cairo latex qt5 tk wxwidgets || ( gtk2 gtk3 ) ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~grozin/matplotlib-2.1.0.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d797e1e858f07b2fe6284b2385ccf7c4
+_md5_=5613a9d4feba57a69c5fd4b3f95912f8
diff --git a/metadata/md5-cache/dev-python/more-itertools-3.0.0 b/metadata/md5-cache/dev-python/more-itertools-3.0.0
index 894586b77082..e9e4b39abcb5 100644
--- a/metadata/md5-cache/dev-python/more-itertools-3.0.0
+++ b/metadata/md5-cache/dev-python/more-itertools-3.0.0
@@ -4,11 +4,11 @@ DESCRIPTION=More routines for operating on iterables, beyond itertools
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/more-itertools
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc x86
 LICENSE=MIT
 RDEPEND=<dev-python/six-2.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/m/more-itertools/more-itertools-3.0.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e580dd5e391203b9f11b8daa57ed7b18
+_md5_=8df3470ecfb8224f3d6cc599967c95f2
diff --git a/metadata/md5-cache/dev-python/oslotest-2.17.1 b/metadata/md5-cache/dev-python/oslotest-2.17.1
index 17577f197c97..de963bf232ee 100644
--- a/metadata/md5-cache/dev-python/oslotest-2.17.1
+++ b/metadata/md5-cache/dev-python/oslotest-2.17.1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://pypi/o/oslotest/oslotest-2.17.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a8acc8722a58641d54633e8121e0915a
+_md5_=3e79932cbed42e8a543015758f8a1a9a
diff --git a/metadata/md5-cache/dev-python/owslib-0.16.0 b/metadata/md5-cache/dev-python/owslib-0.16.0
new file mode 100644
index 000000000000..07415b24aa01
--- /dev/null
+++ b/metadata/md5-cache/dev-python/owslib-0.16.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] test? ( dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pytest-cov[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/tox[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Library for client programming with Open Geospatial Consortium web service
+EAPI=6
+HOMEPAGE=https://geopython.github.io/OWSLib
+IUSE=test python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/pyproj[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] || ( dev-python/elementtree[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/geopython/owslib/archive/0.16.0.tar.gz -> owslib-0.16.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bd3e36c60ea1b3d4844503c10e81c652
diff --git a/metadata/md5-cache/dev-python/portend-2.2 b/metadata/md5-cache/dev-python/portend-2.2
index aa46d04f749c..a73375f91bff 100644
--- a/metadata/md5-cache/dev-python/portend-2.2
+++ b/metadata/md5-cache/dev-python/portend-2.2
@@ -4,11 +4,11 @@ DESCRIPTION=TCP port monitoring utilities
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/portend https://github.com/jaraco/portend
 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 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/tempora-1.8[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/portend/portend-2.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f7be7c03c97908ed92f922a32a6a8403
+_md5_=494439bdeb0772121e0f612e8718ef9c
diff --git a/metadata/md5-cache/dev-python/pyatspi-2.24.0 b/metadata/md5-cache/dev-python/pyatspi-2.24.0
index e8a350dc6c3d..a20f651e90f2 100644
--- a/metadata/md5-cache/dev-python/pyatspi-2.24.0
+++ b/metadata/md5-cache/dev-python/pyatspi-2.24.0
@@ -4,11 +4,11 @@ DESCRIPTION=Python binding to at-spi library
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Accessibility
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86
 LICENSE=LGPL-2 GPL-2+
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-libs/atk-2.11.2 dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygobject-2.90.1:3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=sys-apps/dbus-1 >=app-accessibility/at-spi2-core-2.20.2[introspection] !<gnome-extra/at-spi-1.32.0-r1
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pyatspi/2.24/pyatspi-2.24.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4088b801f08bc691d8db1359f205712a
+_md5_=2e9cff84982ef87466881a30a54d8b5c
diff --git a/metadata/md5-cache/dev-python/pycares-2.1.0 b/metadata/md5-cache/dev-python/pycares-2.1.0
deleted file mode 100644
index 130116025bfb..000000000000
--- a/metadata/md5-cache/dev-python/pycares-2.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python interface for c-ares
-EAPI=6
-HOMEPAGE=https://github.com/saghul/pycares/
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-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 ) >=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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pycares/pycares-2.1.0.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a10d5eb65125f21194d40cab5486fc0a
diff --git a/metadata/md5-cache/dev-python/pycares-2.3.0 b/metadata/md5-cache/dev-python/pycares-2.3.0
new file mode 100644
index 000000000000..aea224a81e1e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pycares-2.3.0
@@ -0,0 +1,15 @@
+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=Python interface for c-ares
+EAPI=6
+HOMEPAGE=https://github.com/saghul/pycares/
+IUSE=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(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pycares/pycares-2.3.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=614c9bcc7efb8f5550e349c4ac8a5e35
diff --git a/metadata/md5-cache/dev-python/pyicu-2.0.2 b/metadata/md5-cache/dev-python/pyicu-2.0.2
new file mode 100644
index 000000000000..b54e0954af00
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyicu-2.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/icu test? ( dev-python/pytest dev-python/six ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Python bindings for dev-libs/icu
+EAPI=6
+HOMEPAGE=https://github.com/ovalhub/pyicu
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-libs/icu python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyICU/PyICU-2.0.2.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4075a4b4cd0e31f2653228713cbb0cae
diff --git a/metadata/md5-cache/dev-python/pypy3-5.10.1 b/metadata/md5-cache/dev-python/pypy3-5.10.1
new file mode 100644
index 000000000000..fb0831693ffd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-5.10.1
@@ -0,0 +1,13 @@
+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	bd050ce908e4637604ee604ed4b78e8f	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_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
new file mode 100644
index 000000000000..517cc85cd21a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pypy3-bin-5.10.1
@@ -0,0 +1,14 @@
+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	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=ada20145a5a99743efeb2ee405c3e6d0
diff --git a/metadata/md5-cache/dev-python/pysaml2-4.0.2-r1 b/metadata/md5-cache/dev-python/pysaml2-4.0.2-r1
deleted file mode 100644
index d595a867965d..000000000000
--- a/metadata/md5-cache/dev-python/pysaml2-4.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=Python implementation of SAML Version 2 to be used in a WSGI environment
-EAPI=6
-HOMEPAGE=https://github.com/rohe/pysaml2
-IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 ~arm64 x86
-LICENSE=Apache-2.0
-RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/repoze-who[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pysaml2/pysaml2-4.0.2.tar.gz
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eafe7e9963f7383c1e05775b951a6a4e
diff --git a/metadata/md5-cache/dev-python/pysaml2-4.0.2-r3 b/metadata/md5-cache/dev-python/pysaml2-4.0.2-r3
index 169d6a2de6c4..b824794c0c7f 100644
--- a/metadata/md5-cache/dev-python/pysaml2-4.0.2-r3
+++ b/metadata/md5-cache/dev-python/pysaml2-4.0.2-r3
@@ -4,11 +4,11 @@ DESCRIPTION=Python implementation of SAML Version 2 to be used in a WSGI environ
 EAPI=6
 HOMEPAGE=https://github.com/rohe/pysaml2
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 x86
 LICENSE=Apache-2.0
 RDEPEND=dev-python/decorator[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/requests-1.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/paste[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/zope-interface[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/repoze-who[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pycrypto-2.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyopenssl[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/defusedxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pysaml2/pysaml2-4.0.2.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f6cb87762c356f3b5a696b557a446efb
+_md5_=f52fa357dcc2ff5f34d660ddcbf5e8bb
diff --git a/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1 b/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1
index de306c809288..78f63ff22203 100644
--- a/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1
+++ b/metadata/md5-cache/dev-python/pytest-cov-2.5.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=py.test plugin for coverage reporting
 EAPI=6
 HOMEPAGE=https://github.com/pytest-dev/pytest-cov https://pypi.python.org/pypi/pytest-cov
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~sparc ~x86
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/py-1.4.22[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pytest-2.7.3[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/cov-core-1.14.0[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/coverage-3.7.1[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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_single_target_pypy(-),-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/sphinx-py3doc-enhanced-theme[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-cov/pytest-cov-2.5.1.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=18e139a5b97e2439c6512d91077991af
+_md5_=548372991a63309f2eaf18c5d1f62935
diff --git a/metadata/md5-cache/dev-python/pytest-qt-2.3.0 b/metadata/md5-cache/dev-python/pytest-qt-2.3.0
index 6c83de976b8b..75d36cb411df 100644
--- a/metadata/md5-cache/dev-python/pytest-qt-2.3.0
+++ b/metadata/md5-cache/dev-python/pytest-qt-2.3.0
@@ -4,7 +4,7 @@ DESCRIPTION=pytest plugin for PyQt4 or PyQt5 applications
 EAPI=6
 HOMEPAGE=https://pypi.python.org/pypi/pytest-qt
 IUSE=doc python_targets_python2_7 python_targets_python3_5
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/pytest-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] || ( dev-python/PyQt4 dev-python/PyQt5 ) doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/p/pytest-qt/pytest-qt-2.3.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f198144679122b90e0c38dafd008354c
+_md5_=b501c8aaa9b985f88daeb3f0b71ccbe3
diff --git a/metadata/md5-cache/dev-python/pytest-qt-2.3.0-r1 b/metadata/md5-cache/dev-python/pytest-qt-2.3.0-r1
new file mode 100644
index 000000000000..3f0b52dcf137
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-qt-2.3.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+DESCRIPTION=pytest plugin for PyQt4 or PyQt5 applications
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/pytest-qt
+IUSE=doc python_targets_python2_7 python_targets_python3_5
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/pytest-2.7.0[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/PyQt5[gui] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] dev-python/sphinx-py3doc-enhanced-theme[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest-qt/pytest-qt-2.3.0.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9c636ae0de4e8992cc734f29f6bb4416
diff --git a/metadata/md5-cache/dev-python/rosdistro-0.6.1 b/metadata/md5-cache/dev-python/rosdistro-0.6.1
deleted file mode 100644
index e4166180049f..000000000000
--- a/metadata/md5-cache/dev-python/rosdistro-0.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-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/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(-)]
-DESCRIPTION=Tools to work with catkinized rosdistro files
-EAPI=5
-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=http://download.ros.org/downloads/rosdistro/rosdistro-0.6.1.tar.gz https://github.com/ros-infrastructure/rosdistro/archive/0.6.1.tar.gz -> rosdistro-0.6.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f77ac7ea98d57a3e7a11ca6b36932d92
diff --git a/metadata/md5-cache/dev-python/rosdistro-0.6.2 b/metadata/md5-cache/dev-python/rosdistro-0.6.2
deleted file mode 100644
index b8fb531d48ad..000000000000
--- a/metadata/md5-cache/dev-python/rosdistro-0.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-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/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(-)]
-DESCRIPTION=Tools to work with catkinized rosdistro files
-EAPI=5
-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=http://download.ros.org/downloads/rosdistro/rosdistro-0.6.2.tar.gz https://github.com/ros-infrastructure/rosdistro/archive/0.6.2.tar.gz -> rosdistro-0.6.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f77ac7ea98d57a3e7a11ca6b36932d92
diff --git a/metadata/md5-cache/dev-python/rosdistro-0.6.4 b/metadata/md5-cache/dev-python/rosdistro-0.6.4
new file mode 100644
index 000000000000..b0d6c4ea3e6e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rosdistro-0.6.4
@@ -0,0 +1,14 @@
+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/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Tools to work with catkinized rosdistro files
+EAPI=5
+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.6.4.tar.gz -> rosdistro-0.6.4.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9e733e8a8f2a215886d432109f75c58a
diff --git a/metadata/md5-cache/dev-python/rosdistro-9999 b/metadata/md5-cache/dev-python/rosdistro-9999
index b2ce11bf882c..12bf25273ec0 100644
--- a/metadata/md5-cache/dev-python/rosdistro-9999
+++ b/metadata/md5-cache/dev-python/rosdistro-9999
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/rospkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyyaml[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-vcs/git-1.8.2.1 python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_pypy3? ( >=virtual/pypy3-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 DESCRIPTION=Tools to work with catkinized rosdistro files
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/rosdistro
@@ -9,4 +9,4 @@ RDEPEND=dev-python/catkin_pkg[python_targets_pypy(-)?,python_targets_pypy3(-)?,p
 REQUIRED_USE=|| ( python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f77ac7ea98d57a3e7a11ca6b36932d92
+_md5_=9e733e8a8f2a215886d432109f75c58a
diff --git a/metadata/md5-cache/dev-python/simplekv-0.11.7 b/metadata/md5-cache/dev-python/simplekv-0.11.7
new file mode 100644
index 000000000000..8ef2df1f87e0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/simplekv-0.11.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A key-value storage for binary data, support many backends.
+EAPI=5
+HOMEPAGE=https://pypi.python.org/pypi/simplekv/ https://github.com/mbr/simplekv
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64
+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/s/simplekv/simplekv-0.11.7.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=274629d0554f5cb366625db8ed7a5c6b
diff --git a/metadata/md5-cache/dev-python/tempora-1.9 b/metadata/md5-cache/dev-python/tempora-1.9
index 76010dd20743..f54ff802473e 100644
--- a/metadata/md5-cache/dev-python/tempora-1.9
+++ b/metadata/md5-cache/dev-python/tempora-1.9
@@ -4,11 +4,11 @@ DESCRIPTION=Objects and routines pertaining to date and time
 EAPI=6
 HOMEPAGE=https://github.com/jaraco/tempora
 IUSE=doc test python_targets_pypy python_targets_pypy3 python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=MIT
 RDEPEND=dev-python/pytz[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_pypy(-)?,python_targets_pypy3(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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/t/tempora/tempora-1.9.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=41eb85150587533e7c7b79fbd1332a5e
+_md5_=9ab48f9bbeae9d311d1c6cd1f4889ebf
diff --git a/metadata/md5-cache/dev-python/vcstools-0.1.40 b/metadata/md5-cache/dev-python/vcstools-0.1.40
new file mode 100644
index 000000000000..8c44438dbb5e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/vcstools-0.1.40
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python library for interacting with various VCS systems
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/vcstools
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_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=http://download.ros.org/downloads/vcstools/vcstools-0.1.40.tar.gz https://github.com/vcstools/vcstools/archive/0.1.40.tar.gz -> vcstools-0.1.40.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fd0058d0f4413eb0c6505f8d83343794
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index 7c669092a2c3..a88a9058c9a3 100644
--- a/metadata/md5-cache/dev-qt/Manifest.gz
+++ b/metadata/md5-cache/dev-qt/Manifest.gz
diff --git a/metadata/md5-cache/dev-qt/assistant-5.7.1 b/metadata/md5-cache/dev-qt/assistant-5.7.1
index cd86d22f3a4f..40178098e91e 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.7.1
+++ b/metadata/md5-cache/dev-qt/assistant-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qthelp-5.7.1 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=de955874787a8d09b48d66997db7bf7e
diff --git a/metadata/md5-cache/dev-qt/assistant-5.9.3 b/metadata/md5-cache/dev-qt/assistant-5.9.3
index 4fd242c564f1..0e1f19425451 100644
--- a/metadata/md5-cache/dev-qt/assistant-5.9.3
+++ b/metadata/md5-cache/dev-qt/assistant-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qthelp-5.9.3 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f00c00eff78e6a3bd3443db7b0cb2618
diff --git a/metadata/md5-cache/dev-qt/designer-5.7.1 b/metadata/md5-cache/dev-qt/designer-5.7.1
index b0b35957c2ce..0008dd14c5c4 100644
--- a/metadata/md5-cache/dev-qt/designer-5.7.1
+++ b/metadata/md5-cache/dev-qt/designer-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=65e8725189331a3117b88194437a6f0d
diff --git a/metadata/md5-cache/dev-qt/designer-5.9.3 b/metadata/md5-cache/dev-qt/designer-5.9.3
index 69f7db518870..8975a083dbf4 100644
--- a/metadata/md5-cache/dev-qt/designer-5.9.3
+++ b/metadata/md5-cache/dev-qt/designer-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtnetwork-5.9.3 ~dev-qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=fcb98472b970fcb711760f75b8582e7a
diff --git a/metadata/md5-cache/dev-qt/linguist-5.7.1 b/metadata/md5-cache/dev-qt/linguist-5.7.1
index 729fce149833..3e801f4b24c6 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.7.1
+++ b/metadata/md5-cache/dev-qt/linguist-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/designer-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a3ee70abae8cae0fb3fb0b5f636404be
diff --git a/metadata/md5-cache/dev-qt/linguist-5.9.3 b/metadata/md5-cache/dev-qt/linguist-5.9.3
index 9b662f77380b..9e534f992793 100644
--- a/metadata/md5-cache/dev-qt/linguist-5.9.3
+++ b/metadata/md5-cache/dev-qt/linguist-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/designer-5.9.3 ~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=ba2a39972e3e2cc6a6666f404785d8d8
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.7.1 b/metadata/md5-cache/dev-qt/linguist-tools-5.7.1
index 9695574f97e5..8a6908d98062 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.7.1
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtxml-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=dbeed594e096764ff6642240bd1240cf
diff --git a/metadata/md5-cache/dev-qt/linguist-tools-5.9.3 b/metadata/md5-cache/dev-qt/linguist-tools-5.9.3
index 29b913808739..cd8fc8fa65fa 100644
--- a/metadata/md5-cache/dev-qt/linguist-tools-5.9.3
+++ b/metadata/md5-cache/dev-qt/linguist-tools-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtxml-5.9.3 qml? ( ~dev-qt/qtdeclarative-5.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=dc32b3ab2a3b7ad35ec30e454ef5817e
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.7.1 b/metadata/md5-cache/dev-qt/pixeltool-5.7.1
index 9c4cd9ac5f9a..c7542dac0633 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.7.1
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=665ad50021991975ec683a46c3a3b72d
diff --git a/metadata/md5-cache/dev-qt/pixeltool-5.9.3 b/metadata/md5-cache/dev-qt/pixeltool-5.9.3
index 73340583b5a2..db300ee8ae5f 100644
--- a/metadata/md5-cache/dev-qt/pixeltool-5.9.3
+++ b/metadata/md5-cache/dev-qt/pixeltool-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtwidgets-5.9.3 dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a10a7c7583a5986442e9a218db32d635
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.7.1 b/metadata/md5-cache/dev-qt/qdbus-5.7.1
index 7e04c4e3231d..02b92d75d831 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.7.1
+++ b/metadata/md5-cache/dev-qt/qdbus-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 ~dev-qt/qtxml-5.7.1 dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=6dda8a2de2af7ed29b71cc6fdc914ed4
diff --git a/metadata/md5-cache/dev-qt/qdbus-5.9.3 b/metadata/md5-cache/dev-qt/qdbus-5.9.3
index ac84d0b5fa35..7e329483da44 100644
--- a/metadata/md5-cache/dev-qt/qdbus-5.9.3
+++ b/metadata/md5-cache/dev-qt/qdbus-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdbus-5.9.3 ~dev-qt/qtxml-5.9.3 dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=082ed90cbe2501d1a63078a9bde9e7ca
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1 b/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1
index 1faf0c84bc60..1649778bb439 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f54c355e28463628eed095d295a48211
diff --git a/metadata/md5-cache/dev-qt/qdbusviewer-5.9.3 b/metadata/md5-cache/dev-qt/qdbusviewer-5.9.3
index 9474d2000347..aae25101b89d 100644
--- a/metadata/md5-cache/dev-qt/qdbusviewer-5.9.3
+++ b/metadata/md5-cache/dev-qt/qdbusviewer-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdbus-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=5e40923d6d9bfca0dc34cb7a415a7262
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.7.1 b/metadata/md5-cache/dev-qt/qdoc-5.7.1
index 96db21b4fc24..72052a52fab9 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.7.1
+++ b/metadata/md5-cache/dev-qt/qdoc-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtxml-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9d7d023c64c918edf558c7ea703cf9e4
diff --git a/metadata/md5-cache/dev-qt/qdoc-5.9.3 b/metadata/md5-cache/dev-qt/qdoc-5.9.3
index 786037d35326..a6be050ae97c 100644
--- a/metadata/md5-cache/dev-qt/qdoc-5.9.3
+++ b/metadata/md5-cache/dev-qt/qdoc-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 qml? ( ~dev-qt/qtdeclarative-5.9.3 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=bacbc407873d7db6bd21571e7ffa6050
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1 b/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1
index c73fecfb3c9c..10773107764e 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qt3d-5.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qt3d-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a14cade7a74204bc44bc18e96f732f95
diff --git a/metadata/md5-cache/dev-qt/qt3d-5.9.3 b/metadata/md5-cache/dev-qt/qt3d-5.9.3
index 0c9d5e7452b9..2f74d482781f 100644
--- a/metadata/md5-cache/dev-qt/qt3d-5.9.3
+++ b/metadata/md5-cache/dev-qt/qt3d-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.9.3 ~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qt3d-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e83fe3cccab7d8f86070c41445f9ad7f
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1 b/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1
index 0beca05143e4..db053df2d696 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.7.1 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtdbus-5.7.1 >=n
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtconnectivity-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=2b95f75a1c6c5d4586fe1c7eeb71342f
diff --git a/metadata/md5-cache/dev-qt/qtbluetooth-5.9.3 b/metadata/md5-cache/dev-qt/qtbluetooth-5.9.3
index ad0b26aaad42..c8048980ac0f 100644
--- a/metadata/md5-cache/dev-qt/qtbluetooth-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtbluetooth-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtconcurrent-5.9.3 ~dev-qt/qtcore-5.9.3 ~dev-qt/qtdbus-5.9.3 >=n
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtconnectivity-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=85c02300c40202ba90824059fffad21a
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.7.1 b/metadata/md5-cache/dev-qt/qtcharts-5.7.1
index 3f461a24af71..f20ec5888d84 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-5.7.1 qml? (
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtcharts-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=7a25fc03e96bb3ae33fa8569bebd2f4e
diff --git a/metadata/md5-cache/dev-qt/qtcharts-5.9.3 b/metadata/md5-cache/dev-qt/qtcharts-5.9.3
index 7a923ed86fcd..ded204eba19b 100644
--- a/metadata/md5-cache/dev-qt/qtcharts-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtcharts-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtwidgets-5.9.3 qml? (
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtcharts-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=491ee4b1f51e7d699947fc4815f7a7c0
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1 b/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1
index 37eda1b862d1..630c9bf8b7fe 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=fe9e4778b359dcd21362dc37c1ce3b82
diff --git a/metadata/md5-cache/dev-qt/qtconcurrent-5.9.3 b/metadata/md5-cache/dev-qt/qtconcurrent-5.9.3
index d2e71bc86da1..baf2b3e69b7f 100644
--- a/metadata/md5-cache/dev-qt/qtconcurrent-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtconcurrent-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=2928615655ff69503d98652a1e5021ec
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.7.1-r3 b/metadata/md5-cache/dev-qt/qtcore-5.7.1-r3
index 811d59d857e6..455ff8b106b7 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.7.1-r3
+++ b/metadata/md5-cache/dev-qt/qtcore-5.7.1-r3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 >=dev-libs/libpcre-8.38[pcr
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a367bd278558379df42d2c4b165d2ef3
diff --git a/metadata/md5-cache/dev-qt/qtcore-5.9.3 b/metadata/md5-cache/dev-qt/qtcore-5.9.3
index e5d2e340f3a5..bbf88e082c3b 100644
--- a/metadata/md5-cache/dev-qt/qtcore-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtcore-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-libs/double-conversion:= dev-libs/glib:2 dev-libs/libpcre2[pcre16,un
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=0dfb616b9d105c3791c4f975c8d88697
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1
index 7d27315fb779..a89bc18b2a0e 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] qml? ( ~dev-qt/qtdeclar
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdatavis3d-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=5efd699a913bf017c8ae7b2f715d37cb
diff --git a/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.3 b/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.3
index 6fd072b6dfdb..fa9f07d5dda1 100644
--- a/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtdatavis3d-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] qml? ( ~dev-qt/qtdeclar
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtdatavis3d-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e50f455d4b2ffbf64a772f94f4342633
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.7.1 b/metadata/md5-cache/dev-qt/qtdbus-5.7.1
index f6a8f6dae1b5..fd854cb29f66 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=300d9f5a3bb98682966d30148e5f7e0c
diff --git a/metadata/md5-cache/dev-qt/qtdbus-5.9.3 b/metadata/md5-cache/dev-qt/qtdbus-5.9.3
index 45a4872efd5a..2f31205ae67b 100644
--- a/metadata/md5-cache/dev-qt/qtdbus-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtdbus-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 >=sys-apps/dbus-1.4.20 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=22652e1639b9804593ec1aacedf30212
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1
index 1d5ee2799db6..0c26e5e2df8a 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=3c04f179185fb1c7beaa54553ad7ecc8
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
index b1db0ddeb787..ec5d73677e0c 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.7.1-r1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtdeclarative-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=692ec7c258748fa466d999f56eba960a
diff --git a/metadata/md5-cache/dev-qt/qtdeclarative-5.9.3 b/metadata/md5-cache/dev-qt/qtdeclarative-5.9.3
index 586ae58d1369..714fe69382ba 100644
--- a/metadata/md5-cache/dev-qt/qtdeclarative-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtdeclarative-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] ~dev-qt/qtnetwork-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtdeclarative-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=ce907a3c0c404e5482425c05724090b6
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.7.1 b/metadata/md5-cache/dev-qt/qtdiag-5.7.1
index 700d48ca68b4..4f74262fad89 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1[ssl=] d
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=708fd8fee5f122532763ee938714342c
diff --git a/metadata/md5-cache/dev-qt/qtdiag-5.9.3 b/metadata/md5-cache/dev-qt/qtdiag-5.9.3
index 6f7b66fe52ca..8f09a0dffb25 100644
--- a/metadata/md5-cache/dev-qt/qtdiag-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtdiag-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 network? ( ~dev-qt/qtnetwork-5.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=94debd9c530d97f5a9beb62a967ad0b7
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1
index 7d841c572760..68aa1bcffcf5 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 dev
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtgraphicaleffects-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9c6d36e0a8bba5a791b151bbafc83bf0
diff --git a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.3 b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.3
index 6ccace5742ca..19a301bb3898 100644
--- a/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtgraphicaleffects-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 dev
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtgraphicaleffects-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=8b0e36d933ed505c15e2f30551b7e2d5
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
index 69dec2032543..c1fc175cc96d 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qtgui-5.7.1-r1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? (
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f3f7e257dfac151c52801eeae2bb30a3
diff --git a/metadata/md5-cache/dev-qt/qtgui-5.9.3 b/metadata/md5-cache/dev-qt/qtgui-5.9.3
index 1b0ec63b5b0c..58b243f29497 100644
--- a/metadata/md5-cache/dev-qt/qtgui-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtgui-5.9.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( eglfs xcb ) accessibility? ( dbus xcb ) eglfs? ( egl ) ibus? (
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=58121064becf6e8e9a62e16b52d1e1c8
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.7.1 b/metadata/md5-cache/dev-qt/qthelp-5.7.1
index 5377d292ae0b..409cd79336d6 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.7.1
+++ b/metadata/md5-cache/dev-qt/qthelp-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtnetwork-5.7.1 ~dev-qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=931c918fc95ed4e8fcaf34834c03b8b0
diff --git a/metadata/md5-cache/dev-qt/qthelp-5.9.3 b/metadata/md5-cache/dev-qt/qthelp-5.9.3
index fbbe4ec2a68d..ce4d9903bdb5 100644
--- a/metadata/md5-cache/dev-qt/qthelp-5.9.3
+++ b/metadata/md5-cache/dev-qt/qthelp-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtnetwork-5.9.3 ~dev-qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f6c6d84ab0305c99267a20cf4693758b
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.7.1 b/metadata/md5-cache/dev-qt/qtimageformats-5.7.1
index 2b9ff95a35ce..55bd5213de8f 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 media-libs/jasper:= media-libs/
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtimageformats-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=5b45684084405c2cb0a770ef1e1b39e5
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.9.3 b/metadata/md5-cache/dev-qt/qtimageformats-5.9.3
index 3f089e261365..0e53e5ca4513 100644
--- a/metadata/md5-cache/dev-qt/qtimageformats-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 media-libs/jasper:= media-libs/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtimageformats-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=7c0973e4d7f95cbe35bbc05c9be5209c
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.7.1 b/metadata/md5-cache/dev-qt/qtlocation-5.7.1
index 365c11982f2c..072a20bc50f0 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~de
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtlocation-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f16af598359c715ab69d2186912d6241
diff --git a/metadata/md5-cache/dev-qt/qtlocation-5.9.3 b/metadata/md5-cache/dev-qt/qtlocation-5.9.3
index 8359353f3dee..20222a5191a5 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=320d543b38c87c6a4aa3bc2227bbfa1f
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1 b/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1
index b5af9c630222..69c93a3728d6 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtnetwork-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtmultimedia-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a414cbddbd38fee4600900317d79a91e
diff --git a/metadata/md5-cache/dev-qt/qtmultimedia-5.9.3 b/metadata/md5-cache/dev-qt/qtmultimedia-5.9.3
index 822515fde1bc..c39a5c07823f 100644
--- a/metadata/md5-cache/dev-qt/qtmultimedia-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtmultimedia-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] ~dev-qt/qtnetwork-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtmultimedia-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=97e074b6c2ea6e8ec7bd8fcf7c594893
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.7.1 b/metadata/md5-cache/dev-qt/qtnetwork-5.7.1
index d7a4d91b4dbe..fd5f2b434354 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.7
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=cd3aab100c8c0dc80d1971f915f37739
diff --git a/metadata/md5-cache/dev-qt/qtnetwork-5.9.3 b/metadata/md5-cache/dev-qt/qtnetwork-5.9.3
index 37d2772e3e65..711a87131b55 100644
--- a/metadata/md5-cache/dev-qt/qtnetwork-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtnetwork-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 >=sys-libs/zlib-1.2.5 connman? ( ~dev-qt/qtdbus-5.9
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=81faf5ec62dfd5a3a5d48ba16e3f5adc
diff --git a/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.3 b/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.3
index d69f9c551e3e..a7f9f1e6cfe4 100644
--- a/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtnetworkauth-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtnetwork-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtnetworkauth-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a5d0b10c9f6fc56323ba72498b7712e3
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.7.1 b/metadata/md5-cache/dev-qt/qtopengl-5.7.1
index 2d343bcd3f82..25b11b2f886a 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtwidgets-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=33702d61bc94ebe2ec41d4e571334f27
diff --git a/metadata/md5-cache/dev-qt/qtopengl-5.9.3 b/metadata/md5-cache/dev-qt/qtopengl-5.9.3
index 4a1662420f99..3d27a70ff84a 100644
--- a/metadata/md5-cache/dev-qt/qtopengl-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtopengl-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] ~dev-qt/qtwidgets-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=3d580076a240579b9ffca441ea2556ee
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.7.1 b/metadata/md5-cache/dev-qt/qtpaths-5.7.1
index 2263ddabe751..4416c1602030 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e7030b81bb1e1985ffae10ff05325f23
diff --git a/metadata/md5-cache/dev-qt/qtpaths-5.9.3 b/metadata/md5-cache/dev-qt/qtpaths-5.9.3
index 86adfd3ffc69..b610f90df41d 100644
--- a/metadata/md5-cache/dev-qt/qtpaths-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtpaths-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=529c9cf384423268eaf25c7d953cd28b
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1 b/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1
index 185f51772b83..e9ca52468b75 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttools-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=0643ba650e59cc2fddf0bc18627ce522
diff --git a/metadata/md5-cache/dev-qt/qtplugininfo-5.9.3 b/metadata/md5-cache/dev-qt/qtplugininfo-5.9.3
index b464c3a402c9..df25a54cb2b5 100644
--- a/metadata/md5-cache/dev-qt/qtplugininfo-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtplugininfo-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttools-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=ca8ba2814d3e39f4038cf0491a0ff5d2
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.7.1 b/metadata/md5-cache/dev-qt/qtpositioning-5.7.1
index b23129e4ebbc..b452580c9724 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.7.1
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 geoclue? ( ~dev-qt/qtdbus-5.7.1 ) qml? ( ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtlocation-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=b31f28eda98b13c7fad47cd84b0d34e9
diff --git a/metadata/md5-cache/dev-qt/qtpositioning-5.9.3 b/metadata/md5-cache/dev-qt/qtpositioning-5.9.3
index 4a0b4a3fff0c..b66a4a07485c 100644
--- a/metadata/md5-cache/dev-qt/qtpositioning-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtpositioning-5.9.3
@@ -11,5 +11,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 geoclue? ( ~dev-qt/qtdbus-5.9.3 ) qml? ( ~dev-qt/qt
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtlocation-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=644698f75aa6190028c1d4f1b67dfae2
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1 b/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1
index 76f18e801d1b..7fd5d6ccc41c 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=] ~dev-qt/qtwidgets-5.7.1
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f5562e8a887725d43355c80fe98d6160
diff --git a/metadata/md5-cache/dev-qt/qtprintsupport-5.9.3 b/metadata/md5-cache/dev-qt/qtprintsupport-5.9.3
index f7bc9a0688e1..25172d37b4fa 100644
--- a/metadata/md5-cache/dev-qt/qtprintsupport-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtprintsupport-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=] ~dev-qt/qtwidgets-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=1f60e213375ddbd5d062fc3d4ab1a1af
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1
index 828b6661783f..371ec25e916c 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 wid
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=d373fd8804095291aca0e9d045cbdff6
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.3 b/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.3
index 98e6ca8cc3a0..fe7bb8b6222e 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 wid
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=7f1403dfb36666220e3f4b5444717652
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1
index 7f26a891e642..cd9c7424f9d4 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgraphicaleffe
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtquickcontrols2-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=76a8075e6e58ad1696f5c0890c901074
diff --git a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.3 b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.3
index 8dc74b4250f8..8660248bd4bc 100644
--- a/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtquickcontrols2-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 wid
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtquickcontrols2-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a45f254daee4dfd9f7d9fef892155ecc
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.7.1 b/metadata/md5-cache/dev-qt/qtscript-5.7.1
index 0f88fbca06a4..97a2aad24fef 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtscript-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 scripttools? ( ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidget
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtscript-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=6736b2476fc9c5189625b2e941b40dac
diff --git a/metadata/md5-cache/dev-qt/qtscript-5.9.3 b/metadata/md5-cache/dev-qt/qtscript-5.9.3
index b890da1afe6b..3e45769f966d 100644
--- a/metadata/md5-cache/dev-qt/qtscript-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtscript-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 scripttools? ( ~dev-qt/qtgui-5.9.3 ~dev-qt/qtwidget
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtscript-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=16365c5f01ad7e0d9b38cbd0d43753f4
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.7.1 b/metadata/md5-cache/dev-qt/qtscxml-5.7.1
index b5107a722eaf..9cb5f97011a2 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtscxml-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=04055beb06fbfb7fc86acdffb7b666e8
diff --git a/metadata/md5-cache/dev-qt/qtscxml-5.9.3 b/metadata/md5-cache/dev-qt/qtscxml-5.9.3
index c59acc4ea1e0..940bac0d54de 100644
--- a/metadata/md5-cache/dev-qt/qtscxml-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtscxml-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtscxml-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=71c58017ad97e2ab56959960ca2bc139
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.7.1 b/metadata/md5-cache/dev-qt/qtsensors-5.7.1
index 2351df625ba1..c9c3f8969b4e 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.7.1 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtsensors-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=c1fd72b820f83b02661f11d402a9ef3e
diff --git a/metadata/md5-cache/dev-qt/qtsensors-5.9.3 b/metadata/md5-cache/dev-qt/qtsensors-5.9.3
index fa315eab4859..072a10a7392a 100644
--- a/metadata/md5-cache/dev-qt/qtsensors-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtsensors-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdbus-5.9.3 qml? ( ~dev-qt/qtdeclarative-5
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtsensors-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=094910a38d69bb3caaf95353aa5af976
diff --git a/metadata/md5-cache/dev-qt/qtserialbus-5.9.3 b/metadata/md5-cache/dev-qt/qtserialbus-5.9.3
index 8e5270279546..52685e9a094f 100644
--- a/metadata/md5-cache/dev-qt/qtserialbus-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtserialbus-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtnetwork-5.9.3 ~dev-qt/qtserialport-5.9.3
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtserialbus-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f4ed19e9c2b7a34fed2788aee6590432
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.7.1 b/metadata/md5-cache/dev-qt/qtserialport-5.7.1
index 340224a65a1e..5753ef728ed1 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtserialport-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=49ce7180d4115c76818f44cba7912401
diff --git a/metadata/md5-cache/dev-qt/qtserialport-5.9.3 b/metadata/md5-cache/dev-qt/qtserialport-5.9.3
index de5d6f4ecaca..5ad33e1af7f6 100644
--- a/metadata/md5-cache/dev-qt/qtserialport-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtserialport-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 virtual/libudev:= dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtserialport-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=4399d1bf39070876cf8b30690effd649
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.9.3 b/metadata/md5-cache/dev-qt/qtspeech-5.9.3
index 6e44a4d9f2b3..5b0151cfbadd 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 ~dev-qt/qtcore-5.9.3 dev-qt/
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtspeech-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=67a38f59ac652928e9bf5ee8c66e1abf
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.7.1 b/metadata/md5-cache/dev-qt/qtsql-5.7.1
index cbe879cbc558..36ffbf8ebee9 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtsql-5.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e8f0cdb244f23477e23ee55eb3f1f937
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1 b/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1
index 69c65601c1c9..64a2af23037d 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1
+++ b/metadata/md5-cache/dev-qt/qtsql-5.7.1-r1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=84cd28235cb661fb555c9e967cb330c3
diff --git a/metadata/md5-cache/dev-qt/qtsql-5.9.3 b/metadata/md5-cache/dev-qt/qtsql-5.9.3
index 6a8bf5a4391c..374b698d398c 100644
--- a/metadata/md5-cache/dev-qt/qtsql-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtsql-5.9.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( freetds mysql oci8 odbc postgres sqlite )
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=741e5e3ff11cde8cad89e9216e3df3fa
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.7.1 b/metadata/md5-cache/dev-qt/qtsvg-5.7.1
index 003bc8b3c1ca..e62775bb8e37 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1 ~dev-qt/qtwidgets-5.7.1 >=sys-l
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtsvg-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=fbcd165e7e76f2890e625ef87af67018
diff --git a/metadata/md5-cache/dev-qt/qtsvg-5.9.3 b/metadata/md5-cache/dev-qt/qtsvg-5.9.3
index 8ef322705c79..d12fe8f2f05e 100644
--- a/metadata/md5-cache/dev-qt/qtsvg-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtsvg-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtwidgets-5.9.3 >=sys-l
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtsvg-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=f200af3ff7f0ff3d7c4821e5c142666c
diff --git a/metadata/md5-cache/dev-qt/qttest-5.7.1 b/metadata/md5-cache/dev-qt/qttest-5.7.1
index 5024c5416098..eac7662babb0 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.7.1
+++ b/metadata/md5-cache/dev-qt/qttest-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=aebe413ac76c08a586128816d0313a81
diff --git a/metadata/md5-cache/dev-qt/qttest-5.9.3 b/metadata/md5-cache/dev-qt/qttest-5.9.3
index f7bdbdc482ba..0deab318be73 100644
--- a/metadata/md5-cache/dev-qt/qttest-5.9.3
+++ b/metadata/md5-cache/dev-qt/qttest-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=fbd71c5be36871bed8f0ca993f18b8ee
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.7.1 b/metadata/md5-cache/dev-qt/qttranslations-5.7.1
index 6cae99c208e8..b388d71db9a0 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.7.1
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qttranslations-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=0c557233df3820f27212a7aab0264ef6
diff --git a/metadata/md5-cache/dev-qt/qttranslations-5.9.3 b/metadata/md5-cache/dev-qt/qttranslations-5.9.3
index 75b34d83d366..f0ed32ca2039 100644
--- a/metadata/md5-cache/dev-qt/qttranslations-5.9.3
+++ b/metadata/md5-cache/dev-qt/qttranslations-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qttranslations-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=dd235fbab214911599d7e26f1c64570e
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1
index f257308b50e2..2fdd11b6ce05 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~de
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtvirtualkeyboard-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=0f0150eaccd9483baeccb20807cee990
diff --git a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.3 b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.3
index c29ffd35a39e..d034994d5f84 100644
--- a/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtvirtualkeyboard-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtvirtualkeyboard-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=0f0150eaccd9483baeccb20807cee990
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.7.1 b/metadata/md5-cache/dev-qt/qtwayland-5.7.1
index ac0ed794dca0..94c785e5893c 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.4.0 ~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwayland-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9d7394a0dc477a8ba16c9719632e18e3
diff --git a/metadata/md5-cache/dev-qt/qtwayland-5.9.3 b/metadata/md5-cache/dev-qt/qtwayland-5.9.3
index 94fc021f5b13..2fa3f931c997 100644
--- a/metadata/md5-cache/dev-qt/qtwayland-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwayland-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-libs/wayland-1.6.0 ~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwayland-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=5fb3aed5377bd12a02bb00e0dda33640
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1 b/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1
index f07025390634..664331b08e68 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 qml? ( ~dev-qt/qtdeclarative-5.7.1 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebchannel-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e8a26835419fd5a3c1421c024f273e4b
diff --git a/metadata/md5-cache/dev-qt/qtwebchannel-5.9.3 b/metadata/md5-cache/dev-qt/qtwebchannel-5.9.3
index 632b7affcdcb..7fe7b240ca75 100644
--- a/metadata/md5-cache/dev-qt/qtwebchannel-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwebchannel-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 qml? ( ~dev-qt/qtdeclarative-5.9.3 ) dev-qt/qtchoos
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwebchannel-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=d9c5f87946f197e5c271af84a3c2c328
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2 b/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2
index c3f062a31d60..251fc7b792d8 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.7.1-r2
@@ -10,5 +10,5 @@ RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtc
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebengine-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=33860c1055ddf549e86fe9e2ddf0b214
diff --git a/metadata/md5-cache/dev-qt/qtwebengine-5.9.3 b/metadata/md5-cache/dev-qt/qtwebengine-5.9.3
index cad18c926921..f4b66e1e89d0 100644
--- a/metadata/md5-cache/dev-qt/qtwebengine-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwebengine-5.9.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtnetwork-5.9.3 ~dev-qt/qtprintsupport-5.9.3 ~dev-qt/qtwebchannel-5.9.3[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2 dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) geolocation? ( ~dev-qt/qtpositioning-5.9.3 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.3[widgets] ~dev-qt/qtwidgets-5.9.3 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.3 )
+DEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtnetwork-5.9.3 ~dev-qt/qtprintsupport-5.9.3 ~dev-qt/qtwebchannel-5.9.3[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) geolocation? ( ~dev-qt/qtpositioning-5.9.3 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.3[widgets] ~dev-qt/qtwidgets-5.9.3 ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) >=app-arch/gzip-1.7 dev-util/gperf dev-util/ninja dev-util/re2c sys-devel/bison pax_kernel? ( sys-apps/elfix ) dev-lang/perl virtual/pkgconfig test? ( ~dev-qt/qttest-5.9.3 )
 DESCRIPTION=Library for rendering dynamic web content in Qt5 C++ and QML applications
 EAPI=6
 HOMEPAGE=https://www.qt.io/
 IUSE=alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
-RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtnetwork-5.9.3 ~dev-qt/qtprintsupport-5.9.3 ~dev-qt/qtwebchannel-5.9.3[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2 dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) geolocation? ( ~dev-qt/qtpositioning-5.9.3 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.3[widgets] ~dev-qt/qtwidgets-5.9.3 ) dev-qt/qtchooser
+RDEPEND=app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss ~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 ~dev-qt/qtnetwork-5.9.3 ~dev-qt/qtprintsupport-5.9.3 ~dev-qt/qtwebchannel-5.9.3[qml] dev-libs/expat dev-libs/libevent:= dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/protobuf:= dev-libs/re2:= media-libs/fontconfig media-libs/freetype media-libs/harfbuzz:= media-libs/libpng:0= >=media-libs/libvpx-1.5:=[svc] media-libs/libwebp:= media-libs/mesa media-libs/opus net-libs/libsrtp:0= sys-apps/dbus sys-apps/pciutils sys-libs/libcap sys-libs/zlib[minizip] virtual/jpeg:0 virtual/libudev x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst alsa? ( media-libs/alsa-lib ) geolocation? ( ~dev-qt/qtpositioning-5.9.3 ) pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( media-video/ffmpeg:0= ) system-icu? ( dev-libs/icu:= ) widgets? ( ~dev-qt/qtdeclarative-5.9.3[widgets] ~dev-qt/qtwidgets-5.9.3 ) dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwebengine-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=b2156a34759f18c9e2f5fff6c48183c8
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=7fff38ddf0d87bffb16dae30266b570b
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.7.1 b/metadata/md5-cache/dev-qt/qtwebkit-5.7.1
index bb8ec6193f7b..8f4e3f964ef9 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.7.1
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( gstreamer gstreamer010 multimedia )
 RESTRICT=mirror test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/community_releases/5.7/5.7.1/qtwebkit-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e9e52d8f9b3c33300a1761c12b5eee6a
diff --git a/metadata/md5-cache/dev-qt/qtwebkit-5.9.1 b/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
index e4d9a07bac81..d30bd6b0e53f 100644
--- a/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
+++ b/metadata/md5-cache/dev-qt/qtwebkit-5.9.1
@@ -11,5 +11,5 @@ REQUIRED_USE=?? ( gstreamer multimedia )
 RESTRICT=mirror test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.1/submodules/qtwebkit-opensource-src-5.9.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=675068bc3ad1ecf755d14d9bc6ace647
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1 b/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1
index ba2596b4f34d..c8d6733cb32c 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtnetwork-5.7.1[ssl=] qml? ( ~dev-qt/qtdecl
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebsockets-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=9eb13718d8a7d4e451684d275bf2c83e
diff --git a/metadata/md5-cache/dev-qt/qtwebsockets-5.9.3 b/metadata/md5-cache/dev-qt/qtwebsockets-5.9.3
index 5663afe0efa7..d2e8a86d28c2 100644
--- a/metadata/md5-cache/dev-qt/qtwebsockets-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwebsockets-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtnetwork-5.9.3[ssl=] qml? ( ~dev-qt/qtdecl
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwebsockets-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e53ff69c93d748c42bcaa1cdc58758a2
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.7.1 b/metadata/md5-cache/dev-qt/qtwebview-5.7.1
index 34cb5b483e89..f16eaa3f8086 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtdeclarative-5.7.1 ~dev-qt/qtgui-5.7.1 ~de
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtwebview-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=82697778ea3ac492e122861147c788ad
diff --git a/metadata/md5-cache/dev-qt/qtwebview-5.9.3 b/metadata/md5-cache/dev-qt/qtwebview-5.9.3
index 1a166f304f11..6c588e5acb07 100644
--- a/metadata/md5-cache/dev-qt/qtwebview-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwebview-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtdeclarative-5.9.3 ~dev-qt/qtgui-5.9.3 ~de
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtwebview-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e8647f9198111762fe53da594ddbae5d
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.7.1 b/metadata/md5-cache/dev-qt/qtwidgets-5.7.1
index ff94d54c5abe..06acdc5142fb 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[gles2=,png=,xcb?] dev-qt/qtchoo
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=6495bb5330a8f0e1ed3035e301a3178a
diff --git a/metadata/md5-cache/dev-qt/qtwidgets-5.9.3 b/metadata/md5-cache/dev-qt/qtwidgets-5.9.3
index 14dd42f35f53..5ba2b595e6be 100644
--- a/metadata/md5-cache/dev-qt/qtwidgets-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtwidgets-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[gles2=,png=,xcb?] gtk? ( ~dev-q
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=508f46744af011dc2fe9c7efa9b6c933
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.7.1 b/metadata/md5-cache/dev-qt/qtx11extras-5.7.1
index 21e6eb64f61f..bd89fb0cf7db 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtgui-5.7.1[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtx11extras-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=ea23adca57db425b64a512f8402662a5
diff --git a/metadata/md5-cache/dev-qt/qtx11extras-5.9.3 b/metadata/md5-cache/dev-qt/qtx11extras-5.9.3
index 9f710af4da04..6142393131a3 100644
--- a/metadata/md5-cache/dev-qt/qtx11extras-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtx11extras-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtgui-5.9.3[xcb] dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtx11extras-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=03dd3ed1dcd532fb496095a94a4187c1
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.7.1 b/metadata/md5-cache/dev-qt/qtxml-5.7.1
index d828fa9d5e82..2fea01d11bec 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtxml-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtbase-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=e6a031338a2cdc2ecba1dffe406860e7
diff --git a/metadata/md5-cache/dev-qt/qtxml-5.9.3 b/metadata/md5-cache/dev-qt/qtxml-5.9.3
index 625440da6cbe..04d1b8394010 100644
--- a/metadata/md5-cache/dev-qt/qtxml-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtxml-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtbase-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=68f7d4b7249b9f5ac7dd097ffbc46119
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1
index 58b385388d53..0fc039d210c8 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.7.1
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.7.1 ~dev-qt/qtnetwork-5.7.1 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.7
 SRC_URI=https://download.qt.io/official_releases/qt/5.7/5.7.1/submodules/qtxmlpatterns-opensource-src-5.7.1.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=a31e531e8991eb6f6300a579ffe9de6a
diff --git a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.3 b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.3
index c51a3bb80990..5ea9907ba72d 100644
--- a/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.3
+++ b/metadata/md5-cache/dev-qt/qtxmlpatterns-5.9.3
@@ -10,5 +10,5 @@ RDEPEND=~dev-qt/qtcore-5.9.3 ~dev-qt/qtnetwork-5.9.3 dev-qt/qtchooser
 RESTRICT=test
 SLOT=5/5.9
 SRC_URI=https://download.qt.io/official_releases/qt/5.9/5.9.3/submodules/qtxmlpatterns-opensource-src-5.9.3.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	be28b1f44ac4f2971b231eeed0194344	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qt5-build	85a12ded55193d24c8841ebdf3927296	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
 _md5_=15bbfc7c1c5360523f01cc03755e547a
diff --git a/metadata/md5-cache/dev-ros/Manifest.gz b/metadata/md5-cache/dev-ros/Manifest.gz
index 02eb690d848b..c695b58bb079 100644
--- a/metadata/md5-cache/dev-ros/Manifest.gz
+++ b/metadata/md5-cache/dev-ros/Manifest.gz
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-2.7.3 b/metadata/md5-cache/dev-ros/gazebo_dev-2.7.3
new file mode 100644
index 000000000000..2739c14033c6
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-2.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sci-electronics/gazebo sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Provides a cmake config for the default version of Gazebo for the ROS distribution.
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gazebo_dev
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=sci-electronics/gazebo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9272b7fc6b39eae0800e872cf98ad7ea
diff --git a/metadata/md5-cache/dev-ros/gazebo_dev-9999 b/metadata/md5-cache/dev-ros/gazebo_dev-9999
new file mode 100644
index 000000000000..58a1740cbf64
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_dev-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sci-electronics/gazebo >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Provides a cmake config for the default version of Gazebo for the ROS distribution.
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gazebo_dev
+IUSE=python_targets_python2_7 test
+LICENSE=Apache-2.0
+RDEPEND=sci-electronics/gazebo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9272b7fc6b39eae0800e872cf98ad7ea
diff --git a/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.3 b/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.3
new file mode 100644
index 000000000000..c2fd181039aa
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_msgs-2.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Message and service data structures for interacting with Gazebo from ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gazebo_msgs
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/sensor_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/sensor_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/trajectory_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/trajectory_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/std_srvs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_srvs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1f44b59ab4536a33899d94f44491e3d
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.2 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.2
index 51421fb424a2..f2c5c8372641 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.2
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.6.2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_plugins
 IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 KEYWORDS=~amd64
 LICENSE=BSD Apache-2.0
-RDEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+RDEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.6.2.tar.gz -> gazebo_ros_pkgs-2.6.2.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1e135e9b86fde8d1627a5ac059bab0ae
+_md5_=a97835cd5f5e80b14fab89d9369802b6
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-2.7.3 b/metadata/md5-cache/dev-ros/gazebo_plugins-2.7.3
new file mode 100644
index 000000000000..8a64f63e44fd
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-2.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gazebo_plugins
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD Apache-2.0
+RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1e5b6146f629141dfb40fd342cc29477
diff --git a/metadata/md5-cache/dev-ros/gazebo_plugins-9999 b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
index 729139dcd947..e3539afd5041 100644
--- a/metadata/md5-cache/dev-ros/gazebo_plugins-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_plugins-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_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(-)]
+DEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Robot-independent Gazebo plugins for sensors, motors and dynamic reconfigurable components
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_plugins
 IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=BSD Apache-2.0
-RDEPEND=dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-qt/qtcore:4 dev-qt/qtgui:4 dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/rospy dev-ros/nodelet dev-ros/angles dev-ros/std_srvs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/urdf dev-ros/tf dev-ros/tf2_ros dev-ros/dynamic_reconfigure[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/driver_base[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/trajectory_msgs[ros_messages_cxx(-)] dev-ros/pcl_conversions dev-ros/image_transport dev-ros/rosconsole dev-ros/cv_bridge media-libs/opencv:= dev-ros/polled_camera dev-ros/diagnostic_updater dev-ros/camera_info_manager dev-ros/moveit_msgs[ros_messages_cxx(-)] dev-libs/libxml2 >=sci-electronics/gazebo-7:= dev-libs/protobuf:= dev-games/ogre sci-libs/pcl dev-libs/boost:= dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1e135e9b86fde8d1627a5ac059bab0ae
+_md5_=1e5b6146f629141dfb40fd342cc29477
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-2.7.3 b/metadata/md5-cache/dev-ros/gazebo_ros-2.7.3
new file mode 100644
index 000000000000..a9f6a62c4d8e
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-2.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gazebo_ros
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7844afbd791467a4c5705be19adf3fcd
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros-9999 b/metadata/md5-cache/dev-ros/gazebo_ros-9999
index 681da6e0efe7..4bdb69ede966 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_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(-)]
+DEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS plugins that offer message and service publishers for interfacing with gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros
 IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=Apache-2.0
-RDEPEND=dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
+RDEPEND=dev-ros/gazebo_dev dev-libs/tinyxml sci-electronics/gazebo:= dev-libs/protobuf:= dev-ros/gazebo_plugins[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roslib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/roscpp dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/dynamic_reconfigure dev-libs/libxml2 dev-libs/boost:=[threads] dev-ros/gazebo_msgs[ros_messages_cxx(-)] dev-ros/std_msgs dev-ros/geometry_msgs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rosgraph_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-),ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6fe881ce4516d99c789037bf8c021a0b
+_md5_=7844afbd791467a4c5705be19adf3fcd
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.3 b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.3
new file mode 100644
index 000000000000..bb49d41ef82f
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-2.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=ROS control plugins for gazebo
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gazebo_ros_control
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c91d6e4b0057042158c6f3930759c72b
diff --git a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999 b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
index 37107524b64c..4c4e062ffce6 100644
--- a/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
+++ b/metadata/md5-cache/dev-ros/gazebo_ros_control-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=ROS control plugins for gazebo
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros_control
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/roscpp dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/roscpp dev-ros/gazebo_dev dev-ros/gazebo_ros dev-ros/control_toolbox dev-ros/controller_manager dev-ros/hardware_interface dev-ros/transmission_interface dev-ros/pluginlib dev-libs/tinyxml2:= >=dev-ros/joint_limits_interface-0.11.0 >=dev-ros/urdf-1.12.3-r1 dev-libs/urdfdom:= sci-electronics/gazebo:= dev-libs/boost:=[threads] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=18ae2263dfb54482940eb4f77b3f4285
+_md5_=c91d6e4b0057042158c6f3930759c72b
diff --git a/metadata/md5-cache/dev-ros/robot_localization-2.5.0-r1 b/metadata/md5-cache/dev-ros/robot_localization-2.5.0-r1
deleted file mode 100644
index d68314282465..000000000000
--- a/metadata/md5-cache/dev-ros/robot_localization-2.5.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-ros/diagnostic_updater dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/eigen_conversions dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roslint dev-cpp/eigen:3 test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Package of nonlinear state estimation nodes
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/robot_localization
-IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-ros/diagnostic_updater dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/eigen_conversions dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp dev-ros/nodelet dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/cra-ros-pkg/robot_localization/archive/2.5.0.tar.gz -> robot_localization-2.5.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=19df5a60346cfc4163783a2526fb5b32
diff --git a/metadata/md5-cache/dev-ros/robot_localization-2.5.1 b/metadata/md5-cache/dev-ros/robot_localization-2.5.1
new file mode 100644
index 000000000000..127f71d6def1
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/robot_localization-2.5.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/diagnostic_updater dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/eigen_conversions dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp dev-ros/nodelet dev-libs/console_bridge:= dev-ros/roslint dev-cpp/eigen:3 test? ( dev-ros/rosbag dev-ros/rostest dev-ros/rosunit ) sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Package of nonlinear state estimation nodes
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/robot_localization
+IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/diagnostic_updater dev-ros/diagnostic_msgs[ros_messages_cxx(-)] dev-ros/eigen_conversions dev-ros/geographic_msgs[ros_messages_cxx(-)] dev-ros/geometry_msgs[ros_messages_cxx(-)] dev-ros/message_filters dev-ros/nav_msgs[ros_messages_cxx(-)] dev-ros/roscpp dev-ros/sensor_msgs[ros_messages_cxx(-)] dev-ros/std_msgs[ros_messages_cxx(-)] dev-ros/std_srvs[ros_messages_cxx(-)] dev-ros/tf2 dev-ros/tf2_geometry_msgs dev-ros/tf2_ros dev-ros/xmlrpcpp dev-libs/boost:= dev-cpp/yaml-cpp dev-ros/nodelet dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geographic_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geographic_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/cra-ros-pkg/robot_localization/archive/2.5.1.tar.gz -> robot_localization-2.5.1.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5b6cb2da4073b6517c4c22f33552e8b6
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-0.10.0-r1 b/metadata/md5-cache/dev-ros/visp_tracker-0.10.0-r1
deleted file mode 100644
index b6be3587e869..000000000000
--- a/metadata/md5-cache/dev-ros/visp_tracker-0.10.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP[opencv,X] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-DESCRIPTION=Wraps the ViSP moving edge tracker provided by the ViSP visual servoing library into a ROS package
-EAPI=5
-HOMEPAGE=http://wiki.ros.org/visp_tracker
-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=GPL-2
-RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP[opencv,X] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.10.0.tar.gz -> vision_visp-0.10.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d3b46f136237e85e93ee6d833904343b
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-0.10.0-r2 b/metadata/md5-cache/dev-ros/visp_tracker-0.10.0-r2
new file mode 100644
index 000000000000..b6a912e1f339
--- /dev/null
+++ b/metadata/md5-cache/dev-ros/visp_tracker-0.10.0-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DESCRIPTION=Wraps the ViSP moving edge tracker provided by the ViSP visual servoing library into a ROS package
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/visp_tracker
+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=GPL-2
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/lagadic/vision_visp/archive/kinetic-0.10.0.tar.gz -> vision_visp-0.10.0.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9bde53a0e1fc40605d3b2a7f265d2dea
diff --git a/metadata/md5-cache/dev-ros/visp_tracker-9999 b/metadata/md5-cache/dev-ros/visp_tracker-9999
index 208d484cc611..41e6ed5b05fa 100644
--- a/metadata/md5-cache/dev-ros/visp_tracker-9999
+++ b/metadata/md5-cache/dev-ros/visp_tracker-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP[opencv,X] dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+DEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/message_generation dev-ros/genmsg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 DESCRIPTION=Wraps the ViSP moving edge tracker provided by the ViSP visual servoing library into a ROS package
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/visp_tracker
 IUSE=python_targets_python2_7 test +ros_messages_python +ros_messages_cxx ros_messages_eus ros_messages_lisp ros_messages_nodejs
 LICENSE=GPL-2
-RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP[opencv,X] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
+RDEPEND=dev-libs/boost:=[threads] dev-ros/dynamic_reconfigure dev-ros/geometry_msgs[ros_messages_python(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/image_proc dev-ros/image_transport dev-ros/nodelet dev-ros/resource_retriever dev-ros/roscpp dev-ros/sensor_msgs dev-ros/tf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-ros/rospy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/ViSP:=[opencv,X] dev-libs/console_bridge:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ros_messages_cxx? ( dev-ros/gencpp:= dev-ros/gencpp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_eus? ( dev-ros/geneus:= dev-ros/geneus[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_python? ( dev-ros/genpy:= dev-ros/genpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_lisp? ( dev-ros/genlisp:= dev-ros/genlisp[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ros_messages_nodejs? ( dev-ros/gennodejs:= dev-ros/gennodejs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/message_runtime dev-ros/std_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/std_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-ros/geometry_msgs[ros_messages_python(-)?,ros_messages_cxx(-)?,ros_messages_lisp(-)?,ros_messages_eus(-)?,ros_messages_nodejs(-)?] ros_messages_python? ( dev-ros/geometry_msgs[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d3b46f136237e85e93ee6d833904343b
+_md5_=9bde53a0e1fc40605d3b2a7f265d2dea
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 57eea50a2197..e18ca36c3276 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/activesupport-5.0.6 b/metadata/md5-cache/dev-ruby/activesupport-5.0.6
index 0c80d9d6a1dd..35d23ca53326 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.0.6
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.0.6
@@ -4,11 +4,11 @@ DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby22] <dev-ruby/i18n-1:*[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby23] <dev-ruby/i18n-1:*[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby24] <dev-ruby/i18n-1:*[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.0
 SRC_URI=https://github.com/rails/rails/archive/v5.0.6.tar.gz -> rails-5.0.6.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6557f26fd4b746bb723e2c5e8a9f175b
+_md5_=410eef1fca52230d3db2ea250ae799fc
diff --git a/metadata/md5-cache/dev-ruby/activesupport-5.1.4 b/metadata/md5-cache/dev-ruby/activesupport-5.1.4
index bb4f9bcebe7d..19ebf506aa47 100644
--- a/metadata/md5-cache/dev-ruby/activesupport-5.1.4
+++ b/metadata/md5-cache/dev-ruby/activesupport-5.1.4
@@ -4,11 +4,11 @@ DESCRIPTION=Utility Classes and Extension to the Standard Library
 EAPI=6
 HOMEPAGE=https://github.com/rails/rails
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby22] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby22] =dev-ruby/i18n-0*:*[ruby_targets_ruby22] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby22] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby23] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby23] =dev-ruby/i18n-0*:*[ruby_targets_ruby23] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby23] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/concurrent-ruby-1.0.2:1[ruby_targets_ruby24] >=dev-ruby/i18n-0.7:*[ruby_targets_ruby24] =dev-ruby/i18n-0*:*[ruby_targets_ruby24] >=dev-ruby/tzinfo-1.1:1[ruby_targets_ruby24] >=dev-ruby/minitest-5.1:5[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=5.1
 SRC_URI=https://github.com/rails/rails/archive/v5.1.4.tar.gz -> rails-5.1.4.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6bc2016f7e581ce76a74931577bea7d8
+_md5_=80a02cd3b662f623cf257553830d424d
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-2.3.0 b/metadata/md5-cache/dev-ruby/amq-protocol-2.3.0
new file mode 100644
index 000000000000..933624df04b7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-2.3.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/bundler[ruby_targets_ruby22] dev-ruby/rspec-its[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/bundler[ruby_targets_ruby23] dev-ruby/rspec-its[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/rspec-its[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=An AMQP 0.9.1 serialization library for Ruby
+EAPI=6
+HOMEPAGE=https://github.com/ruby-amqp/amq-protocol
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=2
+SRC_URI=mirror://rubygems/amq-protocol-2.3.0.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c77085a48dca192c95c017ea71a305a8
diff --git a/metadata/md5-cache/dev-ruby/bunny-2.9.1 b/metadata/md5-cache/dev-ruby/bunny-2.9.1
new file mode 100644
index 000000000000..15f86824a7be
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/bunny-2.9.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Another synchronous Ruby AMQP client
+EAPI=6
+HOMEPAGE=https://github.com/celldee/bunny
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/amq-protocol-2.3.0:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/bunny-2.9.1.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=9f091aa283b2ac564d599eadc715201b
diff --git a/metadata/md5-cache/dev-ruby/capybara-2.15.4 b/metadata/md5-cache/dev-ruby/capybara-2.15.4
deleted file mode 100644
index e617c550d3b8..000000000000
--- a/metadata/md5-cache/dev-ruby/capybara-2.15.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( www-client/firefox ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] dev-ruby/launchy[ruby_targets_ruby22] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby22] dev-ruby/sinatra[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] dev-ruby/launchy[ruby_targets_ruby23] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby23] dev-ruby/sinatra[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] dev-ruby/launchy[ruby_targets_ruby24] >=dev-ruby/selenium-webdriver-2.0[ruby_targets_ruby24] dev-ruby/sinatra[ruby_targets_ruby24] ) ) test? ( ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Capybara aims to simplify the process of integration testing Rack applications
-EAPI=6
-HOMEPAGE=https://github.com/jnicklas/capybara
-IUSE=test test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/addressable[ruby_targets_ruby22] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby22] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby22] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby22] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/addressable[ruby_targets_ruby23] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby23] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby23] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby23] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/addressable[ruby_targets_ruby24] >=dev-ruby/mini_mime-0.1.3[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.3.3[ruby_targets_ruby24] >=dev-ruby/rack-1.0.0:*[ruby_targets_ruby24] >=dev-ruby/rack-test-0.5.4:*[ruby_targets_ruby24] >=dev-ruby/xpath-2.0.0:2[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=2
-SRC_URI=mirror://rubygems/capybara-2.15.4.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=055e393c954472c40af848327e7adff7
diff --git a/metadata/md5-cache/dev-ruby/crass-1.0.3 b/metadata/md5-cache/dev-ruby/crass-1.0.3
index d9e88d52c133..2f9540fe0381 100644
--- a/metadata/md5-cache/dev-ruby/crass-1.0.3
+++ b/metadata/md5-cache/dev-ruby/crass-1.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Ruby CSS parser that's fully compliant with the CSS Syntax Level 3 s
 EAPI=6
 HOMEPAGE=https://github.com/rgrove/crass/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/crass-1.0.3.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=45fa731c8d85acab6e914c34295c9814
+_md5_=1601452ba4eb3dd4aa9fc3297b60f4e0
diff --git a/metadata/md5-cache/dev-ruby/dalli-2.7.6 b/metadata/md5-cache/dev-ruby/dalli-2.7.6
index f8d566056165..a2417bddfcd0 100644
--- a/metadata/md5-cache/dev-ruby/dalli-2.7.6
+++ b/metadata/md5-cache/dev-ruby/dalli-2.7.6
@@ -4,11 +4,11 @@ DESCRIPTION=A high performance pure Ruby client for accessing memcached servers
 EAPI=5
 HOMEPAGE=https://github.com/petergoldstein/dalli
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/petergoldstein/dalli/archive/v2.7.6.tar.gz -> dalli-2.7.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=cc267755d6af40d16ad8a620f0cc71c8
+_md5_=18cfa64c4a9858bf213fddbf9afa2bb4
diff --git a/metadata/md5-cache/dev-ruby/docile-1.2.0 b/metadata/md5-cache/dev-ruby/docile-1.2.0
new file mode 100644
index 000000000000..4e14acff29dc
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/docile-1.2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=Turns any Ruby object into a DSL
+EAPI=6
+HOMEPAGE=https://ms-ati.github.io/docile/
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=mirror://rubygems/docile-1.2.0.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=538ee0d4cb57f88c5e2231c741e7a3b7
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.6.0 b/metadata/md5-cache/dev-ruby/erubi-1.6.0
deleted file mode 100644
index a116c1e3e819..000000000000
--- a/metadata/md5-cache/dev-ruby/erubi-1.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=a ERB template engine for ruby; a simplified fork of Erubis
-EAPI=6
-HOMEPAGE=https://github.com/jeremyevans/erubi
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/erubi-1.6.0.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fa110af633b026a07a35897ac97f4012
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.6.1 b/metadata/md5-cache/dev-ruby/erubi-1.6.1
deleted file mode 100644
index 18527b41b28e..000000000000
--- a/metadata/md5-cache/dev-ruby/erubi-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=a ERB template engine for ruby; a simplified fork of Erubis
-EAPI=6
-HOMEPAGE=https://github.com/jeremyevans/erubi
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=mirror://rubygems/erubi-1.6.1.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1d04dbb749cadf32fb8dea9573749cf8
diff --git a/metadata/md5-cache/dev-ruby/erubi-1.7.0 b/metadata/md5-cache/dev-ruby/erubi-1.7.0
index dd35bd52cad8..c83eb754f957 100644
--- a/metadata/md5-cache/dev-ruby/erubi-1.7.0
+++ b/metadata/md5-cache/dev-ruby/erubi-1.7.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/minitest[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/minitest[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/minitest[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/minitest[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=a ERB template engine for ruby; a simplified fork of Erubis
 EAPI=6
 HOMEPAGE=https://github.com/jeremyevans/erubi
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=mirror://rubygems/erubi-1.7.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=60f057c3fd1e04221024ee7ab9b71d17
+_md5_=50d25e393acc375de57c37c273df3efe
diff --git a/metadata/md5-cache/dev-ruby/fakefs-0.13.0 b/metadata/md5-cache/dev-ruby/fakefs-0.13.0
new file mode 100644
index 000000000000..e1dbe4dde97b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/fakefs-0.13.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby22] >=dev-ruby/minitest-5.5[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby23] >=dev-ruby/minitest-5.5[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/rspec-3.1:3[ruby_targets_ruby24] >=dev-ruby/minitest-5.5[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DESCRIPTION=A fake filesystem. Use it in your tests
+EAPI=6
+HOMEPAGE=https://github.com/defunkt/fakefs
+IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+SLOT=0
+SRC_URI=https://github.com/defunkt/fakefs/archive/v0.13.0.tar.gz -> fakefs-0.13.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=124995a6daf5083990d843ea8748f282
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.9.0 b/metadata/md5-cache/dev-ruby/i18n-0.9.0
deleted file mode 100644
index c1b9ded4d285..000000000000
--- a/metadata/md5-cache/dev-ruby/i18n-0.9.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby22] dev-ruby/bundler[ruby_targets_ruby22] >=dev-ruby/mocha-0.13[ruby_targets_ruby22] dev-ruby/test_declarative[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby23] dev-ruby/bundler[ruby_targets_ruby23] >=dev-ruby/mocha-0.13[ruby_targets_ruby23] dev-ruby/test_declarative[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/activesupport-4.2[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] >=dev-ruby/mocha-0.13[ruby_targets_ruby24] dev-ruby/test_declarative[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Add Internationalization support to your Ruby application
-EAPI=6
-HOMEPAGE=http://rails-i18n.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~alpha ~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_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0.9
-SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.9.0.tar.gz -> i18n-0.9.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=52d308167d43c25d3f033721e125f6c2
diff --git a/metadata/md5-cache/dev-ruby/i18n-0.9.1 b/metadata/md5-cache/dev-ruby/i18n-0.9.1
index 7878464ee9fe..bbbced328566 100644
--- a/metadata/md5-cache/dev-ruby/i18n-0.9.1
+++ b/metadata/md5-cache/dev-ruby/i18n-0.9.1
@@ -4,11 +4,11 @@ DESCRIPTION=Add Internationalization support to your Ruby application
 EAPI=6
 HOMEPAGE=http://rails-i18n.org/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
-KEYWORDS=~alpha ~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
+KEYWORDS=~alpha 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_ruby22? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/concurrent-ruby:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0.9
 SRC_URI=https://github.com/svenfuchs/i18n/archive/v0.9.1.tar.gz -> i18n-0.9.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=52d308167d43c25d3f033721e125f6c2
+_md5_=4478593fcb9e3e0646cab2372f67939c
diff --git a/metadata/md5-cache/dev-ruby/listen-3.1.5-r1 b/metadata/md5-cache/dev-ruby/listen-3.1.5-r1
index faf8a6f7eccd..0776b4fb0a39 100644
--- a/metadata/md5-cache/dev-ruby/listen-3.1.5-r1
+++ b/metadata/md5-cache/dev-ruby/listen-3.1.5-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Listens to file modifications and notifies you about the changes
 EAPI=6
 HOMEPAGE=https://github.com/guard/listen
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64
 LICENSE=MIT
 RDEPEND=!!media-sound/listen !!media-radio/ax25 !!<dev-ruby/listen-2.8.6-r1:2 ruby_targets_ruby22? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby22] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby23] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/rb-inotify-0.9.7[ruby_targets_ruby24] >=dev-ruby/ruby_dep-1.2:1[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/guard/listen/archive/v3.1.5.tar.gz -> listen-3.1.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=db439f126673168835b29493a4a2f8b2
+_md5_=078401ec55e4bbac189d10b653e08ec1
diff --git a/metadata/md5-cache/dev-ruby/loofah-2.1.1 b/metadata/md5-cache/dev-ruby/loofah-2.1.1
index 6cd073476ccd..21aac81faabf 100644
--- a/metadata/md5-cache/dev-ruby/loofah-2.1.1
+++ b/metadata/md5-cache/dev-ruby/loofah-2.1.1
@@ -4,11 +4,11 @@ DESCRIPTION=Library for manipulating and transforming HTML/XML documents and fra
 EAPI=6
 HOMEPAGE=https://github.com/flavorjones/loofah
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( =dev-ruby/crass-1.0*[ruby_targets_ruby22] >=dev-ruby/crass-1.0.2[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby22] ) ruby_targets_ruby23? ( =dev-ruby/crass-1.0*[ruby_targets_ruby23] >=dev-ruby/crass-1.0.2[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby23] ) ruby_targets_ruby24? ( =dev-ruby/crass-1.0*[ruby_targets_ruby24] >=dev-ruby/crass-1.0.2[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.5.9[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/loofah-2.1.1.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=64fbc07558a9c4961696e020080ff718
+_md5_=2191b14888d354fab30eb0a5ea93ace6
diff --git a/metadata/md5-cache/dev-ruby/maxitest-2.4.0 b/metadata/md5-cache/dev-ruby/maxitest-2.4.0
index facd15ac12a9..1bcc3116020a 100644
--- a/metadata/md5-cache/dev-ruby/maxitest-2.4.0
+++ b/metadata/md5-cache/dev-ruby/maxitest-2.4.0
@@ -4,11 +4,11 @@ DESCRIPTION=Minitest + all the features you always wanted
 EAPI=5
 HOMEPAGE=https://github.com/grosser/maxitest
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby22] ) ruby_targets_ruby23? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby23] ) ruby_targets_ruby24? ( <dev-ruby/minitest-5.11:5[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=https://github.com/grosser/maxitest/archive/v2.4.0.tar.gz -> maxitest-2.4.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bd552d3019bdcaed758cd921885278e5
+_md5_=eb0905fe3c500098b9facd7724bc194b
diff --git a/metadata/md5-cache/dev-ruby/method_source-0.9.0 b/metadata/md5-cache/dev-ruby/method_source-0.9.0
index 35f23e50e92b..bcd6f87a21d9 100644
--- a/metadata/md5-cache/dev-ruby/method_source-0.9.0
+++ b/metadata/md5-cache/dev-ruby/method_source-0.9.0
@@ -4,11 +4,11 @@ DESCRIPTION=Retrieve the source code for a method
 EAPI=6
 HOMEPAGE=https://github.com/banister/method_source
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=mirror://rubygems/method_source-0.9.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c5921f16953af8ae42ae8d191b3bb40f
+_md5_=f930b3778674dc5ad4fc8e036a06a689
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-0.1.4 b/metadata/md5-cache/dev-ruby/mini_mime-0.1.4
deleted file mode 100644
index 8f867c9abddc..000000000000
--- a/metadata/md5-cache/dev-ruby/mini_mime-0.1.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=A lightweight mime type lookup toy
-EAPI=6
-HOMEPAGE=https://github.com/discourse/mini_mime
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=0
-SRC_URI=https://github.com/discourse/mini_mime/archive/v0.1.4.tar.gz -> mini_mime-0.1.4.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=42040521f04859b51c1d973492c753c8
diff --git a/metadata/md5-cache/dev-ruby/mini_mime-1.0.0 b/metadata/md5-cache/dev-ruby/mini_mime-1.0.0
index 1c6e0af28244..82d5551c1da2 100644
--- a/metadata/md5-cache/dev-ruby/mini_mime-1.0.0
+++ b/metadata/md5-cache/dev-ruby/mini_mime-1.0.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
 DESCRIPTION=A lightweight mime type lookup toy
 EAPI=6
 HOMEPAGE=https://github.com/discourse/mini_mime
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
 SLOT=0
 SRC_URI=https://github.com/discourse/mini_mime/archive/v1.0.0.tar.gz -> mini_mime-1.0.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=275c6c8e0adc3984ae8c9ceaee6c8325
+_md5_=13292bddab50763185214650443259ff
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.2.9 b/metadata/md5-cache/dev-ruby/pkg-config-1.2.9
new file mode 100644
index 000000000000..0c907e6f59ea
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.2.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby22? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby25] ) ) test? ( x11-libs/cairo ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=A pkg-config implementation by Ruby
+EAPI=6
+HOMEPAGE=https://github.com/rcairo/pkg-config
+IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
+RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=mirror://rubygems/pkg-config-1.2.9.gem
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=daa441f224256c84b2c34727985dff64
diff --git a/metadata/md5-cache/dev-ruby/rack-2.0.3 b/metadata/md5-cache/dev-ruby/rack-2.0.3
index 76858e91a9c5..d484fdab4f1e 100644
--- a/metadata/md5-cache/dev-ruby/rack-2.0.3
+++ b/metadata/md5-cache/dev-ruby/rack-2.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=A modular Ruby webserver interface
 EAPI=6
 HOMEPAGE=https://rack.github.com/
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 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
+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_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] ) !<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_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2.0
 SRC_URI=mirror://rubygems/rack-2.0.3.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=98cf6b273c3915919066cadb568e5dd5
+_md5_=f45cb4bd2f0fdf17b6b43497a8fa12d5
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.6.1 b/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
deleted file mode 100644
index 867e64504f46..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby22] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Enable HTTP caching for Rack-based applications that produce freshness info
-EAPI=5
-HOMEPAGE=https://github.com/rtomayko/rack-cache
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 test test
-KEYWORDS=~amd64 ~arm ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=1.2
-SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.6.1.tar.gz -> rack-cache-1.6.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9cf46be6b5d5eda9aa8d5ddcf04227d1
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.7.0 b/metadata/md5-cache/dev-ruby/rack-cache-1.7.0
deleted file mode 100644
index 3a7b0b5601a4..000000000000
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/maxitest[ruby_targets_ruby22] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby22] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/maxitest[ruby_targets_ruby23] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby23] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/maxitest[ruby_targets_ruby24] >=dev-ruby/minitest-5.7.0:5[ruby_targets_ruby24] >=dev-ruby/mocha-0.13.0[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=Enable HTTP caching for Rack-based applications that produce freshness info
-EAPI=5
-HOMEPAGE=https://github.com/rtomayko/rack-cache
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=1.2
-SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.7.0.tar.gz -> rack-cache-1.7.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=da8b2ce67c7db61f837dfbacedf58332
diff --git a/metadata/md5-cache/dev-ruby/rack-cache-1.7.1 b/metadata/md5-cache/dev-ruby/rack-cache-1.7.1
index 88abd035b138..ae4bf66423c1 100644
--- a/metadata/md5-cache/dev-ruby/rack-cache-1.7.1
+++ b/metadata/md5-cache/dev-ruby/rack-cache-1.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=Enable HTTP caching for Rack-based applications that produce freshne
 EAPI=6
 HOMEPAGE=https://github.com/rtomayko/rack-cache
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-ruby/rack:*[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/rack:*[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/rack:*[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1.2
 SRC_URI=https://github.com/rtomayko/rack-cache/archive/v1.7.1.tar.gz -> rack-cache-1.7.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=fb348484980206f1e39fd7298ac341fc
+_md5_=fd965f362fd4f7a5da62cc8e272a6bb5
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.2 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.2
deleted file mode 100644
index a28141718095..000000000000
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.0:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=Compare doms and assert certain elements exists in doms using Nokogiri
-EAPI=5
-HOMEPAGE=https://github.com/kaspth/rails-dom-testing
-IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby22] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6.0:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2:*[ruby_targets_ruby23] <dev-ruby/activesupport-6.0:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6.0:0[ruby_targets_ruby23] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=2
-SRC_URI=mirror://rubygems/rails-dom-testing-2.0.2.gem
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=059591b5911c1cbc4fdb2438848e861b
diff --git a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3 b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3
index 27391ffd63e3..b18d388cd276 100644
--- a/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3
+++ b/metadata/md5-cache/dev-ruby/rails-dom-testing-2.0.3
@@ -4,11 +4,11 @@ DESCRIPTION=Compare doms and assert certain elements exists in doms using Nokogi
 EAPI=6
 HOMEPAGE=https://github.com/kaspth/rails-dom-testing
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby22] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby22] ) ruby_targets_ruby23? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby23] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby23] ) ruby_targets_ruby24? ( >=dev-ruby/activesupport-4.2.0:*[ruby_targets_ruby24] >=dev-ruby/nokogiri-1.6[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/rails-dom-testing-2.0.3.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d596b6432cd4cc772c17ba0731669243
+_md5_=12a10a5e54c6d7d2eea17f8e6794244b
diff --git a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3-r1 b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3-r1
index fab2c9b95b47..2541822c8b63 100644
--- a/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3-r1
+++ b/metadata/md5-cache/dev-ruby/rails-html-sanitizer-1.0.3-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Sanitize HTML fragments in Rails applications
 EAPI=5
 HOMEPAGE=https://github.com/rafaelfranca/rails-html-sanitizer
 IUSE=test elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-ruby/loofah:0[ruby_targets_ruby22] ) ruby_targets_ruby23? ( dev-ruby/loofah:0[ruby_targets_ruby23] ) ruby_targets_ruby24? ( dev-ruby/loofah:0[ruby_targets_ruby24] ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=1
 SRC_URI=mirror://rubygems/rails-html-sanitizer-1.0.3.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=334e992f355b370a5114dc4af934e827
+_md5_=08111521ee82ad805f02851cce62ed35
diff --git a/metadata/md5-cache/dev-ruby/thor-0.19.4 b/metadata/md5-cache/dev-ruby/thor-0.19.4
index fe8a174003ac..c1a843a34694 100644
--- a/metadata/md5-cache/dev-ruby/thor-0.19.4
+++ b/metadata/md5-cache/dev-ruby/thor-0.19.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby22? ( test? ( dev-ruby/childlabor[ruby_targets_ruby22] dev-ruby/webmock:0[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/childlabor[ruby_targets_ruby23] dev-ruby/webmock:0[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
+DEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
 DESCRIPTION=A scripting framework that replaces rake and sake
 EAPI=6
 HOMEPAGE=http://whatisthor.com/
-IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~amd64-linux
+IUSE=doc elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~amd64-linux
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=0
 SRC_URI=https://github.com/erikhuda/thor/archive/v0.19.4.tar.gz -> thor-git-0.19.4.tgz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7f2a7d3285b17e52f1f4ba5b48b3475a
+_md5_=9c2d864d2bd9443ac300770174784251
diff --git a/metadata/md5-cache/dev-ruby/xpath-2.1.0 b/metadata/md5-cache/dev-ruby/xpath-2.1.0
index 1e65197d7fc1..59c3081ea5fd 100644
--- a/metadata/md5-cache/dev-ruby/xpath-2.1.0
+++ b/metadata/md5-cache/dev-ruby/xpath-2.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=XPath is a Ruby DSL around a subset of XPath 1.0
 EAPI=5
 HOMEPAGE=https://github.com/jnicklas/xpath
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 test test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=2
 SRC_URI=mirror://rubygems/xpath-2.1.0.gem
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=07294647245fa7588c2c4017ce6c6763
+_md5_=230dc35f1dc2f5ca2422e57555171b47
diff --git a/metadata/md5-cache/dev-scheme/Manifest.gz b/metadata/md5-cache/dev-scheme/Manifest.gz
index 5869510d230e..87fadbc20ad0 100644
--- a/metadata/md5-cache/dev-scheme/Manifest.gz
+++ b/metadata/md5-cache/dev-scheme/Manifest.gz
diff --git a/metadata/md5-cache/dev-scheme/guile-2.0.13-r2 b/metadata/md5-cache/dev-scheme/guile-2.0.13-r2
index 6539e8acb5e7..3a04d2ebcb9a 100644
--- a/metadata/md5-cache/dev-scheme/guile-2.0.13-r2
+++ b/metadata/md5-cache/dev-scheme/guile-2.0.13-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/boehm-gc-7.0[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/guile/
 IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/boehm-gc-7.0[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
+RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
 REQUIRED_USE=regex
 SLOT=12/22
 SRC_URI=mirror://gnu/guile/guile-2.0.13.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=41cb063d2161bd902e343a91de84069e
+_md5_=a7fdda91dc31863790e6cdd61020edcc
diff --git a/metadata/md5-cache/dev-scheme/guile-2.0.14-r3 b/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
index 6b5cbf258605..3e19908d46fe 100644
--- a/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
+++ b/metadata/md5-cache/dev-scheme/guile-2.0.14-r3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/boehm-gc-7.0[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/guile/
 IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/boehm-gc-7.0[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
+RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
 REQUIRED_USE=regex
 SLOT=12/22
 SRC_URI=mirror://gnu/guile/guile-2.0.14.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f4967855663cda1c84cf9be4dc134e75
+_md5_=92f182493f56f04e57ac76b2a45c30d7
diff --git a/metadata/md5-cache/dev-scheme/guile-2.2.3 b/metadata/md5-cache/dev-scheme/guile-2.2.3
index dffb5aac876c..c4cf98a83d33 100644
--- a/metadata/md5-cache/dev-scheme/guile-2.2.3
+++ b/metadata/md5-cache/dev-scheme/guile-2.2.3
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/boehm-gc-7.0[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo sys-devel/gettext
+DEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0= virtual/pkgconfig sys-apps/texinfo sys-devel/gettext
 DESCRIPTION=GNU Ubiquitous Intelligent Language for Extensions
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/guile/
 IUSE=debug debug-malloc +deprecated +networking +nls +regex +threads
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 LICENSE=LGPL-3+
-RDEPEND=>=dev-libs/boehm-gc-7.0[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
+RDEPEND=>=dev-libs/boehm-gc-7.0:=[threads?] dev-libs/gmp:= virtual/libffi dev-libs/libltdl:= dev-libs/libunistring:0= sys-devel/libtool sys-libs/ncurses:0= sys-libs/readline:0=
 REQUIRED_USE=regex
 SLOT=12/2.2-1
 SRC_URI=mirror://gnu/guile/guile-2.2.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fa1ff4d8dea011245fb7bfaf7403a8f9
+_md5_=ad70d8c0157fc3ff47497e1d61f89bd5
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 2e044cc304c6..3e9325a9315e 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/catalyst-2.0.18-r4 b/metadata/md5-cache/dev-util/catalyst-2.0.18-r4
index d4986025dd86..6ea38aed372c 100644
--- a/metadata/md5-cache/dev-util/catalyst-2.0.18-r4
+++ b/metadata/md5-cache/dev-util/catalyst-2.0.18-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Release metatool used for creating releases based on Gentoo Linux
 EAPI=5
 HOMEPAGE=https://wiki.gentoo.org/wiki/Catalyst
 IUSE=ccache kernel_linux python_targets_python2_7
-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
 RDEPEND=app-arch/lbzip2 app-crypt/shash app-arch/tar[xattr] sys-fs/dosfstools virtual/cdrtools amd64? ( >=sys-boot/syslinux-3.72 ) x86? ( >=sys-boot/syslinux-3.72 ) ccache? ( dev-util/ccache ) kernel_linux? ( app-misc/zisofs-tools >=sys-fs/squashfs-tools-2.1 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://gentoo/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~jmbsvicetto/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~mattst88/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~zerochaos/distfiles/catalyst-2.0.18.tar.bz2 https://dev.gentoo.org/~dolsen/releases/catalyst/catalyst-2.0.18.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9f07c38c4d082c0d831b75ef66e3a893
+_md5_=d8f34c41ca9b56cbe4dca9db6bd1c475
diff --git a/metadata/md5-cache/dev-util/debhelper-10.10.9 b/metadata/md5-cache/dev-util/debhelper-10.10.9
deleted file mode 100644
index 12ee04fb64d0..000000000000
--- a/metadata/md5-cache/dev-util/debhelper-10.10.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
-DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
-EAPI=6
-HOMEPAGE=https://packages.qa.debian.org/d/debhelper.html
-IUSE=test l10n_de l10n_es l10n_fr
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
-SLOT=0
-SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_10.10.9.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3e743de313d275d4594827b77ee55853
diff --git a/metadata/md5-cache/dev-util/debhelper-11.1.2 b/metadata/md5-cache/dev-util/debhelper-11.1.2
new file mode 100644
index 000000000000..0e57b97815c3
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debhelper-11.1.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long l10n_de? ( >=app-text/po4a-0.24 ) l10n_es? ( >=app-text/po4a-0.24 ) l10n_fr? ( >=app-text/po4a-0.24 ) test? ( dev-perl/Test-Pod sys-apps/fakeroot )
+DESCRIPTION=Collection of programs that can be used to automate common tasks in debian/rules
+EAPI=6
+HOMEPAGE=https://tracker.debian.org/pkg/debhelper
+IUSE=test l10n_de l10n_es l10n_fr
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/perl-5.10:= >=app-arch/dpkg-1.17 dev-perl/TimeDate virtual/perl-Getopt-Long
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debhelper/debhelper_11.1.2.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=16be2c043232472fe92a860b452e3a14
diff --git a/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3 b/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
index d6000025016e..b8521cd87b51 100644
--- a/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
+++ b/metadata/md5-cache/dev-util/gdbus-codegen-2.52.3
@@ -4,7 +4,7 @@ DESCRIPTION=GDBus code and documentation generator
 EAPI=5
 HOMEPAGE=https://www.gtk.org/
 IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos
 LICENSE=LGPL-2+
 PDEPEND=>=dev-libs/glib-2.52.3:2
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml] ) python_targets_python3_4? ( dev-lang/python:3.4[xml] ) python_targets_python3_5? ( dev-lang/python:3.5[xml] ) python_targets_python3_6? ( dev-lang/python:3.6[xml] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] 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(-)]
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targe
 SLOT=0
 SRC_URI=mirror://gnome/sources/glib/2.52/glib-2.52.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=db3deed290302a9f9aa2f7a4a7814381
+_md5_=1bd0f2ff22e1a7890f557a02c9414185
diff --git a/metadata/md5-cache/dev-util/glade-3.20.2 b/metadata/md5-cache/dev-util/glade-3.20.2
index 2583e6bfca12..c02d8d60c44b 100644
--- a/metadata/md5-cache/dev-util/glade-3.20.2
+++ b/metadata/md5-cache/dev-util/glade-3.20.2
@@ -4,11 +4,11 @@ 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
+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_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_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	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4da4c1666f63a73a203202282e9796ff
+_md5_=de7194550d4d59d152fd0a5721f379bd
diff --git a/metadata/md5-cache/dev-util/goland-173.3531.21 b/metadata/md5-cache/dev-util/goland-173.3531.21
deleted file mode 100644
index 4f32aad4ee2f..000000000000
--- a/metadata/md5-cache/dev-util/goland-173.3531.21
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=Golang IDE by JetBrains
-EAPI=6
-HOMEPAGE=http://www.jetbrains.com/go
-KEYWORDS=~amd64
-LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
-RDEPEND=dev-lang/go
-SLOT=0
-SRC_URI=http://download.jetbrains.com/go/goland-173.3531.21.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0a722fd2df349bdd585757860daa80ba
diff --git a/metadata/md5-cache/dev-util/goland-2017.3.1 b/metadata/md5-cache/dev-util/goland-2017.3.1
new file mode 100644
index 000000000000..31e584881d0d
--- /dev/null
+++ b/metadata/md5-cache/dev-util/goland-2017.3.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Golang IDE by JetBrains
+EAPI=6
+HOMEPAGE=http://www.jetbrains.com/go
+KEYWORDS=~amd64
+LICENSE=IDEA || ( IDEA_Academic IDEA_Classroom IDEA_OpenSource IDEA_Personal )
+RDEPEND=dev-lang/go
+SLOT=0
+SRC_URI=http://download.jetbrains.com/go/goland-2017.3.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=2dc73c5d53a951570621a08e583dbe72
diff --git a/metadata/md5-cache/dev-util/heaptrack-9999 b/metadata/md5-cache/dev-util/heaptrack-9999
index 16b8962bc2c7..8bd30fb1ef29 100644
--- a/metadata/md5-cache/dev-util/heaptrack-9999
+++ b/metadata/md5-cache/dev-util/heaptrack-9999
@@ -7,5 +7,5 @@ IUSE=+qt5 debug test
 LICENSE=LGPL-2.1
 RDEPEND=dev-libs/boost:= sys-libs/libunwind sys-libs/zlib qt5? ( >=kde-frameworks/kconfig-5.40.0 >=kde-frameworks/kconfigwidgets-5.40.0 >=kde-frameworks/kcoreaddons-5.40.0 >=kde-frameworks/ki18n-5.40.0 >=kde-frameworks/kio-5.40.0 >=kde-frameworks/kitemmodels-5.40.0 >=kde-frameworks/kwidgetsaddons-5.40.0 >=kde-frameworks/threadweaver-5.40.0 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/kdiagram:5 ) qt5? ( >=kde-frameworks/kf-env-4 )
 SLOT=0
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=996bee619798b39bb19d46470652a19c
diff --git a/metadata/md5-cache/dev-util/kdbg-3.0.0 b/metadata/md5-cache/dev-util/kdbg-3.0.0
index 6c996f467f92..d0f1bfb91f73 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.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !dev-util/kdbg:4 sys-devel/gdb >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kdbg/kdbg-3.0.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a6c9e90d0910fc1b871655af1cba7cc8
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.2.1 b/metadata/md5-cache/dev-util/kdevelop-5.2.1
index a339111b9a83..75d06102e9c3 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.2.1
+++ b/metadata/md5-cache/dev-util/kdevelop-5.2.1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( welcomepage )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.2.1/src/kdevelop-5.2.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d3cb5fa4becdfd65c8271d223e69212e
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 8105df40ba02..af1a7e11ec20 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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.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	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0c335e45dfeb97d6c7f311c8d7454a57
diff --git a/metadata/md5-cache/dev-util/kdevelop-php-5.2.1 b/metadata/md5-cache/dev-util/kdevelop-php-5.2.1
index 13f8d0c68155..4bc94ac94ead 100644
--- a/metadata/md5-cache/dev-util/kdevelop-php-5.2.1
+++ b/metadata/md5-cache/dev-util/kdevelop-php-5.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.2.1/src/kdev-php-5.2.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=612fb440ef06b9ce58f2aea560655ad9
diff --git a/metadata/md5-cache/dev-util/kdevelop-python-5.2.1 b/metadata/md5-cache/dev-util/kdevelop-python-5.2.1
index aec7ecd8ea91..0314fe23f870 100644
--- a/metadata/md5-cache/dev-util/kdevelop-python-5.2.1
+++ b/metadata/md5-cache/dev-util/kdevelop-python-5.2.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.2.1/src/kdev-python-5.2.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f4a6cdd4ae0cc3c0f1e60dfdcd0dff4f
diff --git a/metadata/md5-cache/dev-util/kdevplatform-5.1.2 b/metadata/md5-cache/dev-util/kdevplatform-5.1.2
index 4030a7772fa5..61b99b9c9f17 100644
--- a/metadata/md5-cache/dev-util/kdevplatform-5.1.2
+++ b/metadata/md5-cache/dev-util/kdevplatform-5.1.2
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( welcomepage )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.1.2/src/kdevplatform-5.1.2.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c5d205f5f572c3dfb52cb27b526a9dd9
diff --git a/metadata/md5-cache/dev-util/massif-visualizer-0.7.0 b/metadata/md5-cache/dev-util/massif-visualizer-0.7.0
index c25b8b4c1102..7c1ec6c51448 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.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/kdiagram:5 callgraph? ( media-gfx/kgraphviewer:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/massif-visualizer/0.7.0/src/massif-visualizer-0.7.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ab153fd91110f43cc0d34f46fa749cfb
diff --git a/metadata/md5-cache/dev-util/meson-0.44.0 b/metadata/md5-cache/dev-util/meson-0.44.0
index a97f6faced7e..fce47aa91bea 100644
--- a/metadata/md5-cache/dev-util/meson-0.44.0
+++ b/metadata/md5-cache/dev-util/meson-0.44.0
@@ -4,7 +4,7 @@ DESCRIPTION=Open source build system
 EAPI=6
 HOMEPAGE=http://mesonbuild.com/
 IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86
 LICENSE=Apache-2.0
 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(-)]
 REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://pypi/m/meson/meson-0.44.0.tar.gz
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c33eac99d791e3ca82fa325e2ea36e91
+_md5_=75f5c4b1e7ab4d20c8414e22af51ef47
diff --git a/metadata/md5-cache/dev-util/meson-9999 b/metadata/md5-cache/dev-util/meson-9999
index f857d1d9e8df..8391ce7d5d47 100644
--- a/metadata/md5-cache/dev-util/meson-9999
+++ b/metadata/md5-cache/dev-util/meson-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 python_targe
 RESTRICT=test
 SLOT=0
 _eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8ae0c68e88e50d6d9c488cb84ebd1450
+_md5_=d867032c1e88df399a1ee9c046bb4969
diff --git a/metadata/md5-cache/dev-util/ninja-1.8.2 b/metadata/md5-cache/dev-util/ninja-1.8.2
index 44cd84a710ad..fe685dcb2da6 100644
--- a/metadata/md5-cache/dev-util/ninja-1.8.2
+++ b/metadata/md5-cache/dev-util/ninja-1.8.2
@@ -4,10 +4,10 @@ DESCRIPTION=A small build system similar to make
 EAPI=6
 HOMEPAGE=https://ninja-build.org/
 IUSE=doc emacs test vim-syntax zsh-completion
-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
+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=Apache-2.0
 RDEPEND=emacs? ( virtual/emacs ) vim-syntax? ( || ( app-editors/vim app-editors/gvim ) ) zsh-completion? ( app-shells/zsh ) !<net-irc/ninja-1.5.9_pre14-r1
 SLOT=0
 SRC_URI=https://github.com/ninja-build/ninja/archive/v1.8.2.tar.gz -> ninja-1.8.2.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	elisp-common	23f47b2e1de7abf387105eddd1318738	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=970af98ba4aa5debbb948cbea3a9f705
+_md5_=ab878f7b63d1c5ccdafc739bab21bf92
diff --git a/metadata/md5-cache/dev-util/vbindiff-3.0_beta5 b/metadata/md5-cache/dev-util/vbindiff-3.0_beta5
index 35e7962da68c..e3e0ab4fa1cf 100644
--- a/metadata/md5-cache/dev-util/vbindiff-3.0_beta5
+++ b/metadata/md5-cache/dev-util/vbindiff-3.0_beta5
@@ -3,9 +3,9 @@ DEPEND=sys-libs/ncurses:0=
 DESCRIPTION=Visual binary diff utility
 EAPI=6
 HOMEPAGE=https://www.cjmweb.net/vbindiff/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:0=
 SLOT=0
 SRC_URI=https://github.com/mrdudz/vbindiff/releases/download/3.0_beta5/vbindiff-3.0_beta5.tar.gz
-_md5_=069c553b9fb81094fe286a4d5ee7eefe
+_md5_=d0ece30309100482f829027fea14579a
diff --git a/metadata/md5-cache/dev-util/wstool-0.1.17 b/metadata/md5-cache/dev-util/wstool-0.1.17
new file mode 100644
index 000000000000..c57b7e5be827
--- /dev/null
+++ b/metadata/md5-cache/dev-util/wstool-0.1.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/coverage[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-vcs/git dev-vcs/bzr dev-vcs/mercurial dev-vcs/subversion ) python_targets_python2_7? ( >=dev-lang/python-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=Commands to manage several local SCM repositories for ROS
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/wstool
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD
+RDEPEND=dev-python/pyyaml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/vcstools-0.1.38[python_targets_python2_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=http://download.ros.org/downloads/wstool/wstool-0.1.17.tar.gz https://github.com/vcstools/wstool/archive/0.1.17.tar.gz -> wstool-0.1.17.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ccaeba7a49849b387c58b1ba94de8101
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index 78168727d008..d511dd95e4bb 100644
--- a/metadata/md5-cache/dev-vcs/Manifest.gz
+++ b/metadata/md5-cache/dev-vcs/Manifest.gz
diff --git a/metadata/md5-cache/dev-vcs/git-2.13.6 b/metadata/md5-cache/dev-vcs/git-2.13.6
index fcc98fb6e7b2..63f611c6eb35 100644
--- a/metadata/md5-cache/dev-vcs/git-2.13.6
+++ b/metadata/md5-cache/dev-vcs/git-2.13.6
@@ -11,4 +11,4 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.13.6.tar.xz mirror://kernel/software/scm/git/git-manpages-2.13.6.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.13.6.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a7e9dff5eef4576d8bb0d3e553a10ccf
+_md5_=872644b9d766f19607badc730835048d
diff --git a/metadata/md5-cache/dev-vcs/git-2.14.3 b/metadata/md5-cache/dev-vcs/git-2.14.3
index 60eae50c544e..3d38038c9ee4 100644
--- a/metadata/md5-cache/dev-vcs/git-2.14.3
+++ b/metadata/md5-cache/dev-vcs/git-2.14.3
@@ -11,4 +11,4 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.14.3.tar.xz mirror://kernel/software/scm/git/git-manpages-2.14.3.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.14.3.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=20a7644f6b3f786c6e37824e4ef6a3ed
+_md5_=dd69574bc5bfcb8b2251ae618c7ec9c0
diff --git a/metadata/md5-cache/dev-vcs/git-2.15.1 b/metadata/md5-cache/dev-vcs/git-2.15.1
index e0c4ea0e59ca..2e6b3ede6bc1 100644
--- a/metadata/md5-cache/dev-vcs/git-2.15.1
+++ b/metadata/md5-cache/dev-vcs/git-2.15.1
@@ -11,4 +11,4 @@ REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimen
 SLOT=0
 SRC_URI=mirror://kernel/software/scm/git/git-2.15.1.tar.xz mirror://kernel/software/scm/git/git-manpages-2.15.1.tar.xz doc? ( mirror://kernel/software/scm/git/git-htmldocs-2.15.1.tar.xz )
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=55ca7169008ab29e782f61d3c0f74a8f
+_md5_=806948af5f4691c387e69f1683d351ab
diff --git a/metadata/md5-cache/dev-vcs/git-2.16.0_rc1 b/metadata/md5-cache/dev-vcs/git-2.16.0_rc1
deleted file mode 100644
index c1ac2b4c7095..000000000000
--- a/metadata/md5-cache/dev-vcs/git-2.16.0_rc1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
-DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
-EAPI=6
-HOMEPAGE=http://www.git-scm.com/
-IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
-LICENSE=GPL-2
-RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://kernel/software/scm/git/testing/git-2.16.0.rc1.tar.xz mirror://kernel/software/scm/git/testing/git-manpages-2.16.0.rc1.tar.xz doc? ( mirror://kernel/software/scm/git/testing/git-htmldocs-2.16.0.rc1.tar.xz )
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=55ca7169008ab29e782f61d3c0f74a8f
diff --git a/metadata/md5-cache/dev-vcs/git-2.16.0_rc2 b/metadata/md5-cache/dev-vcs/git-2.16.0_rc2
new file mode 100644
index 000000000000..4c36aa16067e
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-2.16.0_rc2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) doc? ( app-text/asciidoc app-text/docbook2X sys-apps/texinfo app-text/xmlto ) nls? ( sys-devel/gettext ) test? ( app-crypt/gnupg ) virtual/pkgconfig
+DESCRIPTION=stupid content tracker: distributed VCS designed for speed and efficiency
+EAPI=6
+HOMEPAGE=http://www.git-scm.com/
+IUSE=+blksha1 +curl cgi doc emacs gnome-keyring +gpg highlight +iconv libressl mediawiki mediawiki-experimental +nls +pcre +pcre-jit +perl +python ppcsha1 tk +threads +webdav xinetd cvs subversion test python_targets_python2_7
+LICENSE=GPL-2
+RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:= ) sys-libs/zlib pcre? ( pcre-jit? ( dev-libs/libpcre2[jit(+)] ) !pcre-jit? ( dev-libs/libpcre ) ) perl? ( dev-lang/perl:=[-build(-)] ) tk? ( dev-lang/tk:0= ) curl? ( net-misc/curl webdav? ( dev-libs/expat ) ) emacs? ( virtual/emacs ) gpg? ( app-crypt/gnupg ) mediawiki? ( dev-perl/DateTime-Format-ISO8601 dev-perl/HTML-Tree dev-perl/MediaWiki-API ) perl? ( dev-perl/Error dev-perl/Net-SMTP-SSL dev-perl/Authen-SASL cgi? ( dev-perl/CGI highlight? ( app-text/highlight ) ) cvs? ( >=dev-vcs/cvsps-2.1:0 dev-perl/DBI dev-perl/DBD-SQLite ) subversion? ( dev-vcs/subversion[-dso,perl] dev-perl/libwww-perl dev-perl/TermReadKey ) ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://kernel/software/scm/git/testing/git-2.16.0.rc2.tar.xz mirror://kernel/software/scm/git/testing/git-manpages-2.16.0.rc2.tar.xz doc? ( mirror://kernel/software/scm/git/testing/git-htmldocs-2.16.0.rc2.tar.xz )
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=806948af5f4691c387e69f1683d351ab
diff --git a/metadata/md5-cache/dev-vcs/git-9999 b/metadata/md5-cache/dev-vcs/git-9999
index 4261fd41fd27..94b3bb1e2411 100644
--- a/metadata/md5-cache/dev-vcs/git-9999
+++ b/metadata/md5-cache/dev-vcs/git-9999
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=55ca7169008ab29e782f61d3c0f74a8f
+_md5_=806948af5f4691c387e69f1683d351ab
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r1 b/metadata/md5-cache/dev-vcs/git-9999-r1
index 4261fd41fd27..94b3bb1e2411 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r1
+++ b/metadata/md5-cache/dev-vcs/git-9999-r1
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=55ca7169008ab29e782f61d3c0f74a8f
+_md5_=806948af5f4691c387e69f1683d351ab
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r2 b/metadata/md5-cache/dev-vcs/git-9999-r2
index 4261fd41fd27..94b3bb1e2411 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r2
+++ b/metadata/md5-cache/dev-vcs/git-9999-r2
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=55ca7169008ab29e782f61d3c0f74a8f
+_md5_=806948af5f4691c387e69f1683d351ab
diff --git a/metadata/md5-cache/dev-vcs/git-9999-r3 b/metadata/md5-cache/dev-vcs/git-9999-r3
index 4261fd41fd27..94b3bb1e2411 100644
--- a/metadata/md5-cache/dev-vcs/git-9999-r3
+++ b/metadata/md5-cache/dev-vcs/git-9999-r3
@@ -9,4 +9,4 @@ RDEPEND=gnome-keyring? ( app-crypt/libsecret ) !libressl? ( dev-libs/openssl:0=
 REQUIRED_USE=cgi? ( perl ) cvs? ( perl ) mediawiki? ( perl ) mediawiki-experimental? ( mediawiki ) subversion? ( perl ) webdav? ( curl ) pcre-jit? ( pcre ) python? ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=55ca7169008ab29e782f61d3c0f74a8f
+_md5_=806948af5f4691c387e69f1683d351ab
diff --git a/metadata/md5-cache/dev-vcs/kdesvn-2.0.0 b/metadata/md5-cache/dev-vcs/kdesvn-2.0.0
index d3a05d66ead4..211f2a2fa978 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.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kdesvn/2.0.0/kdesvn-2.0.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=71372ba01a13475bfeca4fb1d08ca4f1
diff --git a/metadata/md5-cache/dev-vcs/svn2git-1.0.10 b/metadata/md5-cache/dev-vcs/svn2git-1.0.10
deleted file mode 100644
index 26169b7d4b39..000000000000
--- a/metadata/md5-cache/dev-vcs/svn2git-1.0.10
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-vcs/subversion dev-qt/qtcore:4
-DESCRIPTION=Tool for one-time conversion from svn to git
-EAPI=2
-HOMEPAGE=https://github.com/svn-all-fast-export/svn2git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-vcs/subversion dev-qt/qtcore:4 dev-vcs/git
-SLOT=0
-SRC_URI=https://www.hartwork.org/public/svn2git-1.0.10.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a756fc77e8b620249065effd377cc86e
diff --git a/metadata/md5-cache/dev-vcs/svn2git-1.0.11 b/metadata/md5-cache/dev-vcs/svn2git-1.0.11
deleted file mode 100644
index 751d7d7904ad..000000000000
--- a/metadata/md5-cache/dev-vcs/svn2git-1.0.11
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-vcs/subversion dev-qt/qtcore:4
-DESCRIPTION=Tool for one-time conversion from svn to git
-EAPI=5
-HOMEPAGE=https://github.com/svn-all-fast-export/svn2git
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-vcs/subversion dev-qt/qtcore:4 dev-vcs/git
-SLOT=0
-SRC_URI=https://github.com/svn-all-fast-export/svn2git/archive/1.0.11.tar.gz -> svn2git-1.0.11.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=73df0858163883566e526138f8ef0bfc
diff --git a/metadata/md5-cache/dev-vcs/svn2git-1.0.11-r1 b/metadata/md5-cache/dev-vcs/svn2git-1.0.11-r1
new file mode 100644
index 000000000000..8f72c1e92923
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/svn2git-1.0.11-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-qt/qtcore:5 dev-vcs/subversion
+DESCRIPTION=Tool for one-time conversion from svn to git
+EAPI=6
+HOMEPAGE=https://github.com/svn-all-fast-export/svn2git
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-qt/qtcore:5 dev-vcs/subversion dev-vcs/git
+SLOT=0
+SRC_URI=https://github.com/svn-all-fast-export/svn2git/archive/1.0.11.tar.gz -> svn2git-1.0.11.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=cfd1659a95be5b5b2bd1d88d200afef4
diff --git a/metadata/md5-cache/dev-vcs/svn2git-9999 b/metadata/md5-cache/dev-vcs/svn2git-9999
index 8c3aada430da..ca670389e375 100644
--- a/metadata/md5-cache/dev-vcs/svn2git-9999
+++ b/metadata/md5-cache/dev-vcs/svn2git-9999
@@ -1,10 +1,10 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=dev-vcs/subversion dev-qt/qtcore:4 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=configure install prepare unpack
+DEPEND=dev-qt/qtcore:5 dev-vcs/subversion >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Tool for one-time conversion from svn to git
-EAPI=5
+EAPI=6
 HOMEPAGE=https://github.com/svn-all-fast-export/svn2git
 LICENSE=GPL-3
-RDEPEND=dev-vcs/subversion dev-qt/qtcore:4 dev-vcs/git
+RDEPEND=dev-qt/qtcore:5 dev-vcs/subversion dev-vcs/git
 SLOT=0
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=73df0858163883566e526138f8ef0bfc
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=cfd1659a95be5b5b2bd1d88d200afef4
diff --git a/metadata/md5-cache/games-board/Manifest.gz b/metadata/md5-cache/games-board/Manifest.gz
index e53a82256cd0..e13a4084daa3 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/knights-2.6.0_pre20171003 b/metadata/md5-cache/games-board/knights-2.6.0_pre20171003
index 3970ad760f1d..3beded2431fb 100644
--- a/metadata/md5-cache/games-board/knights-2.6.0_pre20171003
+++ b/metadata/md5-cache/games-board/knights-2.6.0_pre20171003
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-apps/libkdegames-14.12.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) !games-board/knights:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/KDE/knights/archive/4c0a1f61c23d632b2d9bf9f4c5c74ba021633147.tar.gz -> knights-2.6.0_pre20171003.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bc91ff458bc9ec2617614616cefd6744
diff --git a/metadata/md5-cache/games-board/spider-1.2_p4-r1 b/metadata/md5-cache/games-board/spider-1.2_p4-r1
index de595b73796a..537a6b63fe4f 100644
--- a/metadata/md5-cache/games-board/spider-1.2_p4-r1
+++ b/metadata/md5-cache/games-board/spider-1.2_p4-r1
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libXext athena? ( x11-libs/libXaw ) x11-libs/libXmu x11-libs/li
 SLOT=0
 SRC_URI=mirror://debian/pool/main/s/spider/spider_1.2.orig.tar.gz mirror://debian/pool/main/s/spider/spider_1.2-4.diff.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	games	2bb3ede665927a68ffdb7c41eec7efde	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a3bf0b167cde73a4bd54199816ebb94
+_md5_=fc67363fccff886682c160a4ea6f45da
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 27ea800f24aa..f8771de232c1 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/dolphin-5.0 b/metadata/md5-cache/games-emulation/dolphin-5.0
index 36d364b50ca0..f3f17faf28ec 100644
--- a/metadata/md5-cache/games-emulation/dolphin-5.0
+++ b/metadata/md5-cache/games-emulation/dolphin-5.0
@@ -1,5 +1,5 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:0= sys-libs/readline:0= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] ) app-arch/zip media-libs/freetype sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:0= sys-libs/readline:0= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] ) app-arch/zip media-libs/freetype sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
 DESCRIPTION=Gamecube and Wii game emulator
 EAPI=5
 HOMEPAGE=https://www.dolphin-emu.org/
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:0= sys-libs/readline:0= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] )
 SLOT=0
 SRC_URI=https://github.com/dolphin-emu/dolphin/archive/5.0.zip -> dolphin-5.0.zip
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a4b3b1b16ebb407f6c4e0c59d41cd3b
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f910a7a94a969bdc7c191c751b55c5bc
diff --git a/metadata/md5-cache/games-emulation/dolphin-9999 b/metadata/md5-cache/games-emulation/dolphin-9999
index 968e49609e21..94e862c156c7 100644
--- a/metadata/md5-cache/games-emulation/dolphin-9999
+++ b/metadata/md5-cache/games-emulation/dolphin-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install postinst prepare pretend test unpack
-DEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:= sys-libs/glibc sys-libs/readline:= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( virtual/ffmpeg ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] ) >=dev-util/cmake-2.8.8 >=sys-devel/gcc-4.9.0 app-arch/zip media-libs/freetype sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
+DEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:0= sys-libs/readline:0= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] ) app-arch/zip media-libs/freetype sys-devel/gettext virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Gamecube and Wii game emulator
 EAPI=5
 HOMEPAGE=https://www.dolphin-emu.org/
-IUSE=alsa ao bluetooth doc egl +evdev ffmpeg llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets
+IUSE=alsa ao bluetooth doc egl +evdev ffmpeg libav llvm log lto openal +pch portaudio profile pulseaudio qt5 sdl upnp +wxwidgets
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:= sys-libs/glibc sys-libs/readline:= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( virtual/ffmpeg ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] )
+RDEPEND=>=media-libs/libsfml-2.1 >net-libs/enet-1.3.7 >=net-libs/mbedtls-2.1.1 dev-libs/lzo media-libs/libpng:0= sys-libs/readline:0= sys-libs/zlib x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) bluetooth? ( net-wireless/bluez ) egl? ( media-libs/mesa[egl] ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:= ) ) llvm? ( sys-devel/llvm ) openal? ( media-libs/openal media-libs/libsoundtouch ) portaudio? ( media-libs/portaudio ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[haptic,joystick] ) upnp? ( >=net-libs/miniupnpc-1.7 ) wxwidgets? ( dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/wxGTK:3.0[opengl,X] )
 SLOT=0
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e295ad7a402b56966a0c70d42e932200
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	l10n	07318ed5f26525a9d302ca87d20b2865	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bd28c62766eaf11ab6c8b46b2a3d0b47
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.4.2-r1 b/metadata/md5-cache/games-emulation/ppsspp-1.4.2-r1
new file mode 100644
index 000000000000..bbd4c90b973d
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/ppsspp-1.4.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A PSP emulator written in C++.
+EAPI=6
+HOMEPAGE=https://www.ppsspp.org/
+IUSE=+qt5 sdl headless libav +system-ffmpeg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=!headless? ( || ( qt5 sdl ) ) ?? ( qt5 sdl )
+SLOT=0
+SRC_URI=https://github.com/hrydgard/ppsspp/archive/v1.4.2.tar.gz -> ppsspp-1.4.2.tar.gz !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ppsspp-1.4.2-ffmpeg.tar.gz ) https://github.com/hrydgard/ppsspp-lang/archive/f32328a88cbf368af90eb79bc7ad5420795d6585.tar.gz -> ppsspp-1.4.2-assets_lang.tar.gz https://github.com/hrydgard/pspautotests/archive/e18cface3db64ccb96738dc128fe769b28fff65c.tar.gz -> ppsspp-1.4.2-pspautotests.tar.gz https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ppsspp-1.4.2-dx9sdk.tar.gz https://github.com/hrydgard/glslang/archive/b16f7e6819267e57c3c244808d1981f0ce34acbc.tar.gz -> ppsspp-1.4.2-ext_glslang.tar.gz https://github.com/Kingcom/armips/archive/770365d44df35d6e675c58bb2a774ca412278ef5.tar.gz -> ppsspp-1.4.2-ext_armips.tar.gz https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ppsspp-1.4.2-ext_armips_ext_tinyformat.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/6381b2ff9c0d975af8fd2974c97aa12a69ab6cc6.tar.gz -> ppsspp-1.4.2-ext_SPIRV-Cross.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=546c20d0b1dd4083a7fd78edb42197d9
diff --git a/metadata/md5-cache/games-emulation/ppsspp-1.5.4-r1 b/metadata/md5-cache/games-emulation/ppsspp-1.5.4-r1
new file mode 100644
index 000000000000..be0ae095b97e
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/ppsspp-1.5.4-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A PSP emulator written in C++.
+EAPI=6
+HOMEPAGE=https://www.ppsspp.org/
+IUSE=+qt5 sdl headless libav +system-ffmpeg
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
+REQUIRED_USE=!headless? ( || ( qt5 sdl ) ) ?? ( qt5 sdl )
+SLOT=0
+SRC_URI=https://github.com/hrydgard/ppsspp/archive/v1.5.4.tar.gz -> ppsspp-1.5.4.tar.gz !system-ffmpeg? ( https://github.com/hrydgard/ppsspp-ffmpeg/archive/a2e98d7ba4c7c5cac08608732c3058cb46e3e0ef.tar.gz -> ppsspp-1.5.4-ffmpeg.tar.gz ) https://github.com/hrydgard/ppsspp-lang/archive/1e3e4a0ba0ca8c0a092e027dfb7c1c4778366db5.tar.gz -> ppsspp-1.5.4-assets_lang.tar.gz https://github.com/hrydgard/pspautotests/archive/d02ba7407050f445edf9e908374ad4bf3b2f237b.tar.gz -> ppsspp-1.5.4-pspautotests.tar.gz https://github.com/hrydgard/minidx9/archive/7751cf73f5c06f1be21f5f31c3e2d9a7bacd3a93.tar.gz -> ppsspp-1.5.4-dx9sdk.tar.gz https://github.com/hrydgard/glslang/archive/2edde6665d9a56ead5ea0e55b4e64d9a803e6164.tar.gz -> ppsspp-1.5.4-ext_glslang.tar.gz https://github.com/Kingcom/armips/archive/8b4cadaf62d7de42d374056fc6aafc555f2bc7dc.tar.gz -> ppsspp-1.5.4-ext_armips.tar.gz https://github.com/Kingcom/tinyformat/archive/b7f5a22753c81d834ab5133d655f1fd525280765.tar.gz -> ppsspp-1.5.4-ext_armips_ext_tinyformat.tar.gz https://github.com/KhronosGroup/SPIRV-Cross/archive/90966d50f57608587bafd95b4e345b02b814754a.tar.gz -> ppsspp-1.5.4-ext_SPIRV-Cross.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4f496940ba5301f7e2df3b209e5f176c
diff --git a/metadata/md5-cache/games-emulation/ppsspp-9999 b/metadata/md5-cache/games-emulation/ppsspp-9999
index b07246c93bb1..91983533f643 100644
--- a/metadata/md5-cache/games-emulation/ppsspp-9999
+++ b/metadata/md5-cache/games-emulation/ppsspp-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl media-libs/libsdl2 ) qt5? ( dev-db/sqlite dev-qt/assistant:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=A PSP emulator written in C++.
 EAPI=6
 HOMEPAGE=https://www.ppsspp.org/
 IUSE=+qt5 sdl headless libav +system-ffmpeg
 LICENSE=GPL-2
-RDEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl media-libs/libsdl2 ) qt5? ( dev-db/sqlite dev-qt/assistant:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtopengl:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 )
+RDEPEND=sys-libs/zlib system-ffmpeg? ( !libav? ( media-video/ffmpeg:= ) libav? ( media-video/libav:= ) ) sdl? ( media-libs/libsdl2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 )
 REQUIRED_USE=!headless? ( || ( qt5 sdl ) ) ?? ( qt5 sdl )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f8222ce331404a5cca1ad85bd716ed03
+_md5_=d620ec088a59075e4a49876970159b1a
diff --git a/metadata/md5-cache/games-emulation/vbam-2.0.1 b/metadata/md5-cache/games-emulation/vbam-2.0.1
new file mode 100644
index 000000000000..28a9bd1db73e
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/vbam-2.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib virtual/glu virtual/opengl ffmpeg? ( virtual/ffmpeg[-libav] ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( openal? ( media-libs/openal ) x11-libs/wxGTK:3.0[X,opengl] ) wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance
+EAPI=6
+HOMEPAGE=https://github.com/visualboyadvance-m/visualboyadvance-m
+IUSE=ffmpeg link lirc nls openal +sdl wxwidgets
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib virtual/glu virtual/opengl ffmpeg? ( virtual/ffmpeg[-libav] ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( openal? ( media-libs/openal ) x11-libs/wxGTK:3.0[X,opengl] )
+REQUIRED_USE=openal? ( wxwidgets ) || ( sdl wxwidgets )
+SLOT=0
+SRC_URI=https://github.com/visualboyadvance-m/visualboyadvance-m/archive/v2.0.1.tar.gz -> vbam-2.0.1.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e410f762fdad6fd4104180ee9b54dc37
diff --git a/metadata/md5-cache/games-emulation/vbam-9999 b/metadata/md5-cache/games-emulation/vbam-9999
index 48564dfd7f77..04687de75731 100644
--- a/metadata/md5-cache/games-emulation/vbam-9999
+++ b/metadata/md5-cache/games-emulation/vbam-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare test unpack
-DEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib virtual/glu virtual/opengl ffmpeg? ( virtual/ffmpeg[-libav] ) gtk? ( >=dev-cpp/glibmm-2.4.0:2 >=dev-cpp/gtkmm-2.4.0:2.4 >=dev-cpp/gtkglextmm-1.2.0 ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( cairo? ( x11-libs/cairo ) openal? ( media-libs/openal ) x11-libs/wxGTK:3.0[X,opengl] ) wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib virtual/glu virtual/opengl ffmpeg? ( virtual/ffmpeg[-libav] ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( openal? ( media-libs/openal ) x11-libs/wxGTK:3.0[X,opengl] ) wxwidgets? ( virtual/imagemagick-tools ) x86? ( || ( dev-lang/nasm dev-lang/yasm ) ) nls? ( sys-devel/gettext ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Game Boy, GBC, and GBA emulator forked from VisualBoyAdvance
 EAPI=6
 HOMEPAGE=https://github.com/visualboyadvance-m/visualboyadvance-m
-IUSE=cairo ffmpeg gtk link lirc nls openal +sdl wxwidgets
+IUSE=ffmpeg link lirc nls openal +sdl wxwidgets
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib virtual/glu virtual/opengl ffmpeg? ( virtual/ffmpeg[-libav] ) gtk? ( >=dev-cpp/glibmm-2.4.0:2 >=dev-cpp/gtkmm-2.4.0:2.4 >=dev-cpp/gtkglextmm-1.2.0 ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( cairo? ( x11-libs/cairo ) openal? ( media-libs/openal ) x11-libs/wxGTK:3.0[X,opengl] )
-REQUIRED_USE=|| ( sdl gtk wxwidgets )
+RDEPEND=>=media-libs/libpng-1.4:0= media-libs/libsdl2[joystick] link? ( >=media-libs/libsfml-2.0:= ) sys-libs/zlib virtual/glu virtual/opengl ffmpeg? ( virtual/ffmpeg[-libav] ) lirc? ( app-misc/lirc ) nls? ( virtual/libintl ) wxwidgets? ( openal? ( media-libs/openal ) x11-libs/wxGTK:3.0[X,opengl] )
+REQUIRED_USE=openal? ( wxwidgets ) || ( sdl wxwidgets )
 SLOT=0
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4e768dc0bf819adb2f62389a731d9799
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	wxwidgets	04e063b0eff26daaea83d859dd9d6e05	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=af156edd7768d1254a0cc8b4eaca8a41
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index 51e9e346008d..14d0620c2141 100644
--- a/metadata/md5-cache/games-engines/Manifest.gz
+++ b/metadata/md5-cache/games-engines/Manifest.gz
diff --git a/metadata/md5-cache/games-engines/scummvm-tools-2.0.0 b/metadata/md5-cache/games-engines/scummvm-tools-2.0.0
deleted file mode 100644
index 75f66f84f8d1..000000000000
--- a/metadata/md5-cache/games-engines/scummvm-tools-2.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/boost-1.32 sys-libs/zlib x11-libs/wxGTK:3.0 flac? ( media-libs/flac ) iconv? ( virtual/libiconv media-libs/freetype:2 ) mad? ( media-libs/libmad ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libvorbis ) app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=utilities for the SCUMM game engine
-EAPI=6
-HOMEPAGE=http://scummvm.sourceforge.net/
-IUSE=flac iconv mad png vorbis
-KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/boost-1.32 sys-libs/zlib x11-libs/wxGTK:3.0 flac? ( media-libs/flac ) iconv? ( virtual/libiconv media-libs/freetype:2 ) mad? ( media-libs/libmad ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libvorbis )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://scummvm.org/frs/scummvm-tools/2.0.0/scummvm-tools-2.0.0.tar.xz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=4bebe6990f4424d4a08beebebd9804ea
diff --git a/metadata/md5-cache/games-engines/scummvm-tools-2.0.0-r1 b/metadata/md5-cache/games-engines/scummvm-tools-2.0.0-r1
new file mode 100644
index 000000000000..b088b28fdbf2
--- /dev/null
+++ b/metadata/md5-cache/games-engines/scummvm-tools-2.0.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/boost-1.32 sys-libs/zlib x11-libs/wxGTK:3.0 flac? ( media-libs/flac ) iconv? ( virtual/libiconv media-libs/freetype:2 ) mad? ( media-libs/libmad ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libvorbis ) app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=utilities for the SCUMM game engine
+EAPI=6
+HOMEPAGE=http://scummvm.sourceforge.net/
+IUSE=flac iconv mad png vorbis
+KEYWORDS=~amd64 ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2+
+RDEPEND=>=dev-libs/boost-1.32 sys-libs/zlib x11-libs/wxGTK:3.0 flac? ( media-libs/flac ) iconv? ( virtual/libiconv media-libs/freetype:2 ) mad? ( media-libs/libmad ) png? ( media-libs/libpng:0 ) vorbis? ( media-libs/libvorbis )
+RESTRICT=test
+SLOT=0
+SRC_URI=http://scummvm.org/frs/scummvm-tools/2.0.0/scummvm-tools-2.0.0.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=cfcdeaac1600744ec8ab7e969ada0434
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index bf3b8baa357e..40ff17a8c384 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
index 1ecb84b27b7b..f136259c097a 100644
--- a/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20170827
+++ b/metadata/md5-cache/games-puzzle/ksokoban-0.5.0_pre20170827
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.40.0 >=kde-frameworks/kconfig-5.40.0 >=kde-frameworks/kcoreaddons-5.40.0 >=kde-frameworks/ki18n-5.40.0 >=kde-frameworks/kiconthemes-5.40.0 >=kde-frameworks/kio-5.40.0 >=kde-frameworks/kwidgetsaddons-5.40.0 >=kde-frameworks/kxmlgui-5.40.0 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=0
 SRC_URI=https://github.com/KDE/ksokoban/archive/048b42324ef6dac807af4351174065cda2f32f44.tar.gz -> ksokoban-0.5.0_pre20170827.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a0641f5c81a35102f210b8c1bc6e0492
diff --git a/metadata/md5-cache/games-puzzle/ksokoban-9999 b/metadata/md5-cache/games-puzzle/ksokoban-9999
index b76cb25a3f02..cd1b79495cbc 100644
--- a/metadata/md5-cache/games-puzzle/ksokoban-9999
+++ b/metadata/md5-cache/games-puzzle/ksokoban-9999
@@ -7,5 +7,5 @@ IUSE=debug +handbook
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.40.0 >=kde-frameworks/kconfig-5.40.0 >=kde-frameworks/kcoreaddons-5.40.0 >=kde-frameworks/ki18n-5.40.0 >=kde-frameworks/kiconthemes-5.40.0 >=kde-frameworks/kio-5.40.0 >=kde-frameworks/kwidgetsaddons-5.40.0 >=kde-frameworks/kxmlgui-5.40.0 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=0
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0cad6e6b2cf80cfe9e8f451bb3b0105c
diff --git a/metadata/md5-cache/games-roguelike/Manifest.gz b/metadata/md5-cache/games-roguelike/Manifest.gz
index de7309d98e6d..a678f3601ed0 100644
--- a/metadata/md5-cache/games-roguelike/Manifest.gz
+++ b/metadata/md5-cache/games-roguelike/Manifest.gz
diff --git a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.43.05 b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.43.05
index 7d76dcca5b66..761bc0534c53 100644
--- a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.43.05
+++ b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.43.05
@@ -10,5 +10,5 @@ RDEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://www.bay12games.com/dwarves/df_43_05_linux.tar.bz2 ) x86? ( http://www.bay12games.com/dwarves/df_43_05_linux32.tar.bz2 )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e0fafeb32c01db415046715da64c202f
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=102c5922c0c4cd66a46474ac37fbd2e6
diff --git a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.03 b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.03
deleted file mode 100644
index 8ce104443396..000000000000
--- a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.03
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib virtual/glu x11-libs/gtk+:2 media-libs/libsndfile media-libs/openal sys-libs/ncurses:5[unicode] virtual/pkgconfig
-DESCRIPTION=A single-player fantasy game
-EAPI=6
-HOMEPAGE=http://www.bay12games.com/dwarves
-IUSE=debug
-KEYWORDS=~amd64 ~x86 -*
-LICENSE=free-noncomm BSD BitstreamVera
-RDEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib virtual/glu x11-libs/gtk+:2
-RESTRICT=strip
-SLOT=0
-SRC_URI=amd64? ( http://www.bay12games.com/dwarves/df_44_03_linux.tar.bz2 ) x86? ( http://www.bay12games.com/dwarves/df_44_03_linux32.tar.bz2 )
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e0fafeb32c01db415046715da64c202f
diff --git a/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.05 b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.05
new file mode 100644
index 000000000000..168a0f88da1f
--- /dev/null
+++ b/metadata/md5-cache/games-roguelike/dwarf-fortress-0.44.05
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare
+DEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib virtual/glu x11-libs/gtk+:2 media-libs/libsndfile media-libs/openal sys-libs/ncurses:5[unicode] virtual/pkgconfig
+DESCRIPTION=A single-player fantasy game
+EAPI=6
+HOMEPAGE=http://www.bay12games.com/dwarves
+IUSE=debug
+KEYWORDS=~amd64 ~x86 -*
+LICENSE=free-noncomm BSD BitstreamVera
+RDEPEND=media-libs/glew:0 media-libs/libsdl[joystick,video] media-libs/sdl-image[png] media-libs/sdl-ttf sys-libs/zlib virtual/glu x11-libs/gtk+:2
+RESTRICT=strip
+SLOT=0
+SRC_URI=amd64? ( http://www.bay12games.com/dwarves/df_44_05_linux.tar.bz2 ) x86? ( http://www.bay12games.com/dwarves/df_44_05_linux32.tar.bz2 )
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=102c5922c0c4cd66a46474ac37fbd2e6
diff --git a/metadata/md5-cache/games-rpg/Manifest.gz b/metadata/md5-cache/games-rpg/Manifest.gz
index 41189c9df8d9..4c54ce5a477d 100644
--- a/metadata/md5-cache/games-rpg/Manifest.gz
+++ b/metadata/md5-cache/games-rpg/Manifest.gz
diff --git a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3 b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3
deleted file mode 100644
index 840c952fd6b4..000000000000
--- a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DEPEND=app-arch/unzip
-DESCRIPTION=Baldur's Gate: Enhanced Edition
-EAPI=6
-HOMEPAGE=https://www.baldursgate.com/
-KEYWORDS=-* ~amd64 ~x86
-LICENSE=GOG-EULA
-RDEPEND=dev-libs/expat[abi_x86_32(-)] dev-libs/json-c[abi_x86_32(-)] dev-libs/openssl:0[abi_x86_32(-)] media-libs/openal[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)]
-RESTRICT=bindist fetch
-SLOT=0
-SRC_URI=gog_baldur_s_gate_enhanced_edition_2.5.0.8.sh
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=347bf0103bdea1e75238958104d7eedc
diff --git a/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1 b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
new file mode 100644
index 000000000000..0a4e34995881
--- /dev/null
+++ b/metadata/md5-cache/games-rpg/baldurs-gate-ee-2.3.67.3-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DEPEND=app-arch/unzip
+DESCRIPTION=Baldur's Gate: Enhanced Edition
+EAPI=6
+HOMEPAGE=https://www.baldursgate.com/
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=GOG-EULA
+RDEPEND=dev-libs/expat[abi_x86_32(-)] dev-libs/json-c[abi_x86_32(-)] dev-libs/openssl:0[abi_x86_32(-)] media-libs/openal[abi_x86_32(-)] virtual/opengl[abi_x86_32(-)] x11-libs/libX11[abi_x86_32(-)]
+RESTRICT=bindist fetch
+SLOT=0
+SRC_URI=gog_baldur_s_gate_enhanced_edition_2.5.0.9.sh
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=950b4ff1dc9efd8e56a582ed75ff0daf
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index a1957c303d02..309a28523625 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/colobot-0.1.11 b/metadata/md5-cache/games-strategy/colobot-0.1.11
new file mode 100644
index 000000000000..66197027a50c
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/colobot-0.1.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Colobot is an educational real-time strategy video game featuring 3D graphics
+EAPI=6
+HOMEPAGE=https://colobot.info/
+IUSE=devbuild test tools doc +openal
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) games-strategy/colobot-data
+SLOT=0
+SRC_URI=https://github.com/colobot/colobot/archive/colobot-gold-0.1.11-alpha.tar.gz -> colobot-0.1.11.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ad783f8a596504d8870d77a3fc106d91
diff --git a/metadata/md5-cache/games-strategy/colobot-9999 b/metadata/md5-cache/games-strategy/colobot-9999
new file mode 100644
index 000000000000..8808cd801c12
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/colobot-9999
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=Colobot is an educational real-time strategy video game featuring 3D graphics
+EAPI=6
+HOMEPAGE=https://colobot.info/
+IUSE=devbuild test tools doc +openal
+LICENSE=GPL-3
+RDEPEND=dev-games/physfs dev-libs/boost:= media-libs/glew:0 media-libs/libogg media-libs/libpng:0= media-libs/libsdl2:= media-libs/libsndfile:= media-libs/libvorbis:= media-libs/sdl2-image media-libs/sdl2-ttf media-sound/vorbis-tools sys-devel/gettext openal? ( media-libs/openal ) games-strategy/colobot-data
+SLOT=0
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ad783f8a596504d8870d77a3fc106d91
diff --git a/metadata/md5-cache/games-strategy/colobot-data-0.1.11 b/metadata/md5-cache/games-strategy/colobot-data-0.1.11
new file mode 100644
index 000000000000..315287731193
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/colobot-data-0.1.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-arch/unzip music_flac_convert? ( media-sound/vorbis-tools ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Data package for colobot (Colonize with Bots)
+EAPI=6
+HOMEPAGE=https://colobot.info/
+IUSE=+music music_flac_convert +music_ogg
+KEYWORDS=~amd64
+LICENSE=GPL-3
+REQUIRED_USE=music? ( ^^ ( music_flac_convert music_ogg ) ) music_flac_convert? ( music ) music_ogg? ( music )
+SLOT=0
+SRC_URI=https://github.com/colobot/colobot-data/archive/colobot-gold-0.1.11-alpha.zip -> colobot-data-0.1.11.zip music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_0.1.11-alpha.tar.gz -> colobot-data-0.1.11-music-ogg.tar.gz ) music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_0.1.11-alpha.tar.gz -> colobot-data-0.1.11-music-flac.tar.gz )
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0dc1f38fe33f9015edb6737df4637e04
diff --git a/metadata/md5-cache/games-strategy/colobot-data-9999 b/metadata/md5-cache/games-strategy/colobot-data-9999
new file mode 100644
index 000000000000..22101d7a4bd8
--- /dev/null
+++ b/metadata/md5-cache/games-strategy/colobot-data-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=app-arch/unzip music_flac_convert? ( media-sound/vorbis-tools ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Data package for colobot (Colonize with Bots)
+EAPI=6
+HOMEPAGE=https://colobot.info/
+IUSE=+music music_flac_convert +music_ogg
+LICENSE=GPL-3
+REQUIRED_USE=music? ( ^^ ( music_flac_convert music_ogg ) ) music_flac_convert? ( music ) music_ogg? ( music )
+SLOT=0
+SRC_URI=music_ogg? ( https://colobot.info/files/music/colobot-music_ogg_latest.tar.gz -> colobot-data-9999-music-ogg.tar.gz ) music_flac_convert? ( https://colobot.info/files/music/colobot-music_flac_latest.tar.gz -> colobot-data-9999-music-flac.tar.gz )
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f5116a6f76451c3520f53b789dfbf9de
diff --git a/metadata/md5-cache/gnome-base/Manifest.gz b/metadata/md5-cache/gnome-base/Manifest.gz
index d4d971a6f2c0..c984be948867 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/gsettings-desktop-schemas-3.24.1 b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
index 888c545c349f..9c943f3f1ce8 100644
--- a/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
+++ b/metadata/md5-cache/gnome-base/gsettings-desktop-schemas-3.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=Collection of GSettings schemas for GNOME desktop
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gsettings-desktop-schemas
 IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x86-solaris
 LICENSE=LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.31:2 introspection? ( >=dev-libs/gobject-introspection-1.31.0:= ) !<gnome-base/gdm-3.8
 SLOT=0
 SRC_URI=mirror://gnome/sources/gsettings-desktop-schemas/3.24/gsettings-desktop-schemas-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dbc2be75fc83c5bb8f2bf57e96902896
+_md5_=cc6a54bc134017818b5797ac9d4e24e6
diff --git a/metadata/md5-cache/gnome-base/libgtop-2.36.0 b/metadata/md5-cache/gnome-base/libgtop-2.36.0
index c206832f6461..6fa0cabaed46 100644
--- a/metadata/md5-cache/gnome-base/libgtop-2.36.0
+++ b/metadata/md5-cache/gnome-base/libgtop-2.36.0
@@ -4,10 +4,10 @@ DESCRIPTION=A library that provides top functionality to applications
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/libgtop
 IUSE=+introspection
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.26:2 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
 SLOT=2/10
 SRC_URI=mirror://gnome/sources/libgtop/2.36/libgtop-2.36.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e8064590866916068c74746eca8e536f
+_md5_=f7e35ef00b7c150ad4e5524bed6ad210
diff --git a/metadata/md5-cache/kde-apps/Manifest.gz b/metadata/md5-cache/kde-apps/Manifest.gz
index be0be915c003..894b7c4f9a56 100644
--- a/metadata/md5-cache/kde-apps/Manifest.gz
+++ b/metadata/md5-cache/kde-apps/Manifest.gz
diff --git a/metadata/md5-cache/kde-apps/akonadi-17.08.3 b/metadata/md5-cache/kde-apps/akonadi-17.08.3
index 386ecb971681..99bb964e699d 100644
--- a/metadata/md5-cache/kde-apps/akonadi-17.08.3
+++ b/metadata/md5-cache/kde-apps/akonadi-17.08.3
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/akonadi-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=15468fdb36ee6e057613eb2c52220dd7
diff --git a/metadata/md5-cache/kde-apps/akonadi-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-17.12.1
index e83c27939b4c..ae4689c60a2f 100644
--- a/metadata/md5-cache/kde-apps/akonadi-17.12.1
+++ b/metadata/md5-cache/kde-apps/akonadi-17.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) test? ( tools )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=956f8094ce4c6023ebcd0efb1a3a97c2
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-17.08.3 b/metadata/md5-cache/kde-apps/akonadi-calendar-17.08.3
index 972acfd79c58..a40a7746d6f2 100644
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-17.08.3
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/akonadi-calendar-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e6344c57e4df992e4c291d307b4d7990
diff --git a/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.1
index 31c9c9af9996..a9958c6c1f0d 100644
--- a/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.1
+++ b/metadata/md5-cache/kde-apps/akonadi-calendar-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-calendar-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ca879f245848cce518db77992d05805b
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-17.08.3 b/metadata/md5-cache/kde-apps/akonadi-contacts-17.08.3
index 37fb2ee5e6c1..b135f23930d5 100644
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-17.08.3
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/akonadi-contacts-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=49c5581f82feac32b5d52a7987144e3b
diff --git a/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.1
index 2abea3ebaecb..e89ac8f10e3a 100644
--- a/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.1
+++ b/metadata/md5-cache/kde-apps/akonadi-contacts-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-contacts-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=12b715649347b94ae0aa26ff37555a61
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.08.3 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.08.3
index 7fdaa28156b9..cc761bd1c602 100644
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.08.3
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kidentitymanagement-17.08.3:5 >=kde-apps/kmailtransport-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=kde-apps/mailcommon-17.08.3:5 >=kde-apps/mailimporter-17.08.3:5 >=kde-apps/messagelib-17.08.3:5 >=kde-apps/pimcommon-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/akonadi-import-wizard-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d80733a8eccb7e998c41d54fd297ee50
diff --git a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.1
index a45c273effb3..f87df4e2c9d5 100644
--- a/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.1
+++ b/metadata/md5-cache/kde-apps/akonadi-import-wizard-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/mailimporter-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-import-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-import-wizard-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=42a223eeb0ead53a422efdf38433b7ec
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-17.08.3 b/metadata/md5-cache/kde-apps/akonadi-mime-17.08.3
index b1f0904ba025..f52ac7e9afc1 100644
--- a/metadata/md5-cache/kde-apps/akonadi-mime-17.08.3
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/akonadi-mime-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ccc0b761a4d83b7bfe993ccd4ae2bbbf
diff --git a/metadata/md5-cache/kde-apps/akonadi-mime-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-mime-17.12.1
index 8521f4ae5405..de29b24a44d8 100644
--- a/metadata/md5-cache/kde-apps/akonadi-mime-17.12.1
+++ b/metadata/md5-cache/kde-apps/akonadi-mime-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-mime-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=714b811db60bee10aac6bcea42abbcb1
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-17.08.3 b/metadata/md5-cache/kde-apps/akonadi-notes-17.08.3
index 714a5ee916c6..e5709cbffc37 100644
--- a/metadata/md5-cache/kde-apps/akonadi-notes-17.08.3
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kmime-17.08.3:5 >=dev-qt/qtgu
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/akonadi-notes-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4c6477c74eedcd231fc0c352fc8cd4b2
diff --git a/metadata/md5-cache/kde-apps/akonadi-notes-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-notes-17.12.1
index 1753f54390f7..13f9a6a36713 100644
--- a/metadata/md5-cache/kde-apps/akonadi-notes-17.12.1
+++ b/metadata/md5-cache/kde-apps/akonadi-notes-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtgu
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-notes-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=80b586d1f3afecaaf87d14605bd4b49b
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-17.08.3 b/metadata/md5-cache/kde-apps/akonadi-search-17.08.3
index 41c4c4489e0e..8c1fa1439871 100644
--- a/metadata/md5-cache/kde-apps/akonadi-search-17.08.3
+++ b/metadata/md5-cache/kde-apps/akonadi-search-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/akonadi-search-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e05ea4ac14b4f63c6c8341f365bf7956
diff --git a/metadata/md5-cache/kde-apps/akonadi-search-17.12.1 b/metadata/md5-cache/kde-apps/akonadi-search-17.12.1
index 362bf7ba0014..58d5f13a67c0 100644
--- a/metadata/md5-cache/kde-apps/akonadi-search-17.12.1
+++ b/metadata/md5-cache/kde-apps/akonadi-search-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/xapian-1.3:=[chert] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadi-search:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-search-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=43dd6249803d167b10d6662c0ffebe21
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-17.08.3 b/metadata/md5-cache/kde-apps/akonadiconsole-17.08.3
index d43f54713b50..50af8344bc8e 100644
--- a/metadata/md5-cache/kde-apps/akonadiconsole-17.08.3
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-contacts-17.08.3:5 >=kde-apps/calendarsupport-17.08.3:5 >=kde-apps/kcalcore-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kmime-17.08.3:5 >=kde-apps/kpimtextedit-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=kde-apps/messagelib-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/akonadiconsole-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8bd7bf1e73617271f0952249f5203b94
diff --git a/metadata/md5-cache/kde-apps/akonadiconsole-17.12.1 b/metadata/md5-cache/kde-apps/akonadiconsole-17.12.1
index b1f82e2b5254..4d04586c565b 100644
--- a/metadata/md5-cache/kde-apps/akonadiconsole-17.12.1
+++ b/metadata/md5-cache/kde-apps/akonadiconsole-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/xapian:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akonadiconsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadiconsole-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=38836db7ab983fb6652ab0abbb63e116
diff --git a/metadata/md5-cache/kde-apps/akregator-17.08.3 b/metadata/md5-cache/kde-apps/akregator-17.08.3
index 61c7a409c52b..3ca3a3a3270c 100644
--- a/metadata/md5-cache/kde-apps/akregator-17.08.3
+++ b/metadata/md5-cache/kde-apps/akregator-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/grantleetheme-17.08.3:5 >=kde-apps/kontactinterface-17.08.3:5 >=kde-apps/kpimtextedit-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=kde-apps/messagelib-17.08.3:5 >=kde-apps/pimcommon-17.08.3:5 >=kde-apps/syndication-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5= >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akregator:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/akregator-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0d911702f46d59c550aebe8939b5a86a
diff --git a/metadata/md5-cache/kde-apps/akregator-17.12.1 b/metadata/md5-cache/kde-apps/akregator-17.12.1
index 0e46941bc9d0..ce25ad32b981 100644
--- a/metadata/md5-cache/kde-apps/akregator-17.12.1
+++ b/metadata/md5-cache/kde-apps/akregator-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=kde-apps/syndication-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/akregator:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/akregator-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6d63687dda7afcfc0c3e861faeb6d614
diff --git a/metadata/md5-cache/kde-apps/analitza-17.08.3-r1 b/metadata/md5-cache/kde-apps/analitza-17.08.3-r1
index d53a71a6d2c0..a565c2c346c2 100644
--- a/metadata/md5-cache/kde-apps/analitza-17.08.3-r1
+++ b/metadata/md5-cache/kde-apps/analitza-17.08.3-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[-gles2] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/analitza:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/analitza-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ad0d408f25e1338a2cb71f51c0b6b35a
diff --git a/metadata/md5-cache/kde-apps/analitza-17.12.1 b/metadata/md5-cache/kde-apps/analitza-17.12.1
index d9df3aa5faf8..1eeeeb890441 100644
--- a/metadata/md5-cache/kde-apps/analitza-17.12.1
+++ b/metadata/md5-cache/kde-apps/analitza-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[-gles2] >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 eigen? ( dev-cpp/eigen:3 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/analitza:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/analitza-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fc3943ec22bdddf7b38e6707b96e84b4
diff --git a/metadata/md5-cache/kde-apps/ark-17.08.3 b/metadata/md5-cache/kde-apps/ark-17.08.3
index 66d0ba425e57..de4b58910c6e 100644
--- a/metadata/md5-cache/kde-apps/ark-17.08.3
+++ b/metadata/md5-cache/kde-apps/ark-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ark-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2f38e07b2c38d7e712ad36c731551c26
diff --git a/metadata/md5-cache/kde-apps/ark-17.12.1 b/metadata/md5-cache/kde-apps/ark-17.12.1
index dda125e39705..a245010a6f7c 100644
--- a/metadata/md5-cache/kde-apps/ark-17.12.1
+++ b/metadata/md5-cache/kde-apps/ark-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ark-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a2aead06fe85a6b66f44eeebd312af7a
diff --git a/metadata/md5-cache/kde-apps/artikulate-17.08.3 b/metadata/md5-cache/kde-apps/artikulate-17.08.3
index 2b673a3357fb..65156630db2d 100644
--- a/metadata/md5-cache/kde-apps/artikulate-17.08.3
+++ b/metadata/md5-cache/kde-apps/artikulate-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=k
 REQUIRED_USE=|| ( gstreamer qtmedia )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/artikulate-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e546fd04a2802e1b11bba8bb72f31ffb
diff --git a/metadata/md5-cache/kde-apps/artikulate-17.12.1 b/metadata/md5-cache/kde-apps/artikulate-17.12.1
index 0c3a4429e25e..50e3094c31a4 100644
--- a/metadata/md5-cache/kde-apps/artikulate-17.12.1
+++ b/metadata/md5-cache/kde-apps/artikulate-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=k
 REQUIRED_USE=|| ( gstreamer qtmedia )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/artikulate-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=98b69e6abe3f73aedb429248be2bf308
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-17.08.3 b/metadata/md5-cache/kde-apps/audiocd-kio-17.08.3
index b49674bff8f7..53bbdd9da375 100644
--- a/metadata/md5-cache/kde-apps/audiocd-kio-17.08.3
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/libkcddb-17.08.3:5 >=kde-apps/libkcompactdisc-17.08.3:5 >=dev-qt/qtwidgets-5.7.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/audiocd-kio-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=575ad23686143f3245da4a6415e20463
diff --git a/metadata/md5-cache/kde-apps/audiocd-kio-17.12.1 b/metadata/md5-cache/kde-apps/audiocd-kio-17.12.1
index 3db58dfd9ef6..b54a303ab625 100644
--- a/metadata/md5-cache/kde-apps/audiocd-kio-17.12.1
+++ b/metadata/md5-cache/kde-apps/audiocd-kio-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/libkcddb-17.12.1:5 >=kde-apps/libkcompactdisc-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-sound/cdparanoia flac? ( >=media-libs/flac-1.1.2 ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/audiocd-kio:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/audiocd-kio-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=be3434b2bd625d99f488ba460c553c0c
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-17.08.3 b/metadata/md5-cache/kde-apps/baloo-widgets-17.08.3
index 96f9cd0e8ec3..19aedf1086b4 100644
--- a/metadata/md5-cache/kde-apps/baloo-widgets-17.08.3
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/baloo-widgets-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dea209a7f5e0887fff9afdb5c3400b87
diff --git a/metadata/md5-cache/kde-apps/baloo-widgets-17.12.1 b/metadata/md5-cache/kde-apps/baloo-widgets-17.12.1
index 00c4d88cea96..ca0f07c7a477 100644
--- a/metadata/md5-cache/kde-apps/baloo-widgets-17.12.1
+++ b/metadata/md5-cache/kde-apps/baloo-widgets-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/baloo-widgets-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9046029a81877985317557cd071b5d4f
diff --git a/metadata/md5-cache/kde-apps/blinken-17.08.3 b/metadata/md5-cache/kde-apps/blinken-17.08.3
index f3b7bf9f9908..4542f5eb31e5 100644
--- a/metadata/md5-cache/kde-apps/blinken-17.08.3
+++ b/metadata/md5-cache/kde-apps/blinken-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/blinken:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/blinken-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e39a272173f5a6c6e9fc2a8c7409d4cc
diff --git a/metadata/md5-cache/kde-apps/blinken-17.12.1 b/metadata/md5-cache/kde-apps/blinken-17.12.1
index 36546960e1db..8bc628a4e8e3 100644
--- a/metadata/md5-cache/kde-apps/blinken-17.12.1
+++ b/metadata/md5-cache/kde-apps/blinken-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/blinken:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/blinken-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b159b667de0ddd127334601ebded0c6e
diff --git a/metadata/md5-cache/kde-apps/bomber-17.08.3 b/metadata/md5-cache/kde-apps/bomber-17.08.3
index 14d84a49cd37..db490b520516 100644
--- a/metadata/md5-cache/kde-apps/bomber-17.08.3
+++ b/metadata/md5-cache/kde-apps/bomber-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bomber:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/bomber-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4d027261b359e0cc6e8dae98d814a0e4
diff --git a/metadata/md5-cache/kde-apps/bomber-17.12.1 b/metadata/md5-cache/kde-apps/bomber-17.12.1
index 4a9059708ded..2e1081dddf29 100644
--- a/metadata/md5-cache/kde-apps/bomber-17.12.1
+++ b/metadata/md5-cache/kde-apps/bomber-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !games-action/xbomber >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bomber:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/bomber-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8b83639c1b3e3ef265da30f7888b77db
diff --git a/metadata/md5-cache/kde-apps/bovo-17.08.3 b/metadata/md5-cache/kde-apps/bovo-17.08.3
index bf643390e99e..41c17ecb39c5 100644
--- a/metadata/md5-cache/kde-apps/bovo-17.08.3
+++ b/metadata/md5-cache/kde-apps/bovo-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bovo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/bovo-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=45eec26588970a0332a5120a4c54b028
diff --git a/metadata/md5-cache/kde-apps/bovo-17.12.1 b/metadata/md5-cache/kde-apps/bovo-17.12.1
index e0637dcb966d..c837458738e6 100644
--- a/metadata/md5-cache/kde-apps/bovo-17.12.1
+++ b/metadata/md5-cache/kde-apps/bovo-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/bovo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/bovo-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=91a745b75108b09c917b5fe72cbc9c78
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-17.08.3 b/metadata/md5-cache/kde-apps/calendarjanitor-17.08.3
index 29cfb7846ebe..b86cf710eccb 100644
--- a/metadata/md5-cache/kde-apps/calendarjanitor-17.08.3
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-calendar-17.08.3:5 >=kde-apps/calendarsupport-17.08.3:5 >=kde-apps/kcalcore-17.08.3:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/akonadi-calendar-tools-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=529396bff21115f911f0e68132874c42
diff --git a/metadata/md5-cache/kde-apps/calendarjanitor-17.12.1 b/metadata/md5-cache/kde-apps/calendarjanitor-17.12.1
index b4702aea45c1..8b60981e154e 100644
--- a/metadata/md5-cache/kde-apps/calendarjanitor-17.12.1
+++ b/metadata/md5-cache/kde-apps/calendarjanitor-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarjanitor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-calendar-tools-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=178b703ddd5853b830c132df154b5052
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-17.08.3 b/metadata/md5-cache/kde-apps/calendarsupport-17.08.3
index 6aad8a310a60..e390f87ed113 100644
--- a/metadata/md5-cache/kde-apps/calendarsupport-17.08.3
+++ b/metadata/md5-cache/kde-apps/calendarsupport-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-calendar-17.08.3:5 >=kde-apps/akonadi-mime-17.08.3:5 >=kde-apps/kcalcore-17.08.3:5 >=kde-apps/kcalutils-17.08.3:5 >=kde-apps/kdepim-apps-libs-17.08.3:5 >=kde-apps/kholidays-17.08.3:5 >=kde-apps/kidentitymanagement-17.08.3:5 >=kde-apps/kmime-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=kde-apps/pimcommon-17.08.3:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarsupport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/calendarsupport-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5742bb0421f3e8bb80dafbc4b096dbf6
diff --git a/metadata/md5-cache/kde-apps/calendarsupport-17.12.1 b/metadata/md5-cache/kde-apps/calendarsupport-17.12.1
index 9282e7d66602..bf4c7f206889 100644
--- a/metadata/md5-cache/kde-apps/calendarsupport-17.12.1
+++ b/metadata/md5-cache/kde-apps/calendarsupport-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/calendarsupport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/calendarsupport-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5e11627aaecb67bb19d093ffcfadfa87
diff --git a/metadata/md5-cache/kde-apps/cantor-16.12.3 b/metadata/md5-cache/kde-apps/cantor-16.12.3
index 59e7304bf18c..b58c3d11a28b 100644
--- a/metadata/md5-cache/kde-apps/cantor-16.12.3
+++ b/metadata/md5-cache/kde-apps/cantor-16.12.3
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.kde.org/applications/education/cantor https://edu.kde.org/c
 IUSE=analitza julia lua postscript python qalculate +R debug +handbook test python_targets_python2_7
 KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 analitza? ( >=kde-apps/analitza-16.12.3:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cantor:4 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 analitza? ( >=kde-apps/analitza-16.12.3:5 ) julia? ( dev-lang/julia ) lua? ( dev-lang/luajit:2 ) qalculate? ( sci-libs/cln sci-libs/libqalculate:= ) postscript? ( app-text/libspectre ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) R? ( dev-lang/R ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cantor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/Attic/applications/16.12.3/src/cantor-16.12.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=262a289a7f0a679580632ccd4436b0d3
diff --git a/metadata/md5-cache/kde-apps/cantor-17.08.3 b/metadata/md5-cache/kde-apps/cantor-17.08.3
index bb602b468980..a4d2512f3b55 100644
--- a/metadata/md5-cache/kde-apps/cantor-17.08.3
+++ b/metadata/md5-cache/kde-apps/cantor-17.08.3
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/cantor-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5399b5824bd2beb76efd93abf6877a0a
diff --git a/metadata/md5-cache/kde-apps/cantor-17.12.1 b/metadata/md5-cache/kde-apps/cantor-17.12.1
index 5ee5c82864f8..e5bf3166555d 100644
--- a/metadata/md5-cache/kde-apps/cantor-17.12.1
+++ b/metadata/md5-cache/kde-apps/cantor-17.12.1
@@ -11,5 +11,5 @@ REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/cantor-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0893be899d98b755235e7b13970f2bc8
diff --git a/metadata/md5-cache/kde-apps/cervisia-17.08.3 b/metadata/md5-cache/kde-apps/cervisia-17.08.3
index d22358bd3dd2..cee9a8f81aa6 100644
--- a/metadata/md5-cache/kde-apps/cervisia-17.08.3
+++ b/metadata/md5-cache/kde-apps/cervisia-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cervisia:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/cervisia-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c6c07196760d44bcd3f0a770de963019
diff --git a/metadata/md5-cache/kde-apps/cervisia-17.12.1 b/metadata/md5-cache/kde-apps/cervisia-17.12.1
index c992901f9e36..8722f22b6484 100644
--- a/metadata/md5-cache/kde-apps/cervisia-17.12.1
+++ b/metadata/md5-cache/kde-apps/cervisia-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-vcs/cvs >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/cervisia:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/cervisia-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7f2f03e60c19b67c396e95fa59c79629
diff --git a/metadata/md5-cache/kde-apps/dolphin-17.08.3 b/metadata/md5-cache/kde-apps/dolphin-17.08.3
index c7195da08547..34506675deec 100644
--- a/metadata/md5-cache/kde-apps/dolphin-17.08.3
+++ b/metadata/md5-cache/kde-apps/dolphin-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/dolphin-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a2353fe585c74771cc5fdda8cf99b8fa
diff --git a/metadata/md5-cache/kde-apps/dolphin-17.12.1 b/metadata/md5-cache/kde-apps/dolphin-17.12.1
index 43c551a368a3..45d56ec1deec 100644
--- a/metadata/md5-cache/kde-apps/dolphin-17.12.1
+++ b/metadata/md5-cache/kde-apps/dolphin-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/dolphin-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=69c5b07614cb0863b9d7f2441feb4ae7
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-17.08.3 b/metadata/md5-cache/kde-apps/dolphin-plugins-17.08.3
index 3240a9fab758..df450b927da4 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-17.08.3
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/dolphin-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 git? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 ) >=kde-apps/kompare-17.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.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/dolphin-plugins-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=94445e4665f0df22d271c02f69afe6e5
diff --git a/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.1 b/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.1
index 955c206187d0..f05bf11d74c7 100644
--- a/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.1
+++ b/metadata/md5-cache/kde-apps/dolphin-plugins-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/dolphin-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 git? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 ) mercurial? ( >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 ) >=kde-apps/kompare-17.12.1:5 bazaar? ( dev-vcs/bzr ) dropbox? ( net-misc/dropbox-cli ) git? ( dev-vcs/git ) subversion? ( dev-vcs/subversion ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dolphin-plugins:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/dolphin-plugins-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cfc4dd489a3e6c14b3a43e810f36da9f
diff --git a/metadata/md5-cache/kde-apps/dragon-17.08.3 b/metadata/md5-cache/kde-apps/dragon-17.08.3
index 0a979022d644..b6d88acca1a2 100644
--- a/metadata/md5-cache/kde-apps/dragon-17.08.3
+++ b/metadata/md5-cache/kde-apps/dragon-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dragon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/dragon-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c7a36e37c6d234eed3c2b2dca1c7f0c5
diff --git a/metadata/md5-cache/kde-apps/dragon-17.12.1 b/metadata/md5-cache/kde-apps/dragon-17.12.1
index ae9bf51cac28..f4206a2417e1 100644
--- a/metadata/md5-cache/kde-apps/dragon-17.12.1
+++ b/metadata/md5-cache/kde-apps/dragon-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ || ( GPL-2 GPL-3 ) handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/dragon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/dragon-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=834d004813a2fc11feaa289f2adb81e9
diff --git a/metadata/md5-cache/kde-apps/eventviews-17.08.3 b/metadata/md5-cache/kde-apps/eventviews-17.08.3
index 644ebdc33f4a..1489e8362759 100644
--- a/metadata/md5-cache/kde-apps/eventviews-17.08.3
+++ b/metadata/md5-cache/kde-apps/eventviews-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-calendar-17.08.3:5 >=kde-apps/calendarsupport-17.08.3:5 >=kde-apps/kcalcore-17.08.3:5 >=kde-apps/kcalutils-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kmime-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/eventviews:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/eventviews-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=422108ac0e0ee8aa0c8c8a5481264122
diff --git a/metadata/md5-cache/kde-apps/eventviews-17.12.1 b/metadata/md5-cache/kde-apps/eventviews-17.12.1
index 7d1e1e1f557b..da349440fb65 100644
--- a/metadata/md5-cache/kde-apps/eventviews-17.12.1
+++ b/metadata/md5-cache/kde-apps/eventviews-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 dev-libs/libical !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/eventviews:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/eventviews-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b62db6ab014bd720cd9adbfb5230787b
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.08.3 b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.08.3
index a2bf3cf6c2ff..5485e10ba735 100644
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.08.3
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ffmpegthumbs-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1c2943d5b9c84e3acce732dd18a638a8
diff --git a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.1 b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.1
index b0bed20ef4fe..208a97f7baba 100644
--- a/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.1
+++ b/metadata/md5-cache/kde-apps/ffmpegthumbs-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ffmpegthumbs-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=90f77bcfef00d17eed6016ea20d42c83
diff --git a/metadata/md5-cache/kde-apps/filelight-17.08.3 b/metadata/md5-cache/kde-apps/filelight-17.08.3
index 376daf25680c..f553ed5c3bcb 100644
--- a/metadata/md5-cache/kde-apps/filelight-17.08.3
+++ b/metadata/md5-cache/kde-apps/filelight-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/filelight:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/filelight-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=753ca164adf378e19cfa33b2eec9389e
diff --git a/metadata/md5-cache/kde-apps/filelight-17.12.1 b/metadata/md5-cache/kde-apps/filelight-17.12.1
index 2d08786442cf..7e0b4d7964db 100644
--- a/metadata/md5-cache/kde-apps/filelight-17.12.1
+++ b/metadata/md5-cache/kde-apps/filelight-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/filelight:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/filelight-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4303f8cd013b429bb045feb854e25fb7
diff --git a/metadata/md5-cache/kde-apps/granatier-17.08.3 b/metadata/md5-cache/kde-apps/granatier-17.08.3
index 17cc88aea0dd..da69a578c7f5 100644
--- a/metadata/md5-cache/kde-apps/granatier-17.08.3
+++ b/metadata/md5-cache/kde-apps/granatier-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/granatier:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/granatier-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=896d22fefd0bc8454e05f2dbab270112
diff --git a/metadata/md5-cache/kde-apps/granatier-17.12.1 b/metadata/md5-cache/kde-apps/granatier-17.12.1
index d5d5e25b0cc4..f99e1a0dc488 100644
--- a/metadata/md5-cache/kde-apps/granatier-17.12.1
+++ b/metadata/md5-cache/kde-apps/granatier-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/granatier:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/granatier-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1fc6e3916f0e28d4bf26a547c437b5e0
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-17.08.3 b/metadata/md5-cache/kde-apps/grantlee-editor-17.08.3
index 7c9db21f4159..a48646d27c9e 100644
--- a/metadata/md5-cache/kde-apps/grantlee-editor-17.08.3
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-contacts-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kmime-17.08.3:5 >=kde-apps/kpimtextedit-17.08.3:5 >=kde-apps/messagelib-17.08.3:5 >=kde-apps/pimcommon-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/grantlee-editor-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9c07771b7fbfbecb97c01640be3fcbb5
diff --git a/metadata/md5-cache/kde-apps/grantlee-editor-17.12.1 b/metadata/md5-cache/kde-apps/grantlee-editor-17.12.1
index 9a71d8f98c63..373c0c6a8012 100644
--- a/metadata/md5-cache/kde-apps/grantlee-editor-17.12.1
+++ b/metadata/md5-cache/kde-apps/grantlee-editor-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kaddressbook:4 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/grantlee-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/grantlee-editor-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5ec80aa9597d8f0a4bffaae82c6baaef
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-17.08.3 b/metadata/md5-cache/kde-apps/grantleetheme-17.08.3
index 0d3d2304bd35..b09de5a1add7 100644
--- a/metadata/md5-cache/kde-apps/grantleetheme-17.08.3
+++ b/metadata/md5-cache/kde-apps/grantleetheme-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/grantleetheme-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4d0c18678f6456dbbe74c1aab0ce21de
diff --git a/metadata/md5-cache/kde-apps/grantleetheme-17.12.1 b/metadata/md5-cache/kde-apps/grantleetheme-17.12.1
index 720e71f49930..52ff459a12b2 100644
--- a/metadata/md5-cache/kde-apps/grantleetheme-17.12.1
+++ b/metadata/md5-cache/kde-apps/grantleetheme-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/grantleetheme-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=898ef64f1104d2ac3d24748ddebd137e
diff --git a/metadata/md5-cache/kde-apps/gwenview-17.08.3 b/metadata/md5-cache/kde-apps/gwenview-17.08.3
index 2029628e2d14..86584108d649 100644
--- a/metadata/md5-cache/kde-apps/gwenview-17.08.3
+++ b/metadata/md5-cache/kde-apps/gwenview-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcompletion-5.40.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/gwenview-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0e7fe8933a0a66bd17e8b9b090accefd
diff --git a/metadata/md5-cache/kde-apps/gwenview-17.12.1 b/metadata/md5-cache/kde-apps/gwenview-17.12.1
index 93066bc78c6e..2640546236aa 100644
--- a/metadata/md5-cache/kde-apps/gwenview-17.12.1
+++ b/metadata/md5-cache/kde-apps/gwenview-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcompletion-5.40.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/gwenview-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=98beb05dffc896d6da1a7f4675fbd254
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-17.08.3 b/metadata/md5-cache/kde-apps/incidenceeditor-17.08.3
index b68e25bc483a..092279b7956f 100644
--- a/metadata/md5-cache/kde-apps/incidenceeditor-17.08.3
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-calendar-17.08.3:5 >=kde-apps/akonadi-contacts-17.08.3:5 >=kde-apps/akonadi-mime-17.08.3:5 >=kde-apps/calendarsupport-17.08.3:5 >=kde-apps/eventviews-17.08.3:5 >=kde-apps/kcalcore-17.08.3:5 >=kde-apps/kcalutils-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kdepim-apps-libs-17.08.3:5 >=kde-apps/kidentitymanagement-17.08.3:5 >=kde-apps/kldap-17.08.3:5 >=kde-apps/kmailtransport-17.08.3:5 >=kde-apps/kmime-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/incidenceeditor-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2860907995f4f3ec3b9cc0c14364e82a
diff --git a/metadata/md5-cache/kde-apps/incidenceeditor-17.12.1 b/metadata/md5-cache/kde-apps/incidenceeditor-17.12.1
index 5dc53c5a9a92..454fe0344e7f 100644
--- a/metadata/md5-cache/kde-apps/incidenceeditor-17.12.1
+++ b/metadata/md5-cache/kde-apps/incidenceeditor-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/eventviews-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/kdiagram:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/incidenceeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/incidenceeditor-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c917dbc000dba48901c0c94ea67d0d02
diff --git a/metadata/md5-cache/kde-apps/juk-17.12.1 b/metadata/md5-cache/kde-apps/juk-17.12.1
index c9b4adf0d0df..06a00eddc218 100644
--- a/metadata/md5-cache/kde-apps/juk-17.12.1
+++ b/metadata/md5-cache/kde-apps/juk-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=media-libs/taglib-1.6 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/juk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/juk-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b1a312b62adc930756214dcf930e9b26
diff --git a/metadata/md5-cache/kde-apps/k3b-17.08.3 b/metadata/md5-cache/kde-apps/k3b-17.08.3
index 5fc34ec833cd..b70efd4e6398 100644
--- a/metadata/md5-cache/kde-apps/k3b-17.08.3
+++ b/metadata/md5-cache/kde-apps/k3b-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5
 REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/k3b-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=524385d4192f267870eda1af7ac1f854
diff --git a/metadata/md5-cache/kde-apps/k3b-17.12.1 b/metadata/md5-cache/kde-apps/k3b-17.12.1
index 15675b61436a..614544f7a269 100644
--- a/metadata/md5-cache/kde-apps/k3b-17.12.1
+++ b/metadata/md5-cache/kde-apps/k3b-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5
 REQUIRED_USE=flac? ( taglib ) mp3? ( encode taglib ) sox? ( encode taglib )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/k3b-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=db24cbcfb8db962b97b8c7183953a2a2
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-17.08.3 b/metadata/md5-cache/kde-apps/kaccounts-integration-17.08.3
index 9f666e8d7e10..ceb67d9807d0 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-17.08.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kaccounts-integration-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6c66ca8e2671ba7f42cd47d3b08e2fcf
diff --git a/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.1 b/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.1
index 532f349f68e8..9be0439da952 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.1
+++ b/metadata/md5-cache/kde-apps/kaccounts-integration-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kaccounts-integration-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=352579aaa3cce8fd6076fa43642a3a71
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-17.08.3 b/metadata/md5-cache/kde-apps/kaccounts-providers-17.08.3
index 78cc25b48651..72bf06dba2d4 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-17.08.3
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-17.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-apps/kaccounts-integration-17.08.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kaccounts-providers-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9bbe83e5e6c99f31b9ec799fd6ada1cd
diff --git a/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.1 b/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.1
index e5fd0d799890..cde7431387b6 100644
--- a/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.1
+++ b/metadata/md5-cache/kde-apps/kaccounts-providers-17.12.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/signon-ui net-libs/signon-oauth2 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaccounts-providers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kaccounts-providers-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1dd0245e438313da23f5a47d54560e5c
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-17.08.3 b/metadata/md5-cache/kde-apps/kaddressbook-17.08.3
index 76e520b808fb..7d9b45d17f72 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-17.08.3
+++ b/metadata/md5-cache/kde-apps/kaddressbook-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-contacts-17.08.3:5 >=kde-apps/akonadi-search-17.08.3:5 >=kde-apps/grantleetheme-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kdepim-apps-libs-17.08.3:5 >=kde-apps/kontactinterface-17.08.3:5 >=kde-apps/libgravatar-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=kde-apps/pimcommon-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaddressbook:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kaddressbook-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b29b74d83a1eb4b5d944c767156d71fc
diff --git a/metadata/md5-cache/kde-apps/kaddressbook-17.12.1 b/metadata/md5-cache/kde-apps/kaddressbook-17.12.1
index ac6c8f808274..92f9a66f1214 100644
--- a/metadata/md5-cache/kde-apps/kaddressbook-17.12.1
+++ b/metadata/md5-cache/kde-apps/kaddressbook-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/grantlee:5 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kaddressbook:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kaddressbook-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=604d149cb0bd612ff8e17cca9eed3327
diff --git a/metadata/md5-cache/kde-apps/kajongg-17.08.3 b/metadata/md5-cache/kde-apps/kajongg-17.08.3
index 1b0015035556..c667913f1b11 100644
--- a/metadata/md5-cache/kde-apps/kajongg-17.08.3
+++ b/metadata/md5-cache/kde-apps/kajongg-17.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_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kajongg-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d17ecb3d32b1b167f840a6552f0f0e6d
diff --git a/metadata/md5-cache/kde-apps/kajongg-17.12.1 b/metadata/md5-cache/kde-apps/kajongg-17.12.1
index 2a1b91dbcfcc..2c17b262a88e 100644
--- a/metadata/md5-cache/kde-apps/kajongg-17.12.1
+++ b/metadata/md5-cache/kde-apps/kajongg-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_ta
 REQUIRED_USE=^^ ( python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kajongg-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ba6255d3bad662d926beb4e1b49b0819
diff --git a/metadata/md5-cache/kde-apps/kalarm-17.08.3 b/metadata/md5-cache/kde-apps/kalarm-17.08.3
index 2b14af11ee1e..ba59a7420126 100644
--- a/metadata/md5-cache/kde-apps/kalarm-17.08.3
+++ b/metadata/md5-cache/kde-apps/kalarm-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-contacts-17.08.3:5 >=kde-apps/akonadi-mime-17.08.3:5 >=kde-apps/kalarmcal-17.08.3:5 >=kde-apps/kcalcore-17.08.3:5 >=kde-apps/kcalutils-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kdepim-apps-libs-17.08.3:5 >=kde-apps/kholidays-17.08.3:5 >=kde-apps/kidentitymanagement-17.08.3:5 >=kde-apps/kmailtransport-17.08.3:5 >=kde-apps/kmime-17.08.3:5 >=kde-apps/kontactinterface-17.08.3:5 >=kde-apps/kpimtextedit-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=kde-apps/mailcommon-17.08.3:5 >=kde-apps/pimcommon-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kalarm-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cf84b431933b0e8206c30530e464c129
diff --git a/metadata/md5-cache/kde-apps/kalarm-17.12.1 b/metadata/md5-cache/kde-apps/kalarm-17.12.1
index f23ef04b7d81..cccbb6249e2c 100644
--- a/metadata/md5-cache/kde-apps/kalarm-17.12.1
+++ b/metadata/md5-cache/kde-apps/kalarm-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kalarmcal-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/libxslt media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kalarm-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=524a0c2398d6cb25e0247079c3633a35
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-17.08.3 b/metadata/md5-cache/kde-apps/kalarmcal-17.08.3
index 372544f7b56e..f2c5cec00b45 100644
--- a/metadata/md5-cache/kde-apps/kalarmcal-17.08.3
+++ b/metadata/md5-cache/kde-apps/kalarmcal-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/kcalcore-17.08.3:5 >=kde-apps/kholidays-17.08.3:5 >=kde-apps/kidentitymanagement-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarmcal:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kalarmcal-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ae129af148b9ef7e699d68472ba94172
diff --git a/metadata/md5-cache/kde-apps/kalarmcal-17.12.1 b/metadata/md5-cache/kde-apps/kalarmcal-17.12.1
index 66d56610b51e..770696a21ae5 100644
--- a/metadata/md5-cache/kde-apps/kalarmcal-17.12.1
+++ b/metadata/md5-cache/kde-apps/kalarmcal-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalarmcal:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kalarmcal-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fb5966e650ff5a137e8e6d578692fc7a
diff --git a/metadata/md5-cache/kde-apps/kalgebra-17.08.3 b/metadata/md5-cache/kde-apps/kalgebra-17.08.3
index 4bbecf7e8763..4926151c891c 100644
--- a/metadata/md5-cache/kde-apps/kalgebra-17.08.3
+++ b/metadata/md5-cache/kde-apps/kalgebra-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/analitza-17.08.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.40.0:5 >=dev-qt/qtquickcontrols-5.7.1:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalgebra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kalgebra-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d5f958122a8d1cb47b233d87ed07e588
diff --git a/metadata/md5-cache/kde-apps/kalgebra-17.12.1 b/metadata/md5-cache/kde-apps/kalgebra-17.12.1
index 5de17a3972d8..f584c948ae32 100644
--- a/metadata/md5-cache/kde-apps/kalgebra-17.12.1
+++ b/metadata/md5-cache/kde-apps/kalgebra-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/analitza-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 readline? ( sys-libs/readline:0= ) >=kde-frameworks/kirigami-5.40.0:5 >=dev-qt/qtquickcontrols-5.9.1:5 !kde-apps/analitza:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalgebra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kalgebra-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=868f67aaa444892b04d3889e0933976e
diff --git a/metadata/md5-cache/kde-apps/kalzium-17.08.3 b/metadata/md5-cache/kde-apps/kalzium-17.08.3
index 1eebfd5fe3cd..c39ea807a0ad 100644
--- a/metadata/md5-cache/kde-apps/kalzium-17.08.3
+++ b/metadata/md5-cache/kde-apps/kalzium-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editor? ( dev-cpp/eigen:3 || ( sci-libs/avogadrolibs sci-chemistry/avogadro ) sci-chemistry/openbabel ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalzium:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kalzium-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8e235202cdb6b98c22ec0fea9211a455
diff --git a/metadata/md5-cache/kde-apps/kalzium-17.12.1 b/metadata/md5-cache/kde-apps/kalzium-17.12.1
deleted file mode 100644
index aea3b3b45205..000000000000
--- a/metadata/md5-cache/kde-apps/kalzium-17.12.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 editor? ( dev-cpp/eigen:3 || ( sci-libs/avogadrolibs sci-chemistry/avogadro ) sci-chemistry/openbabel ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Periodic table of the elements
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/
-IUSE=editor solver debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 editor? ( dev-cpp/eigen:3 || ( sci-libs/avogadrolibs sci-chemistry/avogadro ) sci-chemistry/openbabel ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalzium:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kalzium-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=481bb05e9f63905a24fdfce2bc275d90
diff --git a/metadata/md5-cache/kde-apps/kalzium-17.12.1-r1 b/metadata/md5-cache/kde-apps/kalzium-17.12.1-r1
new file mode 100644
index 000000000000..3edfb3238601
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kalzium-17.12.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 editor? ( >=kde-frameworks/knewstuff-5.40.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Periodic table of the elements
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/education/kalzium https://edu.kde.org/kalzium/
+IUSE=editor solver debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 editor? ( >=kde-frameworks/knewstuff-5.40.0:5 dev-cpp/eigen:3 sci-chemistry/openbabel sci-libs/avogadrolibs ) solver? ( dev-ml/facile[ocamlopt] ) sci-chemistry/chemical-mime-data >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kalzium:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kalzium-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=24d7273ff8bbaa048e1c0c2c179ce233
diff --git a/metadata/md5-cache/kde-apps/kamera-17.08.3 b/metadata/md5-cache/kde-apps/kamera-17.08.3
index 6a2d8fac4005..14b0a9c2b5ba 100644
--- a/metadata/md5-cache/kde-apps/kamera-17.08.3
+++ b/metadata/md5-cache/kde-apps/kamera-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamera:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kamera-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e429e8862b9391b41b9499f98b92d9a8
diff --git a/metadata/md5-cache/kde-apps/kamera-17.12.1 b/metadata/md5-cache/kde-apps/kamera-17.12.1
index 54ed4f84cfe5..95994edc95e9 100644
--- a/metadata/md5-cache/kde-apps/kamera-17.12.1
+++ b/metadata/md5-cache/kde-apps/kamera-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libgphoto2:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kamera:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kamera-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9953179b6598ad830fa59fb156c2807d
diff --git a/metadata/md5-cache/kde-apps/kanagram-17.08.3 b/metadata/md5-cache/kde-apps/kanagram-17.08.3
index 6d4cec721bc6..96e2fb74dfa8 100644
--- a/metadata/md5-cache/kde-apps/kanagram-17.08.3
+++ b/metadata/md5-cache/kde-apps/kanagram-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/libkeduvocdocument-17.08.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-apps/kdeedu-data-17.08.3:5 >=dev-qt/qtmultimedia-5.7.1:5[qml] >=dev-qt/qtquickcontrols-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kanagram-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=935c2de76f8f854d8f3b61592d62b55f
diff --git a/metadata/md5-cache/kde-apps/kanagram-17.12.1 b/metadata/md5-cache/kde-apps/kanagram-17.12.1
index 98ba4a73d187..ca7204999f02 100644
--- a/metadata/md5-cache/kde-apps/kanagram-17.12.1
+++ b/metadata/md5-cache/kde-apps/kanagram-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=kde-apps/kdeedu-data-17.12.1:5 >=dev-qt/qtmultimedia-5.9.1:5[qml] >=dev-qt/qtquickcontrols-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kanagram:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kanagram-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8c8b218c50117bffe89f3733bab3ad5c
diff --git a/metadata/md5-cache/kde-apps/kapman-17.08.3 b/metadata/md5-cache/kde-apps/kapman-17.08.3
index 7088931b71bf..72b6fffbd622 100644
--- a/metadata/md5-cache/kde-apps/kapman-17.08.3
+++ b/metadata/md5-cache/kde-apps/kapman-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kapman-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4343e6f24928653d96e2be0a89457675
diff --git a/metadata/md5-cache/kde-apps/kapman-17.12.1 b/metadata/md5-cache/kde-apps/kapman-17.12.1
index e618d9467dba..f39179f82a1f 100644
--- a/metadata/md5-cache/kde-apps/kapman-17.12.1
+++ b/metadata/md5-cache/kde-apps/kapman-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kapman-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5105c6846ca41671e26416e7da1c9631
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-17.08.3 b/metadata/md5-cache/kde-apps/kapptemplate-17.08.3
index 4a77b214a1f2..ffea1a5f5ea6 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-17.08.3
+++ b/metadata/md5-cache/kde-apps/kapptemplate-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapptemplate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kapptemplate-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1a2c475cd8f72cd2e0ec81c14e93cd38
diff --git a/metadata/md5-cache/kde-apps/kapptemplate-17.12.1 b/metadata/md5-cache/kde-apps/kapptemplate-17.12.1
index cb60ba5d96fc..62b373fbf008 100644
--- a/metadata/md5-cache/kde-apps/kapptemplate-17.12.1
+++ b/metadata/md5-cache/kde-apps/kapptemplate-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kapptemplate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kapptemplate-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9b7f739e0dc17f0121b73752d9b06402
diff --git a/metadata/md5-cache/kde-apps/kate-17.08.3 b/metadata/md5-cache/kde-apps/kate-17.08.3
index 2d1311c82372..4b50f106422d 100644
--- a/metadata/md5-cache/kde-apps/kate-17.08.3
+++ b/metadata/md5-cache/kde-apps/kate-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 addons? ( >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtsql-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kate-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aac5748d2704210c4b7d4de91e44c0c7
diff --git a/metadata/md5-cache/kde-apps/kate-17.12.1 b/metadata/md5-cache/kde-apps/kate-17.12.1
index b56a7a37ee28..3cdb3b73a2e8 100644
--- a/metadata/md5-cache/kde-apps/kate-17.12.1
+++ b/metadata/md5-cache/kde-apps/kate-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 addons? ( >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtsql-5.9.1:5 ) !kde-misc/ktexteditorpreviewplugin >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kate:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kate-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e6fb9fb9cf9bd21ba4fc733de05f37e4
diff --git a/metadata/md5-cache/kde-apps/katomic-17.08.3 b/metadata/md5-cache/kde-apps/katomic-17.08.3
index 40bfce1e7d6a..634f9ec10fbd 100644
--- a/metadata/md5-cache/kde-apps/katomic-17.08.3
+++ b/metadata/md5-cache/kde-apps/katomic-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/katomic:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/katomic-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=81f0a7a743b837bfe85e97f069cda7b9
diff --git a/metadata/md5-cache/kde-apps/katomic-17.12.1 b/metadata/md5-cache/kde-apps/katomic-17.12.1
index 165a68edf6dd..f2834559140b 100644
--- a/metadata/md5-cache/kde-apps/katomic-17.12.1
+++ b/metadata/md5-cache/kde-apps/katomic-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/katomic:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/katomic-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=698b5cca1c7e3bc36e0d78aec4c21985
diff --git a/metadata/md5-cache/kde-apps/kblackbox-17.08.3 b/metadata/md5-cache/kde-apps/kblackbox-17.08.3
index 83df48bb226c..f242f4d0b9cb 100644
--- a/metadata/md5-cache/kde-apps/kblackbox-17.08.3
+++ b/metadata/md5-cache/kde-apps/kblackbox-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblackbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kblackbox-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bc615d9daaad69e2d4f855149a78e74e
diff --git a/metadata/md5-cache/kde-apps/kblackbox-17.12.1 b/metadata/md5-cache/kde-apps/kblackbox-17.12.1
index ad5f77003a04..67263c80a7bd 100644
--- a/metadata/md5-cache/kde-apps/kblackbox-17.12.1
+++ b/metadata/md5-cache/kde-apps/kblackbox-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblackbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kblackbox-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2a4008003b755fad9cafa77d9f6127ed
diff --git a/metadata/md5-cache/kde-apps/kblocks-17.08.3 b/metadata/md5-cache/kde-apps/kblocks-17.08.3
index cd86e07e51da..88d8862f1fb7 100644
--- a/metadata/md5-cache/kde-apps/kblocks-17.08.3
+++ b/metadata/md5-cache/kde-apps/kblocks-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblocks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kblocks-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3023c64a01f20a0c57f69b68c6299b08
diff --git a/metadata/md5-cache/kde-apps/kblocks-17.12.1 b/metadata/md5-cache/kde-apps/kblocks-17.12.1
index 512a8a4ac80f..93205c3b4038 100644
--- a/metadata/md5-cache/kde-apps/kblocks-17.12.1
+++ b/metadata/md5-cache/kde-apps/kblocks-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblocks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kblocks-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=48a52cfbfe867bc24341d31ae0b72372
diff --git a/metadata/md5-cache/kde-apps/kblog-17.08.3 b/metadata/md5-cache/kde-apps/kblog-17.08.3
index cc691ee4b773..a85e798d1997 100644
--- a/metadata/md5-cache/kde-apps/kblog-17.08.3
+++ b/metadata/md5-cache/kde-apps/kblog-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlrpcclient-5.40.0:5 >=kde-apps/kcalcore-17.08.3:5 >=kde-apps/syndication-17.08.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kblog-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=69afb689d7d8696a15785e18b0800e92
diff --git a/metadata/md5-cache/kde-apps/kblog-17.12.1 b/metadata/md5-cache/kde-apps/kblog-17.12.1
index aeceb30b8565..b31686c0242b 100644
--- a/metadata/md5-cache/kde-apps/kblog-17.12.1
+++ b/metadata/md5-cache/kde-apps/kblog-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlrpcclient-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/syndication-17.12.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kblog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kblog-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=687bfb6d7023a7d91019e4d18034e3e9
diff --git a/metadata/md5-cache/kde-apps/kbounce-17.08.3 b/metadata/md5-cache/kde-apps/kbounce-17.08.3
index 7c00c850a535..b7155a2b85a4 100644
--- a/metadata/md5-cache/kde-apps/kbounce-17.08.3
+++ b/metadata/md5-cache/kde-apps/kbounce-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbounce:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kbounce-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0c156f4592c6e5c622c87bf3d0c92ff0
diff --git a/metadata/md5-cache/kde-apps/kbounce-17.12.1 b/metadata/md5-cache/kde-apps/kbounce-17.12.1
index eec8422c95c0..b888b45941f8 100644
--- a/metadata/md5-cache/kde-apps/kbounce-17.12.1
+++ b/metadata/md5-cache/kde-apps/kbounce-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbounce:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kbounce-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=235a8a30266e94b4522c647a4be063c6
diff --git a/metadata/md5-cache/kde-apps/kbreakout-17.08.3 b/metadata/md5-cache/kde-apps/kbreakout-17.08.3
index 1d60a5c5be06..f65da6ea5d9e 100644
--- a/metadata/md5-cache/kde-apps/kbreakout-17.08.3
+++ b/metadata/md5-cache/kde-apps/kbreakout-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbreakout:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kbreakout-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fc73339357235cf8629ab2859463098b
diff --git a/metadata/md5-cache/kde-apps/kbreakout-17.12.1 b/metadata/md5-cache/kde-apps/kbreakout-17.12.1
index 5962ad51889d..271a75a54ca1 100644
--- a/metadata/md5-cache/kde-apps/kbreakout-17.12.1
+++ b/metadata/md5-cache/kde-apps/kbreakout-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbreakout:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kbreakout-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1d9e59e72529bde08051b72dfaa28465
diff --git a/metadata/md5-cache/kde-apps/kbruch-17.08.3 b/metadata/md5-cache/kde-apps/kbruch-17.08.3
index 0760eeba327a..425b7071af57 100644
--- a/metadata/md5-cache/kde-apps/kbruch-17.08.3
+++ b/metadata/md5-cache/kde-apps/kbruch-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbruch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kbruch-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d2987bb83cccc940f58193fe801236ff
diff --git a/metadata/md5-cache/kde-apps/kbruch-17.12.1 b/metadata/md5-cache/kde-apps/kbruch-17.12.1
index 51f607adcc7c..6c191ce92e84 100644
--- a/metadata/md5-cache/kde-apps/kbruch-17.12.1
+++ b/metadata/md5-cache/kde-apps/kbruch-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kbruch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kbruch-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6a5edaafc5b3f1e4977091881780308e
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-17.08.3 b/metadata/md5-cache/kde-apps/kcachegrind-17.08.3
index 36b7fd418e57..525cb0a2739e 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-17.08.3
+++ b/metadata/md5-cache/kde-apps/kcachegrind-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcachegrind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kcachegrind-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=857e94bf329ed1127d626bfcac4c68c9
diff --git a/metadata/md5-cache/kde-apps/kcachegrind-17.12.1 b/metadata/md5-cache/kde-apps/kcachegrind-17.12.1
index fa0db6f57055..e1ecdda6f5f2 100644
--- a/metadata/md5-cache/kde-apps/kcachegrind-17.12.1
+++ b/metadata/md5-cache/kde-apps/kcachegrind-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/graphviz !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcachegrind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcachegrind-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c229cb4a9001f3689c4abbec17eae5bb
diff --git a/metadata/md5-cache/kde-apps/kcalc-17.08.3 b/metadata/md5-cache/kde-apps/kcalc-17.08.3
index cf320f9ec58c..f568ba40ad85 100644
--- a/metadata/md5-cache/kde-apps/kcalc-17.08.3
+++ b/metadata/md5-cache/kde-apps/kcalc-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kcalc-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5ad038f9ae2d22ea8a5ffda3a32d355e
diff --git a/metadata/md5-cache/kde-apps/kcalc-17.12.1 b/metadata/md5-cache/kde-apps/kcalc-17.12.1
index 847ac6d56b1d..afefb1871b76 100644
--- a/metadata/md5-cache/kde-apps/kcalc-17.12.1
+++ b/metadata/md5-cache/kde-apps/kcalc-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/gmp:0= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcalc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcalc-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f967ecedf5b7d0d3a7b3d9914e32540e
diff --git a/metadata/md5-cache/kde-apps/kcalcore-17.08.3 b/metadata/md5-cache/kde-apps/kcalcore-17.08.3
index 1002817c53fd..54db1d2bb054 100644
--- a/metadata/md5-cache/kde-apps/kcalcore-17.08.3
+++ b/metadata/md5-cache/kde-apps/kcalcore-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kcalcore-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cefbdcc1da87a452e958a47285ac6c2e
diff --git a/metadata/md5-cache/kde-apps/kcalcore-17.12.1 b/metadata/md5-cache/kde-apps/kcalcore-17.12.1
index 2f12739bb53c..675a62bf9bc6 100644
--- a/metadata/md5-cache/kde-apps/kcalcore-17.12.1
+++ b/metadata/md5-cache/kde-apps/kcalcore-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtgui-5.9.1:5 dev-libs/libical:= >=kde-frameworks/kf-env-4 || (
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcalcore-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=804b5b37caa3a83100cc2850a3db1785
diff --git a/metadata/md5-cache/kde-apps/kcalutils-17.08.3 b/metadata/md5-cache/kde-apps/kcalutils-17.08.3
index 22da2e45107c..8fe93e2e54ef 100644
--- a/metadata/md5-cache/kde-apps/kcalutils-17.08.3
+++ b/metadata/md5-cache/kde-apps/kcalutils-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kcalutils-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ff72db0fe533a186a2bd8b438e05b6a6
diff --git a/metadata/md5-cache/kde-apps/kcalutils-17.12.1 b/metadata/md5-cache/kde-apps/kcalutils-17.12.1
index 3f90af77cdd4..080f433bb60d 100644
--- a/metadata/md5-cache/kde-apps/kcalutils-17.12.1
+++ b/metadata/md5-cache/kde-apps/kcalutils-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcalutils-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=24f7271bbaf43ae761f5a385f33ef95f
diff --git a/metadata/md5-cache/kde-apps/kcharselect-17.08.3 b/metadata/md5-cache/kde-apps/kcharselect-17.08.3
index e029076322ed..db3eec8cbf4b 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-17.08.3
+++ b/metadata/md5-cache/kde-apps/kcharselect-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcharselect:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kcharselect-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7946be3cfb0b8a064f1016768bb45d14
diff --git a/metadata/md5-cache/kde-apps/kcharselect-17.12.1 b/metadata/md5-cache/kde-apps/kcharselect-17.12.1
index bb4286631dc6..d474a50f7938 100644
--- a/metadata/md5-cache/kde-apps/kcharselect-17.12.1
+++ b/metadata/md5-cache/kde-apps/kcharselect-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcharselect:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcharselect-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8c151d3258499fae2ec772629d090187
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-17.08.3 b/metadata/md5-cache/kde-apps/kcolorchooser-17.08.3
index 15fede8cbe7e..988e7e0683b0 100644
--- a/metadata/md5-cache/kde-apps/kcolorchooser-17.08.3
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-17.08.3
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kcolorchooser-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c380cbbd11a3c7500a38a4bbedfc10da
diff --git a/metadata/md5-cache/kde-apps/kcolorchooser-17.12.1 b/metadata/md5-cache/kde-apps/kcolorchooser-17.12.1
index 287e17931341..48f7aca96424 100644
--- a/metadata/md5-cache/kde-apps/kcolorchooser-17.12.1
+++ b/metadata/md5-cache/kde-apps/kcolorchooser-17.12.1
@@ -9,5 +9,5 @@ LICENSE=MIT
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcolorchooser:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcolorchooser-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2148f0838104039364c052e4bf4557d4
diff --git a/metadata/md5-cache/kde-apps/kcontacts-17.08.3 b/metadata/md5-cache/kde-apps/kcontacts-17.08.3
index a3abff1c305c..49e199bb5d05 100644
--- a/metadata/md5-cache/kde-apps/kcontacts-17.08.3
+++ b/metadata/md5-cache/kde-apps/kcontacts-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcontacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kcontacts-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=af70a94169f12fa55f6d703b839552a7
diff --git a/metadata/md5-cache/kde-apps/kcontacts-17.12.1 b/metadata/md5-cache/kde-apps/kcontacts-17.12.1
index 3a66075b33c5..12144f598d52 100644
--- a/metadata/md5-cache/kde-apps/kcontacts-17.12.1
+++ b/metadata/md5-cache/kde-apps/kcontacts-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcontacts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcontacts-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=148fb5f93144399536f4d1ea45af4470
diff --git a/metadata/md5-cache/kde-apps/kcron-17.08.3 b/metadata/md5-cache/kde-apps/kcron-17.08.3
index b8634c674de2..555d6dee2edf 100644
--- a/metadata/md5-cache/kde-apps/kcron-17.08.3
+++ b/metadata/md5-cache/kde-apps/kcron-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcron:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kcron-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=adfff0ed561cc05fa8d134120e419fd8
diff --git a/metadata/md5-cache/kde-apps/kcron-17.12.1 b/metadata/md5-cache/kde-apps/kcron-17.12.1
index b1e25a4c93e2..d65be86ad164 100644
--- a/metadata/md5-cache/kde-apps/kcron-17.12.1
+++ b/metadata/md5-cache/kde-apps/kcron-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !prefix? ( virtual/cron ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kcron:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kcron-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a3900686a81478a3039678547f01dbb7
diff --git a/metadata/md5-cache/kde-apps/kdav-17.08.3 b/metadata/md5-cache/kde-apps/kdav-17.08.3
index 9f8c4555577b..1cfd6483e492 100644
--- a/metadata/md5-cache/kde-apps/kdav-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdav-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdav:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdav-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0b6030dd049646816947c0a88516311c
diff --git a/metadata/md5-cache/kde-apps/kdav-17.12.1 b/metadata/md5-cache/kde-apps/kdav-17.12.1
index 86084e8d1761..194720a66f84 100644
--- a/metadata/md5-cache/kde-apps/kdav-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdav-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdav:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdav-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e59f3a5bad3dbebe83dacbae44ce8075
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-17.08.3 b/metadata/md5-cache/kde-apps/kde-apps-meta-17.08.3
index f31f84691c77..f74df1d1afe5 100644
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-17.08.3
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-17.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kate-17.08.3 >=kde-apps/kdeadmin-meta-17.08.3 >=kde-apps/kdecore-meta-17.08.3 >=kde-apps/kdeedu-meta-17.08.3 >=kde-apps/kdegames-meta-17.08.3 >=kde-apps/kdegraphics-meta-17.08.3 >=kde-apps/kdemultimedia-meta-17.08.3 >=kde-apps/kdenetwork-meta-17.08.3 >=kde-apps/kdeutils-meta-17.08.3 accessibility? ( >=kde-apps/kdeaccessibility-meta-17.08.3 ) pim? ( >=kde-apps/kdepim-meta-17.08.3 ) sdk? ( >=kde-apps/kdesdk-meta-17.08.3 ) !kde-apps/kde-apps-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=86547518a2c040f83807b41b3a0bf458
diff --git a/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.1 b/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.1
index 1c2251894b42..879a4ad41585 100644
--- a/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/kde-apps-meta-17.12.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kate-17.12.1 >=kde-apps/kdeadmin-meta-17.12.1 >=kde-apps/kdecore-meta-17.12.1 >=kde-apps/kdeedu-meta-17.12.1 >=kde-apps/kdegames-meta-17.12.1 >=kde-apps/kdegraphics-meta-17.12.1 >=kde-apps/kdemultimedia-meta-17.12.1 >=kde-apps/kdenetwork-meta-17.12.1 >=kde-apps/kdeutils-meta-17.12.1 accessibility? ( >=kde-apps/kdeaccessibility-meta-17.12.1 ) pim? ( >=kde-apps/kdepim-meta-17.12.1 ) sdk? ( >=kde-apps/kdesdk-meta-17.12.1 ) !kde-apps/kde-apps-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a0e6d1ea4df0fc3bef1a113c1f945913
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.08.3 b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.08.3
index 2f7852676ea7..04d1b393e86f 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.08.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=app-arch/advancecomp media-gfx/optipng dev-perl/XML-DOM >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kde-dev-scripts-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4d3c5a24b0769ccf9f57a03a751253c0
diff --git a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.1 b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.1
index 2264330d0e9b..99318b2ac1a9 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.1
+++ b/metadata/md5-cache/kde-apps/kde-dev-scripts-17.12.1
@@ -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.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-scripts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kde-dev-scripts-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9f83e1fe4fc7067af33d9efb06850ccd
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-17.08.3 b/metadata/md5-cache/kde-apps/kde-dev-utils-17.08.3
index c981e36be0ed..a12ab6e55841 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-17.08.3
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kde-dev-utils-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a8ffed95de935ae5f505d6932db98cbb
diff --git a/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.1 b/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.1
index f29e59042a6e..1f8792dcf799 100644
--- a/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.1
+++ b/metadata/md5-cache/kde-apps/kde-dev-utils-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/designer-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-dev-utils:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kde-dev-utils-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=862be38ce8103f8f06d9902a2dea5b55
diff --git a/metadata/md5-cache/kde-apps/kde-meta-17.08.3 b/metadata/md5-cache/kde-apps/kde-meta-17.08.3
index 27861a344218..acfb7e606269 100644
--- a/metadata/md5-cache/kde-apps/kde-meta-17.08.3
+++ b/metadata/md5-cache/kde-apps/kde-meta-17.08.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kde-apps-meta-17.08.3 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kde-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2f7f6dbde5a42635408c1f67e310c38e
diff --git a/metadata/md5-cache/kde-apps/kde-meta-17.12.1 b/metadata/md5-cache/kde-apps/kde-meta-17.12.1
index 3a4f1bb6cbee..b98455c244ed 100644
--- a/metadata/md5-cache/kde-apps/kde-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/kde-meta-17.12.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kde-apps-meta-17.12.1 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kde-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=37a2146aed6d3954dcc2646af68e7054
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.08.3 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.08.3
index 7e11c927d3f2..f0b008fb0cea 100644
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kmag-17.08.3 >=kde-apps/kmousetool-17.08.3 qt4? ( >=kde-apps/kmouth-17.08.3 nls? ( >=kde-apps/kde4-l10n-17.08.3 ) ) !kde-apps/kdeaccessibility-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=17a58840fdc916c5cbb089748d955a14
diff --git a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.1
index 96c6a2df9904..2bb995a7fdab 100644
--- a/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdeaccessibility-meta-17.12.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kmag-17.12.1 >=kde-apps/kmousetool-17.12.1 >=kde-apps/kmouth-17.12.1 !kde-apps/kdeaccessibility-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9479613a160436edf491109b1fc967f8
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.08.3 b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.08.3
index 2229e570a1dc..0bd53ec619ee 100644
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ksystemlog-17.08.3 cron? ( >=kde-apps/kcron-17.08.3 ) !kde-apps/kdeadmin-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=8b27bf1f5ddab165f0702dee7c281654
diff --git a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.1
index fa9fdabc2711..efe9f0b7df51 100644
--- a/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdeadmin-meta-17.12.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ksystemlog-17.12.1 cron? ( >=kde-apps/kcron-17.12.1 ) !kde-apps/kdeadmin-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=7b034eccb07548568d7a8b09d102443f
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-17.08.3 b/metadata/md5-cache/kde-apps/kdebase-meta-17.08.3
index 45588c6cd27f..83dbe0465d04 100644
--- a/metadata/md5-cache/kde-apps/kdebase-meta-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-17.08.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kdecore-meta-17.08.3 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kdebase-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=84e79443aaba2a8b8f5ecc2cdde5dcff
diff --git a/metadata/md5-cache/kde-apps/kdebase-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdebase-meta-17.12.1
index e70ce86792ef..08ac6eeb22c7 100644
--- a/metadata/md5-cache/kde-apps/kdebase-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdebase-meta-17.12.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kdecore-meta-17.12.1 >=kde-plasma/plasma-meta-5.10.5 !kde-apps/kdebase-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=223e3b031bf2c2a4c0b1cb7ebd7ee3ec
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-17.08.3 b/metadata/md5-cache/kde-apps/kdebugsettings-17.08.3
index 8859940f486f..b7d36dc466bd 100644
--- a/metadata/md5-cache/kde-apps/kdebugsettings-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdebugsettings-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1f9fa35cee1cab61b11b372f7fbf38f9
diff --git a/metadata/md5-cache/kde-apps/kdebugsettings-17.12.1 b/metadata/md5-cache/kde-apps/kdebugsettings-17.12.1
index 8a490826b0c0..b6be005043b7 100644
--- a/metadata/md5-cache/kde-apps/kdebugsettings-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdebugsettings-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdebugsettings-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e19fa9f51a61d986e16b04b72711f6ba
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-17.08.3 b/metadata/md5-cache/kde-apps/kdecore-meta-17.08.3
index 777927c311c6..f9186bf9daa7 100644
--- a/metadata/md5-cache/kde-apps/kdecore-meta-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-17.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dolphin-17.08.3 >=kde-apps/kdialog-17.08.3 >=kde-apps/keditbookmarks-17.08.3 >=kde-apps/kfind-17.08.3 || ( www-client/qupzilla >=kde-apps/konqueror-17.08.3 ) >=kde-apps/konsole-17.08.3 >=kde-apps/kwrite-17.08.3 handbook? ( >=kde-apps/khelpcenter-17.08.3 ) !kde-apps/kdecore-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=aa584a298d5ede0c5bba88e3777c3c71
diff --git a/metadata/md5-cache/kde-apps/kdecore-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdecore-meta-17.12.1
index f533894402a9..aa9891756cf3 100644
--- a/metadata/md5-cache/kde-apps/kdecore-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdecore-meta-17.12.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dolphin-17.12.1 >=kde-apps/kdialog-17.12.1 >=kde-apps/keditbookmarks-17.12.1 >=kde-apps/kfind-17.12.1 || ( www-client/qupzilla >=kde-apps/konqueror-17.12.1 ) >=kde-apps/konsole-17.12.1 >=kde-apps/kwrite-17.12.1 handbook? ( >=kde-apps/khelpcenter-17.12.1 ) !kde-apps/kdecore-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b55ecb9037bb7597648e18f4d84071c2
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-17.08.3 b/metadata/md5-cache/kde-apps/kdeedu-data-17.08.3
index 47a543cf69f3..c0fc44e047e5 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-17.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/17.08.3/src/kdeedu-data-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b006b298396dfd948239ecd3d5a43ff5
diff --git a/metadata/md5-cache/kde-apps/kdeedu-data-17.12.1 b/metadata/md5-cache/kde-apps/kdeedu-data-17.12.1
index 92168cc6b013..c1d2e6f35524 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-data-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdeedu-data-17.12.1
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!kde-apps/libkdeedu:4 !kde-apps/kde-l10n
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdeedu-data-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b17d9a218f7520b4abf43aacfe6f7ff5
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-17.08.3 b/metadata/md5-cache/kde-apps/kdeedu-meta-17.08.3
index b2c9ce3874c4..d0fe0c77631b 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-17.08.3
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/analitza-17.08.3 >=kde-apps/artikulate-17.08.3 >=kde-apps/blinken-17.08.3 >=kde-apps/cantor-17.08.3 >=kde-apps/kalgebra-17.08.3 >=kde-apps/kalzium-17.08.3 >=kde-apps/kanagram-17.08.3 >=kde-apps/kbruch-17.08.3 >=kde-apps/kdeedu-data-17.08.3 >=kde-apps/kgeography-17.08.3 >=kde-apps/khangman-17.08.3 >=kde-apps/kig-17.08.3 >=kde-apps/kiten-17.08.3 >=kde-apps/klettres-17.08.3 >=kde-apps/kmplot-17.08.3 >=kde-apps/kqtquickcharts-17.08.3 >=kde-apps/kstars-17.08.3 >=kde-apps/ktouch-17.08.3 >=kde-apps/kturtle-17.08.3 >=kde-apps/kwordquiz-17.08.3 >=kde-apps/libkeduvocdocument-17.08.3 >=kde-apps/marble-17.08.3 >=kde-apps/minuet-17.08.3 >=kde-apps/parley-17.08.3 >=kde-apps/rocs-17.08.3 >=kde-apps/step-17.08.3 !kde-apps/kdeedu-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=60d76cdfe0849fa84bb962f35bc8c091
diff --git a/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.1
index 44ba1f5d03d8..90b30683bf28 100644
--- a/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdeedu-meta-17.12.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/analitza-17.12.1 >=kde-apps/artikulate-17.12.1 >=kde-apps/blinken-17.12.1 >=kde-apps/cantor-17.12.1 >=kde-apps/kalgebra-17.12.1 >=kde-apps/kalzium-17.12.1 >=kde-apps/kanagram-17.12.1 >=kde-apps/kbruch-17.12.1 >=kde-apps/kdeedu-data-17.12.1 >=kde-apps/kgeography-17.12.1 >=kde-apps/khangman-17.12.1 >=kde-apps/kig-17.12.1 >=kde-apps/kiten-17.12.1 >=kde-apps/klettres-17.12.1 >=kde-apps/kmplot-17.12.1 >=kde-apps/kqtquickcharts-17.12.1 >=kde-apps/ktouch-17.12.1 >=kde-apps/kturtle-17.12.1 >=kde-apps/kwordquiz-17.12.1 >=kde-apps/libkeduvocdocument-17.12.1 >=kde-apps/marble-17.12.1 >=kde-apps/minuet-17.12.1 >=kde-apps/parley-17.12.1 >=kde-apps/rocs-17.12.1 >=kde-apps/step-17.12.1 !kde-apps/kdeedu-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=fad2326e88a11480daf662622befb4b9
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-17.08.3 b/metadata/md5-cache/kde-apps/kdegames-meta-17.08.3
index e32b37c278a6..fcc3d844ceb5 100644
--- a/metadata/md5-cache/kde-apps/kdegames-meta-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-17.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/bomber-17.08.3 >=kde-apps/bovo-17.08.3 >=kde-apps/granatier-17.08.3 >=kde-apps/kapman-17.08.3 >=kde-apps/katomic-17.08.3 >=kde-apps/kblackbox-17.08.3 >=kde-apps/kblocks-17.08.3 >=kde-apps/kbounce-17.08.3 >=kde-apps/kbreakout-17.08.3 >=kde-apps/kdiamond-17.08.3 >=kde-apps/kfourinline-17.08.3 >=kde-apps/kgoldrunner-17.08.3 >=kde-apps/kigo-17.08.3 >=kde-apps/killbots-17.08.3 >=kde-apps/kiriki-17.08.3 >=kde-apps/kjumpingcube-17.08.3 >=kde-apps/klickety-17.08.3 >=kde-apps/klines-17.08.3 >=kde-apps/kmahjongg-17.08.3 >=kde-apps/kmines-17.08.3 >=kde-apps/knavalbattle-17.08.3 >=kde-apps/knetwalk-17.08.3 >=kde-apps/kollision-17.08.3 >=kde-apps/konquest-17.08.3 >=kde-apps/kpat-17.08.3 >=kde-apps/kreversi-17.08.3 >=kde-apps/kshisen-17.08.3 >=kde-apps/ksnakeduel-17.08.3 >=kde-apps/kspaceduel-17.08.3 >=kde-apps/ksquares-17.08.3 >=kde-apps/ktuberling-17.08.3 >=kde-apps/libkdegames-17.08.3 >=kde-apps/libkmahjongg-17.08.3 >=kde-apps/lskat-17.08.3 >=kde-apps/picmi-17.08.3 opengl? ( >=kde-apps/ksudoku-17.08.3 >=kde-apps/kubrick-17.08.3 ) python? ( >=kde-apps/kajongg-17.08.3 ) qt4? ( >=kde-apps/kolf-17.08.3 >=kde-apps/ksirk-17.08.3 >=kde-apps/palapeli-17.08.3 nls? ( >=kde-apps/kde4-l10n-17.08.3 ) ) !kde-apps/kdegames-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ad07778051c7055be2b0a47756683dbd
diff --git a/metadata/md5-cache/kde-apps/kdegames-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdegames-meta-17.12.1
index c5b64a7a6b26..891f8c48cd39 100644
--- a/metadata/md5-cache/kde-apps/kdegames-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdegames-meta-17.12.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/bomber-17.12.1 >=kde-apps/bovo-17.12.1 >=kde-apps/granatier-17.12.1 >=kde-apps/kapman-17.12.1 >=kde-apps/katomic-17.12.1 >=kde-apps/kblackbox-17.12.1 >=kde-apps/kblocks-17.12.1 >=kde-apps/kbounce-17.12.1 >=kde-apps/kbreakout-17.12.1 >=kde-apps/kdiamond-17.12.1 >=kde-apps/kfourinline-17.12.1 >=kde-apps/kgoldrunner-17.12.1 >=kde-apps/kigo-17.12.1 >=kde-apps/killbots-17.12.1 >=kde-apps/kiriki-17.12.1 >=kde-apps/kjumpingcube-17.12.1 >=kde-apps/klickety-17.12.1 >=kde-apps/klines-17.12.1 >=kde-apps/kmahjongg-17.12.1 >=kde-apps/kmines-17.12.1 >=kde-apps/knavalbattle-17.12.1 >=kde-apps/knetwalk-17.12.1 >=kde-apps/kolf-17.12.1 >=kde-apps/kollision-17.12.1 >=kde-apps/konquest-17.12.1 >=kde-apps/kpat-17.12.1 >=kde-apps/kreversi-17.12.1 >=kde-apps/kshisen-17.12.1 >=kde-apps/ksirk-17.12.1 >=kde-apps/ksnakeduel-17.12.1 >=kde-apps/kspaceduel-17.12.1 >=kde-apps/ksquares-17.12.1 >=kde-apps/ktuberling-17.12.1 >=kde-apps/libkdegames-17.12.1 >=kde-apps/libkmahjongg-17.12.1 >=kde-apps/lskat-17.12.1 >=kde-apps/palapeli-17.12.1 >=kde-apps/picmi-17.12.1 opengl? ( >=kde-apps/ksudoku-17.12.1 >=kde-apps/kubrick-17.12.1 ) python? ( >=kde-apps/kajongg-17.12.1 ) !kde-apps/kdegames-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ac739c727fa23cf0a94273aae73da775
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.08.3 b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.08.3
index 39d97e1f785d..cc3001c0ea87 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/gwenview-17.08.3 >=kde-apps/kamera-17.08.3 >=kde-apps/kcolorchooser-17.08.3 >=kde-apps/kdegraphics-mobipocket-17.08.3 >=kde-apps/kolourpaint-17.08.3 >=kde-apps/kruler-17.08.3 >=kde-apps/libkdcraw-17.08.3 >=kde-apps/libkexiv2-17.08.3 >=kde-apps/libkipi-17.08.3 >=kde-apps/okular-17.08.3 >=kde-apps/spectacle-17.08.3 >=kde-apps/svgpart-17.08.3 >=kde-apps/thumbnailers-17.08.3 scanner? ( >=kde-apps/libksane-17.08.3 ) !kde-apps/kdegraphics-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f95ad6a28c29ded1c81c5f1acfeb18e2
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.1
index 2e5cb9692eeb..eb7cf28279ed 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdegraphics-meta-17.12.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/gwenview-17.12.1 >=kde-apps/kamera-17.12.1 >=kde-apps/kcolorchooser-17.12.1 >=kde-apps/kdegraphics-mobipocket-17.12.1 >=kde-apps/kolourpaint-17.12.1 >=kde-apps/kruler-17.12.1 >=kde-apps/libkdcraw-17.12.1 >=kde-apps/libkexiv2-17.12.1 >=kde-apps/libkipi-17.12.1 >=kde-apps/okular-17.12.1 >=kde-apps/spectacle-17.12.1 >=kde-apps/svgpart-17.12.1 >=kde-apps/thumbnailers-17.12.1 scanner? ( >=kde-apps/libksane-17.12.1 ) !kde-apps/kdegraphics-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1efcf975eeebf133f72e1b0dcd5d1660
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.08.3 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.08.3
index 43d90a05427c..2b4e2f3ea93c 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 thumbnail? ( >=kde-frameworks/kio-5.40.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdegraphics-mobipocket-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0f4d686c9b63365668847d4702bf5d5a
diff --git a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.1 b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.1
index 07384965be25..5708188b449a 100644
--- a/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdegraphics-mobipocket-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtgui-5.9.1:5 thumbnail? ( >=kde-frameworks/kio-5.40.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdegraphics-mobipocket:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdegraphics-mobipocket-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e74ae9f281704f214a75214aef016f87
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.08.3 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.08.3
index 556118eb2f5d..aa41b85b9f6d 100644
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dragon-17.08.3 >=kde-apps/kdenlive-17.08.3 >=kde-apps/kmix-17.08.3 >=kde-apps/kwave-17.08.3 >=kde-apps/libkcddb-17.08.3 cdrom? ( >=kde-apps/audiocd-kio-17.08.3 >=kde-apps/k3b-17.08.3 >=kde-apps/libkcompactdisc-17.08.3 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-17.08.3 ) qt4? ( >=kde-apps/juk-17.08.3 nls? ( >=kde-apps/kde4-l10n-17.08.3 ) ) !kde-apps/kdemultimedia-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e7e52fd8a9240ac93ab91ad52752dfdd
diff --git a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.1
index d230f437c62a..2cb56d41c503 100644
--- a/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdemultimedia-meta-17.12.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dragon-17.12.1 >=kde-apps/juk-17.12.1 >=kde-apps/kdenlive-17.12.1 >=kde-apps/kmix-17.12.1 >=kde-apps/kwave-17.12.1 >=kde-apps/libkcddb-17.12.1 cdrom? ( >=kde-apps/audiocd-kio-17.12.1 >=kde-apps/k3b-17.12.1 >=kde-apps/libkcompactdisc-17.12.1 ) ffmpeg? ( >=kde-apps/ffmpegthumbs-17.12.1 ) !kde-apps/kdemultimedia-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=f6b67c399a121114b39562478c45c64d
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.08.3 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.08.3
index 2c41221e94c6..e8838729dcfb 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdenetwork-filesharing-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=650a7b3f923b480db49761634887dfd3
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.1 b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.1
index 1d5ac18897de..8f19af9ba823 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdenetwork-filesharing-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenetwork-filesharing:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdenetwork-filesharing-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c2abbae7a7066633d084f335a6dc9f7b
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.08.3 b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.08.3
index b3a6e96f864b..0b160c94b744 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kdenetwork-filesharing-17.08.3 >=kde-apps/krdc-17.08.3 >=kde-apps/krfb-17.08.3 >=kde-apps/plasma-telepathy-meta-17.08.3 qt4? ( >=kde-apps/kget-17.08.3 >=kde-apps/zeroconf-ioslave-17.08.3 nls? ( >=kde-apps/kde4-l10n-17.08.3 ) ) !kde-apps/kdenetwork-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=01f2c22271d705db72c31a0d78a7c684
diff --git a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.1
index 0e26f4d8fbc2..47778f9d0883 100644
--- a/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdenetwork-meta-17.12.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/kdenetwork-filesharing-17.12.1 >=kde-apps/kget-17.12.1 >=kde-apps/krdc-17.12.1 >=kde-apps/krfb-17.12.1 >=kde-apps/plasma-telepathy-meta-17.12.1 >=kde-apps/zeroconf-ioslave-17.12.1 !kde-apps/kdenetwork-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=0864a5560d9ca2bca5050d667bebd1ca
diff --git a/metadata/md5-cache/kde-apps/kdenlive-17.08.3 b/metadata/md5-cache/kde-apps/kdenlive-17.08.3
index 3b50219ab546..cd615c25848d 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdenlive-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.7.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.40.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenlive:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdenlive-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5973df8547d796b71b3c3d1b005175e9
diff --git a/metadata/md5-cache/kde-apps/kdenlive-17.12.1 b/metadata/md5-cache/kde-apps/kdenlive-17.12.1
index 82d2f5d4d047..53b2bd38cc47 100644
--- a/metadata/md5-cache/kde-apps/kdenlive-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdenlive-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5[gles2=] >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=dev-qt/qtscript-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=media-libs/mlt-6.4.0[ffmpeg,kdenlive,melt,qt5,sdl,xml] virtual/ffmpeg[encode,sdl,X] virtual/opengl freesound? ( >=dev-qt/qtwebkit-5.9.1:5 ) semantic-desktop? ( >=kde-frameworks/kfilemetadata-5.40.0:5 ) v4l? ( media-libs/libv4l ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdenlive:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdenlive-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=794abc15cefaba740e923c5794ef0d8c
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-17.08.3 b/metadata/md5-cache/kde-apps/kdepim-addons-17.08.3
index 4545a21694dc..26f595b23f15 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdepim-addons-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=defde6451a2317c914be98314680de69
diff --git a/metadata/md5-cache/kde-apps/kdepim-addons-17.12.1 b/metadata/md5-cache/kde-apps/kdepim-addons-17.12.1
index bda84904272c..7ecdb03413ad 100644
--- a/metadata/md5-cache/kde-apps/kdepim-addons-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdepim-addons-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdepim-addons-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=17c2fc135e8e7195bcfae5a99233f5c6
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.08.3 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.08.3
index c27b1cb8123e..47ebfe892da8 100644
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-contacts-17.08.3:5 >=kde-apps/grantleetheme-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/libkleo-17.08.3:5 >=kde-apps/pimcommon-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdepim-apps-libs-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6b03c5e7093ecd142aaeb0144f1c6392
diff --git a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.1 b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.1
index ac6eb1194090..53a088aa0134 100644
--- a/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdepim-apps-libs-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/prison-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-libs/grantlee-5.1.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdepim-apps-libs:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdepim-apps-libs-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9f44a813ead9b8c415c01e5cbcf997fb
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-17.08.3-r1 b/metadata/md5-cache/kde-apps/kdepim-meta-17.08.3-r1
index bf755abaf225..23832d9bce46 100644
--- a/metadata/md5-cache/kde-apps/kdepim-meta-17.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-17.08.3-r1
@@ -6,5 +6,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/akonadi-17.08.3 >=kde-apps/akonadiconsole-17.08.3 >=kde-apps/akonadi-calendar-17.08.3 >=kde-apps/akonadi-contacts-17.08.3 >=kde-apps/akonadi-import-wizard-17.08.3 >=kde-apps/akonadi-mime-17.08.3 >=kde-apps/akonadi-notes-17.08.3 >=kde-apps/akonadi-search-17.08.3 >=kde-apps/akregator-17.08.3 >=kde-apps/calendarjanitor-17.08.3 >=kde-apps/calendarsupport-17.08.3 >=kde-apps/eventviews-17.08.3 >=kde-apps/grantlee-editor-17.08.3 >=kde-apps/grantleetheme-17.08.3 >=kde-apps/incidenceeditor-17.08.3 >=kde-apps/kaddressbook-17.08.3 >=kde-apps/kalarm-17.08.3 >=kde-apps/kalarmcal-17.08.3 >=kde-apps/kcalcore-17.08.3 >=kde-apps/kcalutils-17.08.3 >=kde-apps/kcontacts-17.08.3 >=kde-apps/kdepim-addons-17.08.3 >=kde-apps/kdepim-apps-libs-17.08.3 >=kde-apps/kdepim-runtime-17.08.3 >=kde-apps/kholidays-17.08.3 >=kde-apps/kidentitymanagement-17.08.3 >=kde-apps/kimap-17.08.3 >=kde-apps/kldap-17.08.3 >=kde-apps/kleopatra-17.08.3 >=kde-apps/kmail-17.08.3 >=kde-apps/kmail-account-wizard-17.08.3 >=kde-apps/kmailtransport-17.08.3 >=kde-apps/kmbox-17.08.3 >=kde-apps/kmime-17.08.3 >=kde-apps/knotes-17.08.3 >=kde-apps/konsolekalendar-17.08.3 >=kde-apps/kontact-17.08.3 >=kde-apps/kontactinterface-17.08.3 >=kde-apps/korganizer-17.08.3 >=kde-apps/kpimtextedit-17.08.3 >=kde-apps/libgravatar-17.08.3 >=kde-apps/libkdepim-17.08.3 >=kde-apps/libkgapi-17.08.3 >=kde-apps/libkleo-17.08.3 >=kde-apps/libksieve-17.08.3 >=kde-apps/libktnef-17.08.3 >=kde-apps/mailcommon-17.08.3 >=kde-apps/mailimporter-17.08.3 >=kde-apps/mbox-importer-17.08.3 >=kde-apps/messagelib-17.08.3 >=kde-apps/pim-data-exporter-17.08.3 >=kde-apps/pim-sieve-editor-17.08.3 >=kde-apps/pimcommon-17.08.3 >=kde-apps/syndication-17.08.3 !kde-apps/kdepim-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=cb2beb5fab524378b704f1cecb0c5207
diff --git a/metadata/md5-cache/kde-apps/kdepim-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdepim-meta-17.12.1
index 062bb6822927..bc6b34cea330 100644
--- a/metadata/md5-cache/kde-apps/kdepim-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdepim-meta-17.12.1
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/akonadi-17.12.1 >=kde-apps/akonadiconsole-17.12.1 >=kde-apps/akonadi-calendar-17.12.1 >=kde-apps/akonadi-contacts-17.12.1 >=kde-apps/akonadi-import-wizard-17.12.1 >=kde-apps/akonadi-mime-17.12.1 >=kde-apps/akonadi-notes-17.12.1 >=kde-apps/akonadi-search-17.12.1 >=kde-apps/akregator-17.12.1 >=kde-apps/calendarjanitor-17.12.1 >=kde-apps/calendarsupport-17.12.1 >=kde-apps/eventviews-17.12.1 >=kde-apps/grantlee-editor-17.12.1 >=kde-apps/grantleetheme-17.12.1 >=kde-apps/incidenceeditor-17.12.1 >=kde-apps/kaddressbook-17.12.1 >=kde-apps/kalarm-17.12.1 >=kde-apps/kalarmcal-17.12.1 >=kde-apps/kcalcore-17.12.1 >=kde-apps/kcalutils-17.12.1 >=kde-apps/kcontacts-17.12.1 >=kde-apps/kdepim-addons-17.12.1 >=kde-apps/kdepim-apps-libs-17.12.1 >=kde-apps/kdepim-runtime-17.12.1 >=kde-apps/kholidays-17.12.1 >=kde-apps/kidentitymanagement-17.12.1 >=kde-apps/kimap-17.12.1 >=kde-apps/kldap-17.12.1 >=kde-apps/kleopatra-17.12.1 >=kde-apps/kmail-17.12.1 >=kde-apps/kmail-account-wizard-17.12.1 >=kde-apps/kmailtransport-17.12.1 >=kde-apps/kmbox-17.12.1 >=kde-apps/kmime-17.12.1 >=kde-apps/knotes-17.12.1 >=kde-apps/konsolekalendar-17.12.1 >=kde-apps/kontact-17.12.1 >=kde-apps/kontactinterface-17.12.1 >=kde-apps/korganizer-17.12.1 >=kde-apps/kpimtextedit-17.12.1 >=kde-apps/ksmtp-17.12.1 >=kde-apps/libgravatar-17.12.1 >=kde-apps/libkdepim-17.12.1 >=kde-apps/libkgapi-17.12.1 >=kde-apps/libkleo-17.12.1 >=kde-apps/libksieve-17.12.1 >=kde-apps/libktnef-17.12.1 >=kde-apps/mailcommon-17.12.1 >=kde-apps/mailimporter-17.12.1 >=kde-apps/mbox-importer-17.12.1 >=kde-apps/messagelib-17.12.1 >=kde-apps/pim-data-exporter-17.12.1 >=kde-apps/pim-sieve-editor-17.12.1 >=kde-apps/pimcommon-17.12.1 >=kde-apps/syndication-17.12.1 !kde-apps/kdepim-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=fdfbef72ec0b621d29033dfd1d832b61
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-17.08.3 b/metadata/md5-cache/kde-apps/kdepim-runtime-17.08.3
index 2bed90984038..2850b4184d54 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdepim-runtime-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a8d84f5bdb7b79f3c58c371fbf220fdb
diff --git a/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.1 b/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.1
index 34734c8382ff..6e80d2b41e92 100644
--- a/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdepim-runtime-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdepim-runtime-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bddc5ac99087b20657606d4e79001c9b
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.08.3 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.08.3
index 87a40e1b0557..5456f4079911 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdesdk-kioslaves-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b92ab396ba1b0083fc066d165a5670b4
diff --git a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.1 b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.1
index 4e86a9442e10..ca632e87e2b0 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdesdk-kioslaves-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 dev-lang/perl !<kde-apps/kde4-l10n-17.03.90:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-kioslaves:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdesdk-kioslaves-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0cf76a651c7f4c87a0c70086ff638af7
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-17.08.3 b/metadata/md5-cache/kde-apps/kdesdk-meta-17.08.3
index 9c2e253a53a4..dcac5e91a545 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-17.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dolphin-plugins-17.08.3 >=kde-apps/kapptemplate-17.08.3 >=kde-apps/kcachegrind-17.08.3 >=kde-apps/kde-dev-scripts-17.08.3 >=kde-apps/kde-dev-utils-17.08.3 >=kde-apps/kdesdk-kioslaves-17.08.3 >=kde-apps/kdesdk-thumbnailers-17.08.3 >=kde-apps/kompare-17.08.3 >=kde-apps/kross-interpreters-17.08.3 >=kde-apps/libkomparediff2-17.08.3 >=kde-apps/lokalize-17.08.3 >=kde-apps/okteta-17.08.3 >=kde-apps/poxml-17.08.3 >=kde-apps/umbrello-17.08.3 cvs? ( >=kde-apps/cervisia-17.08.3 ) !kde-apps/kdesdk-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=9b8578a475dea9b8e114058862e678cb
diff --git a/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.1
index 85004f92d5ec..0e7926c4dce9 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdesdk-meta-17.12.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/dolphin-plugins-17.12.1 >=kde-apps/kapptemplate-17.12.1 >=kde-apps/kcachegrind-17.12.1 >=kde-apps/kde-dev-scripts-17.12.1 >=kde-apps/kde-dev-utils-17.12.1 >=kde-apps/kdesdk-kioslaves-17.12.1 >=kde-apps/kdesdk-thumbnailers-17.12.1 >=kde-apps/kompare-17.12.1 >=kde-apps/kross-interpreters-17.12.1 >=kde-apps/libkomparediff2-17.12.1 >=kde-apps/lokalize-17.12.1 >=kde-apps/okteta-17.12.1 >=kde-apps/poxml-17.12.1 >=kde-apps/umbrello-17.12.1 cvs? ( >=kde-apps/cervisia-17.12.1 ) !kde-apps/kdesdk-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2758888f24f743555392ef164e1fcf94
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.08.3 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.08.3
index 810051c5783a..42b0beee1f1b 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdesdk-thumbnailers-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=68f668f50f9f212566a7fb736bb32944
diff --git a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.1 b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.1
index f5480d59533a..7484077f35ea 100644
--- a/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdesdk-thumbnailers-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdesdk-thumbnailers:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdesdk-thumbnailers-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5dbaced390c5e4e50a244e828e2231e0
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-17.08.3-r1 b/metadata/md5-cache/kde-apps/kdeutils-meta-17.08.3-r1
index 6724a9985a6b..978b3f78d840 100644
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-17.08.3-r1
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-17.08.3-r1
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ark-17.08.3 >=kde-apps/filelight-17.08.3 >=kde-apps/kcalc-17.08.3 >=kde-apps/kcharselect-17.08.3 >=kde-apps/kdebugsettings-17.08.3 >=kde-apps/kdf-17.08.3 >=kde-apps/kgpg-17.08.3 >=kde-apps/kteatime-17.08.3 >=kde-apps/ktimer-17.08.3 >=kde-apps/kwalletmanager-17.08.3 cups? ( >=kde-apps/print-manager-17.08.3 ) floppy? ( >=kde-apps/kfloppy-17.08.3 ) qt4? ( >=kde-apps/kimagemapeditor-17.08.3 >=kde-apps/sweeper-17.08.3 nls? ( >=kde-apps/kde4-l10n-17.08.3 ) ) !kde-apps/kdeutils-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=360a25d066eb55ad1481b6a0088e7126
diff --git a/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.1 b/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.1
index 6ea0b8e6f169..522d493b923a 100644
--- a/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdeutils-meta-17.12.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-apps/ark-17.12.1 >=kde-apps/filelight-17.12.1 >=kde-apps/kcalc-17.12.1 >=kde-apps/kcharselect-17.12.1 >=kde-apps/kdebugsettings-17.12.1 >=kde-apps/kdf-17.12.1 >=kde-apps/kgpg-17.12.1 >=kde-apps/kimagemapeditor-17.12.1 >=kde-apps/kteatime-17.12.1 >=kde-apps/ktimer-17.12.1 >=kde-apps/kwalletmanager-17.12.1 >=kde-apps/sweeper-17.12.1 cups? ( >=kde-apps/print-manager-17.12.1 ) floppy? ( >=kde-apps/kfloppy-17.12.1 ) !kde-apps/kdeutils-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ab21cf3351c714255ac295dddbedcba2
diff --git a/metadata/md5-cache/kde-apps/kdf-17.08.3 b/metadata/md5-cache/kde-apps/kdf-17.08.3
index e71bbb52bffd..3b6d469f1853 100644
--- a/metadata/md5-cache/kde-apps/kdf-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdf-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdf-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=193a8e4729984f4462fdc005cfb35649
diff --git a/metadata/md5-cache/kde-apps/kdf-17.12.1 b/metadata/md5-cache/kde-apps/kdf-17.12.1
index dc2540bdbe9d..8064bc12a04b 100644
--- a/metadata/md5-cache/kde-apps/kdf-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdf-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdf-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=650fa3c98c9cac3966c21030a454b79f
diff --git a/metadata/md5-cache/kde-apps/kdialog-17.08.3 b/metadata/md5-cache/kde-apps/kdialog-17.08.3
index 54c49acca7d2..52781c3b2f29 100644
--- a/metadata/md5-cache/kde-apps/kdialog-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdialog-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdialog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdialog-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=21a379fdadaa31225d48816e550ec433
diff --git a/metadata/md5-cache/kde-apps/kdialog-17.12.1 b/metadata/md5-cache/kde-apps/kdialog-17.12.1
index 1406c4c5ac49..313e62bf561e 100644
--- a/metadata/md5-cache/kde-apps/kdialog-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdialog-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdialog:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdialog-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d1e420467a1a870969468770e27c30d2
diff --git a/metadata/md5-cache/kde-apps/kdiamond-17.08.3 b/metadata/md5-cache/kde-apps/kdiamond-17.08.3
index 8cff2c2b9b91..b6eb170411ea 100644
--- a/metadata/md5-cache/kde-apps/kdiamond-17.08.3
+++ b/metadata/md5-cache/kde-apps/kdiamond-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdiamond:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdiamond-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7ebf7214e00b9089029ff0c91787bde7
diff --git a/metadata/md5-cache/kde-apps/kdiamond-17.12.1 b/metadata/md5-cache/kde-apps/kdiamond-17.12.1
index d47480a6f8ed..c6b32251e62a 100644
--- a/metadata/md5-cache/kde-apps/kdiamond-17.12.1
+++ b/metadata/md5-cache/kde-apps/kdiamond-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kdiamond:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdiamond-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3b421c14200258d5d1e965224fc0ccb2
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-17.08.3 b/metadata/md5-cache/kde-apps/keditbookmarks-17.08.3
index e64bb130a157..a446c38fac7f 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-17.08.3
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/keditbookmarks-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b1166fd780677eb27d7e9f512706f617
diff --git a/metadata/md5-cache/kde-apps/keditbookmarks-17.12.1 b/metadata/md5-cache/kde-apps/keditbookmarks-17.12.1
index d04e766c8ab0..943b747dc3e3 100644
--- a/metadata/md5-cache/kde-apps/keditbookmarks-17.12.1
+++ b/metadata/md5-cache/kde-apps/keditbookmarks-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<=kde-apps/konqueror-16.08.3:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/keditbookmarks:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/keditbookmarks-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6156671d040751654e25977588ee1cfe
diff --git a/metadata/md5-cache/kde-apps/kfind-17.08.3 b/metadata/md5-cache/kde-apps/kfind-17.08.3
index 1ad8726dbd2a..4840a81c3946 100644
--- a/metadata/md5-cache/kde-apps/kfind-17.08.3
+++ b/metadata/md5-cache/kde-apps/kfind-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kfind-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dcfd61e3918acb31d87e5413c6d9ee48
diff --git a/metadata/md5-cache/kde-apps/kfind-17.12.1 b/metadata/md5-cache/kde-apps/kfind-17.12.1
index 641e7891d967..c10bb2db449d 100644
--- a/metadata/md5-cache/kde-apps/kfind-17.12.1
+++ b/metadata/md5-cache/kde-apps/kfind-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfind:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kfind-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b50e517d22b1dde4520221d9f2d71405
diff --git a/metadata/md5-cache/kde-apps/kfloppy-17.08.3 b/metadata/md5-cache/kde-apps/kfloppy-17.08.3
index c5cd2a5b49f2..c314bf72e04d 100644
--- a/metadata/md5-cache/kde-apps/kfloppy-17.08.3
+++ b/metadata/md5-cache/kde-apps/kfloppy-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfloppy:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kfloppy-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3abf832fda2e0d7a392e12ae1ebb40d3
diff --git a/metadata/md5-cache/kde-apps/kfloppy-17.12.1 b/metadata/md5-cache/kde-apps/kfloppy-17.12.1
index 06e9f6640b91..785bf92f261b 100644
--- a/metadata/md5-cache/kde-apps/kfloppy-17.12.1
+++ b/metadata/md5-cache/kde-apps/kfloppy-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfloppy:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kfloppy-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=54a92eecca592db7751c789791af1976
diff --git a/metadata/md5-cache/kde-apps/kfourinline-17.08.3 b/metadata/md5-cache/kde-apps/kfourinline-17.08.3
index 1bf735857049..814f7d90119f 100644
--- a/metadata/md5-cache/kde-apps/kfourinline-17.08.3
+++ b/metadata/md5-cache/kde-apps/kfourinline-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfourinline:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kfourinline-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d4db567522aa7b2cb5613f30ae037270
diff --git a/metadata/md5-cache/kde-apps/kfourinline-17.12.1 b/metadata/md5-cache/kde-apps/kfourinline-17.12.1
index 800073520b37..098014257bae 100644
--- a/metadata/md5-cache/kde-apps/kfourinline-17.12.1
+++ b/metadata/md5-cache/kde-apps/kfourinline-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kfourinline:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kfourinline-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cf743d92077f286bfb10a8d7965eb0b8
diff --git a/metadata/md5-cache/kde-apps/kgeography-17.08.3 b/metadata/md5-cache/kde-apps/kgeography-17.08.3
index 941dd67019b4..c7351b33dfbc 100644
--- a/metadata/md5-cache/kde-apps/kgeography-17.08.3
+++ b/metadata/md5-cache/kde-apps/kgeography-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgeography:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kgeography-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7942f129ed89d2f6915311c51cc370da
diff --git a/metadata/md5-cache/kde-apps/kgeography-17.12.1 b/metadata/md5-cache/kde-apps/kgeography-17.12.1
index b7f106b3dd5e..9c84a691544e 100644
--- a/metadata/md5-cache/kde-apps/kgeography-17.12.1
+++ b/metadata/md5-cache/kde-apps/kgeography-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgeography:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kgeography-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7116f6f2b0fe25be358e6bb65932b3c1
diff --git a/metadata/md5-cache/kde-apps/kget-17.12.1 b/metadata/md5-cache/kde-apps/kget-17.12.1
index 1b6c50b42365..0f029599cf5e 100644
--- a/metadata/md5-cache/kde-apps/kget-17.12.1
+++ b/metadata/md5-cache/kde-apps/kget-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] bittorrent? ( net-libs/libktorrent:5 ) gpg? ( app-crypt/gpgme[qt5] ) mms? ( media-libs/libmms ) sqlite? ( dev-db/sqlite:3 ) !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kget:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kget-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=65a9736c7fb6338fffa8ca64b48123d3
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-17.08.3 b/metadata/md5-cache/kde-apps/kgoldrunner-17.08.3
index 5d244f4ba570..1b02dc311578 100644
--- a/metadata/md5-cache/kde-apps/kgoldrunner-17.08.3
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgoldrunner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kgoldrunner-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=753e3100637c87d89b48bded92471d45
diff --git a/metadata/md5-cache/kde-apps/kgoldrunner-17.12.1 b/metadata/md5-cache/kde-apps/kgoldrunner-17.12.1
index b987e561e2ab..5bf7fbbf0a11 100644
--- a/metadata/md5-cache/kde-apps/kgoldrunner-17.12.1
+++ b/metadata/md5-cache/kde-apps/kgoldrunner-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/libsndfile media-libs/openal !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgoldrunner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kgoldrunner-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e2de7126ccbed64cedb87a6df7abf5b3
diff --git a/metadata/md5-cache/kde-apps/kgpg-17.08.3 b/metadata/md5-cache/kde-apps/kgpg-17.08.3
index c19a0422c80c..b27e333991dd 100644
--- a/metadata/md5-cache/kde-apps/kgpg-17.08.3
+++ b/metadata/md5-cache/kde-apps/kgpg-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-contacts-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgpg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kgpg-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bea67fc847f2d1b7c2bdcf40566d76c0
diff --git a/metadata/md5-cache/kde-apps/kgpg-17.12.1 b/metadata/md5-cache/kde-apps/kgpg-17.12.1
index 8e220ab10b30..c0b61c4e8274 100644
--- a/metadata/md5-cache/kde-apps/kgpg-17.12.1
+++ b/metadata/md5-cache/kde-apps/kgpg-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/gnupg >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kgpg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-gpg ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kgpg-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bc6af4d3e845cd57bf1e461373295fd2
diff --git a/metadata/md5-cache/kde-apps/khangman-17.08.3 b/metadata/md5-cache/kde-apps/khangman-17.08.3
index 1507d41ec7ec..1d402def3da5 100644
--- a/metadata/md5-cache/kde-apps/khangman-17.08.3
+++ b/metadata/md5-cache/kde-apps/khangman-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.08.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-17.08.3:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtmultimedia-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khangman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/khangman-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b347dd28986938a4e584960f49966b8f
diff --git a/metadata/md5-cache/kde-apps/khangman-17.12.1 b/metadata/md5-cache/kde-apps/khangman-17.12.1
index 2b2c1f5dba47..ef28b7eccb0d 100644
--- a/metadata/md5-cache/kde-apps/khangman-17.12.1
+++ b/metadata/md5-cache/kde-apps/khangman-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-apps/kdeedu-data-17.12.1:5 >=dev-qt/qtgraphicaleffects-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtquickcontrols-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khangman:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/khangman-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=404802cf0d6f418ca90c62b7bc6a3eff
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-17.08.3 b/metadata/md5-cache/kde-apps/khelpcenter-17.08.3
index 39428f7d2b59..dd94ba641ff4 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-17.08.3
+++ b/metadata/md5-cache/kde-apps/khelpcenter-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khelpcenter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/khelpcenter-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=26bdb7c42fe5d8ea3f3073f72a49e07c
diff --git a/metadata/md5-cache/kde-apps/khelpcenter-17.12.1 b/metadata/md5-cache/kde-apps/khelpcenter-17.12.1
index ab7a9192d90f..7f8e763ee43a 100644
--- a/metadata/md5-cache/kde-apps/khelpcenter-17.12.1
+++ b/metadata/md5-cache/kde-apps/khelpcenter-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdoctools-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxml2 dev-libs/xapian:= >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/khelpcenter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/khelpcenter-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c792ff11b417c4c39743ae303bea60a5
diff --git a/metadata/md5-cache/kde-apps/kholidays-17.08.3 b/metadata/md5-cache/kde-apps/kholidays-17.08.3
index ef7c54cbd238..fb9cd4624b99 100644
--- a/metadata/md5-cache/kde-apps/kholidays-17.08.3
+++ b/metadata/md5-cache/kde-apps/kholidays-17.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kholidays:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kholidays-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b5432866b7d47df488d3c6ac56b9855a
diff --git a/metadata/md5-cache/kde-apps/kholidays-17.12.1 b/metadata/md5-cache/kde-apps/kholidays-17.12.1
index 1857a121ea4d..15900e01eba2 100644
--- a/metadata/md5-cache/kde-apps/kholidays-17.12.1
+++ b/metadata/md5-cache/kde-apps/kholidays-17.12.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kholidays:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kholidays-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=887a19a07585116dd938068a964c095c
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-17.08.3 b/metadata/md5-cache/kde-apps/kidentitymanagement-17.08.3
index 79657b07a09a..a6a7ae936ccf 100644
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-17.08.3
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kidentitymanagement-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=df58c47872737e527756adc9be2e3e3e
diff --git a/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.1 b/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.1
index ea3b0f150346..a99e73f73587 100644
--- a/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.1
+++ b/metadata/md5-cache/kde-apps/kidentitymanagement-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kidentitymanagement-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=771c29cc4e5066573fcfddf21ac14e4a
diff --git a/metadata/md5-cache/kde-apps/kig-17.08.3 b/metadata/md5-cache/kde-apps/kig-17.08.3
index 52c40fdf4a6f..06c6550b379e 100644
--- a/metadata/md5-cache/kde-apps/kig-17.08.3
+++ b/metadata/md5-cache/kde-apps/kig-17.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/17.08.3/src/kig-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c92c774d626b553bd05aeff08911d166
diff --git a/metadata/md5-cache/kde-apps/kig-17.12.1 b/metadata/md5-cache/kde-apps/kig-17.12.1
index f49a921c80c8..6befe78aa024 100644
--- a/metadata/md5-cache/kde-apps/kig-17.12.1
+++ b/metadata/md5-cache/kde-apps/kig-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/
 REQUIRED_USE=python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kig-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1be851991efb62cf10a2c67e6ebe2eed
diff --git a/metadata/md5-cache/kde-apps/kigo-17.08.3 b/metadata/md5-cache/kde-apps/kigo-17.08.3
index e0629eb9d171..89c101af4e70 100644
--- a/metadata/md5-cache/kde-apps/kigo-17.08.3
+++ b/metadata/md5-cache/kde-apps/kigo-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kigo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kigo-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=408e1a706a0c143d25af8601c9a30c9c
diff --git a/metadata/md5-cache/kde-apps/kigo-17.12.1 b/metadata/md5-cache/kde-apps/kigo-17.12.1
index 5e37c22589ec..0f0bf16c5902 100644
--- a/metadata/md5-cache/kde-apps/kigo-17.12.1
+++ b/metadata/md5-cache/kde-apps/kigo-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 games-board/gnugo >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kigo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kigo-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=faff1c565a91d12b86676078379d6111
diff --git a/metadata/md5-cache/kde-apps/killbots-17.08.3 b/metadata/md5-cache/kde-apps/killbots-17.08.3
index e5b196786167..c9cf62a5548a 100644
--- a/metadata/md5-cache/kde-apps/killbots-17.08.3
+++ b/metadata/md5-cache/kde-apps/killbots-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/killbots:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/killbots-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=42fe1927fa7a6c1dddf6d768dd60c262
diff --git a/metadata/md5-cache/kde-apps/killbots-17.12.1 b/metadata/md5-cache/kde-apps/killbots-17.12.1
index 12188e883c60..bbb3cf5a2b1c 100644
--- a/metadata/md5-cache/kde-apps/killbots-17.12.1
+++ b/metadata/md5-cache/kde-apps/killbots-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/killbots:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/killbots-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=abaea641b8bebbead2e36b60553f718a
diff --git a/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.1 b/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.1
index 22a9e6ae3797..d1db8ec2294f 100644
--- a/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.1
+++ b/metadata/md5-cache/kde-apps/kimagemapeditor-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimagemapeditor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kimagemapeditor-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e5d47a3854e6026622d585fb0234bf6c
diff --git a/metadata/md5-cache/kde-apps/kimap-17.08.3 b/metadata/md5-cache/kde-apps/kimap-17.08.3
index 3670a6f4b515..e24c9092e888 100644
--- a/metadata/md5-cache/kde-apps/kimap-17.08.3
+++ b/metadata/md5-cache/kde-apps/kimap-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/kmime-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kimap-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fd3cf716384f4dfcd1ef9466e0c257b3
diff --git a/metadata/md5-cache/kde-apps/kimap-17.12.1 b/metadata/md5-cache/kde-apps/kimap-17.12.1
index 301a7a6713ac..00399a747e0c 100644
--- a/metadata/md5-cache/kde-apps/kimap-17.12.1
+++ b/metadata/md5-cache/kde-apps/kimap-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 dev-libs/cyrus-sasl !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kimap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kimap-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=667fd9b4a77ab021f96547a3e4653b96
diff --git a/metadata/md5-cache/kde-apps/kio-extras-17.08.3 b/metadata/md5-cache/kde-apps/kio-extras-17.08.3
index 8fbf204d741b..2d30ea8ba50b 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-17.08.3
+++ b/metadata/md5-cache/kde-apps/kio-extras-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5[bzip2,lzma] >=kde-frameworks/kbookmar
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kio-extras-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f9c71d00170ef3bfb1e38c05849f2d70
diff --git a/metadata/md5-cache/kde-apps/kio-extras-17.12.1 b/metadata/md5-cache/kde-apps/kio-extras-17.12.1
index ebe45b4db415..5ac2528144f3 100644
--- a/metadata/md5-cache/kde-apps/kio-extras-17.12.1
+++ b/metadata/md5-cache/kde-apps/kio-extras-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5[bzip2,lzma] >=kde-frameworks/kbookmar
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kio-extras-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=548b6de70c654ac17fd9d17f89322657
diff --git a/metadata/md5-cache/kde-apps/kiriki-17.08.3 b/metadata/md5-cache/kde-apps/kiriki-17.08.3
index 1b0653af5ab5..203c6ef38b4a 100644
--- a/metadata/md5-cache/kde-apps/kiriki-17.08.3
+++ b/metadata/md5-cache/kde-apps/kiriki-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiriki:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kiriki-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a86b3fc9d4fc857e86f716b51257c758
diff --git a/metadata/md5-cache/kde-apps/kiriki-17.12.1 b/metadata/md5-cache/kde-apps/kiriki-17.12.1
index 8fb35e5a1164..1ca003e26f4a 100644
--- a/metadata/md5-cache/kde-apps/kiriki-17.12.1
+++ b/metadata/md5-cache/kde-apps/kiriki-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiriki:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kiriki-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=335d648126dde34b535ca74b7a140591
diff --git a/metadata/md5-cache/kde-apps/kiten-17.08.3 b/metadata/md5-cache/kde-apps/kiten-17.08.3
index 74b0a764023d..e53c0e8bb0cc 100644
--- a/metadata/md5-cache/kde-apps/kiten-17.08.3
+++ b/metadata/md5-cache/kde-apps/kiten-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiten:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kiten-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a5c478fdcf86f6a58a1e252d75e9dbb9
diff --git a/metadata/md5-cache/kde-apps/kiten-17.12.1 b/metadata/md5-cache/kde-apps/kiten-17.12.1
index e091ba6b7480..4381bc17769a 100644
--- a/metadata/md5-cache/kde-apps/kiten-17.12.1
+++ b/metadata/md5-cache/kde-apps/kiten-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kiten:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kiten-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7a87c95eedb92a014dd296f08dc20b59
diff --git a/metadata/md5-cache/kde-apps/kjots-5.0.2 b/metadata/md5-cache/kde-apps/kjots-5.0.2
index 41f433394ebe..2c8c0a4380d3 100644
--- a/metadata/md5-cache/kde-apps/kjots-5.0.2
+++ b/metadata/md5-cache/kde-apps/kjots-5.0.2
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/applications/utilities/kjots/
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.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.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjots:4 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.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.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/grantlee:5 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjots:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kjots/5.0.2/kjots-5.0.2.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ab2c8ee88eb9582f64cf5919f5779e9e
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-17.08.3 b/metadata/md5-cache/kde-apps/kjumpingcube-17.08.3
index e81db44dde54..caea8e85dc9a 100644
--- a/metadata/md5-cache/kde-apps/kjumpingcube-17.08.3
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kjumpingcube-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=460befae53d141a1b1588f731f293cb2
diff --git a/metadata/md5-cache/kde-apps/kjumpingcube-17.12.1 b/metadata/md5-cache/kde-apps/kjumpingcube-17.12.1
index 98fceb9cb83f..4659017a1d0a 100644
--- a/metadata/md5-cache/kde-apps/kjumpingcube-17.12.1
+++ b/metadata/md5-cache/kde-apps/kjumpingcube-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kjumpingcube:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kjumpingcube-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3c05a72a5dbc576135d0aad11112a41d
diff --git a/metadata/md5-cache/kde-apps/kldap-17.08.3 b/metadata/md5-cache/kde-apps/kldap-17.08.3
index dd9fc978b11e..45098fb65d9b 100644
--- a/metadata/md5-cache/kde-apps/kldap-17.08.3
+++ b/metadata/md5-cache/kde-apps/kldap-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kldap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kldap-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=86fef2c49208f53d9e6e53c359d25259
diff --git a/metadata/md5-cache/kde-apps/kldap-17.12.1 b/metadata/md5-cache/kde-apps/kldap-17.12.1
index 2aaeb7fac477..5faa08d591f6 100644
--- a/metadata/md5-cache/kde-apps/kldap-17.12.1
+++ b/metadata/md5-cache/kde-apps/kldap-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/cyrus-sasl net-nds/openldap !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kldap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kldap-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ebe535b333dd7748393cbab3e69058ba
diff --git a/metadata/md5-cache/kde-apps/kleopatra-17.08.3 b/metadata/md5-cache/kde-apps/kleopatra-17.08.3
index bf3956c7d8a9..ac830a608cb4 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-17.08.3
+++ b/metadata/md5-cache/kde-apps/kleopatra-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/kmime-17.08.3:5 >=kde-apps/libkleo-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kleopatra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kleopatra-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a96b1214dbc53b273d5fbca85d094e3c
diff --git a/metadata/md5-cache/kde-apps/kleopatra-17.12.1 b/metadata/md5-cache/kde-apps/kleopatra-17.12.1
index f211a2e15c40..4cadb4533ab8 100644
--- a/metadata/md5-cache/kde-apps/kleopatra-17.12.1
+++ b/metadata/md5-cache/kde-apps/kleopatra-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] dev-libs/boost:= dev-libs/libassuan dev-libs/libgpg-error !kde-apps/kdepim-l10n >=app-crypt/gnupg-2.1 app-crypt/paperkey >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kleopatra:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kleopatra-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0253a589684d6b34dab71366729f8e1f
diff --git a/metadata/md5-cache/kde-apps/klettres-17.08.3 b/metadata/md5-cache/kde-apps/klettres-17.08.3
index 57d76b393dd5..e595c4323f59 100644
--- a/metadata/md5-cache/kde-apps/klettres-17.08.3
+++ b/metadata/md5-cache/kde-apps/klettres-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klettres:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/klettres-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=33863b726679d79fc642adce6655bdcc
diff --git a/metadata/md5-cache/kde-apps/klettres-17.12.1 b/metadata/md5-cache/kde-apps/klettres-17.12.1
index f6930565b286..083605f0aa33 100644
--- a/metadata/md5-cache/kde-apps/klettres-17.12.1
+++ b/metadata/md5-cache/kde-apps/klettres-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klettres:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/klettres-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=10f2b3ff0df1804c972f45c75a442fc5
diff --git a/metadata/md5-cache/kde-apps/klickety-17.08.3 b/metadata/md5-cache/kde-apps/klickety-17.08.3
index 019a715f9a4a..3657b28d2c88 100644
--- a/metadata/md5-cache/kde-apps/klickety-17.08.3
+++ b/metadata/md5-cache/kde-apps/klickety-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klickety:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/klickety-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2fc3e65b00d952151a4072e0e6b59b63
diff --git a/metadata/md5-cache/kde-apps/klickety-17.12.1 b/metadata/md5-cache/kde-apps/klickety-17.12.1
index 1844de9a2610..9a5ea534e651 100644
--- a/metadata/md5-cache/kde-apps/klickety-17.12.1
+++ b/metadata/md5-cache/kde-apps/klickety-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klickety:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/klickety-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e2526d403ffa4edc9d61e6d1c763de11
diff --git a/metadata/md5-cache/kde-apps/klines-17.08.3 b/metadata/md5-cache/kde-apps/klines-17.08.3
index f83459355b95..aedd8a21d1e5 100644
--- a/metadata/md5-cache/kde-apps/klines-17.08.3
+++ b/metadata/md5-cache/kde-apps/klines-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/klines-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e3605e2a1a99a1c2cdfa4b29442eee89
diff --git a/metadata/md5-cache/kde-apps/klines-17.12.1 b/metadata/md5-cache/kde-apps/klines-17.12.1
index 18d7b38d386b..e8061377e321 100644
--- a/metadata/md5-cache/kde-apps/klines-17.12.1
+++ b/metadata/md5-cache/kde-apps/klines-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/klines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/klines-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=990d4a676301571fc4f2c10ada7e1d2e
diff --git a/metadata/md5-cache/kde-apps/kmag-17.08.3 b/metadata/md5-cache/kde-apps/kmag-17.08.3
index d116d1359dda..9561d83b3e61 100644
--- a/metadata/md5-cache/kde-apps/kmag-17.08.3
+++ b/metadata/md5-cache/kde-apps/kmag-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmag:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kmag-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a038dff367e71714f328f004cc077aed
diff --git a/metadata/md5-cache/kde-apps/kmag-17.12.1 b/metadata/md5-cache/kde-apps/kmag-17.12.1
index e79dca177800..905470bdfc7d 100644
--- a/metadata/md5-cache/kde-apps/kmag-17.12.1
+++ b/metadata/md5-cache/kde-apps/kmag-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 keyboardfocus? ( media-libs/libqaccessibilityclient:5 ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmag:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmag-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fcdda3f759c0a90139a9da55f5ab2b5d
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-17.08.3 b/metadata/md5-cache/kde-apps/kmahjongg-17.08.3
index 0e2e421d21b1..1571c2dd3f6d 100644
--- a/metadata/md5-cache/kde-apps/kmahjongg-17.08.3
+++ b/metadata/md5-cache/kde-apps/kmahjongg-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=kde-apps/libkmahjongg-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmahjongg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kmahjongg-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=546f3a6f82f50b398576f4a127e62bfc
diff --git a/metadata/md5-cache/kde-apps/kmahjongg-17.12.1 b/metadata/md5-cache/kde-apps/kmahjongg-17.12.1
index e9b7678b09ad..8365ae28181c 100644
--- a/metadata/md5-cache/kde-apps/kmahjongg-17.12.1
+++ b/metadata/md5-cache/kde-apps/kmahjongg-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=kde-apps/libkmahjongg-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmahjongg:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmahjongg-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cd9d328e8a2ec90f33d710850559380c
diff --git a/metadata/md5-cache/kde-apps/kmail-17.08.3 b/metadata/md5-cache/kde-apps/kmail-17.08.3
index ac5833a908fe..3d00ebc44bef 100644
--- a/metadata/md5-cache/kde-apps/kmail-17.08.3
+++ b/metadata/md5-cache/kde-apps/kmail-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kmail-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c237a1c0d04ff622b31ffa011bcb29b7
diff --git a/metadata/md5-cache/kde-apps/kmail-17.12.1 b/metadata/md5-cache/kde-apps/kmail-17.12.1
deleted file mode 100644
index b0fb821bc7ba..000000000000
--- a/metadata/md5-cache/kde-apps/kmail-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/libktnef-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kldap-17.12.1:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-17.12.1:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
-EAPI=6
-HOMEPAGE=https://www.kde.org/applications/internet/kmail/
-IUSE=test debug +handbook test
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
-RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/libktnef-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/ktnef >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-apps/kmail-account-wizard-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmail-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1ae430b3dae64f3dcc528bc125988c2f
diff --git a/metadata/md5-cache/kde-apps/kmail-17.12.1-r1 b/metadata/md5-cache/kde-apps/kmail-17.12.1-r1
new file mode 100644
index 000000000000..124cf715896e
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmail-17.12.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/libktnef-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kldap-17.12.1:5 dev-libs/libxslt test? ( >=kde-apps/akonadi-17.12.1:5[sqlite,tools] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Email client, supporting POP3 and IMAP mailboxes.
+EAPI=6
+HOMEPAGE=https://www.kde.org/applications/internet/kmail/
+IUSE=test debug +handbook test
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
+RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libgravatar-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/libktnef-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/messagelib-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/ktnef >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-apps/kmail-account-wizard-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmail-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dd72409b72c56cd7df5dec9596c3ca89
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.08.3 b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.08.3
index c7af5c2e8486..7efd31091e43 100644
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.08.3
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/kidentitymanagement-17.08.3:5 >=kde-apps/kldap-17.08.3:5 >=kde-apps/kmailtransport-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=kde-apps/libkleo-17.08.3:5 >=kde-apps/pimcommon-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kmail-account-wizard-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=60431c22ec8a72c2b70e6c834cd12274
diff --git a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.1 b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.1
index 0bf13a5a723e..419f7462324a 100644
--- a/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.1
+++ b/metadata/md5-cache/kde-apps/kmail-account-wizard-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/libkleo-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n !kde-apps/kdepim-runtime:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmail-account-wizard:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmail-account-wizard-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e6bbc28b56f27883ea7cf9088529f82c
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-17.08.3 b/metadata/md5-cache/kde-apps/kmailtransport-17.08.3
index 647421f9376c..d156442b0f50 100644
--- a/metadata/md5-cache/kde-apps/kmailtransport-17.08.3
+++ b/metadata/md5-cache/kde-apps/kmailtransport-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kmailtransport-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c717ce29073e8f8e24e9e7e8e0b1c5c5
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-17.12.1 b/metadata/md5-cache/kde-apps/kmailtransport-17.12.1
deleted file mode 100644
index 75879116bbfb..000000000000
--- a/metadata/md5-cache/kde-apps/kmailtransport-17.12.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/ksmtp-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 test? ( >=kde-frameworks/ktextwidgets-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Mail transport service
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/ksmtp-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmailtransport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
-RESTRICT=test
-SLOT=5
-SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmailtransport-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9a93aaa264a89b008a8d483cfc59e071
diff --git a/metadata/md5-cache/kde-apps/kmailtransport-17.12.1-r1 b/metadata/md5-cache/kde-apps/kmailtransport-17.12.1-r1
new file mode 100644
index 000000000000..4ccb9bccdaa5
--- /dev/null
+++ b/metadata/md5-cache/kde-apps/kmailtransport-17.12.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/ksmtp-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 test? ( >=kde-frameworks/ktextwidgets-5.40.0:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 test? ( >=dev-qt/qttest-5.9.1:5 ) >=dev-qt/qtcore-5.9.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Mail transport service
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/ksmtp-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kdepimlibs:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmailtransport:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
+RESTRICT=test
+SLOT=5
+SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmailtransport-17.12.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fb6c262b1b970b9845c8fc7adc9104bd
diff --git a/metadata/md5-cache/kde-apps/kmbox-17.08.3 b/metadata/md5-cache/kde-apps/kmbox-17.08.3
index b1587aa6cdc5..908aea204e6b 100644
--- a/metadata/md5-cache/kde-apps/kmbox-17.08.3
+++ b/metadata/md5-cache/kde-apps/kmbox-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-apps/kmime-17.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kmbox-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=259bde8d82b581a9069d018b75b278b5
diff --git a/metadata/md5-cache/kde-apps/kmbox-17.12.1 b/metadata/md5-cache/kde-apps/kmbox-17.12.1
index 6a4c5690ee9b..301eaf5ec75f 100644
--- a/metadata/md5-cache/kde-apps/kmbox-17.12.1
+++ b/metadata/md5-cache/kde-apps/kmbox-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-apps/kmime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmbox:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmbox-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=64020712d490617cddef3bce72a2847b
diff --git a/metadata/md5-cache/kde-apps/kmime-17.08.3 b/metadata/md5-cache/kde-apps/kmime-17.08.3
index e19ba3638291..501db27a6497 100644
--- a/metadata/md5-cache/kde-apps/kmime-17.08.3
+++ b/metadata/md5-cache/kde-apps/kmime-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kmime-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0087bba43038d5ef4614ca18223889f0
diff --git a/metadata/md5-cache/kde-apps/kmime-17.12.1 b/metadata/md5-cache/kde-apps/kmime-17.12.1
index 6fed49c5a113..cab9801f6210 100644
--- a/metadata/md5-cache/kde-apps/kmime-17.12.1
+++ b/metadata/md5-cache/kde-apps/kmime-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmime-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b40b99d96c71264f6d3ebc0933d16da8
diff --git a/metadata/md5-cache/kde-apps/kmines-17.08.3 b/metadata/md5-cache/kde-apps/kmines-17.08.3
index fa3682ab3a5e..c76cc8c92601 100644
--- a/metadata/md5-cache/kde-apps/kmines-17.08.3
+++ b/metadata/md5-cache/kde-apps/kmines-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kmines-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b804e4f4801895aa2b0d8d083b6dc598
diff --git a/metadata/md5-cache/kde-apps/kmines-17.12.1 b/metadata/md5-cache/kde-apps/kmines-17.12.1
index 5343c5b8855a..2b611690d7fe 100644
--- a/metadata/md5-cache/kde-apps/kmines-17.12.1
+++ b/metadata/md5-cache/kde-apps/kmines-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmines:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmines-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=be3ded71de3bbd33d4a626a64f49adc6
diff --git a/metadata/md5-cache/kde-apps/kmix-17.08.3 b/metadata/md5-cache/kde-apps/kmix-17.08.3
index 41f06ed52527..18372a1927a2 100644
--- a/metadata/md5-cache/kde-apps/kmix-17.08.3
+++ b/metadata/md5-cache/kde-apps/kmix-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmix:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kmix-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=11328794f939d025786e739998c6c3dd
diff --git a/metadata/md5-cache/kde-apps/kmix-17.12.1 b/metadata/md5-cache/kde-apps/kmix-17.12.1
index 4df3ee15d09e..c43bcdde1f41 100644
--- a/metadata/md5-cache/kde-apps/kmix-17.12.1
+++ b/metadata/md5-cache/kde-apps/kmix-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 alsa? ( >=media-libs/alsa-lib-1.0.14a ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra >=media-sound/pulseaudio-0.9.12 ) >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmix:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmix-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=122e4f2430842e2fb9f6506a55081f0f
diff --git a/metadata/md5-cache/kde-apps/kmousetool-17.08.3 b/metadata/md5-cache/kde-apps/kmousetool-17.08.3
index 99944f0ce4fe..3f651e1c19fa 100644
--- a/metadata/md5-cache/kde-apps/kmousetool-17.08.3
+++ b/metadata/md5-cache/kde-apps/kmousetool-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmousetool:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kmousetool-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8298150a7c61494e0515f220f697540b
diff --git a/metadata/md5-cache/kde-apps/kmousetool-17.12.1 b/metadata/md5-cache/kde-apps/kmousetool-17.12.1
index 76c055adc79f..6f34e55546f6 100644
--- a/metadata/md5-cache/kde-apps/kmousetool-17.12.1
+++ b/metadata/md5-cache/kde-apps/kmousetool-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXtst !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmousetool:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmousetool-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bc810b85c89f63d3ad8945b7d0f4c513
diff --git a/metadata/md5-cache/kde-apps/kmouth-17.12.1 b/metadata/md5-cache/kde-apps/kmouth-17.12.1
index 5de4de56c205..058041f7641c 100644
--- a/metadata/md5-cache/kde-apps/kmouth-17.12.1
+++ b/metadata/md5-cache/kde-apps/kmouth-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtspeech-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmouth:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmouth-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b00700dea8d13873195c00be69daed34
diff --git a/metadata/md5-cache/kde-apps/kmplot-17.08.3 b/metadata/md5-cache/kde-apps/kmplot-17.08.3
index 0fad7a3c0bc3..fad1af4dd72b 100644
--- a/metadata/md5-cache/kde-apps/kmplot-17.08.3
+++ b/metadata/md5-cache/kde-apps/kmplot-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmplot:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kmplot-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=acb1824720805e31ce23b02bcb7070b7
diff --git a/metadata/md5-cache/kde-apps/kmplot-17.12.1 b/metadata/md5-cache/kde-apps/kmplot-17.12.1
index 987fcd1722d7..5ba1006c9978 100644
--- a/metadata/md5-cache/kde-apps/kmplot-17.12.1
+++ b/metadata/md5-cache/kde-apps/kmplot-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kmplot:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kmplot-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=729c2d923ed70bed3cb0c13051e1decf
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-17.08.3 b/metadata/md5-cache/kde-apps/knavalbattle-17.08.3
index 57bece3368bb..b118aff8d134 100644
--- a/metadata/md5-cache/kde-apps/knavalbattle-17.08.3
+++ b/metadata/md5-cache/kde-apps/knavalbattle-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knavalbattle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/knavalbattle-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c3b46d6206bb5f4296b579a78d452b02
diff --git a/metadata/md5-cache/kde-apps/knavalbattle-17.12.1 b/metadata/md5-cache/kde-apps/knavalbattle-17.12.1
index 25d6a9e6d5c2..51f680e14ab3 100644
--- a/metadata/md5-cache/kde-apps/knavalbattle-17.12.1
+++ b/metadata/md5-cache/kde-apps/knavalbattle-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knavalbattle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/knavalbattle-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1176a4417618722f921ae2d255832c78
diff --git a/metadata/md5-cache/kde-apps/knetwalk-17.08.3 b/metadata/md5-cache/kde-apps/knetwalk-17.08.3
index 0bcedffce683..a2e8eb14dab9 100644
--- a/metadata/md5-cache/kde-apps/knetwalk-17.08.3
+++ b/metadata/md5-cache/kde-apps/knetwalk-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knetwalk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/knetwalk-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f89b47fc9e93ebfa46cd410742cee2ac
diff --git a/metadata/md5-cache/kde-apps/knetwalk-17.12.1 b/metadata/md5-cache/kde-apps/knetwalk-17.12.1
index fd3cb23431e4..6f02eee59f9e 100644
--- a/metadata/md5-cache/kde-apps/knetwalk-17.12.1
+++ b/metadata/md5-cache/kde-apps/knetwalk-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knetwalk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/knetwalk-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f15f34b587a364818339f02ba2c28b61
diff --git a/metadata/md5-cache/kde-apps/knotes-17.08.3 b/metadata/md5-cache/kde-apps/knotes-17.08.3
index c21cb8ec7084..8ad59c5601ef 100644
--- a/metadata/md5-cache/kde-apps/knotes-17.08.3
+++ b/metadata/md5-cache/kde-apps/knotes-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-notes-17.08.3:5 >=kde-apps/akonadi-search-17.08.3:5 >=kde-apps/kcalcore-17.08.3:5 >=kde-apps/kcalutils-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kmime-17.08.3:5 >=kde-apps/kontactinterface-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=kde-apps/pimcommon-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knotes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/knotes-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=da15c3eaba6fb6de143e5a6ac1bdc1e4
diff --git a/metadata/md5-cache/kde-apps/knotes-17.12.1 b/metadata/md5-cache/kde-apps/knotes-17.12.1
index 130e601d8682..ce1543007b7a 100644
--- a/metadata/md5-cache/kde-apps/knotes-17.12.1
+++ b/metadata/md5-cache/kde-apps/knotes-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 dev-libs/libxslt x11-libs/libX11 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/knotes:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/knotes-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aaf8ab91d8d3bb14645be318348a6aa0
diff --git a/metadata/md5-cache/kde-apps/kolf-17.12.1 b/metadata/md5-cache/kde-apps/kolf-17.12.1
index ad83470557fc..57e093122dcb 100644
--- a/metadata/md5-cache/kde-apps/kolf-17.12.1
+++ b/metadata/md5-cache/kde-apps/kolf-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolf:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kolf-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ed06f3b3244457881f67979974bb15ea
diff --git a/metadata/md5-cache/kde-apps/kollision-17.08.3 b/metadata/md5-cache/kde-apps/kollision-17.08.3
index 98fb411fc67c..8d20c856c243 100644
--- a/metadata/md5-cache/kde-apps/kollision-17.08.3
+++ b/metadata/md5-cache/kde-apps/kollision-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kollision:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kollision-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3f70db307a07c7f21e514e811eb68ca5
diff --git a/metadata/md5-cache/kde-apps/kollision-17.12.1 b/metadata/md5-cache/kde-apps/kollision-17.12.1
index c48ee85dbe45..48b5509272c0 100644
--- a/metadata/md5-cache/kde-apps/kollision-17.12.1
+++ b/metadata/md5-cache/kde-apps/kollision-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kollision:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kollision-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=376846a81674449ff6c60d111c23b432
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-17.08.3 b/metadata/md5-cache/kde-apps/kolourpaint-17.08.3
index 16ad6df58eb9..b783d8be1e6c 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-17.08.3
+++ b/metadata/md5-cache/kde-apps/kolourpaint-17.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.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 scanner? ( >=kde-apps/libksane-17.08.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolourpaint:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kolourpaint-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=812a82188dc5bc8af585178ff8f22be0
diff --git a/metadata/md5-cache/kde-apps/kolourpaint-17.12.1 b/metadata/md5-cache/kde-apps/kolourpaint-17.12.1
index df12b9d6ec7c..d0714cd2d3f8 100644
--- a/metadata/md5-cache/kde-apps/kolourpaint-17.12.1
+++ b/metadata/md5-cache/kde-apps/kolourpaint-17.12.1
@@ -9,5 +9,5 @@ LICENSE=BSD-2 LGPL-2 LGPL-2+ || ( LGPL-2.1 LGPL-3 ) GPL-2 handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 scanner? ( >=kde-apps/libksane-17.12.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kolourpaint:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kolourpaint-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=334b1cd61969839a035212d5a7a4af50
diff --git a/metadata/md5-cache/kde-apps/kompare-17.08.3 b/metadata/md5-cache/kde-apps/kompare-17.08.3
index 744f6150af5b..a34eba8b9edb 100644
--- a/metadata/md5-cache/kde-apps/kompare-17.08.3
+++ b/metadata/md5-cache/kde-apps/kompare-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkomparediff2-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kompare:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kompare-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9f364a4c4689e125342b25ef2e55d49a
diff --git a/metadata/md5-cache/kde-apps/kompare-17.12.1 b/metadata/md5-cache/kde-apps/kompare-17.12.1
index c7e714bad4bc..5233e1575d6f 100644
--- a/metadata/md5-cache/kde-apps/kompare-17.12.1
+++ b/metadata/md5-cache/kde-apps/kompare-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkomparediff2-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kompare:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kompare-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7810ebb64b8b17168b6c12374d4bba13
diff --git a/metadata/md5-cache/kde-apps/konqueror-17.08.3 b/metadata/md5-cache/kde-apps/konqueror-17.08.3
index 0442b7204f49..ea35be82ec44 100644
--- a/metadata/md5-cache/kde-apps/konqueror-17.08.3
+++ b/metadata/md5-cache/kde-apps/konqueror-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/konqueror-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=eee7e660736e8846ecee1ec0902707e6
diff --git a/metadata/md5-cache/kde-apps/konqueror-17.12.1 b/metadata/md5-cache/kde-apps/konqueror-17.12.1
index 0a0f27ca9de4..c0603bcbedfc 100644
--- a/metadata/md5-cache/kde-apps/konqueror-17.12.1
+++ b/metadata/md5-cache/kde-apps/konqueror-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/konqueror-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3bf841515709ddd381afb8bd0135d204
diff --git a/metadata/md5-cache/kde-apps/konquest-17.08.3 b/metadata/md5-cache/kde-apps/konquest-17.08.3
index 7426eed6c4c2..7d7ca35517f0 100644
--- a/metadata/md5-cache/kde-apps/konquest-17.08.3
+++ b/metadata/md5-cache/kde-apps/konquest-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konquest:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/konquest-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=106e0799ef1672a183445faa0b0a2e27
diff --git a/metadata/md5-cache/kde-apps/konquest-17.12.1 b/metadata/md5-cache/kde-apps/konquest-17.12.1
index f4938d2f5f2a..52e1fd537cf4 100644
--- a/metadata/md5-cache/kde-apps/konquest-17.12.1
+++ b/metadata/md5-cache/kde-apps/konquest-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konquest:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/konquest-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=39abbe22a167acefc8d27ff1e8a2d56d
diff --git a/metadata/md5-cache/kde-apps/konsole-17.08.3 b/metadata/md5-cache/kde-apps/konsole-17.08.3
index e22b9355f836..3500a5ca7807 100644
--- a/metadata/md5-cache/kde-apps/konsole-17.08.3
+++ b/metadata/md5-cache/kde-apps/konsole-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/konsole-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9876cb9d08a97b969219a0d093d1ef37
diff --git a/metadata/md5-cache/kde-apps/konsole-17.12.1 b/metadata/md5-cache/kde-apps/konsole-17.12.1
index bc571a03fd56..6dac166791ac 100644
--- a/metadata/md5-cache/kde-apps/konsole-17.12.1
+++ b/metadata/md5-cache/kde-apps/konsole-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsole:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/konsole-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=866ca0be0b19b1bce9e1b7099d9b24a8
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-17.08.3 b/metadata/md5-cache/kde-apps/konsolekalendar-17.08.3
index 82684d576696..c2ce083fec6a 100644
--- a/metadata/md5-cache/kde-apps/konsolekalendar-17.08.3
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-calendar-17.08.3:5 >=kde-apps/calendarsupport-17.08.3:5 >=kde-apps/kcalcore-17.08.3:5 >=kde-apps/kcalutils-17.08.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/akonadi-calendar-tools-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5875c459c29525e0507d33f3c09fd53a
diff --git a/metadata/md5-cache/kde-apps/konsolekalendar-17.12.1 b/metadata/md5-cache/kde-apps/konsolekalendar-17.12.1
index b791d24b073b..7d89d6eee2e9 100644
--- a/metadata/md5-cache/kde-apps/konsolekalendar-17.12.1
+++ b/metadata/md5-cache/kde-apps/konsolekalendar-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/konsolekalendar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/akonadi-calendar-tools-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=41b8cf3c86d80a33123f4e10707254ea
diff --git a/metadata/md5-cache/kde-apps/kontact-17.08.3 b/metadata/md5-cache/kde-apps/kontact-17.08.3
index 4657c2a3309b..e453145e0efd 100644
--- a/metadata/md5-cache/kde-apps/kontact-17.08.3
+++ b/metadata/md5-cache/kde-apps/kontact-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/grantleetheme-17.08.3:5 >=kde-apps/kdepim-apps-libs-17.08.3:5 >=kde-apps/kontactinterface-17.08.3:5 >=kde-apps/kpimtextedit-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=kde-apps/mailcommon-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontact:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kontact-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0cebc004a3db35d77ed2a231ea9d204f
diff --git a/metadata/md5-cache/kde-apps/kontact-17.12.1 b/metadata/md5-cache/kde-apps/kontact-17.12.1
index 118b1aa8cb10..c85e7e3b84c5 100644
--- a/metadata/md5-cache/kde-apps/kontact-17.12.1
+++ b/metadata/md5-cache/kde-apps/kontact-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/grantleetheme-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontact:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kontact-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0b0b36331f38f21615b2db494f7a598b
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-17.08.3 b/metadata/md5-cache/kde-apps/kontactinterface-17.08.3
index d05830729999..581d228035d1 100644
--- a/metadata/md5-cache/kde-apps/kontactinterface-17.08.3
+++ b/metadata/md5-cache/kde-apps/kontactinterface-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontactinterface:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kontactinterface-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0a583d4f009354aa62755a34575c6110
diff --git a/metadata/md5-cache/kde-apps/kontactinterface-17.12.1 b/metadata/md5-cache/kde-apps/kontactinterface-17.12.1
index 6e44ba24d992..d8fc254f54b0 100644
--- a/metadata/md5-cache/kde-apps/kontactinterface-17.12.1
+++ b/metadata/md5-cache/kde-apps/kontactinterface-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kontactinterface:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kontactinterface-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a2549361bdde54f6c5dfb9badfc1d429
diff --git a/metadata/md5-cache/kde-apps/kopete-17.08.3_p20171029 b/metadata/md5-cache/kde-apps/kopete-17.08.3_p20171029
index ac814ff3df81..b1194a254e24 100644
--- a/metadata/md5-cache/kde-apps/kopete-17.08.3_p20171029
+++ b/metadata/md5-cache/kde-apps/kopete-17.08.3_p20171029
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=https://github.com/KDE/kopete/archive/d7dbacb483124d5d6a8ad30586ec126c8514a715.tar.gz -> kopete-17.08.3_p20171029.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d3666437bf7aea8e38257468c0d8238e
diff --git a/metadata/md5-cache/kde-apps/korganizer-17.08.3 b/metadata/md5-cache/kde-apps/korganizer-17.08.3
index 21f4deae1f39..075777405d18 100644
--- a/metadata/md5-cache/kde-apps/korganizer-17.08.3
+++ b/metadata/md5-cache/kde-apps/korganizer-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-calendar-17.08.3:5 >=kde-apps/akonadi-contacts-17.08.3:5 >=kde-apps/akonadi-mime-17.08.3:5 >=kde-apps/akonadi-notes-17.08.3:5 >=kde-apps/akonadi-search-17.08.3:5 >=kde-apps/calendarsupport-17.08.3:5 >=kde-apps/eventviews-17.08.3:5 >=kde-apps/incidenceeditor-17.08.3:5 >=kde-apps/kcalcore-17.08.3:5 >=kde-apps/kcalutils-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kdepim-apps-libs-17.08.3:5 >=kde-apps/kholidays-17.08.3:5 >=kde-apps/kidentitymanagement-17.08.3:5 >=kde-apps/kmailtransport-17.08.3:5 >=kde-apps/kmime-17.08.3:5 >=kde-apps/kontactinterface-17.08.3:5 >=kde-apps/kpimtextedit-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=kde-apps/pimcommon-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/korganizer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/korganizer-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=862a15eb38408fbb0c41cdb2eeacd502
diff --git a/metadata/md5-cache/kde-apps/korganizer-17.12.1 b/metadata/md5-cache/kde-apps/korganizer-17.12.1
index 2e7c5b078a41..65aa0cef1513 100644
--- a/metadata/md5-cache/kde-apps/korganizer-17.12.1
+++ b/metadata/md5-cache/kde-apps/korganizer-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-calendar-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/akonadi-notes-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/eventviews-17.12.1:5 >=kde-apps/incidenceeditor-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kdepim-apps-libs-17.12.1:5 >=kde-apps/kholidays-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kontactinterface-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libX11 ) !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-apps/kdepim-runtime-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/korganizer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/korganizer-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5e0d5d1f582fc64deb8a95bb83763425
diff --git a/metadata/md5-cache/kde-apps/kpat-17.08.3 b/metadata/md5-cache/kde-apps/kpat-17.08.3
index 25e9d31b18d9..4514b3287dc0 100644
--- a/metadata/md5-cache/kde-apps/kpat-17.08.3
+++ b/metadata/md5-cache/kde-apps/kpat-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kpat-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0c5ab38ec16984f2aac927750f452442
diff --git a/metadata/md5-cache/kde-apps/kpat-17.12.1 b/metadata/md5-cache/kde-apps/kpat-17.12.1
index 510332336910..1e365c27a90a 100644
--- a/metadata/md5-cache/kde-apps/kpat-17.12.1
+++ b/metadata/md5-cache/kde-apps/kpat-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 x11-misc/shared-mime-info >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kpat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kpat-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=80e98ff800e2e6a72136cf67fe96425d
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-17.08.3 b/metadata/md5-cache/kde-apps/kpimtextedit-17.08.3
index 1d783af53138..ea878a19fb39 100644
--- a/metadata/md5-cache/kde-apps/kpimtextedit-17.08.3
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kpimtextedit-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b78a4e4847f9c9d2d4a5d2281efbb71c
diff --git a/metadata/md5-cache/kde-apps/kpimtextedit-17.12.1 b/metadata/md5-cache/kde-apps/kpimtextedit-17.12.1
index e3c066625eb4..9898b214b31a 100644
--- a/metadata/md5-cache/kde-apps/kpimtextedit-17.12.1
+++ b/metadata/md5-cache/kde-apps/kpimtextedit-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kpimtextedit-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c70029487e4d9c9062345a2c1d014797
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-17.08.3 b/metadata/md5-cache/kde-apps/kqtquickcharts-17.08.3
index 3f9c3580187c..30503f2ea931 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-17.08.3
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kqtquickcharts-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=88ed61295348e06b10bacc57668af56d
diff --git a/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.1 b/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.1
index 201f73a27dbe..e42fb7cbac5a 100644
--- a/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.1
+++ b/metadata/md5-cache/kde-apps/kqtquickcharts-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kqtquickcharts:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kqtquickcharts-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=814e55e7fe91d369030a11c8d7255eab
diff --git a/metadata/md5-cache/kde-apps/krdc-17.08.3 b/metadata/md5-cache/kde-apps/krdc-17.08.3
index 84696b0c5dc6..6dfa8b96c0fb 100644
--- a/metadata/md5-cache/kde-apps/krdc-17.08.3
+++ b/metadata/md5-cache/kde-apps/krdc-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krdc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/krdc-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bf743b208d95e61a1eb7fbbab818c2f3
diff --git a/metadata/md5-cache/kde-apps/krdc-17.12.1 b/metadata/md5-cache/kde-apps/krdc-17.12.1
index 6fd8baa2f2db..a6adf52a2cb0 100644
--- a/metadata/md5-cache/kde-apps/krdc-17.12.1
+++ b/metadata/md5-cache/kde-apps/krdc-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 vnc? ( >=net-libs/libvncserver-0.9 ) rdp? ( >=net-misc/freerdp-1.1.0_beta1[X] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krdc:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/krdc-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=098fbdda4e8acd6c2a74c4d80bd93898
diff --git a/metadata/md5-cache/kde-apps/kreversi-17.08.3 b/metadata/md5-cache/kde-apps/kreversi-17.08.3
index 710da8a9d742..7eefcbcd290a 100644
--- a/metadata/md5-cache/kde-apps/kreversi-17.08.3
+++ b/metadata/md5-cache/kde-apps/kreversi-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kreversi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kreversi-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cc1f2a26caf1efd1db6ce4f7be9cf1ea
diff --git a/metadata/md5-cache/kde-apps/kreversi-17.12.1 b/metadata/md5-cache/kde-apps/kreversi-17.12.1
index 6d35bf32037e..7384305b8f28 100644
--- a/metadata/md5-cache/kde-apps/kreversi-17.12.1
+++ b/metadata/md5-cache/kde-apps/kreversi-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kreversi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kreversi-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=93c7c55d5522ec85cf1387ef505e7ca7
diff --git a/metadata/md5-cache/kde-apps/krfb-17.08.3 b/metadata/md5-cache/kde-apps/krfb-17.08.3
index 61a70c6e91ad..33dfd6c1c351 100644
--- a/metadata/md5-cache/kde-apps/krfb-17.08.3
+++ b/metadata/md5-cache/kde-apps/krfb-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krfb:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/krfb-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=59d66c917dcca45d92d1eb82c8e2b2af
diff --git a/metadata/md5-cache/kde-apps/krfb-17.12.1 b/metadata/md5-cache/kde-apps/krfb-17.12.1
index 6f82d76ba153..6ec6316bc088 100644
--- a/metadata/md5-cache/kde-apps/krfb-17.12.1
+++ b/metadata/md5-cache/kde-apps/krfb-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=net-libs/libvncserver-0.9.9 x11-libs/libX11 x11-libs/libxcb x11-libs/libXtst x11-libs/xcb-util-image >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/krfb:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/krfb-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b0f72961a05c0325a8d01d45083396ef
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-17.08.3 b/metadata/md5-cache/kde-apps/kross-interpreters-17.08.3
index 0fe7bf47e068..c2a66e6f331a 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-17.08.3
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-17.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/17.08.3/src/kross-interpreters-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=774dad5e362bfe0876b564c3b0f70ae3
diff --git a/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1 b/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1
index b3fad8ef5b42..20a328344bfb 100644
--- a/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1
+++ b/metadata/md5-cache/kde-apps/kross-interpreters-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kross-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidget
 REQUIRED_USE=|| ( python ruby ) python? ( python_targets_python2_7 )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kross-interpreters-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d66643edd6a99e6a0a165c2f4d349149
diff --git a/metadata/md5-cache/kde-apps/kruler-17.08.3 b/metadata/md5-cache/kde-apps/kruler-17.08.3
index c1bec93b63c0..e5aec3f22811 100644
--- a/metadata/md5-cache/kde-apps/kruler-17.08.3
+++ b/metadata/md5-cache/kde-apps/kruler-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kruler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kruler-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c352ae0f26a1cb6fc19eccd3fec66055
diff --git a/metadata/md5-cache/kde-apps/kruler-17.12.1 b/metadata/md5-cache/kde-apps/kruler-17.12.1
index a3213e57f1e9..02e259bc928a 100644
--- a/metadata/md5-cache/kde-apps/kruler-17.12.1
+++ b/metadata/md5-cache/kde-apps/kruler-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 X? ( >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kruler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kruler-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6a532d96e7aa8dfb2ed7b6932070a7c3
diff --git a/metadata/md5-cache/kde-apps/kshisen-17.08.3 b/metadata/md5-cache/kde-apps/kshisen-17.08.3
index 2387ddb10035..1979d56342de 100644
--- a/metadata/md5-cache/kde-apps/kshisen-17.08.3
+++ b/metadata/md5-cache/kde-apps/kshisen-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=kde-apps/libkmahjongg-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kshisen:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kshisen-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d85089c9fcf1c89ef1cb023526b44265
diff --git a/metadata/md5-cache/kde-apps/kshisen-17.12.1 b/metadata/md5-cache/kde-apps/kshisen-17.12.1
index 066f6c5203cf..751a70d4e61f 100644
--- a/metadata/md5-cache/kde-apps/kshisen-17.12.1
+++ b/metadata/md5-cache/kde-apps/kshisen-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=kde-apps/libkmahjongg-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kshisen:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kshisen-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d8b4378093fbcba1eeb6a98fac70ee88
diff --git a/metadata/md5-cache/kde-apps/ksirk-17.12.1 b/metadata/md5-cache/kde-apps/ksirk-17.12.1
index c2c025256d94..9b4497c169cd 100644
--- a/metadata/md5-cache/kde-apps/ksirk-17.12.1
+++ b/metadata/md5-cache/kde-apps/ksirk-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 app-crypt/qca:2[qt5] media-libs/phonon[qt5(+)] sys-libs/zlib !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksirk:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksirk-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7d587c4d35a7ed0315be6ea7b6c66785
diff --git a/metadata/md5-cache/kde-apps/ksmtp-17.12.1 b/metadata/md5-cache/kde-apps/ksmtp-17.12.1
index 07cc80e1b0c1..d01907563daa 100644
--- a/metadata/md5-cache/kde-apps/ksmtp-17.12.1
+++ b/metadata/md5-cache/kde-apps/ksmtp-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksmtp-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fed3515f2192e5c9117086079ac61c38
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-17.08.3 b/metadata/md5-cache/kde-apps/ksnakeduel-17.08.3
index 846869e1008d..de588027688a 100644
--- a/metadata/md5-cache/kde-apps/ksnakeduel-17.08.3
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksnakeduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ksnakeduel-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=89b4e5a61ab035e835f57eb067e4d658
diff --git a/metadata/md5-cache/kde-apps/ksnakeduel-17.12.1 b/metadata/md5-cache/kde-apps/ksnakeduel-17.12.1
index 0e28be67546e..01d796004a94 100644
--- a/metadata/md5-cache/kde-apps/ksnakeduel-17.12.1
+++ b/metadata/md5-cache/kde-apps/ksnakeduel-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksnakeduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksnakeduel-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8202199ed0d0dc7f85ddb8a7a882f1f5
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-17.08.3 b/metadata/md5-cache/kde-apps/kspaceduel-17.08.3
index ccb150d6d992..5fc28145402f 100644
--- a/metadata/md5-cache/kde-apps/kspaceduel-17.08.3
+++ b/metadata/md5-cache/kde-apps/kspaceduel-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kspaceduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kspaceduel-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=811931ae48a0240cf34fb85619e2ea7e
diff --git a/metadata/md5-cache/kde-apps/kspaceduel-17.12.1 b/metadata/md5-cache/kde-apps/kspaceduel-17.12.1
index 8bfd03212bef..1ef4be78fa44 100644
--- a/metadata/md5-cache/kde-apps/kspaceduel-17.12.1
+++ b/metadata/md5-cache/kde-apps/kspaceduel-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kspaceduel:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kspaceduel-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9fe3f5db6495d786675e58283c5ad45c
diff --git a/metadata/md5-cache/kde-apps/ksquares-17.08.3 b/metadata/md5-cache/kde-apps/ksquares-17.08.3
index 5066f40a7eb4..7f9fd77b5543 100644
--- a/metadata/md5-cache/kde-apps/ksquares-17.08.3
+++ b/metadata/md5-cache/kde-apps/ksquares-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksquares:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ksquares-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=96e31bcce5901d3c93fa49a160a3adcb
diff --git a/metadata/md5-cache/kde-apps/ksquares-17.12.1 b/metadata/md5-cache/kde-apps/ksquares-17.12.1
index 481af7b3deca..f667e25c3f00 100644
--- a/metadata/md5-cache/kde-apps/ksquares-17.12.1
+++ b/metadata/md5-cache/kde-apps/ksquares-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksquares:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksquares-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=503bea865a83e7f934ffdd389a369286
diff --git a/metadata/md5-cache/kde-apps/kstars-17.08.3 b/metadata/md5-cache/kde-apps/kstars-17.08.3
index 4e2e43b509ed..637f00bdef85 100644
--- a/metadata/md5-cache/kde-apps/kstars-17.08.3
+++ b/metadata/md5-cache/kde-apps/kstars-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0
 REQUIRED_USE=indi? ( fits ) python_targets_python2_7
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kstars-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=410c565682734b4e356f39fb93878ee3
diff --git a/metadata/md5-cache/kde-apps/ksudoku-17.08.3 b/metadata/md5-cache/kde-apps/ksudoku-17.08.3
index 2ba5532b3b92..d1741174b85d 100644
--- a/metadata/md5-cache/kde-apps/ksudoku-17.08.3
+++ b/metadata/md5-cache/kde-apps/ksudoku-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 opengl? ( >=dev-qt/qtopengl-5.7.1:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksudoku:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ksudoku-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7022e6bf62e08c04a63a86dc0f380fc8
diff --git a/metadata/md5-cache/kde-apps/ksudoku-17.12.1 b/metadata/md5-cache/kde-apps/ksudoku-17.12.1
index 020d3abde2c7..afdac77bd5dd 100644
--- a/metadata/md5-cache/kde-apps/ksudoku-17.12.1
+++ b/metadata/md5-cache/kde-apps/ksudoku-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 opengl? ( >=dev-qt/qtopengl-5.9.1:5 virtual/glu ) !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ksudoku:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksudoku-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7834efdc4fd82950246e934b359216cb
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-17.08.3 b/metadata/md5-cache/kde-apps/ksystemlog-17.08.3
index 6c03f5861eff..78dbaf34534a 100644
--- a/metadata/md5-cache/kde-apps/ksystemlog-17.08.3
+++ b/metadata/md5-cache/kde-apps/ksystemlog-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ksystemlog-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2fc1539dfed367ad55f75cfda4ea11c3
diff --git a/metadata/md5-cache/kde-apps/ksystemlog-17.12.1 b/metadata/md5-cache/kde-apps/ksystemlog-17.12.1
index 8faa488d853e..1b85067cf9fc 100644
--- a/metadata/md5-cache/kde-apps/ksystemlog-17.12.1
+++ b/metadata/md5-cache/kde-apps/ksystemlog-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ksystemlog-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9948f9339dc7458897ce8f3e7a134a64
diff --git a/metadata/md5-cache/kde-apps/kteatime-17.08.3 b/metadata/md5-cache/kde-apps/kteatime-17.08.3
index db8024044b56..52ca14d80063 100644
--- a/metadata/md5-cache/kde-apps/kteatime-17.08.3
+++ b/metadata/md5-cache/kde-apps/kteatime-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kteatime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kteatime-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d09bfbbeeb88835095d9f80c40a648ae
diff --git a/metadata/md5-cache/kde-apps/kteatime-17.12.1 b/metadata/md5-cache/kde-apps/kteatime-17.12.1
index d68b29bdefef..bbd18a0a3b70 100644
--- a/metadata/md5-cache/kde-apps/kteatime-17.12.1
+++ b/metadata/md5-cache/kde-apps/kteatime-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kteatime:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kteatime-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=006c64ed4d27fb9cc705c17bd69d61db
diff --git a/metadata/md5-cache/kde-apps/ktimer-17.08.3 b/metadata/md5-cache/kde-apps/ktimer-17.08.3
index 064704acd1e4..aff2aac74113 100644
--- a/metadata/md5-cache/kde-apps/ktimer-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktimer-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktimer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktimer-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=632238d80c1f8d6761e7d0789c258aed
diff --git a/metadata/md5-cache/kde-apps/ktimer-17.12.1 b/metadata/md5-cache/kde-apps/ktimer-17.12.1
index bf69b689685b..b5e7a4b51902 100644
--- a/metadata/md5-cache/kde-apps/ktimer-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktimer-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktimer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktimer-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fdf243d73bd0d84c982fd498b9b4115a
diff --git a/metadata/md5-cache/kde-apps/ktouch-17.08.3 b/metadata/md5-cache/kde-apps/ktouch-17.08.3
index 1c8c33d15952..669a3c91f07e 100644
--- a/metadata/md5-cache/kde-apps/ktouch-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktouch-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-17.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktouch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktouch-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7f3f7f5196e989d6f861d7dcb7ac8dce
diff --git a/metadata/md5-cache/kde-apps/ktouch-17.12.1 b/metadata/md5-cache/kde-apps/ktouch-17.12.1
index 4c49da32f5c2..98ce1aa90b1e 100644
--- a/metadata/md5-cache/kde-apps/ktouch-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktouch-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libxcb >=kde-apps/kqtquickcharts-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktouch:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktouch-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1137cbf30604fe2ece5b99851669ca7b
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.08.3 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.08.3
index c15f6dd6d6fd..806dd947caf3 100644
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-17.08.3:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktp-accounts-kcm-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2b44f134ad1f081b4ce85188d9437276
diff --git a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.1 b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.1
index 45308cf945f7..e8cd74abd221 100644
--- a/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktp-accounts-kcm-17.12.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] >=kde-apps/kaccounts-providers-17.12.1:5 net-im/telepathy-connection-managers >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-accounts-kcm:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-accounts-kcm-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e5e58f595839a82e85d28331ddd6a0d0
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-17.08.3 b/metadata/md5-cache/kde-apps/ktp-approver-17.08.3
index 9fb0a9be6b59..0ee26ad333ed 100644
--- a/metadata/md5-cache/kde-apps/ktp-approver-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-approver-17.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-approver:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktp-approver-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c5017543ed90d8e78204392400932809
diff --git a/metadata/md5-cache/kde-apps/ktp-approver-17.12.1 b/metadata/md5-cache/kde-apps/ktp-approver-17.12.1
index 62ad08c92431..cff334e12852 100644
--- a/metadata/md5-cache/kde-apps/ktp-approver-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktp-approver-17.12.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-approver:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-approver-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=65b8fe72f6aa3c3d6a6738c5d5b82693
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.08.3 b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.08.3
index 5121b04f2813..a3750c29cd57 100644
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.08.3:5 >=kde-apps/ktp-common-internals-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktp-auth-handler-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a088be3d7153b4129da19663541e3ef1
diff --git a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.1 b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.1
index 066bee17e3c5..f84f72d56d89 100644
--- a/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktp-auth-handler-17.12.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/kaccounts-integration-17.12.1:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 app-crypt/qca:2[qt5] net-libs/accounts-qt net-libs/signond net-libs/telepathy-qt[qt5(+)] app-crypt/qca:2[ssl] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-auth-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-auth-handler-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1cd0a3041d5b9cc30f75ec1228fa54ae
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-17.08.3 b/metadata/md5-cache/kde-apps/ktp-call-ui-17.08.3
index 61d2fc03b572..2b6cdcdfb934 100644
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktp-call-ui-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=626dc583b4023f68f6c931fefe554d00
diff --git a/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.1 b/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.1
index 6c2da3057e0b..986fca6f0747 100644
--- a/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktp-call-ui-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 dev-libs/boost dev-libs/glib:2 media-libs/phonon[qt5(+)] media-libs/qt-gstreamer[qt5(+)] net-libs/farstream:0.2 net-libs/telepathy-farstream net-libs/telepathy-qt[farstream,qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-call-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-call-ui-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f367f17c34d362d0c78c358506a12f94
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-17.08.3 b/metadata/md5-cache/kde-apps/ktp-common-internals-17.08.3
index e7240acaaa29..bc209e844e4f 100644
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-17.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.08.3:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktp-common-internals-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3bd7b4f8ea41efdc9e3898aaf618d57e
diff --git a/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.1 b/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.1
index f36c7efb8327..6075ff93dbac 100644
--- a/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktp-common-internals-17.12.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=net-libs/telepathy-logger-qt-17.08.0:5 >=net-libs/telepathy-qt-0.9.5[qt5(+)] otr? ( dev-libs/libgcrypt:0= >=net-libs/libotr-4.0.0 ) sso? ( >=kde-apps/kaccounts-integration-17.12.1:5 net-libs/accounts-qt net-libs/telepathy-accounts-signon ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-common-internals:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-common-internals-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=51483183c789d09c950ece03475a6394
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-17.08.3 b/metadata/md5-cache/kde-apps/ktp-contact-list-17.08.3
index 4ddc5c3e0c79..3614f8217be8 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktp-contact-list-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=495a8503ea6a6416557c5a40913a334a
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.1 b/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.1
index f66185f914cd..9da2992f3c48 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktp-contact-list-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-list:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-contact-list-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=64a04e912e5f4e183dd7fa86427c2717
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.08.3 b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.08.3
index 5ffcafb9f55d..9a37dc5a5dfe 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/ktp-common-internals-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktp-contact-runner-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fd9024fa23a32867fd3ee7814acb9146
diff --git a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.1 b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.1
index a3c0ffc0aeb7..e818e6fb429c 100644
--- a/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktp-contact-runner-17.12.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-contact-runner:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-contact-runner-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6e513d781659ff0386e55f5c1e97f8ca
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.08.3 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.08.3
index 8dfda42ee2fa..740764d080e6 100644
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.08.3
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktp-desktop-applets-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bbfc3240001057611def7ad55ee43d4f
diff --git a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.1 b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.1
index e2b8781bcfa6..679c71497c27 100644
--- a/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktp-desktop-applets-17.12.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-desktop-applets:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-desktop-applets-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ab6633c1acf6be89efb3294c6598cbe2
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.08.3 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.08.3
index e3b527e5a498..d78e80797fe3 100644
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/ktp-common-internals-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktp-filetransfer-handler-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bae0987866d08a5c3f5294df36c0d1d8
diff --git a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.1 b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.1
index 4e58b9681821..6441a99adeaf 100644
--- a/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktp-filetransfer-handler-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-filetransfer-handler:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-filetransfer-handler-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ecba561fa7e8faea9faecd2deba23cee
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-17.08.3 b/metadata/md5-cache/kde-apps/ktp-kded-module-17.08.3
index 303a4ec9968b..8cb5c1448697 100644
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-17.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-apps/ktp-common-internals-17.08.3:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-17.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktp-kded-module-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e76c1f90211cffd62087868d01000198
diff --git a/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.1 b/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.1
index 9ba7671c6d1a..d4f257a5df26 100644
--- a/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktp-kded-module-17.12.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/signon-kwallet-extension-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-kded-module:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-kded-module-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f7c51ed16aa7e7047ec5f0c93159a9ec
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-17.08.3 b/metadata/md5-cache/kde-apps/ktp-send-file-17.08.3
index 9898cc8327e4..0508e3523ec3 100644
--- a/metadata/md5-cache/kde-apps/ktp-send-file-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-17.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/ktp-common-internals-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.08.3:5 >=kde-apps/ktp-filetransfer-handler-17.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktp-send-file-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=78c356cb7d0a8ce9414da32db37f97c8
diff --git a/metadata/md5-cache/kde-apps/ktp-send-file-17.12.1 b/metadata/md5-cache/kde-apps/ktp-send-file-17.12.1
index e14e94ca33e3..e4f94cd26133 100644
--- a/metadata/md5-cache/kde-apps/ktp-send-file-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktp-send-file-17.12.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-libs/telepathy-qt[qt5(+)] >=kde-apps/ktp-contact-list-17.12.1:5 >=kde-apps/ktp-filetransfer-handler-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-send-file:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-send-file-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d3bde96425d6c989eef302f534847e72
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-17.08.3 b/metadata/md5-cache/kde-apps/ktp-text-ui-17.08.3
index 5e1399183128..fd5dc646985e 100644
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-17.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.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/ktp-common-internals-17.08.3:5[otr] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-apps/ktp-contact-list-17.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktp-text-ui-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0f2578b4852f74796933808abc83ecce
diff --git a/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.1 b/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.1
index e77e7155751d..8ecaa612d534 100644
--- a/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktp-text-ui-17.12.1
@@ -9,5 +9,5 @@ LICENSE=Apache-2.0 || ( AFL-2.1 BSD ) GPL-2+ LGPL-2.1+ MIT
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-apps/ktp-common-internals-17.12.1:5[otr] >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 net-libs/telepathy-qt[qt5(+)] speech? ( >=dev-qt/qtspeech-5.9.1:5 ) >=kde-apps/ktp-contact-list-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktp-text-ui:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktp-text-ui-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=31c665181c737d5ebc1c4b33d00259bb
diff --git a/metadata/md5-cache/kde-apps/ktuberling-17.08.3 b/metadata/md5-cache/kde-apps/ktuberling-17.08.3
index 262956c01616..ca44ffbc0b58 100644
--- a/metadata/md5-cache/kde-apps/ktuberling-17.08.3
+++ b/metadata/md5-cache/kde-apps/ktuberling-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktuberling:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktuberling-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=746ac6a368c6fb67f2f08a85a49327cf
diff --git a/metadata/md5-cache/kde-apps/ktuberling-17.12.1 b/metadata/md5-cache/kde-apps/ktuberling-17.12.1
index a7d74985a12b..02dcc4825da8 100644
--- a/metadata/md5-cache/kde-apps/ktuberling-17.12.1
+++ b/metadata/md5-cache/kde-apps/ktuberling-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/ktuberling:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktuberling-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1038287370eaea721680d9a6f51d09b0
diff --git a/metadata/md5-cache/kde-apps/kturtle-17.08.3 b/metadata/md5-cache/kde-apps/kturtle-17.08.3
index 45c2daf9e9e0..546a0822fc66 100644
--- a/metadata/md5-cache/kde-apps/kturtle-17.08.3
+++ b/metadata/md5-cache/kde-apps/kturtle-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kturtle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kturtle-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=55c274c26ad985b46edfbe3e8c77ffc2
diff --git a/metadata/md5-cache/kde-apps/kturtle-17.12.1 b/metadata/md5-cache/kde-apps/kturtle-17.12.1
index 9a749f037c74..1a3a2f49846e 100644
--- a/metadata/md5-cache/kde-apps/kturtle-17.12.1
+++ b/metadata/md5-cache/kde-apps/kturtle-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kturtle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kturtle-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f89540e0837e30bda032ae99b5651474
diff --git a/metadata/md5-cache/kde-apps/kubrick-17.08.3 b/metadata/md5-cache/kde-apps/kubrick-17.08.3
index b6dfeabd8e04..dc616d835a5a 100644
--- a/metadata/md5-cache/kde-apps/kubrick-17.08.3
+++ b/metadata/md5-cache/kde-apps/kubrick-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtopengl-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kubrick:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kubrick-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7acd2b68face20800c8b9f96fb169414
diff --git a/metadata/md5-cache/kde-apps/kubrick-17.12.1 b/metadata/md5-cache/kde-apps/kubrick-17.12.1
index b3562287bf69..c5ae4cd4f547 100644
--- a/metadata/md5-cache/kde-apps/kubrick-17.12.1
+++ b/metadata/md5-cache/kde-apps/kubrick-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 virtual/glu virtual/opengl !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kubrick:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kubrick-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f0610d60542083915aca0d76650459c5
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-17.08.3 b/metadata/md5-cache/kde-apps/kwalletmanager-17.08.3
index 0be91b1b5470..01bbfa2390ed 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-17.08.3
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kwalletmanager-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a7faa12191f55fe9bbae9edfa7a5769e
diff --git a/metadata/md5-cache/kde-apps/kwalletmanager-17.12.1 b/metadata/md5-cache/kde-apps/kwalletmanager-17.12.1
index c303f0da3d25..1cfd4234eea7 100644
--- a/metadata/md5-cache/kde-apps/kwalletmanager-17.12.1
+++ b/metadata/md5-cache/kde-apps/kwalletmanager-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/kwalletmanager-15.04.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kwalletmanager-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=faaa9c3774d329920439864295659be3
diff --git a/metadata/md5-cache/kde-apps/kwave-17.08.3 b/metadata/md5-cache/kde-apps/kwave-17.08.3
index e3ebec32d017..130b77712eff 100644
--- a/metadata/md5-cache/kde-apps/kwave-17.08.3
+++ b/metadata/md5-cache/kde-apps/kwave-17.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.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.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.7.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kwave-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=88d4b105739ba81dd63aa8d9926b68b8
diff --git a/metadata/md5-cache/kde-apps/kwave-17.12.1 b/metadata/md5-cache/kde-apps/kwave-17.12.1
index 6162ce9e5255..ee6319779429 100644
--- a/metadata/md5-cache/kde-apps/kwave-17.12.1
+++ b/metadata/md5-cache/kde-apps/kwave-17.12.1
@@ -9,5 +9,5 @@ LICENSE=CC-BY-SA-3.0 CC0-1.0 GPL-2+ LGPL-2+ handbook? ( FDL-1.2 ) opus? ( BSD-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/audiofile:= >=sci-libs/fftw-3 media-libs/libsamplerate alsa? ( media-libs/alsa-lib ) flac? ( media-libs/flac ) mp3? ( media-libs/id3lib media-libs/libmad || ( media-sound/lame media-sound/toolame media-sound/twolame ) ) qtmedia? ( >=dev-qt/qtmultimedia-5.9.1:5 ) opus? ( media-libs/libogg media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libogg media-libs/libvorbis ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kwave-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e12ad0d34f5d768ac3c2ac5b3a0a60ff
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-17.08.3 b/metadata/md5-cache/kde-apps/kwordquiz-17.08.3
index 2fb600cbad6d..e7a50d8efdcc 100644
--- a/metadata/md5-cache/kde-apps/kwordquiz-17.08.3
+++ b/metadata/md5-cache/kde-apps/kwordquiz-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwordquiz:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kwordquiz-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d8cd79a7fb4fd74abb28c9abd0bc22ea
diff --git a/metadata/md5-cache/kde-apps/kwordquiz-17.12.1 b/metadata/md5-cache/kde-apps/kwordquiz-17.12.1
index c544108e6231..fdbdfe272050 100644
--- a/metadata/md5-cache/kde-apps/kwordquiz-17.12.1
+++ b/metadata/md5-cache/kde-apps/kwordquiz-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkeduvocdocument-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/phonon[qt5(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwordquiz:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kwordquiz-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2e94f36b7940f46038f1605a16f36ee2
diff --git a/metadata/md5-cache/kde-apps/kwrite-17.08.3 b/metadata/md5-cache/kde-apps/kwrite-17.08.3
index 397cb367398c..a500bfb73c08 100644
--- a/metadata/md5-cache/kde-apps/kwrite-17.08.3
+++ b/metadata/md5-cache/kde-apps/kwrite-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwrite:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kate-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d3fd21316e0b5306f7dab3968e7cc02e
diff --git a/metadata/md5-cache/kde-apps/kwrite-17.12.1 b/metadata/md5-cache/kde-apps/kwrite-17.12.1
index 98405400a98c..c9bccc764816 100644
--- a/metadata/md5-cache/kde-apps/kwrite-17.12.1
+++ b/metadata/md5-cache/kde-apps/kwrite-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kwrite:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kate-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1ec19493095d035321afda652edd6c04
diff --git a/metadata/md5-cache/kde-apps/libgravatar-17.08.3 b/metadata/md5-cache/kde-apps/libgravatar-17.08.3
index 56c7dbf2a80f..22e829a96b0c 100644
--- a/metadata/md5-cache/kde-apps/libgravatar-17.08.3
+++ b/metadata/md5-cache/kde-apps/libgravatar-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/pimcommon-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libgravatar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libgravatar-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3b65ce3aed571afdb86ba53228363824
diff --git a/metadata/md5-cache/kde-apps/libgravatar-17.12.1 b/metadata/md5-cache/kde-apps/libgravatar-17.12.1
index 133432293692..230d7ebb248e 100644
--- a/metadata/md5-cache/kde-apps/libgravatar-17.12.1
+++ b/metadata/md5-cache/kde-apps/libgravatar-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libgravatar:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libgravatar-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=beb94fac01f541f260eef3b3950cfc59
diff --git a/metadata/md5-cache/kde-apps/libkcddb-17.08.3 b/metadata/md5-cache/kde-apps/libkcddb-17.08.3
index a71e40033a32..f12c0e28e611 100644
--- a/metadata/md5-cache/kde-apps/libkcddb-17.08.3
+++ b/metadata/md5-cache/kde-apps/libkcddb-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libkcddb-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cae1559c73606b7aada7952cfa673fd4
diff --git a/metadata/md5-cache/kde-apps/libkcddb-17.12.1 b/metadata/md5-cache/kde-apps/libkcddb-17.12.1
index 644cb4149a90..7fea75e23538 100644
--- a/metadata/md5-cache/kde-apps/libkcddb-17.12.1
+++ b/metadata/md5-cache/kde-apps/libkcddb-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kd
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkcddb-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e4ed2d1e418cca8158da3e002e3e2848
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-17.08.3 b/metadata/md5-cache/kde-apps/libkcompactdisc-17.08.3
index 582ad32b53b8..2c0a9d7d5258 100644
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-17.08.3
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libkcompactdisc-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aa73f159dea9b7b1153ebfc76bce6b83
diff --git a/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.1 b/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.1
index f4bc983b008a..f14227957407 100644
--- a/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.1
+++ b/metadata/md5-cache/kde-apps/libkcompactdisc-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 media-libs/phonon[qt5(+)] alsa? ( media-libs/alsa-lib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkcompactdisc-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=60d253c89d319c5eccaba4ae38273ca6
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-17.08.3 b/metadata/md5-cache/kde-apps/libkdcraw-17.08.3
index 938d139d60d4..bc3d52908b88 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-17.08.3
+++ b/metadata/md5-cache/kde-apps/libkdcraw-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libkdcraw-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a3a00cf2b3436baef71672f62be99a06
diff --git a/metadata/md5-cache/kde-apps/libkdcraw-17.12.1 b/metadata/md5-cache/kde-apps/libkdcraw-17.12.1
index b72a3e5e064a..aba9ba6d8df0 100644
--- a/metadata/md5-cache/kde-apps/libkdcraw-17.12.1
+++ b/metadata/md5-cache/kde-apps/libkdcraw-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-libs/libraw-0.16:= >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkdcraw-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ac56850989ddf7ea772cef4d6b83c126
diff --git a/metadata/md5-cache/kde-apps/libkdegames-17.08.3 b/metadata/md5-cache/kde-apps/libkdegames-17.08.3
index 9edf80f93429..1fc5d14b523d 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-17.08.3
+++ b/metadata/md5-cache/kde-apps/libkdegames-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libkdegames-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8f5852731cd2205320d05cfd19734f11
diff --git a/metadata/md5-cache/kde-apps/libkdegames-17.12.1 b/metadata/md5-cache/kde-apps/libkdegames-17.12.1
index a1e4a77e70b3..1346123f2263 100644
--- a/metadata/md5-cache/kde-apps/libkdegames-17.12.1
+++ b/metadata/md5-cache/kde-apps/libkdegames-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5[widgets] >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 media-libs/libsndfile media-libs/openal >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkdegames-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b61186187d35fa19b2b013d40bf38f62
diff --git a/metadata/md5-cache/kde-apps/libkdepim-17.08.3 b/metadata/md5-cache/kde-apps/libkdepim-17.08.3
index 1326082f11de..c2811234a526 100644
--- a/metadata/md5-cache/kde-apps/libkdepim-17.08.3
+++ b/metadata/md5-cache/kde-apps/libkdepim-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-contacts-17.08.3:5 >=kde-apps/akonadi-search-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kldap-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkdepim:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libkdepim-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=11099483a566173a87c4b06c82eb0b26
diff --git a/metadata/md5-cache/kde-apps/libkdepim-17.12.1 b/metadata/md5-cache/kde-apps/libkdepim-17.12.1
index c757c3fa0404..04c4d7bb7911 100644
--- a/metadata/md5-cache/kde-apps/libkdepim-17.12.1
+++ b/metadata/md5-cache/kde-apps/libkdepim-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-search-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kldap-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkdepim:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkdepim-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d27b91dfd95df8873c85409097ef9dd0
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.08.3 b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.08.3
index aed16e0058ae..0443fbcb153e 100644
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.08.3
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libkeduvocdocument-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8919469c9479c0dc37bb4c9285756498
diff --git a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.1 b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.1
index be18101bf4a9..4b5af2909636 100644
--- a/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.1
+++ b/metadata/md5-cache/kde-apps/libkeduvocdocument-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkeduvocdocument:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkeduvocdocument-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fc4c0711688f0c790416357a03d33f5e
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-17.08.3 b/metadata/md5-cache/kde-apps/libkexiv2-17.08.3
index 531f2aca5ecb..c37db9d9067b 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-17.08.3
+++ b/metadata/md5-cache/kde-apps/libkexiv2-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libkexiv2-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=618f7c9492c770dce7e7962ebeee5d4f
diff --git a/metadata/md5-cache/kde-apps/libkexiv2-17.12.1 b/metadata/md5-cache/kde-apps/libkexiv2-17.12.1
index 96b93e043a2e..138c25c83368 100644
--- a/metadata/md5-cache/kde-apps/libkexiv2-17.12.1
+++ b/metadata/md5-cache/kde-apps/libkexiv2-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=dev-qt/qtgui-5.9.1:5 >=media-gfx/exiv2-0.25:=[xmp=] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkexiv2-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ba19d1ef3906fb72dc2cfc56a1e5775c
diff --git a/metadata/md5-cache/kde-apps/libkgapi-17.08.3 b/metadata/md5-cache/kde-apps/libkgapi-17.08.3
index ec62e14b5aac..a467ffebf231 100644
--- a/metadata/md5-cache/kde-apps/libkgapi-17.08.3
+++ b/metadata/md5-cache/kde-apps/libkgapi-17.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kcalcore-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libkgapi-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8cec243a73b44aeaa9d04a163e832515
diff --git a/metadata/md5-cache/kde-apps/libkgapi-17.12.1 b/metadata/md5-cache/kde-apps/libkgapi-17.12.1
index 9d997757afa5..6158465b49cd 100644
--- a/metadata/md5-cache/kde-apps/libkgapi-17.12.1
+++ b/metadata/md5-cache/kde-apps/libkgapi-17.12.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkgapi-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3932b1adf2ee4ad7f11f2959cc732033
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-17.08.3 b/metadata/md5-cache/kde-apps/libkgeomap-17.08.3
index c2824b472a53..f8abbfb662f3 100644
--- a/metadata/md5-cache/kde-apps/libkgeomap-17.08.3
+++ b/metadata/md5-cache/kde-apps/libkgeomap-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/marble-17.08.3:5=[kde] >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkgeomap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libkgeomap-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cfb19a31d29abc717d51b59068da6975
diff --git a/metadata/md5-cache/kde-apps/libkgeomap-17.12.1 b/metadata/md5-cache/kde-apps/libkgeomap-17.12.1
index 5a32186d5e22..8ddde74c49e5 100644
--- a/metadata/md5-cache/kde-apps/libkgeomap-17.12.1
+++ b/metadata/md5-cache/kde-apps/libkgeomap-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-apps/marble-17.12.1:5=[kde] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkgeomap:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkgeomap-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=be4082f64cf30ac0565ab8bef019febd
diff --git a/metadata/md5-cache/kde-apps/libkipi-17.08.3 b/metadata/md5-cache/kde-apps/libkipi-17.08.3
index e1862ad2d757..3dadc820de8e 100644
--- a/metadata/md5-cache/kde-apps/libkipi-17.08.3
+++ b/metadata/md5-cache/kde-apps/libkipi-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5/32
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libkipi-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2897bd18f089533eacda7f4030f17351
diff --git a/metadata/md5-cache/kde-apps/libkipi-17.12.1 b/metadata/md5-cache/kde-apps/libkipi-17.12.1
index e4587ed3920f..49329413bd70 100644
--- a/metadata/md5-cache/kde-apps/libkipi-17.12.1
+++ b/metadata/md5-cache/kde-apps/libkipi-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !<kde-apps/libkipi-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5/32
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkipi-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4255d17f008de0d16dc59a4ca961c0f8
diff --git a/metadata/md5-cache/kde-apps/libkleo-17.08.3 b/metadata/md5-cache/kde-apps/libkleo-17.08.3
index d0705ecbcc2c..853fdd3d1eb0 100644
--- a/metadata/md5-cache/kde-apps/libkleo-17.08.3
+++ b/metadata/md5-cache/kde-apps/libkleo-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kpimtextedit-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkleo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libkleo-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8d217de1d6339c23a168e52eb1f65e0e
diff --git a/metadata/md5-cache/kde-apps/libkleo-17.12.1 b/metadata/md5-cache/kde-apps/libkleo-17.12.1
index bba01b00f3cf..eced98a0775e 100644
--- a/metadata/md5-cache/kde-apps/libkleo-17.12.1
+++ b/metadata/md5-cache/kde-apps/libkleo-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-apps/kpimtextedit-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=app-crypt/gpgme-1.7.1[cxx,qt5] !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkleo:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkleo-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6603d206edf3f515ef50e4979e31961b
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-17.08.3 b/metadata/md5-cache/kde-apps/libkmahjongg-17.08.3
index f49a22b8fe06..ec1ca3b96555 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-17.08.3
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libkmahjongg-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c78fbf3fcc78620466680bf527bcde57
diff --git a/metadata/md5-cache/kde-apps/libkmahjongg-17.12.1 b/metadata/md5-cache/kde-apps/libkmahjongg-17.12.1
index 574729a3d339..be2983f9ced1 100644
--- a/metadata/md5-cache/kde-apps/libkmahjongg-17.12.1
+++ b/metadata/md5-cache/kde-apps/libkmahjongg-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkmahjongg-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a031f862490c62de64f6a65f6f6cb7df
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-17.08.3 b/metadata/md5-cache/kde-apps/libkomparediff2-17.08.3
index 07c0acdb49c0..bb17138c4887 100644
--- a/metadata/md5-cache/kde-apps/libkomparediff2-17.08.3
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libkomparediff2-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=80bc70fb0e0d54f8afe61f8b28676ffe
diff --git a/metadata/md5-cache/kde-apps/libkomparediff2-17.12.1 b/metadata/md5-cache/kde-apps/libkomparediff2-17.12.1
index d8a4f69453da..bf0b19eef44a 100644
--- a/metadata/md5-cache/kde-apps/libkomparediff2-17.12.1
+++ b/metadata/md5-cache/kde-apps/libkomparediff2-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libkomparediff2:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libkomparediff2-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=71717e4a34cd202c01d8518f9b8e2abe
diff --git a/metadata/md5-cache/kde-apps/libksane-17.08.3 b/metadata/md5-cache/kde-apps/libksane-17.08.3
index 81627b663b2f..3a8f4bb092fd 100644
--- a/metadata/md5-cache/kde-apps/libksane-17.08.3
+++ b/metadata/md5-cache/kde-apps/libksane-17.08.3
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-gfx/sane-backends !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libksane-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5492bcaf9f2e18f976d60bf8377fa827
diff --git a/metadata/md5-cache/kde-apps/libksane-17.12.1 b/metadata/md5-cache/kde-apps/libksane-17.12.1
index f41d0a508fc9..a62757b414cb 100644
--- a/metadata/md5-cache/kde-apps/libksane-17.12.1
+++ b/metadata/md5-cache/kde-apps/libksane-17.12.1
@@ -9,5 +9,5 @@ LICENSE=|| ( LGPL-2.1 LGPL-3 )
 RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-gfx/sane-backends !<kde-apps/libksane-15.08.3-r1:4 !kde-base/legacy-icons >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libksane-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c6e6c58cb19f02f56b03eeac0b7f6693
diff --git a/metadata/md5-cache/kde-apps/libksieve-17.08.3 b/metadata/md5-cache/kde-apps/libksieve-17.08.3
index 88be9e359735..ee6fa33cf7ae 100644
--- a/metadata/md5-cache/kde-apps/libksieve-17.08.3
+++ b/metadata/md5-cache/kde-apps/libksieve-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/libksieve-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=421b2bbed5fc962242332684f7c9a179
diff --git a/metadata/md5-cache/kde-apps/libksieve-17.12.1 b/metadata/md5-cache/kde-apps/libksieve-17.12.1
index cbc6aff79609..a722628cc51d 100644
--- a/metadata/md5-cache/kde-apps/libksieve-17.12.1
+++ b/metadata/md5-cache/kde-apps/libksieve-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/libksieve-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5322310fe94bfa3632c9426f00d36282
diff --git a/metadata/md5-cache/kde-apps/libktnef-17.08.3 b/metadata/md5-cache/kde-apps/libktnef-17.08.3
index 2977493e4f24..040a593d6e8f 100644
--- a/metadata/md5-cache/kde-apps/libktnef-17.08.3
+++ b/metadata/md5-cache/kde-apps/libktnef-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kcalcore-17.08.3:5 >=kde-apps/kcalutils-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libktnef:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/ktnef-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=52518cde20f4947e84c1a41f299d5ab2
diff --git a/metadata/md5-cache/kde-apps/libktnef-17.12.1 b/metadata/md5-cache/kde-apps/libktnef-17.12.1
index 64f6b2d31ae8..8f52bbced0a9 100644
--- a/metadata/md5-cache/kde-apps/libktnef-17.12.1
+++ b/metadata/md5-cache/kde-apps/libktnef-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcalutils-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/libktnef:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/ktnef-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=06df9e7ba703b871c194c906560b35ff
diff --git a/metadata/md5-cache/kde-apps/lokalize-17.08.3 b/metadata/md5-cache/kde-apps/lokalize-17.08.3
index 46b12ced31e6..be981c2ee7ba 100644
--- a/metadata/md5-cache/kde-apps/lokalize-17.08.3
+++ b/metadata/md5-cache/kde-apps/lokalize-17.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_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/lokalize-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=90903b0cc9a6f9e395abf953ae3990b0
diff --git a/metadata/md5-cache/kde-apps/lokalize-17.12.1 b/metadata/md5-cache/kde-apps/lokalize-17.12.1
index 6a9caa0d94a0..d258d8f62085 100644
--- a/metadata/md5-cache/kde-apps/lokalize-17.12.1
+++ b/metadata/md5-cache/kde-apps/lokalize-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) pytho
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 )
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/lokalize-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c620f02ee70224779b40da303cb5febe
diff --git a/metadata/md5-cache/kde-apps/lskat-17.08.3 b/metadata/md5-cache/kde-apps/lskat-17.08.3
index 9400f2e50812..418b10bec37c 100644
--- a/metadata/md5-cache/kde-apps/lskat-17.08.3
+++ b/metadata/md5-cache/kde-apps/lskat-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lskat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/lskat-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3130a045fcf85a720d80b1b9d6951ad9
diff --git a/metadata/md5-cache/kde-apps/lskat-17.12.1 b/metadata/md5-cache/kde-apps/lskat-17.12.1
index 6e5c9c1719fc..848c60c6beae 100644
--- a/metadata/md5-cache/kde-apps/lskat-17.12.1
+++ b/metadata/md5-cache/kde-apps/lskat-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/lskat:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 selinux? ( sec-policy/selinux-games ) >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/lskat-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1f2532cb8056fc767c0133620dda0569
diff --git a/metadata/md5-cache/kde-apps/mailcommon-17.08.3 b/metadata/md5-cache/kde-apps/mailcommon-17.08.3
index d4ba42fcd220..0b9580b22209 100644
--- a/metadata/md5-cache/kde-apps/mailcommon-17.08.3
+++ b/metadata/md5-cache/kde-apps/mailcommon-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/mailcommon-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=17d2e02ca954cc529a27d6ebd9425485
diff --git a/metadata/md5-cache/kde-apps/mailcommon-17.12.1 b/metadata/md5-cache/kde-apps/mailcommon-17.12.1
index 7891c2f8862e..02dc1d80684b 100644
--- a/metadata/md5-cache/kde-apps/mailcommon-17.12.1
+++ b/metadata/md5-cache/kde-apps/mailcommon-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/mailcommon-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e19b66251bccff75b1b8423e205b2e67
diff --git a/metadata/md5-cache/kde-apps/mailimporter-17.08.3 b/metadata/md5-cache/kde-apps/mailimporter-17.08.3
index bb720b887474..277acde1a6f1 100644
--- a/metadata/md5-cache/kde-apps/mailimporter-17.08.3
+++ b/metadata/md5-cache/kde-apps/mailimporter-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-mime-17.08.3:5 >=kde-apps/kmime-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailimporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/mailimporter-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=00a25851d3b9d7f9c205554ba55eb7e5
diff --git a/metadata/md5-cache/kde-apps/mailimporter-17.12.1 b/metadata/md5-cache/kde-apps/mailimporter-17.12.1
index f0af941aeb8a..812c2a30e48a 100644
--- a/metadata/md5-cache/kde-apps/mailimporter-17.12.1
+++ b/metadata/md5-cache/kde-apps/mailimporter-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mailimporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/mailimporter-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fa5d621b3e7458f6964e8ea929556e19
diff --git a/metadata/md5-cache/kde-apps/marble-17.08.3 b/metadata/md5-cache/kde-apps/marble-17.08.3
index 0d2ab5605430..3d996609dc1d 100644
--- a/metadata/md5-cache/kde-apps/marble-17.08.3
+++ b/metadata/md5-cache/kde-apps/marble-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qt
 RESTRICT=test
 SLOT=5/17.08
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/marble-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6b7f3236c85307b5baca80a85897e5f5
diff --git a/metadata/md5-cache/kde-apps/marble-17.12.1 b/metadata/md5-cache/kde-apps/marble-17.12.1
index 791915c8e37c..7c230e16c283 100644
--- a/metadata/md5-cache/kde-apps/marble-17.12.1
+++ b/metadata/md5-cache/kde-apps/marble-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qt
 RESTRICT=test
 SLOT=5/17.12
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/marble-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0b3297b41cbca3c6ac53f1644219c0ef
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-17.08.3 b/metadata/md5-cache/kde-apps/mbox-importer-17.08.3
index bdc3023672d6..2bb121bed35a 100644
--- a/metadata/md5-cache/kde-apps/mbox-importer-17.08.3
+++ b/metadata/md5-cache/kde-apps/mbox-importer-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/kidentitymanagement-17.08.3:5 >=kde-apps/mailcommon-17.08.3:5 >=kde-apps/mailimporter-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mbox-importer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/mbox-importer-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=19559f2141f1cc1e970369136489ec6b
diff --git a/metadata/md5-cache/kde-apps/mbox-importer-17.12.1 b/metadata/md5-cache/kde-apps/mbox-importer-17.12.1
index b449a8ad9f80..bad962984220 100644
--- a/metadata/md5-cache/kde-apps/mbox-importer-17.12.1
+++ b/metadata/md5-cache/kde-apps/mbox-importer-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/mailimporter-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/mbox-importer:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/mbox-importer-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=17fd6d8edc80636f539ba9abfa526673
diff --git a/metadata/md5-cache/kde-apps/messagelib-17.08.3-r1 b/metadata/md5-cache/kde-apps/messagelib-17.08.3-r1
index f8af83890dc1..237c01809180 100644
--- a/metadata/md5-cache/kde-apps/messagelib-17.08.3-r1
+++ b/metadata/md5-cache/kde-apps/messagelib-17.08.3-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/messagelib-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=02ed9e9fb3a22805fd0cb99b23950eb1
diff --git a/metadata/md5-cache/kde-apps/messagelib-17.12.1 b/metadata/md5-cache/kde-apps/messagelib-17.12.1
index 6bce2e4e8ae0..593daa4496bb 100644
--- a/metadata/md5-cache/kde-apps/messagelib-17.12.1
+++ b/metadata/md5-cache/kde-apps/messagelib-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/messagelib-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=24f1fb5c1b0da32b4214c738b168663e
diff --git a/metadata/md5-cache/kde-apps/minuet-17.08.3 b/metadata/md5-cache/kde-apps/minuet-17.08.3
index 48d256df67b8..548615f57309 100644
--- a/metadata/md5-cache/kde-apps/minuet-17.08.3
+++ b/metadata/md5-cache/kde-apps/minuet-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/minuet:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/minuet-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=109b9227b81672bae2346ec7bce1d1de
diff --git a/metadata/md5-cache/kde-apps/minuet-17.12.1 b/metadata/md5-cache/kde-apps/minuet-17.12.1
index e642411f659d..c172636f7c7d 100644
--- a/metadata/md5-cache/kde-apps/minuet-17.12.1
+++ b/metadata/md5-cache/kde-apps/minuet-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtquickcontrols2-5.9.1:5 media-sound/fluidsynth >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/minuet:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/minuet-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b34f033c0b48824a49d6db5fad7450b9
diff --git a/metadata/md5-cache/kde-apps/okteta-17.08.3 b/metadata/md5-cache/kde-apps/okteta-17.08.3
index 8e12abd042a9..00ea10e77bc0 100644
--- a/metadata/md5-cache/kde-apps/okteta-17.08.3
+++ b/metadata/md5-cache/kde-apps/okteta-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5[scripttools] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 crypt? ( app-crypt/qca:2[qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okteta:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/okteta-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3c3e46d6f4958c94fae8ff855795461b
diff --git a/metadata/md5-cache/kde-apps/okteta-17.12.1 b/metadata/md5-cache/kde-apps/okteta-17.12.1
index a7fe6565ee56..14fd126512ad 100644
--- a/metadata/md5-cache/kde-apps/okteta-17.12.1
+++ b/metadata/md5-cache/kde-apps/okteta-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtscript-5.9.1:5[scripttools] >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 crypt? ( app-crypt/qca:2[qt5] ) designer? ( >=dev-qt/designer-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okteta:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/okteta-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ce52bb1e3e841e0ae3ede6aa8dc36327
diff --git a/metadata/md5-cache/kde-apps/okular-17.08.3 b/metadata/md5-cache/kde-apps/okular-17.08.3
index 69bab019e02f..2aedbdee5596 100644
--- a/metadata/md5-cache/kde-apps/okular-17.08.3
+++ b/metadata/md5-cache/kde-apps/okular-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/okular-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9aa9bb281b7ad9178064867b56971554
diff --git a/metadata/md5-cache/kde-apps/okular-17.12.1 b/metadata/md5-cache/kde-apps/okular-17.12.1
index ec936d1913cc..4946205f7ab6 100644
--- a/metadata/md5-cache/kde-apps/okular-17.12.1
+++ b/metadata/md5-cache/kde-apps/okular-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/threadweaver-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 media-libs/freetype media-libs/phonon[qt5(+)] sys-libs/zlib chm? ( >=kde-frameworks/khtml-5.40.0:5 dev-libs/chmlib ) crypt? ( app-crypt/qca:2[qt5] ) djvu? ( app-text/djvu ) epub? ( app-text/ebook-tools ) image-backend? ( >=kde-apps/libkexiv2-17.12.1:5 >=dev-qt/qtgui-5.9.1:5[gif,jpeg,png] ) markdown? ( app-text/discount ) mobi? ( >=kde-apps/kdegraphics-mobipocket-17.12.1:5 ) pdf? ( app-text/poppler[qt5,-exceptions(-)] ) plucker? ( virtual/jpeg:0 ) postscript? ( app-text/libspectre ) share? ( dev-libs/purpose:5 ) speech? ( >=dev-qt/qtspeech-5.9.1:5 ) tiff? ( media-libs/tiff:0 ) image-backend? ( >=kde-frameworks/kimageformats-5.40.0:5 ) mobile? ( >=kde-frameworks/kirigami-5.40.0:5 >=dev-qt/qtquickcontrols-5.9.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/okular:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/okular-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=efd615b03ed2e2f5de9fa5476843d523
diff --git a/metadata/md5-cache/kde-apps/palapeli-17.12.1 b/metadata/md5-cache/kde-apps/palapeli-17.12.1
index 44a79d05d0e0..72dd13b54f93 100644
--- a/metadata/md5-cache/kde-apps/palapeli-17.12.1
+++ b/metadata/md5-cache/kde-apps/palapeli-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/palapeli:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/palapeli-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d70de4e62f097445c63fd7812f757424
diff --git a/metadata/md5-cache/kde-apps/parley-17.08.3 b/metadata/md5-cache/kde-apps/parley-17.08.3
index d92d87817c6c..f50753d3c510 100644
--- a/metadata/md5-cache/kde-apps/parley-17.08.3
+++ b/metadata/md5-cache/kde-apps/parley-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkeduvocdocument-17.08.3:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtmultimedia-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-17.08.3:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/parley:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/parley-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9742dcc125a1fb993e82927ba7b49058
diff --git a/metadata/md5-cache/kde-apps/parley-17.12.1 b/metadata/md5-cache/kde-apps/parley-17.12.1
index 9a3768c7cafe..c0357f28032b 100644
--- a/metadata/md5-cache/kde-apps/parley-17.12.1
+++ b/metadata/md5-cache/kde-apps/parley-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-apps/libkeduvocdocument-17.12.1:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtmultimedia-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtwebengine-5.9.1:5[widgets] dev-libs/libxml2:2 dev-libs/libxslt >=kde-apps/kdeedu-data-17.12.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/parley:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/parley-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3a5140db5141a84a167ba9bc55be5486
diff --git a/metadata/md5-cache/kde-apps/picmi-17.08.3 b/metadata/md5-cache/kde-apps/picmi-17.08.3
index c77a111eaf59..6dac6242bd19 100644
--- a/metadata/md5-cache/kde-apps/picmi-17.08.3
+++ b/metadata/md5-cache/kde-apps/picmi-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.08.3:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/picmi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/picmi-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=db14bd4a689bc4aa0a460674ba8467e6
diff --git a/metadata/md5-cache/kde-apps/picmi-17.12.1 b/metadata/md5-cache/kde-apps/picmi-17.12.1
index 0b2cfb462b3b..eb55127465e9 100644
--- a/metadata/md5-cache/kde-apps/picmi-17.12.1
+++ b/metadata/md5-cache/kde-apps/picmi-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkdegames-17.12.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/picmi:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/picmi-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=13b70da55158b7872324a3e69cf35268
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-17.08.3 b/metadata/md5-cache/kde-apps/pim-data-exporter-17.08.3
index 5ac8f38379fc..a9f4e2d05c5a 100644
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-17.08.3
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kidentitymanagement-17.08.3:5 >=kde-apps/kmailtransport-17.08.3:5 >=kde-apps/kmime-17.08.3:5 >=kde-apps/kpimtextedit-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=kde-apps/mailcommon-17.08.3:5 >=kde-apps/pimcommon-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/pim-data-exporter-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1efc1e2c4585334dd66a3ab3f7b363a8
diff --git a/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.1 b/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.1
index 1bd78c8cfcf2..04332d8d1eda 100644
--- a/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.1
+++ b/metadata/md5-cache/kde-apps/pim-data-exporter-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kidentitymanagement-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/kmime-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=kde-apps/mailcommon-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kdepim-l10n !kde-apps/kmail:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-data-exporter:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/pim-data-exporter-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3834b8b38f9cbe92cdf69b6f1913dc48
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.08.3 b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.08.3
index f40e79120b01..6b85ad98363a 100644
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.08.3
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-contacts-17.08.3:5 >=kde-apps/akonadi-mime-17.08.3:5 >=kde-apps/calendarsupport-17.08.3:5 >=kde-apps/kcalcore-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kmailtransport-17.08.3:5 >=kde-apps/libksieve-17.08.3:5 >=kde-apps/pimcommon-17.08.3:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/pim-sieve-editor-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=369a26941ecff91af7fe061edac4905b
diff --git a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.1 b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.1
index 9c47818de5a1..8147b504c46f 100644
--- a/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.1
+++ b/metadata/md5-cache/kde-apps/pim-sieve-editor-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/akonadi-mime-17.12.1:5 >=kde-apps/calendarsupport-17.12.1:5 >=kde-apps/kcalcore-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kmailtransport-17.12.1:5 >=kde-apps/libksieve-17.12.1:5 >=kde-apps/pimcommon-17.12.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pim-sieve-editor:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/pim-sieve-editor-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=085e9e69472827265a2b2d9ed0a30151
diff --git a/metadata/md5-cache/kde-apps/pimcommon-17.08.3 b/metadata/md5-cache/kde-apps/pimcommon-17.08.3
index 85c46204a7c7..43024347b139 100644
--- a/metadata/md5-cache/kde-apps/pimcommon-17.08.3
+++ b/metadata/md5-cache/kde-apps/pimcommon-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.08.3:5 >=kde-apps/akonadi-contacts-17.08.3:5 >=kde-apps/kcontacts-17.08.3:5 >=kde-apps/kimap-17.08.3:5 >=kde-apps/kpimtextedit-17.08.3:5 >=kde-apps/libkdepim-17.08.3:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pimcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/pimcommon-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ea831dc7c26d3cfaa42a77cf55634d54
diff --git a/metadata/md5-cache/kde-apps/pimcommon-17.12.1 b/metadata/md5-cache/kde-apps/pimcommon-17.12.1
index 0c177e01bf9a..fe7d031969ac 100644
--- a/metadata/md5-cache/kde-apps/pimcommon-17.12.1
+++ b/metadata/md5-cache/kde-apps/pimcommon-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.1:5 >=kde-apps/akonadi-contacts-17.12.1:5 >=kde-apps/kcontacts-17.12.1:5 >=kde-apps/kimap-17.12.1:5 >=kde-apps/kpimtextedit-17.12.1:5 >=kde-apps/libkdepim-17.12.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/grantlee:5 !kde-apps/kdepim-common-libs:4 !kde-apps/kdepim-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/pimcommon:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/pimcommon-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=94e9fa111db7f67cbf0ce70573a9c01b
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.08.3 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.08.3
index 5290b2fbfe67..2dbad8a85c79 100644
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.08.3
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.08.3
@@ -7,5 +7,5 @@ KEYWORDS=amd64 x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
 RDEPEND=>=kde-apps/ktp-accounts-kcm-17.08.3 >=kde-apps/ktp-approver-17.08.3 >=kde-apps/ktp-auth-handler-17.08.3 >=kde-apps/ktp-common-internals-17.08.3 >=kde-apps/ktp-contact-list-17.08.3 >=kde-apps/ktp-contact-runner-17.08.3 >=kde-apps/ktp-desktop-applets-17.08.3 >=kde-apps/ktp-filetransfer-handler-17.08.3 >=kde-apps/ktp-kded-module-17.08.3 >=kde-apps/ktp-send-file-17.08.3 >=kde-apps/ktp-text-ui-17.08.3 gstreamer? ( >=kde-apps/ktp-call-ui-17.08.3 ) !kde-apps/plasma-telepathy-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5bf3c50cabf8ae39d34fd30189e3436b
diff --git a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.1 b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.1
index 3fda893b52bf..f753d19859af 100644
--- a/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.1
+++ b/metadata/md5-cache/kde-apps/plasma-telepathy-meta-17.12.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-2.1 )
 RDEPEND=>=kde-apps/ktp-accounts-kcm-17.12.1 >=kde-apps/ktp-approver-17.12.1 >=kde-apps/ktp-auth-handler-17.12.1 >=kde-apps/ktp-common-internals-17.12.1 >=kde-apps/ktp-contact-list-17.12.1 >=kde-apps/ktp-contact-runner-17.12.1 >=kde-apps/ktp-desktop-applets-17.12.1 >=kde-apps/ktp-filetransfer-handler-17.12.1 >=kde-apps/ktp-kded-module-17.12.1 >=kde-apps/ktp-send-file-17.12.1 >=kde-apps/ktp-text-ui-17.12.1 gstreamer? ( >=kde-apps/ktp-call-ui-17.12.1 ) !kde-apps/plasma-telepathy-meta:4
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	kde5-meta-pkg	3d8c9f0bc2b2bececeb9a9bb63b82e8d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=904dc6400b92235473f0dc2f82f19f90
diff --git a/metadata/md5-cache/kde-apps/poxml-17.08.3 b/metadata/md5-cache/kde-apps/poxml-17.08.3
index affa074836f9..5310b7259078 100644
--- a/metadata/md5-cache/kde-apps/poxml-17.08.3
+++ b/metadata/md5-cache/kde-apps/poxml-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.7.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/poxml:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/poxml-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2e74b164ec2bc28a937cbbbda7512b56
diff --git a/metadata/md5-cache/kde-apps/poxml-17.12.1 b/metadata/md5-cache/kde-apps/poxml-17.12.1
index 446bf21038d2..756ad1bbec31 100644
--- a/metadata/md5-cache/kde-apps/poxml-17.12.1
+++ b/metadata/md5-cache/kde-apps/poxml-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-qt/qtxml-5.9.1:5 sys-devel/gettext >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/poxml:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/poxml-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6b1503f1d154b16c49d42dcfebaa049c
diff --git a/metadata/md5-cache/kde-apps/print-manager-17.08.3 b/metadata/md5-cache/kde-apps/print-manager-17.08.3
index f3158f3830a3..bd634b20929b 100644
--- a/metadata/md5-cache/kde-apps/print-manager-17.08.3
+++ b/metadata/md5-cache/kde-apps/print-manager-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-print/cups >=kde-plasma/kde-cli-tools-5.10.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/print-manager:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/print-manager-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a01a19d08aa3a28a7ae1146e85045fcd
diff --git a/metadata/md5-cache/kde-apps/print-manager-17.12.1 b/metadata/md5-cache/kde-apps/print-manager-17.12.1
index 2d384f763341..3b939dffc58c 100644
--- a/metadata/md5-cache/kde-apps/print-manager-17.12.1
+++ b/metadata/md5-cache/kde-apps/print-manager-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 net-print/cups >=kde-plasma/kde-cli-tools-5.10.5:5 gtk? ( app-admin/system-config-printer ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/print-manager:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/print-manager-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fba5e7b15360395d7455521769b932c3
diff --git a/metadata/md5-cache/kde-apps/rocs-17.08.3 b/metadata/md5-cache/kde-apps/rocs-17.08.3
index e9c7b99e23c3..6e732bf4ee47 100644
--- a/metadata/md5-cache/kde-apps/rocs-17.08.3
+++ b/metadata/md5-cache/kde-apps/rocs-17.08.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/rocs-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cd8d829e5fce2e5af39e8844102ceff0
diff --git a/metadata/md5-cache/kde-apps/rocs-17.12.1 b/metadata/md5-cache/kde-apps/rocs-17.12.1
index 86b69873c7d5..885aa9066f24 100644
--- a/metadata/md5-cache/kde-apps/rocs-17.12.1
+++ b/metadata/md5-cache/kde-apps/rocs-17.12.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/rocs-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d31e73b73003574ae3a1e0cb7593386a
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.08.3 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.08.3
index d6fc236581b2..8dee4ac583cf 100644
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.08.3
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kwallet-5.40.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/signon-kwallet-extension-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b57e48edd98b470a742aa2973f075183
diff --git a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.1 b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.1
index 4dbfb699ba4d..d0ce2b17d302 100644
--- a/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.1
+++ b/metadata/md5-cache/kde-apps/signon-kwallet-extension-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kwallet-5.40.0:5 net-libs/signond >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/signon-kwallet-extension:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/signon-kwallet-extension-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3445e773e29ae4c9ed2bf56169a9a404
diff --git a/metadata/md5-cache/kde-apps/spectacle-17.08.3 b/metadata/md5-cache/kde-apps/spectacle-17.08.3
index 79cff8026175..ccd12f3be92d 100644
--- a/metadata/md5-cache/kde-apps/spectacle-17.08.3
+++ b/metadata/md5-cache/kde-apps/spectacle-17.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.08.3:5= ) share? ( dev-libs/purpose:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/spectacle-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=04edfb02b060947df0414b93428e6fcc
diff --git a/metadata/md5-cache/kde-apps/spectacle-17.12.1 b/metadata/md5-cache/kde-apps/spectacle-17.12.1
index 5b827baca0b3..700d45397f99 100644
--- a/metadata/md5-cache/kde-apps/spectacle-17.12.1
+++ b/metadata/md5-cache/kde-apps/spectacle-17.12.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+ handbook? ( FDL-1.3 ) kipi? ( GPL-2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtx11extras-5.9.1:5 x11-libs/libxcb x11-libs/xcb-util x11-libs/xcb-util-cursor x11-libs/xcb-util-image kipi? ( >=kde-apps/libkipi-17.12.1:5= ) share? ( dev-libs/purpose:5 ) kipi? ( media-plugins/kipi-plugins:5 ) !kde-apps/ksnapshot >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/spectacle:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/spectacle-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=faf8d8aecbde37d17322fe6bafbb6fb3
diff --git a/metadata/md5-cache/kde-apps/step-17.08.3 b/metadata/md5-cache/kde-apps/step-17.08.3
index 331cd3ef9fe9..e4d0d4b77d54 100644
--- a/metadata/md5-cache/kde-apps/step-17.08.3
+++ b/metadata/md5-cache/kde-apps/step-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtopengl-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/step:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/step-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a53528a9e293b1e1ff384a32ce79f003
diff --git a/metadata/md5-cache/kde-apps/step-17.12.1 b/metadata/md5-cache/kde-apps/step-17.12.1
index 7df98d37de5e..d4ac83dd8497 100644
--- a/metadata/md5-cache/kde-apps/step-17.12.1
+++ b/metadata/md5-cache/kde-apps/step-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/khtml-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kplotting-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdeclarative-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtopengl-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=dev-cpp/eigen-3.2:3 sci-libs/cln gsl? ( sci-libs/gsl:= ) qalculate? ( >=sci-libs/libqalculate-0.9.5:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/step:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/step-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e39a220c3b8e0421d9f1ac4eeffce482
diff --git a/metadata/md5-cache/kde-apps/svgpart-17.08.3 b/metadata/md5-cache/kde-apps/svgpart-17.08.3
index 2bcc6d385be8..b5fb738b07e4 100644
--- a/metadata/md5-cache/kde-apps/svgpart-17.08.3
+++ b/metadata/md5-cache/kde-apps/svgpart-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/svgpart-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c6264b84af400315a1241b05c148b2bc
diff --git a/metadata/md5-cache/kde-apps/svgpart-17.12.1 b/metadata/md5-cache/kde-apps/svgpart-17.12.1
index 6dc75fb86ed9..6ce924b70979 100644
--- a/metadata/md5-cache/kde-apps/svgpart-17.12.1
+++ b/metadata/md5-cache/kde-apps/svgpart-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/svgpart-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4b738d75e994381ac5a06781bbfdb20f
diff --git a/metadata/md5-cache/kde-apps/sweeper-17.12.1 b/metadata/md5-cache/kde-apps/sweeper-17.12.1
index 2a014ab96dc5..40c27c997a3f 100644
--- a/metadata/md5-cache/kde-apps/sweeper-17.12.1
+++ b/metadata/md5-cache/kde-apps/sweeper-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/sweeper:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/sweeper-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9f7fafbcb069d65f11f99fdca3301ff9
diff --git a/metadata/md5-cache/kde-apps/syndication-17.08.3 b/metadata/md5-cache/kde-apps/syndication-17.08.3
index 1f83db80a48a..78f979e3b97b 100644
--- a/metadata/md5-cache/kde-apps/syndication-17.08.3
+++ b/metadata/md5-cache/kde-apps/syndication-17.08.3
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/syndication:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/syndication-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3d6306dc516a6ac49583c141292e6f43
diff --git a/metadata/md5-cache/kde-apps/syndication-17.12.1 b/metadata/md5-cache/kde-apps/syndication-17.12.1
index 7d93aa659a7a..a1c939de6e25 100644
--- a/metadata/md5-cache/kde-apps/syndication-17.12.1
+++ b/metadata/md5-cache/kde-apps/syndication-17.12.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtxml-5.9.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/syndication:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/syndication-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=081cb63496f69616df6ec945cd609a17
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-17.08.3 b/metadata/md5-cache/kde-apps/thumbnailers-17.08.3
index 32bd48660cd2..f6df4913509e 100644
--- a/metadata/md5-cache/kde-apps/thumbnailers-17.08.3
+++ b/metadata/md5-cache/kde-apps/thumbnailers-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 raw? ( >=kde-apps/libkdcraw-17.08.3:5 >=kde-apps/libkexiv2-17.08.3:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/kdegraphics-thumbnailers-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ff0667224ca07d7cbee6e9fd3f35e145
diff --git a/metadata/md5-cache/kde-apps/thumbnailers-17.12.1 b/metadata/md5-cache/kde-apps/thumbnailers-17.12.1
index c3aeddc90f14..2da2a9c910f7 100644
--- a/metadata/md5-cache/kde-apps/thumbnailers-17.12.1
+++ b/metadata/md5-cache/kde-apps/thumbnailers-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 raw? ( >=kde-apps/libkdcraw-17.12.1:5 >=kde-apps/libkexiv2-17.12.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/kdegraphics-thumbnailers-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=64716ddb99b3563491aca9e0279479be
diff --git a/metadata/md5-cache/kde-apps/umbrello-17.08.3 b/metadata/md5-cache/kde-apps/umbrello-17.08.3
index d4c5d81fbc4a..3d05d5046152 100644
--- a/metadata/md5-cache/kde-apps/umbrello-17.08.3
+++ b/metadata/md5-cache/kde-apps/umbrello-17.08.3
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/umbrello:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.08.3/src/umbrello-17.08.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=94c1d38a84ca208a5244b174125d7baf
diff --git a/metadata/md5-cache/kde-apps/umbrello-17.12.1 b/metadata/md5-cache/kde-apps/umbrello-17.12.1
index 00121f0d4759..6acac82f8e95 100644
--- a/metadata/md5-cache/kde-apps/umbrello-17.12.1
+++ b/metadata/md5-cache/kde-apps/umbrello-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtwebkit-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 dev-libs/libxml2 dev-libs/libxslt !<kde-apps/kde4-l10n-17.07.80 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/umbrello:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/umbrello-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7e4e6679c02dd84bdbc924c491323905
diff --git a/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.1 b/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.1
index 673ba37532a2..2357a1e27426 100644
--- a/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.1
+++ b/metadata/md5-cache/kde-apps/zeroconf-ioslave-17.12.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdnssd-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtdbus-5.9.1:5 !kde-apps/kde4-l10n >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !kde-apps/zeroconf-ioslave:4 !kde-apps/kde-l10n !<kde-apps/kde4-l10n-16.12.0:4 !kde-apps/kdepim-l10n:5 >=dev-qt/qtcore-5.9.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/applications/17.12.1/src/zeroconf-ioslave-17.12.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c98ee44fd9f62859ab908c4b17e25234
diff --git a/metadata/md5-cache/kde-frameworks/Manifest.gz b/metadata/md5-cache/kde-frameworks/Manifest.gz
index 4d2d137696c2..4de4255f5dd6 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.40.0 b/metadata/md5-cache/kde-frameworks/attica-5.40.0
index 55e542dc7384..71c48309d2ee 100644
--- a/metadata/md5-cache/kde-frameworks/attica-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/attica-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/attica-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7fa6614f4c3543cf1a2423e3b527f703
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.41.0 b/metadata/md5-cache/kde-frameworks/attica-5.41.0
deleted file mode 100644
index f5aaee03d8e7..000000000000
--- a/metadata/md5-cache/kde-frameworks/attica-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing access to Open Collaboration Services
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/attica-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0e589edfc01bb8c6ca3e766c89740779
diff --git a/metadata/md5-cache/kde-frameworks/attica-5.42.0 b/metadata/md5-cache/kde-frameworks/attica-5.42.0
new file mode 100644
index 000000000000..2f1a64351acf
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/attica-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing access to Open Collaboration Services
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/attica-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=272d4128912609ff1bcd1905e9ab28f3
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.40.0 b/metadata/md5-cache/kde-frameworks/baloo-5.40.0
index 97ab4031b2d1..bb4c5af64b7a 100644
--- a/metadata/md5-cache/kde-frameworks/baloo-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.40.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kfilemetadata-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kidletime-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/solid-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kfilemetadata-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kidletime-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/solid-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/baloo-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7c987a3fe39961d7938a564d22355d9b
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.41.0 b/metadata/md5-cache/kde-frameworks/baloo-5.41.0
deleted file mode 100644
index 128b8b8cd4ad..000000000000
--- a/metadata/md5-cache/kde-frameworks/baloo-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kcrash-5.41:5 >=kde-frameworks/kdbusaddons-5.41:5 >=kde-frameworks/kfilemetadata-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kidletime-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/solid-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for searching and managing metadata
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kcrash-5.41:5 >=kde-frameworks/kdbusaddons-5.41:5 >=kde-frameworks/kfilemetadata-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kidletime-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/solid-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/baloo-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4c58e92d10c2e885336be071560438bd
diff --git a/metadata/md5-cache/kde-frameworks/baloo-5.42.0 b/metadata/md5-cache/kde-frameworks/baloo-5.42.0
new file mode 100644
index 000000000000..920dd879438d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/baloo-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kfilemetadata-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kidletime-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/solid-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for searching and managing metadata
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kfilemetadata-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kidletime-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/solid-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-db/lmdb-0.9.17 !kde-frameworks/baloo:4[-minimal(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/baloo-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f9b8077a67c432cf8490d98bdd92f2e2
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.40.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.40.0
index f3ea2e7011a8..20e25542224d 100644
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/bluez-qt-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0d38786cc06e32663f6acb0d11a4dddc
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.41.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.41.0
deleted file mode 100644
index 3e5d3eae9c63..000000000000
--- a/metadata/md5-cache/kde-frameworks/bluez-qt-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils virtual/pkgconfig
-DESCRIPTION=Qt wrapper for Bluez 5 DBus API
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/bluez-qt-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f2a516f7331d83e72c3c4f9d884943e2
diff --git a/metadata/md5-cache/kde-frameworks/bluez-qt-5.42.0 b/metadata/md5-cache/kde-frameworks/bluez-qt-5.42.0
new file mode 100644
index 000000000000..09e4771eff42
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/bluez-qt-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils virtual/pkgconfig
+DESCRIPTION=Qt wrapper for Bluez 5 DBus API
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/bluez-qt-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c56161d95ba41891363e8e9a5fa8cc78
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.40.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.40.0
index 6ef588d35b28..741e087d90c7 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.40.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-3
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/breeze-icons-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=12cd99720a0b5fde53e5437426a1b6b8
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.41.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.41.0
deleted file mode 100644
index b33f9926b17b..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-5.41.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.41:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze SVG icon theme
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-3
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/breeze-icons-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=69caf38e215dfa5a53beb377c255f1fe
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-5.42.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-5.42.0
new file mode 100644
index 000000000000..a127dcf82f3c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-5.42.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.42:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze SVG icon theme
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-3
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/breeze-icons-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=17f0add66b425821672ea72242eae400
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.40.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.40.0
index 62124ad48964..49635a8fc2a9 100644
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.40.0
@@ -8,5 +8,5 @@ KEYWORDS=amd64 x86
 LICENSE=LGPL-3
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/breeze-icons-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2f77a430eaaf55a2335715c9c4b6f691
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.41.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.41.0
deleted file mode 100644
index fc1e0183e482..000000000000
--- a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.41.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.41:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Breeze SVG icon theme binary resource
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-3
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/breeze-icons-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=df0cf4e64053bb52eaa8e3b7e097e312
diff --git a/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.42.0 b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.42.0
new file mode 100644
index 000000000000..63651271288f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/breeze-icons-rcc-5.42.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.42:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Breeze SVG icon theme binary resource
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/breeze-icons-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1b671feb97e59218633840d7c85ec2cb
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.40.0-r1 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.40.0-r1
index afde9bd23214..097cf8106630 100644
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.40.0-r1
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.40.0-r1
@@ -9,5 +9,5 @@ LICENSE=BSD
 RDEPEND=app-arch/libarchive[bzip2]
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/extra-cmake-modules-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=741708726b584a0fac550220a9ce1e24
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.41.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.41.0
deleted file mode 100644
index f6933aef0d5a..000000000000
--- a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=doc? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/sphinx[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/sphinx[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) test? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Extra modules and scripts for CMake
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
-IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/libarchive[bzip2]
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/extra-cmake-modules-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b789f32f670fc5742da8dff72e2c2ff2
diff --git a/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.42.0 b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.42.0
new file mode 100644
index 000000000000..0facf7dd8187
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/extra-cmake-modules-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=doc? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) || ( ( dev-lang/python:3.6 dev-python/sphinx[python_targets_python3_6(-),python_single_target_python3_6(+)] ) ( dev-lang/python:3.5 dev-python/sphinx[python_targets_python3_5(-),python_single_target_python3_5(+)] ) ( dev-lang/python:3.4 dev-python/sphinx[python_targets_python3_4(-),python_single_target_python3_4(+)] ) ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/sphinx[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) ) test? ( >=dev-qt/qtcore-5.7.1:5 >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Extra modules and scripts for CMake
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/extra-cmake-modules.git
+IUSE=doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/libarchive[bzip2]
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/extra-cmake-modules-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=998c656bf561ace2ca172ca34f09e3e7
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.40.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.40.0
index 4851ad016768..99d567e427c5 100644
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.40.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=appstream X test debug test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/knewstuff-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kpackage-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/knewstuff-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kpackage-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/frameworkintegration-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fabe2500a8e7f78aeac7faa32df21ba4
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.41.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.41.0
deleted file mode 100644
index 1e40fff62b4c..000000000000
--- a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.41.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.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/knewstuff-5.41:5 >=kde-frameworks/knotifications-5.41:5 >=kde-frameworks/kpackage-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=appstream X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/knewstuff-5.41:5 >=kde-frameworks/knotifications-5.41:5 >=kde-frameworks/kpackage-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/frameworkintegration-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=737070f89064e1299e23782b229eead2
diff --git a/metadata/md5-cache/kde-frameworks/frameworkintegration-5.42.0 b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.42.0
new file mode 100644
index 000000000000..cf0afd522f44
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/frameworkintegration-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/knewstuff-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kpackage-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for integrating Qt applications with KDE Plasma workspaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=appstream X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/knewstuff-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kpackage-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 appstream? ( app-admin/packagekit-qt dev-libs/appstream[qt5] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/frameworkintegration-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9f1f403c964b89e911af28ff738c6383
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.40.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.40.0
index 3c1689c86aa8..b2581e89c2ee 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.40.0
@@ -6,8 +6,8 @@ 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.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-plasma/kactivitymanagerd-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-plasma/kactivitymanagerd-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kactivities-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=238998429b6cfe775363d6379ace32f2
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.41.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.41.0
deleted file mode 100644
index f5fe1409786f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-libs/boost-1.54 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for working with KDE activities
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-plasma/kactivitymanagerd-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kactivities-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a26aa2b13f20d1e834fa0bb02d63d6d4
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-5.42.0 b/metadata/md5-cache/kde-frameworks/kactivities-5.42.0
new file mode 100644
index 000000000000..2c0cf4997354
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-libs/boost-1.54 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for working with KDE activities
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 )
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-plasma/kactivitymanagerd-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kactivities-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=82cae55a50b20bae514b9aaa04cdbf21
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.40.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.40.0
index 4a431e27b807..f953105db606 100644
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kactivities-stats-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=087279d7302741529f5c190c70ef29cf
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.41.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.41.0
deleted file mode 100644
index 5d3a82764ae3..000000000000
--- a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=dev-libs/boost-1.54 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for getting the usage statistics collected by the activities service
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kactivities-stats-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=45be8bff12c0bd8574bd4faa06f06956
diff --git a/metadata/md5-cache/kde-frameworks/kactivities-stats-5.42.0 b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.42.0
new file mode 100644
index 000000000000..aa6ef8aba0ba
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kactivities-stats-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=dev-libs/boost-1.54 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for getting the usage statistics collected by the activities service
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=kde-frameworks/kactivities-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kactivities-stats-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b2ddec7aa68aeebcc57c2a0ebfd14059
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.40.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.40.0
index 7f3145d7ed0a..f47ef7386d0d 100644
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.40.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.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kapidox-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3082b324629c59333c029b3a84c997a6
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.41.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.41.0
deleted file mode 100644
index 07f37a1ddbdc..000000000000
--- a/metadata/md5-cache/kde-frameworks/kapidox-5.41.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-DESCRIPTION=Framework for building KDE API documentation in a standard format and style
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=doc python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD-2
-RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-gfx/graphviz[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] doc? ( >=dev-qt/qt-docs-5.7.1:5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
-REQUIRED_USE=python_targets_python2_7
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kapidox-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=19b65b2e813fba8fcd778eca732f11a7
diff --git a/metadata/md5-cache/kde-frameworks/kapidox-5.42.0 b/metadata/md5-cache/kde-frameworks/kapidox-5.42.0
new file mode 100644
index 000000000000..8150994170e2
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kapidox-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+DESCRIPTION=Framework for building KDE API documentation in a standard format and style
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=doc python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=app-doc/doxygen dev-python/jinja[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyyaml[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] media-gfx/graphviz[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] doc? ( >=dev-qt/qt-docs-5.7.1:5 ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kapidox-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ee816bab864f6aaa71d809765351e6d7
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.40.0 b/metadata/md5-cache/kde-frameworks/karchive-5.40.0
index 6c3ab20c5a0c..149440bc3af5 100644
--- a/metadata/md5-cache/kde-frameworks/karchive-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=+bzip2 +lzma debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/karchive-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=27cb43db29f708ff70f58546dd532976
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.41.0 b/metadata/md5-cache/kde-frameworks/karchive-5.41.0
deleted file mode 100644
index 8c3a2f6be27b..000000000000
--- a/metadata/md5-cache/kde-frameworks/karchive-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+bzip2 +lzma debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/karchive-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5731a79e5882f6073d5602e2096f6be8
diff --git a/metadata/md5-cache/kde-frameworks/karchive-5.42.0 b/metadata/md5-cache/kde-frameworks/karchive-5.42.0
new file mode 100644
index 000000000000..29f9311091fa
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/karchive-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for reading, creation, and manipulation of various archive formats
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+bzip2 +lzma debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=bzip2? ( app-arch/bzip2 ) lzma? ( app-arch/xz-utils ) sys-libs/zlib >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/karchive-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6162f648bb031423a41318b073d1161b
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.40.0 b/metadata/md5-cache/kde-frameworks/kauth-5.40.0
index 9979ac755595..83de01412681 100644
--- a/metadata/md5-cache/kde-frameworks/kauth-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.40.0
@@ -7,8 +7,8 @@ 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.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kauth-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=08f9172b70c66382f098e9e56520010c
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.41.0 b/metadata/md5-cache/kde-frameworks/kauth-5.41.0
deleted file mode 100644
index 1951b5a6276d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kauth-5.41.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.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to let applications perform actions as a privileged user
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls +policykit test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
-RDEPEND=>=kde-frameworks/kcoreaddons-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kauth-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1a11bc0d73f6813c8e775d305e0b40c1
diff --git a/metadata/md5-cache/kde-frameworks/kauth-5.42.0 b/metadata/md5-cache/kde-frameworks/kauth-5.42.0
new file mode 100644
index 000000000000..628ba027032c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kauth-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to let applications perform actions as a privileged user
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls +policykit test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+PDEPEND=policykit? ( kde-plasma/polkit-kde-agent )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 policykit? ( sys-auth/polkit-qt[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kauth-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fe50ece8f6beeafc36c9c61e5270309b
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.40.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.40.0
index bac53e71f11d..2fabe188bcce 100644
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kbookmarks-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2bdd13d90b30034abd1a42866ef1d8ef
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.41.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.41.0
deleted file mode 100644
index 181976530a86..000000000000
--- a/metadata/md5-cache/kde-frameworks/kbookmarks-5.41.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.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kconfigwidgets-5.41:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing bookmarks stored in XBEL format
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcodecs-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kbookmarks-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=54ba66ceb1e47fbf91959251877a3d22
diff --git a/metadata/md5-cache/kde-frameworks/kbookmarks-5.42.0 b/metadata/md5-cache/kde-frameworks/kbookmarks-5.42.0
new file mode 100644
index 000000000000..2488e6301e08
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kbookmarks-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kconfigwidgets-5.42:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for managing bookmarks stored in XBEL format
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kbookmarks-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=926c456bc2cbb34aab6679a18f2ed263
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.40.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.40.0
index cc642e5eb61f..0cb0a61e6c22 100644
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdeclarative-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdeclarative-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kcmutils-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fdbe12941d64da15665840ca0111619c
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.41.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.41.0
deleted file mode 100644
index 5ad492f56f2e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcmutils-5.41.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.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kdeclarative-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to work with KDE System Settings modules
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/kauth-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kdeclarative-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kcmutils-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8e11a30311f63aeebf5f6fa81cef7646
diff --git a/metadata/md5-cache/kde-frameworks/kcmutils-5.42.0 b/metadata/md5-cache/kde-frameworks/kcmutils-5.42.0
new file mode 100644
index 000000000000..800d4ba740fc
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcmutils-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdeclarative-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to work with KDE System Settings modules
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdeclarative-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kcmutils-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6574dc65babe4d2e33ab65354d2c20ea
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.40.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.40.0
index c6c274cb0930..b3b59036ad77 100644
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.40.0
@@ -6,8 +6,8 @@ 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.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kcodecs-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1881a8dfd2ba56eb0bd117f214c41597
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.41.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.41.0
deleted file mode 100644
index 404ad830aa4c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcodecs-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for manipulating strings using various encodings
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2+ LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kcodecs-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5b817a23a4095c7c7a0eda2e2d427582
diff --git a/metadata/md5-cache/kde-frameworks/kcodecs-5.42.0 b/metadata/md5-cache/kde-frameworks/kcodecs-5.42.0
new file mode 100644
index 000000000000..bfe9bc0d7233
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcodecs-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for manipulating strings using various encodings
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2+ LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kcodecs-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=378da3e62daa508a021c2de45333d588
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.40.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.40.0
index 1e6eb61e98dd..e43a6cbd67d3 100644
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kcompletion-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1c54a4ed6725a7fdec26510c20a222a7
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.41.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.41.0
deleted file mode 100644
index bb06a5d1b47e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcompletion-5.41.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.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for common completion tasks such as filename or URL completion
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kcompletion-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0087f13a5cd407ecbe601d1fb30d767b
diff --git a/metadata/md5-cache/kde-frameworks/kcompletion-5.42.0 b/metadata/md5-cache/kde-frameworks/kcompletion-5.42.0
new file mode 100644
index 000000000000..49eaaa962788
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcompletion-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for common completion tasks such as filename or URL completion
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kcompletion-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4347ba04c17e9850ba88833444f285b7
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.40.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.40.0
index 8a685777778b..28c46ff5ba1b 100644
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.40.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kconfig-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ca8a31b59b57350fe0f01e52800658fe
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.41.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.41.0
deleted file mode 100644
index 715cbe06af9a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfig-5.41.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for reading and writing configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kconfig-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=965ee525c2a25beca5478a0a2ee766e0
diff --git a/metadata/md5-cache/kde-frameworks/kconfig-5.42.0 b/metadata/md5-cache/kde-frameworks/kconfig-5.42.0
new file mode 100644
index 000000000000..96bb94ae3277
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfig-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for reading and writing configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kconfig-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=89fbfaff3a52eb554c80a85c9c3c210a
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.40.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.40.0
index 90b75c5be299..6b0cc6efb07d 100644
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=+man test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kconfigwidgets-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7f8a06a2547f374edfcbfa06e3af9906
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.41.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.41.0
deleted file mode 100644
index e155cc9a777b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.41.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.41:5 >=kde-frameworks/kcodecs-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kguiaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 man? ( >=kde-frameworks/kdoctools-5.41:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing an assortment of configuration-related widgets
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.41:5 >=kde-frameworks/kcodecs-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kguiaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kconfigwidgets-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=fed3023b601b138283eb0f7a0f5b117c
diff --git a/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.42.0 b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.42.0
new file mode 100644
index 000000000000..aa91bb2221c9
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kconfigwidgets-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 man? ( >=kde-frameworks/kdoctools-5.42:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing an assortment of configuration-related widgets
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kconfigwidgets-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=834fdfa0193b33716aa57c0a101ec642
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.40.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.40.0
index 95bed02877e3..1ed4fbe1d7a6 100644
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=fam nls debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kcoreaddons-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bdac0bab9cada1645284f2fd9dd908c7
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.41.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.41.0
deleted file mode 100644
index 462b05422a6a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) x11-misc/shared-mime-info nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=fam nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kcoreaddons-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=539658846866ae52850fcc8e7de3eb42
diff --git a/metadata/md5-cache/kde-frameworks/kcoreaddons-5.42.0 b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.42.0
new file mode 100644
index 000000000000..757c9a7ea960
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcoreaddons-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) x11-misc/shared-mime-info nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for solving common problems such as caching, randomisation, and more
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=fam nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtcore-5.7.1:5[icu] fam? ( virtual/fam ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kcoreaddons-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=db6dca60fd6df32f7163b9deb63514f7
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.40.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.40.0
index 029edc1babf6..579d6131a27f 100644
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.40.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kcrash-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=27b8d078635b9b48f8677fe7cbcac0e9
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.41.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.41.0
deleted file mode 100644
index 240f884b14f3..000000000000
--- a/metadata/md5-cache/kde-frameworks/kcrash-5.41.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.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-proto/xproto nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=dev-qt/qtwidgets-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for intercepting and handling application crashes
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kcrash-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a2afdd1794180698d60365c768a43313
diff --git a/metadata/md5-cache/kde-frameworks/kcrash-5.42.0 b/metadata/md5-cache/kde-frameworks/kcrash-5.42.0
new file mode 100644
index 000000000000..5150ebfb812f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kcrash-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-proto/xproto nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=dev-qt/qtwidgets-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for intercepting and handling application crashes
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kcrash-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=23ffaa3864e6e7bbdbc06d91cd5f400f
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.40.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.40.0
index 855f0043f04c..31f56b4b4b65 100644
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=nls X debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kdbusaddons-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=fc0dc2aafbfdf6e796f450cc5746db65
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.41.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.41.0
deleted file mode 100644
index cd1b2548b4d3..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for registering services and applications per freedesktop standards
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kdbusaddons-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=81cda1765ba13ae70b94b2c88904df35
diff --git a/metadata/md5-cache/kde-frameworks/kdbusaddons-5.42.0 b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.42.0
new file mode 100644
index 000000000000..9cff3a1ccb9e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdbusaddons-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for registering services and applications per freedesktop standards
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kdbusaddons-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6f4e636614f777f3c2fbb33761d2d4ff
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.40.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.40.0
index ff1fce190402..f8eaaa3ff0bc 100644
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug doc
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kpackage-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kpackage-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kdeclarative-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=788246ff5295c82893f3acc04a1eaaad
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.41.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.41.0
deleted file mode 100644
index 841ba2be1016..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdeclarative-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kglobalaccel-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kpackage-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing integration of QML and KDE work spaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kglobalaccel-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kpackage-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kdeclarative-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9d1735136bc2a914c81da2b04718e5c2
diff --git a/metadata/md5-cache/kde-frameworks/kdeclarative-5.42.0 b/metadata/md5-cache/kde-frameworks/kdeclarative-5.42.0
new file mode 100644
index 000000000000..49cd1826c77e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdeclarative-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kpackage-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing integration of QML and KDE work spaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kpackage-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libepoxy >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kdeclarative-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=367f52e720c52fa38b1994ecf207c2e9
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.40.0-r1 b/metadata/md5-cache/kde-frameworks/kded-5.40.0-r1
index 887890d45771..9e80e021da39 100644
--- a/metadata/md5-cache/kde-frameworks/kded-5.40.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kded-5.40.0-r1
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=+man debug
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kinit-5.40:5 >=kde-frameworks/kservice-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kinit-5.40:5 >=kde-frameworks/kservice-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kded-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=31e6d1ac0c862acd61ddb271691a8dda
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.41.0 b/metadata/md5-cache/kde-frameworks/kded-5.41.0
deleted file mode 100644
index 898610ffbc83..000000000000
--- a/metadata/md5-cache/kde-frameworks/kded-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kcrash-5.41:5 >=kde-frameworks/kdbusaddons-5.41:5 >=kde-frameworks/kinit-5.41:5 >=kde-frameworks/kservice-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 man? ( >=kde-frameworks/kdoctools-5.41:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Central daemon of KDE workspaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kcrash-5.41:5 >=kde-frameworks/kdbusaddons-5.41:5 >=kde-frameworks/kinit-5.41:5 >=kde-frameworks/kservice-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kded-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=21e411b31abda5da52ecdce36cfaad78
diff --git a/metadata/md5-cache/kde-frameworks/kded-5.42.0 b/metadata/md5-cache/kde-frameworks/kded-5.42.0
new file mode 100644
index 000000000000..f69e31286f76
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kded-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kinit-5.42:5 >=kde-frameworks/kservice-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 man? ( >=kde-frameworks/kdoctools-5.42:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Central daemon of KDE workspaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kinit-5.42:5 >=kde-frameworks/kservice-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kded-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6d18366b668bf05e5736e0ccebd0cf63
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.40.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.40.0
index 22e1da096b1b..236b3a3c93b2 100644
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.40.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=libressl X test debug test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kded-5.40:5 >=kde-frameworks/kdesignerplugin-5.40:5 >=kde-frameworks/kemoticons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kunitconversion-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/solid-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.40:5 >=kde-frameworks/kinit-5.40:5 >=kde-frameworks/kitemmodels-5.40:5 >=dev-qt/qtxml-5.7.1:5 !<kde-apps/kde4-l10n-16.04.3 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kded-5.40:5 >=kde-frameworks/kdesignerplugin-5.40:5 >=kde-frameworks/kemoticons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kunitconversion-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/solid-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.40:5 >=kde-frameworks/kinit-5.40:5 >=kde-frameworks/kitemmodels-5.40:5 >=dev-qt/qtxml-5.7.1:5 !<kde-apps/kde4-l10n-16.04.3 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/portingAids/kdelibs4support-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=995bb2b6bc9644388d4d65e53d0f0210
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.41.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.41.0
deleted file mode 100644
index 72fc2277b291..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.41.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kauth-5.41:5 >=kde-frameworks/kcodecs-5.41:5 >=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kcrash-5.41:5 >=kde-frameworks/kdbusaddons-5.41:5 >=kde-frameworks/kded-5.41:5 >=kde-frameworks/kdesignerplugin-5.41:5 >=kde-frameworks/kemoticons-5.41:5 >=kde-frameworks/kglobalaccel-5.41:5 >=kde-frameworks/kguiaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kjobwidgets-5.41:5 >=kde-frameworks/knotifications-5.41:5 >=kde-frameworks/kparts-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/ktextwidgets-5.41:5 >=kde-frameworks/kunitconversion-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=kde-frameworks/solid-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.41:5 >=dev-qt/designer-5.7.1:5 dev-lang/perl dev-perl/URI test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=libressl X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.41:5 >=kde-frameworks/kcodecs-5.41:5 >=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kcrash-5.41:5 >=kde-frameworks/kdbusaddons-5.41:5 >=kde-frameworks/kded-5.41:5 >=kde-frameworks/kdesignerplugin-5.41:5 >=kde-frameworks/kemoticons-5.41:5 >=kde-frameworks/kglobalaccel-5.41:5 >=kde-frameworks/kguiaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kjobwidgets-5.41:5 >=kde-frameworks/knotifications-5.41:5 >=kde-frameworks/kparts-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/ktextwidgets-5.41:5 >=kde-frameworks/kunitconversion-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=kde-frameworks/solid-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.41:5 >=kde-frameworks/kinit-5.41:5 >=kde-frameworks/kitemmodels-5.41:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/portingAids/kdelibs4support-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9e925226c0ed9bba2b1163365acc4a33
diff --git a/metadata/md5-cache/kde-frameworks/kdelibs4support-5.42.0 b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.42.0
new file mode 100644
index 000000000000..f11074b5460e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdelibs4support-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kded-5.42:5 >=kde-frameworks/kdesignerplugin-5.42:5 >=kde-frameworks/kemoticons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kunitconversion-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/solid-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.42:5 >=dev-qt/designer-5.7.1:5 dev-lang/perl dev-perl/URI test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework easing the development transition from KDELibs 4 to KF 5
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=libressl X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kded-5.42:5 >=kde-frameworks/kdesignerplugin-5.42:5 >=kde-frameworks/kemoticons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kunitconversion-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/solid-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 app-text/docbook-xml-dtd:4.2 virtual/libintl !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libICE x11-libs/libSM x11-libs/libX11 ) >=kde-frameworks/kdoctools-5.42:5 >=kde-frameworks/kinit-5.42:5 >=kde-frameworks/kitemmodels-5.42:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/portingAids/kdelibs4support-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=49261df9484eb84af92612a7491e04e1
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.40.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.40.0
index 5ac0cffe5f80..f25fff7b11a8 100644
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=designer nls webkit debug
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kplotting-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/sonnet-5.40:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.40:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kplotting-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/sonnet-5.40:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.40:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kdesignerplugin-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9eb14e11b883abcecce8c031e92bda04
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.41.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.41.0
deleted file mode 100644
index d4893d76eea6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kplotting-5.41:5 >=kde-frameworks/ktextwidgets-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=kde-frameworks/sonnet-5.41:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.41:5 ) >=kde-frameworks/kdoctools-5.41:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=designer nls webkit debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kplotting-5.41:5 >=kde-frameworks/ktextwidgets-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=kde-frameworks/sonnet-5.41:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.41:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kdesignerplugin-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3fdb98622ff91d9a46ab834eabb5169c
diff --git a/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.42.0 b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.42.0
new file mode 100644
index 000000000000..f434872c15de
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesignerplugin-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kplotting-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/sonnet-5.42:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.42:5 ) >=kde-frameworks/kdoctools-5.42:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing plugins to use KDE frameworks widgets in QtDesigner
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=designer nls webkit debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 designer? ( >=dev-qt/designer-5.7.1:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kplotting-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/sonnet-5.42:5 ) webkit? ( >=dev-qt/designer-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kdewebkit-5.42:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kdesignerplugin-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3bf6799dcc7439850d295d1bba1a430b
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.40.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.40.0
index ba8406547b65..e6ff53ee4f6f 100644
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=X debug doc
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kpty-5.40:5 >=kde-frameworks/kservice-5.40:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kpty-5.40:5 >=kde-frameworks/kservice-5.40:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kdesu-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=06e5484db9793488b148f7736a7d09ba
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.41.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.41.0
deleted file mode 100644
index 24186b20bace..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdesu-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kpty-5.41:5 >=kde-frameworks/kservice-5.41:5 X? ( x11-libs/libX11 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to handle super user actions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kpty-5.41:5 >=kde-frameworks/kservice-5.41:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kdesu-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a0cc3e9ecad38935109e78b23de6e37f
diff --git a/metadata/md5-cache/kde-frameworks/kdesu-5.42.0 b/metadata/md5-cache/kde-frameworks/kdesu-5.42.0
new file mode 100644
index 000000000000..3e1a83445312
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdesu-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kpty-5.42:5 >=kde-frameworks/kservice-5.42:5 X? ( x11-libs/libX11 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to handle super user actions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kpty-5.42:5 >=kde-frameworks/kservice-5.42:5 X? ( x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kdesu-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4d9d855e5e6843f15ea3ddce4c749b31
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.40.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.40.0
index 5dd399d24a76..872b561b3acd 100644
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwallet-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwallet-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kdewebkit-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=009262bb1a9d925f458a4889bdc24203
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.41.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.41.0
deleted file mode 100644
index c30938e9378d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdewebkit-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kjobwidgets-5.41:5 >=kde-frameworks/kparts-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwallet-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing KDE integration of QtWebKit
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kjobwidgets-5.41:5 >=kde-frameworks/kparts-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwallet-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kdewebkit-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e0747a68e32cba5c1e986bea31b526c8
diff --git a/metadata/md5-cache/kde-frameworks/kdewebkit-5.42.0 b/metadata/md5-cache/kde-frameworks/kdewebkit-5.42.0
new file mode 100644
index 000000000000..953f07db042e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdewebkit-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwallet-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing KDE integration of QtWebKit
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwallet-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kdewebkit-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6495c0bb2421c1d46acbc29cf9903f3e
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.40.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.40.0
index cfaef0a43f17..4133640d7ef1 100644
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=nls zeroconf debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kdnssd-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c1af5e2444e60c2723f75b991417cc73
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.41.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.41.0
deleted file mode 100644
index 95636139dc32..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdnssd-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for network service discovery using Zeroconf
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls zeroconf debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kdnssd-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7ba1becabea5a694677ad7f54ec47fd7
diff --git a/metadata/md5-cache/kde-frameworks/kdnssd-5.42.0 b/metadata/md5-cache/kde-frameworks/kdnssd-5.42.0
new file mode 100644
index 000000000000..0b65a3d319b0
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdnssd-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for network service discovery using Zeroconf
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls zeroconf debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtnetwork-5.7.1:5 zeroconf? ( >=dev-qt/qtdbus-5.7.1:5 net-dns/avahi[mdnsresponder-compat] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kdnssd-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b67e5dd15c0ab39f99031131c64e63cf
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.40.0-r1 b/metadata/md5-cache/kde-frameworks/kdoctools-5.40.0-r1
index 944220d5c080..2e47c0b0d17e 100644
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.40.0-r1
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.40.0-r1
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
-RDEPEND=>=kde-frameworks/karchive-5.40: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.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40: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.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kdoctools-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=72ce06ecf5a0f9d7eed1602165f8de6a
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.41.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.41.0
deleted file mode 100644
index aac7ce0c259e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kdoctools-5.41.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.41:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt dev-lang/perl dev-perl/URI sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Tools to generate documentation in various formats from DocBook files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/karchive-5.41: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.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kdoctools-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=40771509c2bb8ce31ac1b662ecf43df1
diff --git a/metadata/md5-cache/kde-frameworks/kdoctools-5.42.0 b/metadata/md5-cache/kde-frameworks/kdoctools-5.42.0
new file mode 100644
index 000000000000..06d37c82d203
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kdoctools-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.42:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt dev-lang/perl dev-perl/URI sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Tools to generate documentation in various formats from DocBook files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/karchive-5.42:5 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets app-text/sgml-common dev-libs/libxml2:2 dev-libs/libxslt >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kdoctools-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=05683a71c581dcfae46ddbcb15c3e22a
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.40.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.40.0
index b93d9f6ce023..c025c31197db 100644
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.40.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kservice-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kservice-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kemoticons-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=89c258dcbae138ab61178cfa6378525c
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.41.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.41.0
deleted file mode 100644
index c4e0d734f835..000000000000
--- a/metadata/md5-cache/kde-frameworks/kemoticons-5.41.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.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kservice-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for converting text emoticons to graphical representations
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/karchive-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kservice-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kemoticons-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6259a1fef4ad1b0e2a594c125a5f0bae
diff --git a/metadata/md5-cache/kde-frameworks/kemoticons-5.42.0 b/metadata/md5-cache/kde-frameworks/kemoticons-5.42.0
new file mode 100644
index 000000000000..69c0db4b887c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kemoticons-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kservice-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for converting text emoticons to graphical representations
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kservice-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kemoticons-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=13039e88219306a131435b9ae69930ff
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.40.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.40.0
index 2e91ea746dee..ac0fe181f891 100644
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.40.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=epub exif ffmpeg libav office pdf taglib debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/ki18n-5.40:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.40:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) !taglib? ( >=dev-qt/qtmultimedia-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/ki18n-5.40:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.40:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) !taglib? ( >=dev-qt/qtmultimedia-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 REQUIRED_USE=test? ( taglib )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kfilemetadata-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=56d64a770a6f0a32d761e4dba0eb2648
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.41.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.41.0
deleted file mode 100644
index 5ab08854efaa..000000000000
--- a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.41.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.41:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.41:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) !taglib? ( >=dev-qt/qtmultimedia-5.7.1:5 ) kernel_linux? ( sys-apps/attr ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Library for extracting file metadata
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=epub exif ffmpeg libav office pdf taglib debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/ki18n-5.41:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.41:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) !taglib? ( >=dev-qt/qtmultimedia-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kfilemetadata-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a4366a75fe614fa00fd66b077832aba0
diff --git a/metadata/md5-cache/kde-frameworks/kfilemetadata-5.42.0 b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.42.0
new file mode 100644
index 000000000000..db07e73a06c8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kfilemetadata-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.42:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.42:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) kernel_linux? ( sys-apps/attr ) test? ( || ( dev-lang/python:3.6 dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 ) ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Library for extracting file metadata
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=epub exif ffmpeg libav office pdf taglib debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/ki18n-5.42:5 >=dev-qt/qtxml-5.7.1:5 epub? ( app-text/ebook-tools ) exif? ( media-gfx/exiv2:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) ) office? ( >=kde-frameworks/karchive-5.42:5 ) pdf? ( app-text/poppler[qt5] ) taglib? ( media-libs/taglib ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kfilemetadata-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9e676c52f89a12da286e26a46e3f8d26
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.40.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.40.0
index 5e63bd967125..187c94be77e6 100644
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kglobalaccel-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d756bf4771aef2bf144290c93d20c907
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.41.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.41.0
deleted file mode 100644
index d22a2f6be6ed..000000000000
--- a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kcrash-5.41:5 >=kde-frameworks/kdbusaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to handle global shortcuts
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kcrash-5.41:5 >=kde-frameworks/kdbusaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kglobalaccel-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=28acc087dcbbf38f949de22d1c8e7074
diff --git a/metadata/md5-cache/kde-frameworks/kglobalaccel-5.42.0 b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.42.0
new file mode 100644
index 000000000000..0b341c807f3f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kglobalaccel-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to handle global shortcuts
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5[X] >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb x11-libs/xcb-util-keysyms >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kglobalaccel-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d6e15eae3a51ac1c5b30f9a9de24b553
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.40.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.40.0
index bc53dc6d1e01..59679662fc64 100644
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kguiaddons-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=213236a92070a0e990ffbd22390336ae
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.41.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.41.0
deleted file mode 100644
index dbe932f381f9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kguiaddons-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing assorted high-level user interface components
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kguiaddons-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=099ac82ffb493e7ad49234b1374ce211
diff --git a/metadata/md5-cache/kde-frameworks/kguiaddons-5.42.0 b/metadata/md5-cache/kde-frameworks/kguiaddons-5.42.0
new file mode 100644
index 000000000000..1e7b8a293b36
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kguiaddons-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-proto/xproto sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing assorted high-level user interface components
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kguiaddons-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d97dc002c9735397704d6d5d64fd6686
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.40.0 b/metadata/md5-cache/kde-frameworks/khtml-5.40.0
index c7016110e53e..efd53139c6f8 100644
--- a/metadata/md5-cache/kde-frameworks/khtml-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=libressl X test debug test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kjs-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwallet-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/sonnet-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kjs-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwallet-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/sonnet-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/portingAids/khtml-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=553edbca3e49a5580075cd0bff77d310
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.41.0 b/metadata/md5-cache/kde-frameworks/khtml-5.41.0
deleted file mode 100644
index deb0b743230b..000000000000
--- a/metadata/md5-cache/kde-frameworks/khtml-5.41.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.41:5 >=kde-frameworks/kcodecs-5.41:5 >=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kglobalaccel-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kjobwidgets-5.41:5 >=kde-frameworks/kjs-5.41:5 >=kde-frameworks/knotifications-5.41:5 >=kde-frameworks/kparts-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/ktextwidgets-5.41:5 >=kde-frameworks/kwallet-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=kde-frameworks/sonnet-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) dev-lang/perl dev-util/gperf test? ( >=dev-qt/qtx11extras-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KHTML web rendering engine
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=libressl X test debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2
-RDEPEND=>=kde-frameworks/karchive-5.41:5 >=kde-frameworks/kcodecs-5.41:5 >=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kglobalaccel-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kjobwidgets-5.41:5 >=kde-frameworks/kjs-5.41:5 >=kde-frameworks/knotifications-5.41:5 >=kde-frameworks/kparts-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/ktextwidgets-5.41:5 >=kde-frameworks/kwallet-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=kde-frameworks/sonnet-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/portingAids/khtml-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=69e76baa63ce10e0d6fbb984b495e0d8
diff --git a/metadata/md5-cache/kde-frameworks/khtml-5.42.0 b/metadata/md5-cache/kde-frameworks/khtml-5.42.0
new file mode 100644
index 000000000000..3796eb3936da
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/khtml-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kjs-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwallet-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/sonnet-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) dev-lang/perl dev-util/gperf test? ( >=dev-qt/qtx11extras-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KHTML web rendering engine
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=libressl X test debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kjs-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwallet-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/sonnet-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/giflib:= media-libs/libpng:0= media-libs/phonon[qt5(+)] sys-libs/zlib virtual/jpeg:0 !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/portingAids/khtml-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fa309a608a18ca622b5a3eaeb98bb729
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.40.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.40.0
index 4d719f16a997..44e6378e2e26 100644
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.40.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/ki18n-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b316c2c33c6370973e8dd697cbabd780
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.41.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.41.0
deleted file mode 100644
index 3f0f44448da1..000000000000
--- a/metadata/md5-cache/kde-frameworks/ki18n-5.41.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework based on Gettext for internationalizing user interface text
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/ki18n-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1926b1d3ee99190787b084494249607f
diff --git a/metadata/md5-cache/kde-frameworks/ki18n-5.42.0 b/metadata/md5-cache/kde-frameworks/ki18n-5.42.0
new file mode 100644
index 000000000000..53ae2e9c76f6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ki18n-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl test? ( >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework based on Gettext for internationalizing user interface text
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-qt/qtscript-5.7.1:5 sys-devel/gettext virtual/libintl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+REQUIRED_USE=^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/ki18n-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9779ea95c907add1105106b8032c20cc
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.40.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.40.0
index bbb404d9e103..8995eec66be6 100644
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.40.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kiconthemes-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1a6685e886bd360a80670ff5a28dea7f
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.41.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.41.0
deleted file mode 100644
index 5d49a82a4937..000000000000
--- a/metadata/md5-cache/kde-frameworks/kiconthemes-5.41.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.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for icon theming and configuration
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kiconthemes-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d76a73d55de375c29422e195f36b13c
diff --git a/metadata/md5-cache/kde-frameworks/kiconthemes-5.42.0 b/metadata/md5-cache/kde-frameworks/kiconthemes-5.42.0
new file mode 100644
index 000000000000..e7929f89d537
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kiconthemes-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for icon theming and configuration
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kiconthemes-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f948676d4a0e93e4cd834e8b1d2df661
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.40.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.40.0
index 5aca578e6c2d..6bd8c1414200 100644
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.40.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=X xscreensaver debug doc
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 REQUIRED_USE=xscreensaver? ( X )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kidletime-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=406128436ca36875ad07b347da9d56c3
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.41.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.41.0
deleted file mode 100644
index a52aadaf6c2f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kidletime-5.41.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for detection and notification of device idle time
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=X xscreensaver debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-REQUIRED_USE=xscreensaver? ( X )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kidletime-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=51f93c389b29bb1ef1a0e7c0cace8f6c
diff --git a/metadata/md5-cache/kde-frameworks/kidletime-5.42.0 b/metadata/md5-cache/kde-frameworks/kidletime-5.42.0
new file mode 100644
index 000000000000..768cf667607f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kidletime-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for detection and notification of device idle time
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=X xscreensaver debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb x11-libs/libXext ) xscreensaver? ( >=dev-qt/qtdbus-5.7.1:5 x11-libs/libXScrnSaver ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+REQUIRED_USE=xscreensaver? ( X )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kidletime-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b3001b01746d7369d1b12cf0596d6215
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.40.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.40.0
index fd252f7d73cd..f1ab5b8399ef 100644
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=eps openexr test debug test
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.40:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kimageformats-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2e25b7fbdaa19ea539ff24e9d46f936c
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.41.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.41.0
deleted file mode 100644
index 9eb0c2c9060b..000000000000
--- a/metadata/md5-cache/kde-frameworks/kimageformats-5.41.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.41:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=eps openexr test debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.41:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kimageformats-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=906e95c41685f0ac1503d271ae718989
diff --git a/metadata/md5-cache/kde-frameworks/kimageformats-5.42.0 b/metadata/md5-cache/kde-frameworks/kimageformats-5.42.0
new file mode 100644
index 000000000000..811b65ad8ace
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kimageformats-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.42:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing additional format plugins for Qt's image I/O system
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=eps openexr test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.42:5 >=dev-qt/qtgui-5.7.1:5 eps? ( >=dev-qt/qtprintsupport-5.7.1:5 ) openexr? ( media-libs/ilmbase:= media-libs/openexr:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kimageformats-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f4ef7a2a5226f6b1ddac1cfcdc64c664
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.40.0 b/metadata/md5-cache/kde-frameworks/kinit-5.40.0
index 198acdf52e43..0d33802f7ae1 100644
--- a/metadata/md5-cache/kde-frameworks/kinit-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=+caps +man X debug
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kinit-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5c30da30c4121c5e254d86ba646059a4
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.41.0 b/metadata/md5-cache/kde-frameworks/kinit-5.41.0
deleted file mode 100644
index 787ae6c43dab..000000000000
--- a/metadata/md5-cache/kde-frameworks/kinit-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kcrash-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) man? ( >=kde-frameworks/kdoctools-5.41:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+caps +man X debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kcrash-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kinit-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=857978f21500ceae56f8aab756c7a0ea
diff --git a/metadata/md5-cache/kde-frameworks/kinit-5.42.0 b/metadata/md5-cache/kde-frameworks/kinit-5.42.0
new file mode 100644
index 000000000000..e0e49bdd9c9f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kinit-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) man? ( >=kde-frameworks/kdoctools-5.42:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Helper library to speed up start of applications on KDE work spaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+caps +man X debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 caps? ( sys-libs/libcap ) X? ( x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kinit-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=5871a7371fc62257fa8a05089bca2398
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.40.0-r3 b/metadata/md5-cache/kde-frameworks/kio-5.40.0-r3
index 5a1af19b165d..a925e218088c 100644
--- a/metadata/md5-cache/kde-frameworks/kio-5.40.0-r3
+++ b/metadata/md5-cache/kde-frameworks/kio-5.40.0-r3
@@ -7,9 +7,9 @@ IUSE=acl +handbook kerberos +kwallet X test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
 PDEPEND=>=kde-frameworks/kded-5.40:5
-RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kbookmarks-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/solid-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.40:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kbookmarks-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/solid-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.40:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kio-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2c783030fdb30162413af7ae1ea6d319
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.41.0 b/metadata/md5-cache/kde-frameworks/kio-5.41.0
deleted file mode 100644
index f047bb885486..000000000000
--- a/metadata/md5-cache/kde-frameworks/kio-5.41.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/karchive-5.41:5 >=kde-frameworks/kbookmarks-5.41:5 >=kde-frameworks/kcodecs-5.41:5 >=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kdbusaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kjobwidgets-5.41:5 >=kde-frameworks/knotifications-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/ktextwidgets-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=kde-frameworks/solid-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.41:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=dev-qt/qtconcurrent-5.7.1:5 handbook? ( >=kde-frameworks/kdoctools-5.41:5 ) test? ( sys-libs/zlib ) X? ( x11-libs/libX11 x11-libs/libXrender x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing transparent file and data management
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=acl +handbook kerberos +kwallet X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-PDEPEND=>=kde-frameworks/kded-5.41:5
-RDEPEND=>=kde-frameworks/karchive-5.41:5 >=kde-frameworks/kbookmarks-5.41:5 >=kde-frameworks/kcodecs-5.41:5 >=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kdbusaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kjobwidgets-5.41:5 >=kde-frameworks/knotifications-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/ktextwidgets-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=kde-frameworks/solid-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.41:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kio-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=af2e590a59c50a13e2d2c3ab320f9b1c
diff --git a/metadata/md5-cache/kde-frameworks/kio-5.42.0 b/metadata/md5-cache/kde-frameworks/kio-5.42.0
new file mode 100644
index 000000000000..4300a67f60f6
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kio-5.42.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kbookmarks-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/solid-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.42:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.42:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=dev-qt/qtconcurrent-5.7.1:5 test? ( sys-libs/zlib ) X? ( x11-libs/libX11 x11-libs/libXrender x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing transparent file and data management
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=acl +handbook kerberos +kwallet X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+PDEPEND=>=kde-frameworks/kded-5.42:5
+RDEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kbookmarks-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/solid-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-libs/libxml2 dev-libs/libxslt acl? ( sys-apps/attr virtual/acl ) handbook? ( >=kde-frameworks/kdoctools-5.42:5 ) kerberos? ( virtual/krb5 ) kwallet? ( >=kde-frameworks/kwallet-5.42:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kio-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=3c553919ff1554d44b3563bbf2dc4926
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.40.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.40.0
index b4f0b6642990..59bef04a9896 100644
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.40.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://techbase.kde.org/Kirigami
 IUSE=plasma debug examples test
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 plasma? ( >=kde-frameworks/plasma-5.40:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 plasma? ( >=kde-frameworks/plasma-5.40:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kirigami2-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=efab4227342f02f481d2ae544ac6f40b
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.41.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.41.0
deleted file mode 100644
index b2707a78d2e6..000000000000
--- a/metadata/md5-cache/kde-frameworks/kirigami-5.41.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 plasma? ( >=kde-frameworks/plasma-5.41:5 ) >=dev-qt/linguist-tools-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
-EAPI=6
-HOMEPAGE=https://techbase.kde.org/Kirigami
-IUSE=plasma debug examples test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 plasma? ( >=kde-frameworks/plasma-5.41:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kirigami2-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a79f27361fa013f4cc4993aba6669dc9
diff --git a/metadata/md5-cache/kde-frameworks/kirigami-5.42.0 b/metadata/md5-cache/kde-frameworks/kirigami-5.42.0
new file mode 100644
index 000000000000..f510d8b25dee
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kirigami-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/linguist-tools-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Lightweight user interface framework for mobile and convergent applications
+EAPI=6
+HOMEPAGE=https://techbase.kde.org/Kirigami
+IUSE=debug examples test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kirigami2-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=048b5c3fd6578b42d37a7cf3e0cf9363
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.40.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.40.0
index 9378fe2896ae..42fbecf4ae1f 100644
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.40.0
@@ -6,8 +6,8 @@ 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.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kitemmodels-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=819210a72b7ce78fcc24816246e1eca4
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.41.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.41.0
deleted file mode 100644
index 1177ec681091..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemmodels-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=test? ( >=dev-qt/qtwidgets-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kitemmodels-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5317a881e2f5c6742841f1b6919671c8
diff --git a/metadata/md5-cache/kde-frameworks/kitemmodels-5.42.0 b/metadata/md5-cache/kde-frameworks/kitemmodels-5.42.0
new file mode 100644
index 000000000000..35739a48981c
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemmodels-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=test? ( >=dev-qt/qtwidgets-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing data models to help with tasks such as sorting and filtering
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kitemmodels-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9b5029d136591559f64bc120f87a932b
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.40.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.40.0
index 99c32e938f1c..91cc83fe8f79 100644
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kitemviews-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=05801dcb37f397f2b5dbb19971bc55c2
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.41.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.41.0
deleted file mode 100644
index b6352abf4034..000000000000
--- a/metadata/md5-cache/kde-frameworks/kitemviews-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing additional widgets for item models
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kitemviews-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c3d1b854770f4c2df50552363510eaf6
diff --git a/metadata/md5-cache/kde-frameworks/kitemviews-5.42.0 b/metadata/md5-cache/kde-frameworks/kitemviews-5.42.0
new file mode 100644
index 000000000000..477eb3e511b4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kitemviews-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing additional widgets for item models
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kitemviews-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=df6df54cdad36b07e198ea497615813e
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.40.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.40.0
index 40ddac6b4d3a..4f08b6251066 100644
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=nls X debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kjobwidgets-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=981441fb8da29eff0320a5df516d6884
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.41.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.41.0
deleted file mode 100644
index a7f0474cc32f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.41.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.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-libs/libX11 x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls X debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kjobwidgets-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=57b24fa5787eeaea2f77f66d8c1f94d7
diff --git a/metadata/md5-cache/kde-frameworks/kjobwidgets-5.42.0 b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.42.0
new file mode 100644
index 000000000000..7066053dffad
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjobwidgets-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-libs/libX11 x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing assorted widgets for showing the progress of jobs
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls X debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kjobwidgets-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=8ceb7f4fe9821bda5f4d2fb3eb6ee05a
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.40.0 b/metadata/md5-cache/kde-frameworks/kjs-5.40.0
index b5b74140db70..7e45fd1711b8 100644
--- a/metadata/md5-cache/kde-frameworks/kjs-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2 LGPL-2+
-RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/portingAids/kjs-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b9277a5a6c0ec724705cfbcbe0e7f7f8
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.41.0 b/metadata/md5-cache/kde-frameworks/kjs-5.41.0
deleted file mode 100644
index 6f9ef53c3687..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjs-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=dev-libs/libpcre >=kde-frameworks/kdoctools-5.41:5 dev-lang/perl sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=ECMAScipt compatible parser and engine
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD-2 LGPL-2+
-RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/portingAids/kjs-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a346c67befa9f93d4dc14abdff04dabf
diff --git a/metadata/md5-cache/kde-frameworks/kjs-5.42.0 b/metadata/md5-cache/kde-frameworks/kjs-5.42.0
new file mode 100644
index 000000000000..37877299ea56
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjs-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/libpcre >=kde-frameworks/kdoctools-5.42:5 dev-lang/perl sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=ECMAScipt compatible parser and engine
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2 LGPL-2+
+RDEPEND=dev-libs/libpcre >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/portingAids/kjs-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e517b654d0860f18c6400416b2f23929
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.40.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.40.0
index 2ff71ecfdb77..7cc146ddce44 100644
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kjs-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kjs-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/portingAids/kjsembed-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1cf63cbc85a922af0f12946b4d006e4b
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.41.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.41.0
deleted file mode 100644
index d5206c7f77c9..000000000000
--- a/metadata/md5-cache/kde-frameworks/kjsembed-5.41.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.41:5 >=kde-frameworks/kjs-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kdoctools-5.41:5 >=dev-qt/designer-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework binding JavaScript objects to QObjects
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kjs-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/portingAids/kjsembed-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dadbee7d969ecec42702be488f8f17ce
diff --git a/metadata/md5-cache/kde-frameworks/kjsembed-5.42.0 b/metadata/md5-cache/kde-frameworks/kjsembed-5.42.0
new file mode 100644
index 000000000000..75f381a3eb77
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kjsembed-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kjs-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kdoctools-5.42:5 >=dev-qt/designer-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework binding JavaScript objects to QObjects
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kjs-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/portingAids/kjsembed-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d87ae37235075fd97111e1461f6e7b82
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.40.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.40.0
index f74b1279b40a..a50fa242000a 100644
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
 KEYWORDS=amd64 ~arm x86
 LICENSE=MIT
-RDEPEND=>=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/portingAids/kmediaplayer-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=82b66f7a856440a1e620387a532056b8
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.41.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.41.0
deleted file mode 100644
index 6bd156221287..000000000000
--- a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kparts-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing a common interface for KParts that can play media files
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RDEPEND=>=kde-frameworks/kparts-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/portingAids/kmediaplayer-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f9ce52e47965f74f9e024f9498173497
diff --git a/metadata/md5-cache/kde-frameworks/kmediaplayer-5.42.0 b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.42.0
new file mode 100644
index 000000000000..375d30a70f32
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kmediaplayer-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing a common interface for KParts that can play media files
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RDEPEND=>=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/portingAids/kmediaplayer-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4efa5c076abee87bedc1b748e3053551
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.40.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.40.0
index 92a17d36061c..438ed14459d7 100644
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug doc
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/attica-5.40:5 >=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kirigami-5.40:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/attica-5.40:5 >=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kirigami-5.40:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/knewstuff-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=46ef6da2a0bb68289242108b3be1ca9c
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.41.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.41.0
deleted file mode 100644
index 556ec2561aa6..000000000000
--- a/metadata/md5-cache/kde-frameworks/knewstuff-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/attica-5.41:5 >=kde-frameworks/karchive-5.41:5 >=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/ktextwidgets-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for downloading and sharing additional application data
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/attica-5.41:5 >=kde-frameworks/karchive-5.41:5 >=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/ktextwidgets-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kirigami-5.41:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/knewstuff-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=20fe499ab204f3e4816cf7214991c8b7
diff --git a/metadata/md5-cache/kde-frameworks/knewstuff-5.42.0 b/metadata/md5-cache/kde-frameworks/knewstuff-5.42.0
new file mode 100644
index 000000000000..c61be8e2ae53
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knewstuff-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/attica-5.42:5 >=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for downloading and sharing additional application data
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/attica-5.42:5 >=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kirigami-5.42:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/knewstuff-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=dcf9fd98c448de261ca8933f47ad2d6a
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.40.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.40.0
index f75de1cb6269..c187505d7490 100644
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=dbus nls speech X debug doc
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/knotifications-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=95a21c62a37f5b31a5a71c71390800d6
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.41.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.41.0
deleted file mode 100644
index 02bb29a5b5f8..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifications-5.41.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.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for notifying the user of an event
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=dbus nls speech X debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcodecs-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/knotifications-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ef6aeab2d1defd125f1dbd7ed8032010
diff --git a/metadata/md5-cache/kde-frameworks/knotifications-5.42.0 b/metadata/md5-cache/kde-frameworks/knotifications-5.42.0
new file mode 100644
index 000000000000..45ca93ae1309
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifications-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for notifying the user of an event
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=dbus nls speech X debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/phonon[qt5(+)] dbus? ( dev-libs/libdbusmenu-qt[qt5(+)] ) speech? ( >=dev-qt/qtspeech-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/knotifications-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ce3312b5fb6482147de5241990e4c11c
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.40.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.40.0
index de82e380e962..9654201ba808 100644
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=phonon debug doc
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/knotifyconfig-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0b6f0fe8d7d3fc0800700228acde5cb6
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.41.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.41.0
deleted file mode 100644
index 8ae3a6a446bb..000000000000
--- a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.41.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.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kio-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for configuring desktop notifications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=phonon debug doc
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kio-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/knotifyconfig-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c6b7a53599366b57f7c273d7aad0bc3
diff --git a/metadata/md5-cache/kde-frameworks/knotifyconfig-5.42.0 b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.42.0
new file mode 100644
index 000000000000..62adae63a58b
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/knotifyconfig-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for configuring desktop notifications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=phonon debug doc
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 phonon? ( media-libs/phonon[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/knotifyconfig-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f58337ebde2970d4c869483a52b0f5d9
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.40.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.40.0
index 61291de0c614..952eadc94fa5 100644
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=man debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kpackage-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0bd934036f91db775cb2e0d5e2f0a4f3
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.41.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.41.0
deleted file mode 100644
index 2238e9ee7454..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpackage-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 man? ( >=kde-frameworks/kdoctools-5.41:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework to install and load packages of non binary content
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kpackage-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eafcbbd7e99f14bc0ba8174bf55ef55e
diff --git a/metadata/md5-cache/kde-frameworks/kpackage-5.42.0 b/metadata/md5-cache/kde-frameworks/kpackage-5.42.0
new file mode 100644
index 000000000000..f74b66f77096
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpackage-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 man? ( >=kde-frameworks/kdoctools-5.42:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework to install and load packages of non binary content
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kpackage-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=24bfe4fb28b8685ce67ac46ee5ff58a5
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.40.0 b/metadata/md5-cache/kde-frameworks/kparts-5.40.0
index ad1dee57689a..30bc98aebd88 100644
--- a/metadata/md5-cache/kde-frameworks/kparts-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kparts-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=25abf8cc483cf2987ff1176c5c7ae916
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.41.0 b/metadata/md5-cache/kde-frameworks/kparts-5.41.0
deleted file mode 100644
index 73a801734c69..000000000000
--- a/metadata/md5-cache/kde-frameworks/kparts-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kjobwidgets-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/ktextwidgets-5.41:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing elaborate user-interface components
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kjobwidgets-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kparts-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=610c40cbb6798cbd294bf74f6c1ae3c4
diff --git a/metadata/md5-cache/kde-frameworks/kparts-5.42.0 b/metadata/md5-cache/kde-frameworks/kparts-5.42.0
new file mode 100644
index 000000000000..845aee47c4c3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kparts-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/ktextwidgets-5.42:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing elaborate user-interface components
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kparts-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f577175f51edf0e6fbd6ac8abb4422b1
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.40.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.40.0
index ea408769cdcc..3eddf924554b 100644
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.40.0
@@ -6,8 +6,8 @@ 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.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kpeople-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3b56718af4afc7fcd8c8adb3b0e35543
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.41.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.41.0
deleted file mode 100644
index 3ff88fd2be6a..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpeople-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=KDE contact person abstraction library
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kpeople.git
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kpeople-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a461aadfd8a6862edcfe5256c59866cf
diff --git a/metadata/md5-cache/kde-frameworks/kpeople-5.42.0 b/metadata/md5-cache/kde-frameworks/kpeople-5.42.0
new file mode 100644
index 000000000000..4a56b86e605d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpeople-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=KDE contact person abstraction library
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kpeople.git
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-libs/kpeople:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kpeople-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=76d9365d1f09489bea1598e7e1969f1a
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.40.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.40.0
index fffa2856bcf2..f045cdd19c77 100644
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kplotting-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=efcc6bc489e0e9b6bc9b2d0010f550df
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.41.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.41.0
deleted file mode 100644
index 583d74df263e..000000000000
--- a/metadata/md5-cache/kde-frameworks/kplotting-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing easy data-plotting functions
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kplotting-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=941277bc1b802a123d5e919913ac7020
diff --git a/metadata/md5-cache/kde-frameworks/kplotting-5.42.0 b/metadata/md5-cache/kde-frameworks/kplotting-5.42.0
new file mode 100644
index 000000000000..368d210d7da3
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kplotting-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing easy data-plotting functions
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kplotting-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=930c75e3328e1cb8986e561664a8e618
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.40.0 b/metadata/md5-cache/kde-frameworks/kpty-5.40.0
index eed1c78ba6ca..2a160f40f969 100644
--- a/metadata/md5-cache/kde-frameworks/kpty-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kpty-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=428d346bcc1aadbfef57019ad904b7b7
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.41.0 b/metadata/md5-cache/kde-frameworks/kpty-5.41.0
deleted file mode 100644
index 331b235e6c8f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kpty-5.41.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.41:5 >=kde-frameworks/ki18n-5.41:5 sys-libs/libutempter sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for pseudo terminal devices and running child processes
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kpty-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=10c8e0069f21dccb19400ec6a1b1c4c8
diff --git a/metadata/md5-cache/kde-frameworks/kpty-5.42.0 b/metadata/md5-cache/kde-frameworks/kpty-5.42.0
new file mode 100644
index 000000000000..dcaed8584af7
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kpty-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 sys-libs/libutempter sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for pseudo terminal devices and running child processes
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 sys-libs/libutempter >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kpty-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=20f7a6cd39ac8c27e3f4d21c0b437450
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.40.0 b/metadata/md5-cache/kde-frameworks/kross-5.40.0
index 658009e9c2e0..ee83676f424f 100644
--- a/metadata/md5-cache/kde-frameworks/kross-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kross-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/portingAids/kross-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=630093845b227c158d633e3a670a1155
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.41.0 b/metadata/md5-cache/kde-frameworks/kross-5.41.0
deleted file mode 100644
index 61263cea309d..000000000000
--- a/metadata/md5-cache/kde-frameworks/kross-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kparts-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kdoctools-5.41:5 >=dev-qt/designer-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for embedding scripting into applications
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kparts-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/portingAids/kross-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7db1389b0f2e96b1f4322e63e07e8a1f
diff --git a/metadata/md5-cache/kde-frameworks/kross-5.42.0 b/metadata/md5-cache/kde-frameworks/kross-5.42.0
new file mode 100644
index 000000000000..77bac81dba98
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kross-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kdoctools-5.42:5 >=dev-qt/designer-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for embedding scripting into applications
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/portingAids/kross-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0b71613570ce74be08b000a94c906052
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.40.0 b/metadata/md5-cache/kde-frameworks/krunner-5.40.0
index acda882074d9..0d41fefd8592 100644
--- a/metadata/md5-cache/kde-frameworks/krunner-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/plasma-5.40:5 >=kde-frameworks/solid-5.40:5 >=kde-frameworks/threadweaver-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kapptemplate-15.12.3-r1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/plasma-5.40:5 >=kde-frameworks/solid-5.40:5 >=kde-frameworks/threadweaver-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !<kde-apps/kapptemplate-15.12.3-r1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/krunner-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=50aedb89a6ee24d3d039cb47df46f4c1
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.41.0 b/metadata/md5-cache/kde-frameworks/krunner-5.41.0
deleted file mode 100644
index 42eb6b87a6eb..000000000000
--- a/metadata/md5-cache/kde-frameworks/krunner-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/plasma-5.41:5 >=kde-frameworks/solid-5.41:5 >=kde-frameworks/threadweaver-5.41:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for providing different actions given a string query
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/plasma-5.41:5 >=kde-frameworks/solid-5.41:5 >=kde-frameworks/threadweaver-5.41:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/krunner-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=555eb587b2dee862665c5b8081d1351f
diff --git a/metadata/md5-cache/kde-frameworks/krunner-5.42.0 b/metadata/md5-cache/kde-frameworks/krunner-5.42.0
new file mode 100644
index 000000000000..c0cd709ef668
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/krunner-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/plasma-5.42:5 >=kde-frameworks/solid-5.42:5 >=kde-frameworks/threadweaver-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for providing different actions given a string query
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/plasma-5.42:5 >=kde-frameworks/solid-5.42:5 >=kde-frameworks/threadweaver-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/krunner-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e072d08ad99dcce618650c3171ffbc99
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.40.0 b/metadata/md5-cache/kde-frameworks/kservice-5.40.0
index 45401a15a72b..95cc981e65f9 100644
--- a/metadata/md5-cache/kde-frameworks/kservice-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.40.0
@@ -6,9 +6,9 @@ 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.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kcrash-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kservice-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b85257623593909d047011752b2660d8
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.41.0 b/metadata/md5-cache/kde-frameworks/kservice-5.41.0
deleted file mode 100644
index 550b7ceeb0a1..000000000000
--- a/metadata/md5-cache/kde-frameworks/kservice-5.41.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.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kcrash-5.41:5 >=kde-frameworks/kdbusaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.41:5 ) test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Advanced plugin and service introspection
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=+man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2 LGPL-2.1+
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kcrash-5.41:5 >=kde-frameworks/kdbusaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kservice-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=53c34a18d18f1400cc70003dfac8e01c
diff --git a/metadata/md5-cache/kde-frameworks/kservice-5.42.0 b/metadata/md5-cache/kde-frameworks/kservice-5.42.0
new file mode 100644
index 000000000000..6272c4b22f51
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kservice-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/bison sys-devel/flex man? ( >=kde-frameworks/kdoctools-5.42:5 ) test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Advanced plugin and service introspection
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=+man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2 LGPL-2.1+
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kcrash-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kservice-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d1255b02fd8e236b943893db5d2ce6ef
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.40.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.40.0
index fc09ebf9b2fc..fb5efe38c297 100644
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.40.0
@@ -6,9 +6,9 @@ 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.40:5 >=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/sonnet-5.40:5 >=kde-frameworks/syntax-highlighting-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kauth-5.40:5 >=kde-frameworks/kcodecs-5.40:5 >=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/kjobwidgets-5.40:5 >=kde-frameworks/kparts-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=kde-frameworks/sonnet-5.40:5 >=kde-frameworks/syntax-highlighting-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/ktexteditor-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d3a4b1ebc9401d03e490897b3d208888
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.41.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.41.0
deleted file mode 100644
index b6aa14a4b76c..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktexteditor-5.41.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.41:5 >=kde-frameworks/kauth-5.41:5 >=kde-frameworks/kcodecs-5.41:5 >=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kguiaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kjobwidgets-5.41:5 >=kde-frameworks/kparts-5.41:5 >=kde-frameworks/ktextwidgets-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=kde-frameworks/sonnet-5.41:5 >=kde-frameworks/syntax-highlighting-5.41:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=dev-qt/qtxmlpatterns-5.7.1:5 test? ( >=kde-frameworks/kservice-5.41:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing a full text editor component
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=editorconfig git test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.41:5 >=kde-frameworks/kauth-5.41:5 >=kde-frameworks/kcodecs-5.41:5 >=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kguiaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/kjobwidgets-5.41:5 >=kde-frameworks/kparts-5.41:5 >=kde-frameworks/ktextwidgets-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=kde-frameworks/sonnet-5.41:5 >=kde-frameworks/syntax-highlighting-5.41:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/ktexteditor-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=22b745661e768be0c03c17795737baa9
diff --git a/metadata/md5-cache/kde-frameworks/ktexteditor-5.42.0 b/metadata/md5-cache/kde-frameworks/ktexteditor-5.42.0
new file mode 100644
index 000000000000..802cd3d00ef5
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktexteditor-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/sonnet-5.42:5 >=kde-frameworks/syntax-highlighting-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=dev-qt/qtxmlpatterns-5.7.1:5 test? ( >=kde-frameworks/kservice-5.42:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing a full text editor component
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=editorconfig git test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kauth-5.42:5 >=kde-frameworks/kcodecs-5.42:5 >=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/kjobwidgets-5.42:5 >=kde-frameworks/kparts-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=kde-frameworks/sonnet-5.42:5 >=kde-frameworks/syntax-highlighting-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 editorconfig? ( app-text/editorconfig-core-c ) git? ( dev-libs/libgit2:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/ktexteditor-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f30729c8ef0b9426cb8fe738d9e39b37
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.40.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.40.0
index a301794cfd31..52ac28e790a0 100644
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.40.0
@@ -6,8 +6,8 @@ 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.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/sonnet-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kcompletion-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/sonnet-5.40:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/ktextwidgets-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=83cb5b8a615ae8cc6b8171bcb220fae4
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.41.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.41.0
deleted file mode 100644
index 73678d49e541..000000000000
--- a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.41.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.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=kde-frameworks/sonnet-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=speech test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=kde-frameworks/kcompletion-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=kde-frameworks/sonnet-5.41:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/ktextwidgets-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a2cf8be8e2f0beb55b658f92697927f8
diff --git a/metadata/md5-cache/kde-frameworks/ktextwidgets-5.42.0 b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.42.0
new file mode 100644
index 000000000000..ce2ff7d90e1d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/ktextwidgets-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/sonnet-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing an assortment of widgets for displaying and editing text
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=speech test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=kde-frameworks/kcompletion-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/sonnet-5.42:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 speech? ( >=dev-qt/qtspeech-5.7.1:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/ktextwidgets-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2c8beff7f9dd6799faa5ec0d82ff2ab7
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.40.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.40.0
index 89d9db3084f8..20a7c4fd7f2a 100644
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.40:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/ki18n-5.40:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kunitconversion-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aacccc7f9a62fccb72a707330423f44e
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.41.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.41.0
deleted file mode 100644
index 574d3740cc7f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kunitconversion-5.41.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.41:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for converting units
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/ki18n-5.41:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kunitconversion-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=810ce56a551836ae887b2edd14163123
diff --git a/metadata/md5-cache/kde-frameworks/kunitconversion-5.42.0 b/metadata/md5-cache/kde-frameworks/kunitconversion-5.42.0
new file mode 100644
index 000000000000..e13c8824fe78
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kunitconversion-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/ki18n-5.42:5 >=dev-qt/qtnetwork-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for converting units
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/ki18n-5.42:5 >=dev-qt/qtnetwork-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kunitconversion-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f9e929dd914f69e47c3f7846070e055e
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.40.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.40.0
index 88a8b859b329..291cce4e0cb3 100644
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=gpg +man debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdbusaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kwallet-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8bc88acf1c9c3dbcbf19206028acc453
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.41.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.41.0
deleted file mode 100644
index 127536a05a1f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwallet-5.41.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.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kdbusaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/knotifications-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) man? ( >=kde-frameworks/kdoctools-5.41:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing desktop-wide storage for passwords
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=gpg +man debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kdbusaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/knotifications-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kwallet-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c1011496155cdc97331719976bd4e438
diff --git a/metadata/md5-cache/kde-frameworks/kwallet-5.42.0 b/metadata/md5-cache/kde-frameworks/kwallet-5.42.0
new file mode 100644
index 000000000000..7118b6e44a20
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwallet-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) man? ( >=kde-frameworks/kdoctools-5.42:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing desktop-wide storage for passwords
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=gpg +man debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdbusaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libgcrypt:0= gpg? ( >=app-crypt/gpgme-1.7.1[cxx,qt5] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kwallet-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f360dcfe404c371306515fe702d401ca
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.40.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.40.0
index cc9161a77f78..19b68a90adbd 100644
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.40.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://cgit.kde.org/kwayland.git
 IUSE=debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.7.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.7.1:5[egl(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.7.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.7.1:5[egl(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kwayland-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2da8b30678d88b713eb093c20eed38ed
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.41.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.41.0
deleted file mode 100644
index c9a40fddae4c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwayland-5.41.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/kwayland.git
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.7.1:5[egl(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kwayland-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=395627bf6defbbe5a714ea9c4418f1c1
diff --git a/metadata/md5-cache/kde-frameworks/kwayland-5.42.0 b/metadata/md5-cache/kde-frameworks/kwayland-5.42.0
new file mode 100644
index 000000000000..da90df565803
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwayland-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Qt-style client and server library wrapper for Wayland libraries
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/kwayland.git
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[egl] >=dev-libs/wayland-1.13.0 media-libs/mesa[egl] >=dev-qt/qtwayland-5.7.1:5[egl(+)] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kwayland-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1399ddbc69f9a9500c90f8e33d457dc6
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.40.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.40.0
index c095b8e1f8b9..6e5123a08d3e 100644
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kwidgetsaddons-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f94747fcb6b5dcecf74301eeafbb86bd
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.41.0 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.41.0
deleted file mode 100644
index 6db3819a112c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=An assortment of high-level widgets for common tasks
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kwidgetsaddons-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c92f5c1c70e65a0496d6611b4d65d2c
diff --git a/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.42.1 b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.42.1
new file mode 100644
index 000000000000..850e20a8b10a
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwidgetsaddons-5.42.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=An assortment of high-level widgets for common tasks
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kwidgetsaddons-5.42.1.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f60a3a1b79a05d61245a02c68af376fe
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.40.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.40.0
index d6b6a20c1020..1c9ec466bea8 100644
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.40.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=nls X test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kwindowsystem-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=61188aad60dd227190e75dd2bdf49877
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.41.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.41.0
deleted file mode 100644
index f3e1267ade7f..000000000000
--- a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.41.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing access to properties and features of the window manager
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kwindowsystem-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5de6c0b7532878b45ba13b67e700ae97
diff --git a/metadata/md5-cache/kde-frameworks/kwindowsystem-5.42.0 b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.42.0
new file mode 100644
index 000000000000..66d2a35ac8ef
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kwindowsystem-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing access to properties and features of the window manager
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=|| ( LGPL-2.1 LGPL-3 ) MIT
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXfixes x11-libs/libxcb x11-libs/xcb-util-keysyms ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kwindowsystem-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=ffbe0b37d9c4ce7bb607b5dc4eab77ce
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.40.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.40.0
index d8c59d21950b..afa905f795c0 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=attica test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.40:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kitemviews-5.40:5 >=kde-frameworks/ktextwidgets-5.40:5 >=kde-frameworks/kwidgetsaddons-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.40:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kxmlgui-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=95edcd9e10b22d8575ef4170c65dbc3d
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.41.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.41.0
deleted file mode 100644
index 81a1517a539c..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlgui-5.41.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.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kglobalaccel-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/ktextwidgets-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.41:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=attica test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kglobalaccel-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kitemviews-5.41:5 >=kde-frameworks/ktextwidgets-5.41:5 >=kde-frameworks/kwidgetsaddons-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.41:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kxmlgui-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=cab148274fcbfb783c20885526782f8d
diff --git a/metadata/md5-cache/kde-frameworks/kxmlgui-5.42.0 b/metadata/md5-cache/kde-frameworks/kxmlgui-5.42.0
new file mode 100644
index 000000000000..6e25d0f58a75
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlgui-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.42:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for managing menu and toolbar actions in an abstract way
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=attica test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kitemviews-5.42:5 >=kde-frameworks/ktextwidgets-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5[ssl] >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 attica? ( >=kde-frameworks/attica-5.42:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kxmlgui-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e9b8393232123ad095929f528dcc1105
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.40.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.40.0
index ec7ef67381a3..ec02e064bbdc 100644
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=BSD-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kio-5.40:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/kxmlrpcclient-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=582fa1c9d3a2a871f6e9e8b973929fed
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.41.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.41.0
deleted file mode 100644
index 952750e35015..000000000000
--- a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.41.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.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kio-5.41:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kio-5.41:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/kxmlrpcclient-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7908b19a688391dff99b759d148e018b
diff --git a/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.42.0 b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.42.0
new file mode 100644
index 000000000000..f940c96e459d
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/kxmlrpcclient-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=dev-qt/qtxml-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework providing client-side support for the XML-RPC protocol
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD-2
+RDEPEND=>=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kio-5.42:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/kxmlrpcclient-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=208fa3b6f20be2c9355fc68099887bfc
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.40.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.40.0
index 4a4a8870d917..ab4eb861c2de 100644
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.40.0
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug doc test
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/modemmanager-qt-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8662bf0ba6d2608970cf87fd96c28415
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.41.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.41.0
deleted file mode 100644
index 9714167dbd40..000000000000
--- a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.41.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=ModemManager bindings for Qt
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/modemmanager-qt-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3460b1f9893b88a6b5c487fcdaac9017
diff --git a/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.42.0 b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.42.0
new file mode 100644
index 000000000000..988300a58561
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/modemmanager-qt-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=ModemManager bindings for Qt
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 net-misc/modemmanager >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/modemmanager-qt-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=cc321998618f4f378721f1a1ebcfb6ac
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.40.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.40.0
index 8e47b8bfdd3d..4265d9681962 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=teamd debug doc test
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/networkmanager-qt-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c847ac20f934a6f25d49144cb8f275a6
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.40.0-r1 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.40.0-r1
index 5d77ac203f5c..f82201544e86 100644
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.40.0-r1
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.40.0-r1
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=teamd debug doc test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/networkmanager-qt-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9d43bc794ee199874203ded1226818bf
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.41.0-r1 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.41.0-r1
deleted file mode 100644
index 4b7b1a9bdd02..000000000000
--- a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.41.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=NetworkManager bindings for Qt
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=teamd debug doc test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=LGPL-2
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/networkmanager-qt-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9d43bc794ee199874203ded1226818bf
diff --git a/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.42.0 b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.42.0
new file mode 100644
index 000000000000..bf70afeaec66
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/networkmanager-qt-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=NetworkManager bindings for Qt
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=teamd debug doc test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 || ( >=net-misc/networkmanager-1.4.0-r1[consolekit,teamd=] >=net-misc/networkmanager-1.4.0-r1[elogind,teamd=] >=net-misc/networkmanager-1.4.0-r1[systemd,teamd=] ) !net-libs/libnm-qt:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/networkmanager-qt-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=679e0792d08c99645434029b55fdc61d
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.40.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.40.0
index 3fe0b4bfdb95..dc04c1ecc9e0 100644
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.40.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-3
 RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/oxygen-icons5-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a273defef1556f8ba56794f4eeb01ab2
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.41.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.41.0
deleted file mode 100644
index d779fe56d2c4..000000000000
--- a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/extra-cmake-modules-5.41:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Oxygen SVG icon theme
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-3
-RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/oxygen-icons5-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ec9ece790d250e4927dcde8aea28491e
diff --git a/metadata/md5-cache/kde-frameworks/oxygen-icons-5.42.0 b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.42.0
new file mode 100644
index 000000000000..de6f139a2077
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/oxygen-icons-5.42.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.42:5 >=dev-qt/qtcore-5.7.1:5 test? ( >=dev-qt/qttest-5.7.1:5 app-misc/fdupes ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( >=dev-qt/qttest-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Oxygen SVG icon theme
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-3
+RDEPEND=!kde-apps/kdepim-icons:4 !kde-frameworks/oxygen-icons:4
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/oxygen-icons5-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d91700002f32b0d14db54bde5b3d00e4
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.40.0 b/metadata/md5-cache/kde-frameworks/plasma-5.40.0
index 8ac0350d518a..2af8f943f75e 100644
--- a/metadata/md5-cache/kde-frameworks/plasma-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.40.0
@@ -6,9 +6,9 @@ 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.40:5 >=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdeclarative-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kpackage-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.40:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kactivities-5.40:5 >=kde-frameworks/karchive-5.40:5 >=kde-frameworks/kconfig-5.40:5 >=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kcoreaddons-5.40:5 >=kde-frameworks/kdeclarative-5.40:5 >=kde-frameworks/kglobalaccel-5.40:5 >=kde-frameworks/kguiaddons-5.40:5 >=kde-frameworks/ki18n-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kio-5.40:5 >=kde-frameworks/knotifications-5.40:5 >=kde-frameworks/kpackage-5.40:5 >=kde-frameworks/kservice-5.40:5 >=kde-frameworks/kwindowsystem-5.40:5 >=kde-frameworks/kxmlgui-5.40:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.40:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 RESTRICT=test
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/plasma-framework-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5515da310843ee430ef76ef5317c55ca
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.41.0 b/metadata/md5-cache/kde-frameworks/plasma-5.41.0
deleted file mode 100644
index 646e3cf1a22a..000000000000
--- a/metadata/md5-cache/kde-frameworks/plasma-5.41.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=kde-frameworks/kactivities-5.41:5 >=kde-frameworks/karchive-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kdeclarative-5.41:5 >=kde-frameworks/kglobalaccel-5.41:5 >=kde-frameworks/kguiaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/knotifications-5.41:5 >=kde-frameworks/kpackage-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.41:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kdoctools-5.41:5 X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Plasma framework
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=gles2 wayland X test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.41:5 >=kde-frameworks/karchive-5.41:5 >=kde-frameworks/kconfig-5.41:5 >=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kcoreaddons-5.41:5 >=kde-frameworks/kdeclarative-5.41:5 >=kde-frameworks/kglobalaccel-5.41:5 >=kde-frameworks/kguiaddons-5.41:5 >=kde-frameworks/ki18n-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kio-5.41:5 >=kde-frameworks/knotifications-5.41:5 >=kde-frameworks/kpackage-5.41:5 >=kde-frameworks/kservice-5.41:5 >=kde-frameworks/kwindowsystem-5.41:5 >=kde-frameworks/kxmlgui-5.41:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.41:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-RESTRICT=test
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/plasma-framework-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dfe852add4359e44f7142e1690cc603b
diff --git a/metadata/md5-cache/kde-frameworks/plasma-5.42.0 b/metadata/md5-cache/kde-frameworks/plasma-5.42.0
new file mode 100644
index 000000000000..667f408c911e
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/plasma-5.42.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kactivities-5.42:5 >=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdeclarative-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kirigami-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kpackage-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.42:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kdoctools-5.42:5 X? ( x11-proto/xproto ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Plasma framework
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=gles2 wayland X test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kactivities-5.42:5 >=kde-frameworks/karchive-5.42:5 >=kde-frameworks/kconfig-5.42:5 >=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kcoreaddons-5.42:5 >=kde-frameworks/kdeclarative-5.42:5 >=kde-frameworks/kglobalaccel-5.42:5 >=kde-frameworks/kguiaddons-5.42:5 >=kde-frameworks/ki18n-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kio-5.42:5 >=kde-frameworks/kirigami-5.42:5 >=kde-frameworks/knotifications-5.42:5 >=kde-frameworks/kpackage-5.42:5 >=kde-frameworks/kservice-5.42:5 >=kde-frameworks/kwidgetsaddons-5.42:5 >=kde-frameworks/kwindowsystem-5.42:5 >=kde-frameworks/kxmlgui-5.42:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !gles2? ( virtual/opengl ) wayland? ( >=kde-frameworks/kwayland-5.42:5 media-libs/mesa[egl] ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libxcb ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RESTRICT=test
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/plasma-framework-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=52602b73d9e255076db6ed292491878b
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.40.0 b/metadata/md5-cache/kde-frameworks/prison-5.40.0
index 12e516a09c1e..6695cda316fb 100644
--- a/metadata/md5-cache/kde-frameworks/prison-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/prison-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://cgit.kde.org/prison.git
 IUSE=debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/prison-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=11f75cada3ecbeb71dcf8e0b707fea0b
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.41.0 b/metadata/md5-cache/kde-frameworks/prison-5.41.0
deleted file mode 100644
index b9050c1961f8..000000000000
--- a/metadata/md5-cache/kde-frameworks/prison-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=QRCode and data matrix barcode library
-EAPI=6
-HOMEPAGE=https://cgit.kde.org/prison.git
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/prison-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0a8055a57e3e72fefa520211aceb29ac
diff --git a/metadata/md5-cache/kde-frameworks/prison-5.42.0 b/metadata/md5-cache/kde-frameworks/prison-5.42.0
new file mode 100644
index 000000000000..41f29d200303
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/prison-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=QRCode and data matrix barcode library
+EAPI=6
+HOMEPAGE=https://cgit.kde.org/prison.git
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 media-gfx/qrencode:= media-libs/libdmtx >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/prison-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e0b11ed327a523b05e1b5bd0fff4788c
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.40.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.40.0
index a2db3a40d32e..b2ec34eb92f8 100644
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug test
 KEYWORDS=amd64 ~arm x86
 LICENSE=|| ( GPL-2+ LGPL-3+ )
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kirigami-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.40:5 >=kde-frameworks/kiconthemes-5.40:5 >=kde-frameworks/kirigami-5.40:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/qqc2-desktop-style-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4367b6828df8b6bd47ddb5e1ad75f017
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.41.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.41.0
deleted file mode 100644
index 6f2621c9ce63..000000000000
--- a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.41.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.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kirigami-5.41:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=|| ( GPL-2+ LGPL-3+ )
-RDEPEND=>=kde-frameworks/kconfigwidgets-5.41:5 >=kde-frameworks/kiconthemes-5.41:5 >=kde-frameworks/kirigami-5.41:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/qqc2-desktop-style-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=960321e84677b3ff914a4687eaf2f843
diff --git a/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.42.0 b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.42.0
new file mode 100644
index 000000000000..bf9810fada93
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/qqc2-desktop-style-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kirigami-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Style for QtQuickControls 2 that uses QWidget's QStyle for painting
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=|| ( GPL-2+ LGPL-3+ )
+RDEPEND=>=kde-frameworks/kconfigwidgets-5.42:5 >=kde-frameworks/kiconthemes-5.42:5 >=kde-frameworks/kirigami-5.42:5 >=dev-qt/qtdeclarative-5.7.1:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtquickcontrols2-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/qqc2-desktop-style-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=2568c27a224f73a206ff5459f020560b
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.40.0 b/metadata/md5-cache/kde-frameworks/solid-5.40.0
index b0085979515c..077b23a25303 100644
--- a/metadata/md5-cache/kde-frameworks/solid-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/solid-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=nls test debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/solid-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d771cdab1e2ecdb42536071243cce372
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.41.0 b/metadata/md5-cache/kde-frameworks/solid-5.41.0
deleted file mode 100644
index f03ae54b1923..000000000000
--- a/metadata/md5-cache/kde-frameworks/solid-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls test debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/solid-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1cf83fb76d474646e2c81a6aa8a9dd48
diff --git a/metadata/md5-cache/kde-frameworks/solid-5.42.0 b/metadata/md5-cache/kde-frameworks/solid-5.42.0
new file mode 100644
index 000000000000..267ece23c13f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/solid-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) test? ( >=dev-qt/qtconcurrent-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Provider for platform independent hardware discovery, abstraction and management
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-fs/udisks:2 virtual/udev >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/solid-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6c8590c6e2b388d359474a6f0c0f482c
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.40.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.40.0
index ef19be2a82fe..819428121175 100644
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=aspell +hunspell nls debug doc test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/sonnet-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=81aebe4293424617943d6bd6f07180d0
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.41.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.41.0
deleted file mode 100644
index 8a87133de227..000000000000
--- a/metadata/md5-cache/kde-frameworks/sonnet-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=aspell +hunspell nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/sonnet-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=869fcd0b5b7d99cb53ee245aeed1b19c
diff --git a/metadata/md5-cache/kde-frameworks/sonnet-5.42.0 b/metadata/md5-cache/kde-frameworks/sonnet-5.42.0
new file mode 100644
index 000000000000..24f6f11e51b8
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/sonnet-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for providing spell-checking through abstraction of popular backends
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=aspell +hunspell nls test debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 aspell? ( app-text/aspell ) hunspell? ( app-text/hunspell:= ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/sonnet-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7c97c2e7e52e71919526b811000495c2
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.40.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.40.0
index 8341e306cdb0..d1e89028151d 100644
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.40.0
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=nls debug doc test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/syntax-highlighting-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4364b01f0e6e012eb1fac4e1a60f06aa
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.41.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.41.0
deleted file mode 100644
index 36a01011edbf..000000000000
--- a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for syntax highlighting
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=nls debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+ LGPL-2.1+
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/syntax-highlighting-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=88fe7622e922b6449a355b7584879651
diff --git a/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.42.0 b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.42.0
new file mode 100644
index 000000000000..7a46d253dfd4
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/syntax-highlighting-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 dev-lang/perl nls? ( >=dev-qt/linguist-tools-5.7.1:5 ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for syntax highlighting
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=nls debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+ LGPL-2.1+
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/syntax-highlighting-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=686451df65c3fb0001e601d838eb9ecd
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.40.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.40.0
index d949c2070380..bde86682ab66 100644
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.40.0
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.40.0
@@ -6,8 +6,8 @@ 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.40:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
 SLOT=5/5.40
 SRC_URI=mirror://kde/stable/frameworks/5.40/threadweaver-5.40.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7e70da02a77f4550f64a77901a6deded
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.41.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.41.0
deleted file mode 100644
index edae07c94dfc..000000000000
--- a/metadata/md5-cache/kde-frameworks/threadweaver-5.41.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
-DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.41:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
-DESCRIPTION=Framework for managing threads using job and queue-based interfaces
-EAPI=6
-HOMEPAGE=https://www.kde.org/
-IUSE=debug doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.41:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
-SLOT=5/5.41
-SRC_URI=mirror://kde/stable/frameworks/5.41/threadweaver-5.41.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6af520d4d2345ebc79d62f785e593af4
diff --git a/metadata/md5-cache/kde-frameworks/threadweaver-5.42.0 b/metadata/md5-cache/kde-frameworks/threadweaver-5.42.0
new file mode 100644
index 000000000000..d7a9b3b2e48f
--- /dev/null
+++ b/metadata/md5-cache/kde-frameworks/threadweaver-5.42.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.42:5 doc? ( >=dev-qt/qthelp-5.7.1:5 >=app-doc/doxygen-1.8.13-r1 ) test? ( >=dev-qt/qttest-5.7.1:5 ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 ) dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Framework for managing threads using job and queue-based interfaces
+EAPI=6
+HOMEPAGE=https://www.kde.org/
+IUSE=debug doc test
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=LGPL-2+
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.42:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5 doc? ( >=dev-qt/qt-docs-5.7.1:5 )
+SLOT=5/5.42
+SRC_URI=mirror://kde/stable/frameworks/5.42/threadweaver-5.42.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=49f13ae000e6a4f83cc62b324e4c5ae9
diff --git a/metadata/md5-cache/kde-misc/Manifest.gz b/metadata/md5-cache/kde-misc/Manifest.gz
index 330d9404db97..9c0b4034f490 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/akonadi-ews-0.8.1 b/metadata/md5-cache/kde-misc/akonadi-ews-0.8.1
index 157b0f301958..714cdda6fa71 100644
--- a/metadata/md5-cache/kde-misc/akonadi-ews-0.8.1
+++ b/metadata/md5-cache/kde-misc/akonadi-ews-0.8.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2+
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-apps/akonadi-14.12.0:5 >=kde-apps/akonadi-mime-14.12.0:5 >=kde-apps/kcalcore-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kmime-14.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/KrissN/akonadi-ews/archive/v0.8.1.tar.gz -> akonadi-ews-0.8.1.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a3e68e592147433e9d33a28b5dce251f
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 ee63c7335317..3ccdcef3e8d3 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.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.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	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a1e42e14451e65ad074f27ec2c94f6c5
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 511cfc712dc9..a364706dc04e 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.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 media-libs/lcms:2 x11-libs/libxcb x11-libs/libX11 x11-libs/libXrandr >=kde-plasma/kde-cli-tools-5.10.5:5 x11-misc/colord >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/colord-kde/0.5.0/src/colord-kde-0.5.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2fd46f95b05b884bfae4ec67f75a982a
diff --git a/metadata/md5-cache/kde-misc/gmailfeed-1.1 b/metadata/md5-cache/kde-misc/gmailfeed-1.1
index 22f57ee14d43..1b36bb23b678 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.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5[xml] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/anthon38/gmailfeed/archive/v1.1.tar.gz -> gmailfeed-1.1.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d77da5f98b14f5fc04066adf9edb000d
diff --git a/metadata/md5-cache/kde-misc/kdeconnect-1.2 b/metadata/md5-cache/kde-misc/kdeconnect-1.2
index d159e2bef2dc..e2acb6b6722a 100644
--- a/metadata/md5-cache/kde-misc/kdeconnect-1.2
+++ b/metadata/md5-cache/kde-misc/kdeconnect-1.2
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcmutils-5.38.0:5 >=kde-frameworks/kconfig-5.38.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdeconnect/1.2/src/kdeconnect-kde-1.2.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=592e38bd46bba7d9b392262038e365e2
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 71d60ffeb94e..84aff4efacf3 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.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-misc/kdiff3:4 sys-apps/diffutils >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kdiff3-0.9.98_p20170219.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9d1f7176d2822696bc90adda083530ae
diff --git a/metadata/md5-cache/kde-misc/kdirstat-3.1.2 b/metadata/md5-cache/kde-misc/kdirstat-3.1.2
index 3e2515e5cec3..436f126c8857 100644
--- a/metadata/md5-cache/kde-misc/kdirstat-3.1.2
+++ b/metadata/md5-cache/kde-misc/kdirstat-3.1.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-libs/zlib !kde-misc/kdirstat:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://bitbucket.org/jeromerobert/k4dirstat/get/k4dirstat-3.1.2.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=302bc7103360e7d387d38ad6fcf8e43b
diff --git a/metadata/md5-cache/kde-misc/kimtoy-1.91 b/metadata/md5-cache/kde-misc/kimtoy-1.91
index 81be2ee59bd9..afc3b74f4276 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.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 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.40.0:5 ) !kde-misc/kimtoy:4 >=app-i18n/fcitx-4.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1466629206/140967-kimtoy-1.91.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=377c8497e26837ca5966326ca75c39a9
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.0.1 b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.0.1
index 9bfe66902c7f..c7071da60bb0 100644
--- a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.0.1
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-apps/libkgapi-17.04.0:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-17.04.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kio-gdrive/1.2.0.1/src/kio-gdrive-1.2.0.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9c196df2ac1758a118a5d0fd44047b38
diff --git a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.1-r1 b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.1-r1
index e7b927ee12ae..875facba41cf 100644
--- a/metadata/md5-cache/kde-misc/kio-gdrive-1.2.1-r1
+++ b/metadata/md5-cache/kde-misc/kio-gdrive-1.2.1-r1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-apps/libkgapi-14.12.0:5 >=dev-qt/qtwidgets-5.7.1:5 kaccounts? ( >=kde-apps/kaccounts-integration-14.12.0:5 ) !kaccounts? ( dev-libs/qtkeychain:=[qt5(+)] ) kaccounts? ( >=kde-apps/kaccounts-providers-14.12.0:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kio-gdrive/1.2.1/src/kio-gdrive-1.2.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=adbe6acb11f2416283b571cf4f005b32
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 1fb1d94d2fb3..402941113dc2 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.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 !kde-misc/kio-gopher:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kio-gopher/kio-gopher-0.1.99.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=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 f613423b7cb2..751d5212dcc2 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.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-misc/kio-locate:4 sys-apps/mlocate >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dl.opendesktop.org/api/files/download/id/1460972255/120965-kio-locate-0.5.3.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4d37fb33026958d67b43584597c64b1c
diff --git a/metadata/md5-cache/kde-misc/kio-stash-1.0 b/metadata/md5-cache/kde-misc/kio-stash-1.0
index 18ca666db339..df306408001e 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.40.0 >=kde-frameworks/kdbusaddons-5.40.0
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kde/stable/kio-stash/kio-stash-1.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=babeb3280ff120275ff295b43295384d
diff --git a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.4.0 b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.4.0
index b3ede53bcfcd..3aab67421a06 100644
--- a/metadata/md5-cache/kde-misc/kmarkdownwebview-0.4.0
+++ b/metadata/md5-cache/kde-misc/kmarkdownwebview-0.4.0
@@ -9,5 +9,5 @@ LICENSE=!webkit? ( BSD ) LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 webkit? ( >=dev-qt/qtwebkit-5.7.1:5 ) !webkit? ( >=dev-qt/qtwebchannel-5.7.1:5 >=dev-qt/qtwebengine-5.7.1:5[widgets] ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kmarkdownwebview/0.4.0/src/kmarkdownwebview-0.4.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5b890f020db609fd9abb878d6cb2aa71
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 c0bab974b2ab..306cdeef34ea 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.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtwidgets-5.7.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.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	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b7b719c4eec81f3b6638bddbe90337b1
diff --git a/metadata/md5-cache/kde-misc/krename-4.0.9_p20170610 b/metadata/md5-cache/kde-misc/krename-4.0.9_p20170610
index 261e4d8b276c..30fc689e581e 100644
--- a/metadata/md5-cache/kde-misc/krename-4.0.9_p20170610
+++ b/metadata/md5-cache/kde-misc/krename-4.0.9_p20170610
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 exif? ( media-gfx/exiv2:= ) pdf? ( app-text/podofo ) taglib? ( media-libs/taglib ) truetype? ( media-libs/freetype:2 ) !kde-misc/krename:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/krename-4.0.9_p20170610.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bf0ff2245c1883efb97c6a66c1edac7a
diff --git a/metadata/md5-cache/kde-misc/krusader-2.6.0 b/metadata/md5-cache/kde-misc/krusader-2.6.0
index 2e9540da8841..831439912464 100644
--- a/metadata/md5-cache/kde-misc/krusader-2.6.0
+++ b/metadata/md5-cache/kde-misc/krusader-2.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 sys-apps/acl sys-libs/zlib >=kde-apps/kio-extras-14.12.0:5 !kde-misc/krusader:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/krusader/2.6.0/krusader-2.6.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2bb992c64356949aa3ab6f8054a82d9a
diff --git a/metadata/md5-cache/kde-misc/kshutdown-4.0 b/metadata/md5-cache/kde-misc/kshutdown-4.0
index dc9edfb6a3fc..c485554ef3fe 100644
--- a/metadata/md5-cache/kde-misc/kshutdown-4.0
+++ b/metadata/md5-cache/kde-misc/kshutdown-4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 kde? ( kde-frameworks/kconfig:5 kde-frameworks/kconfigwidgets:5 kde-frameworks/kcoreaddons:5 kde-frameworks/kdbusaddons:5 kde-frameworks/kglobalaccel:5 kde-frameworks/ki18n:5 kde-frameworks/kidletime:5 kde-frameworks/knotifications:5 kde-frameworks/knotifyconfig:5 kde-frameworks/kwidgetsaddons:5 kde-frameworks/kxmlgui:5 ) !kde-misc/kshutdown:4
 SLOT=5
 SRC_URI=mirror://sourceforge/kshutdown/kshutdown-source-4.0.zip
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5e4cc84fbdd18fb6ecefcba327195358
diff --git a/metadata/md5-cache/kde-misc/kshutdown-4.1.1_beta b/metadata/md5-cache/kde-misc/kshutdown-4.1.1_beta
index a1f5a8f1e773..bcbe4a4aea0b 100644
--- a/metadata/md5-cache/kde-misc/kshutdown-4.1.1_beta
+++ b/metadata/md5-cache/kde-misc/kshutdown-4.1.1_beta
@@ -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.1.1beta.zip
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=903f761e704b2c9727dc992170e39c41
diff --git a/metadata/md5-cache/kde-misc/ktexteditorpreviewplugin-0.2.1 b/metadata/md5-cache/kde-misc/ktexteditorpreviewplugin-0.2.1
index 8373d55cff03..b67ae6a43635 100644
--- a/metadata/md5-cache/kde-misc/ktexteditorpreviewplugin-0.2.1
+++ b/metadata/md5-cache/kde-misc/ktexteditorpreviewplugin-0.2.1
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktexteditorpreviewplugin/0.2.1/src/ktexteditorpreviewplugin-0.2.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=61607ca759eccd83c51075e309d97eb3
diff --git a/metadata/md5-cache/kde-misc/ktoshiba-5.3.1 b/metadata/md5-cache/kde-misc/ktoshiba-5.3.1
index d02ac330785a..6edb5821fbed 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.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 net-libs/libmnl >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=http://prdownloads.sourceforge.net/ktoshiba/ktoshiba-5.3.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6a9db043b0c2a5f7e2000f0cf98025f8
diff --git a/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20170924 b/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20170924
index 7598716358ad..755cd07daf2e 100644
--- a/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20170924
+++ b/metadata/md5-cache/kde-misc/kwebkitpart-1.4.0_pre20170924
@@ -9,5 +9,5 @@ LICENSE=LGPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-misc/kwebkitpart:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/KDE/kwebkitpart/archive/6179caa457e0a6c5d17904e877e18171bd6ac795.tar.gz -> kwebkitpart-1.4.0_pre20170924.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=28281634eb1fd789611ff334fc54bfee
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.7.2 b/metadata/md5-cache/kde-misc/latte-dock-0.7.2
index 251ecb181046..adbb79f9972b 100644
--- a/metadata/md5-cache/kde-misc/latte-dock-0.7.2
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.7.2
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kactivities-5.40.0 >=kde-frameworks/karchive-5.40.0 >=kde-frameworks/kconfig-5.40.0 >=kde-frameworks/kcoreaddons-5.40.0 >=kde-frameworks/kcrash-5.40.0 >=kde-frameworks/kdbusaddons-5.40.0 >=kde-frameworks/kdeclarative-5.40.0 >=kde-frameworks/kglobalaccel-5.40.0 >=kde-frameworks/ki18n-5.40.0 >=kde-frameworks/kiconthemes-5.40.0 >=kde-frameworks/knotifications-5.40.0 >=kde-frameworks/kpackage-5.40.0 >=kde-frameworks/kwayland-5.40.0 >=kde-frameworks/kwindowsystem-5.40.0 >=kde-frameworks/kxmlgui-5.40.0 >=kde-frameworks/plasma-5.40.0[X] >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[xcb] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb
 SLOT=0
 SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.7.2.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4cf9e084637e292fad6bc47866eb5435
diff --git a/metadata/md5-cache/kde-misc/latte-dock-0.7.3 b/metadata/md5-cache/kde-misc/latte-dock-0.7.3
index d5f370a9ae95..15ef4658fcc7 100644
--- a/metadata/md5-cache/kde-misc/latte-dock-0.7.3
+++ b/metadata/md5-cache/kde-misc/latte-dock-0.7.3
@@ -8,5 +8,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kactivities-5.40.0 >=kde-frameworks/karchive-5.40.0 >=kde-frameworks/kconfig-5.40.0 >=kde-frameworks/kcoreaddons-5.40.0 >=kde-frameworks/kcrash-5.40.0 >=kde-frameworks/kdbusaddons-5.40.0 >=kde-frameworks/kdeclarative-5.40.0 >=kde-frameworks/kglobalaccel-5.40.0 >=kde-frameworks/ki18n-5.40.0 >=kde-frameworks/kiconthemes-5.40.0 >=kde-frameworks/knewstuff-5.40.0 >=kde-frameworks/knotifications-5.40.0 >=kde-frameworks/kpackage-5.40.0 >=kde-frameworks/kwayland-5.40.0 >=kde-frameworks/kwindowsystem-5.40.0 >=kde-frameworks/kxmlgui-5.40.0 >=kde-frameworks/plasma-5.40.0[X] >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[xcb] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libSM x11-libs/libX11 x11-libs/libxcb
 SLOT=0
 SRC_URI=mirror://kde/stable/latte-dock/latte-dock-0.7.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0cbafb291283effbb63373f40a788534
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 a11422a84c42..01470f116402 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.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=http://arielch.fedorapeople.org/devel/src/OpenOfficeorgThumbnail-1.0.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=cde6974bd969a945b29c8288af18592e
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 2e1b7b24e96c..b5ac93b7faa2 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.40.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=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	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1183015ed71e22d85fb997c184a09562
diff --git a/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.18 b/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.18
index 952c3dda64dc..eaa06a200adf 100644
--- a/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.18
+++ b/metadata/md5-cache/kde-misc/plasma-applet-redshift-control-1.0.18
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/plasma-5.40.0:5 x11-misc/redshift >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=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	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=434f8b1e4e1a1cc4f09fd241e29798e4
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 19f609bf4474..cc5bdab0f7ab 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.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5[xml] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=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	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b1329fd6b2c797c242c1ae8f62a2ae77
diff --git a/metadata/md5-cache/kde-misc/rsibreak-0.12.7 b/metadata/md5-cache/kde-misc/rsibreak-0.12.7
index d645235bd53f..48140970badb 100644
--- a/metadata/md5-cache/kde-misc/rsibreak-0.12.7
+++ b/metadata/md5-cache/kde-misc/rsibreak-0.12.7
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.2 )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/frameworkintegration-5.40.0:5 !kde-misc/rsibreak:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/rsibreak/0.12/rsibreak-0.12.7.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aeea0e4c395caada164f15a8d0dc6d6e
diff --git a/metadata/md5-cache/kde-misc/skanlite-2.0.1 b/metadata/md5-cache/kde-misc/skanlite-2.0.1
index a8ec22e006ea..8d294b81ae15 100644
--- a/metadata/md5-cache/kde-misc/skanlite-2.0.1
+++ b/metadata/md5-cache/kde-misc/skanlite-2.0.1
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) handbook? ( FDL-1.2+ )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libksane-14.12.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libpng:0= !kde-misc/skanlite:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/skanlite/2.0/skanlite-2.0.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b05897343ce28a222251698a0d0d16d9
diff --git a/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1 b/metadata/md5-cache/kde-misc/systemd-kcm-1.2.1
index e27e0a85102a..5df3be045d7d 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.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-apps/systemd !kde-misc/kcmsystemd:4 !kde-misc/systemd-kcm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/systemd-kcm/systemd-kcm-1.2.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5df1b9990ae7051885fc63a3ec700064
diff --git a/metadata/md5-cache/kde-misc/tellico-3.1 b/metadata/md5-cache/kde-misc/tellico-3.1
index d737078f9951..62bb5c6798bc 100644
--- a/metadata/md5-cache/kde-misc/tellico-3.1
+++ b/metadata/md5-cache/kde-misc/tellico-3.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=k
 RESTRICT=test
 SLOT=5
 SRC_URI=http://tellico-project.org/files/tellico-3.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e0e91d1a181e1006fe873d1f21db3f31
diff --git a/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta2 b/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta2
index 4a17b8dcd003..50222fb850f5 100644
--- a/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta2
+++ b/metadata/md5-cache/kde-misc/wacomtablet-3.0.0_beta2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=x11-drivers/xf86-input-wacom-0.20.0 x11-libs/libX11 x11-libs/libxcb x11-libs/libXi x11-libs/libXrandr !kde-misc/wacomtablet:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/wacomtablet/2.9.82/wacomtablet-2.9.82.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e2430eecfc6244f22522ef7ce9581a00
diff --git a/metadata/md5-cache/kde-misc/yakuake-3.0.4 b/metadata/md5-cache/kde-misc/yakuake-3.0.4
index 80204d2d756e..59ccdd216608 100644
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.4
+++ b/metadata/md5-cache/kde-misc/yakuake-3.0.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/konsole-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/yakuake/3.0.4/src/yakuake-3.0.4.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7fe393ad0796f91c608773abf02f52c8
diff --git a/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2 b/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2
index d190b6f2d32d..2a618ea77717 100644
--- a/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2
+++ b/metadata/md5-cache/kde-misc/yakuake-3.0.4-r2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 LGPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/konsole-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 !kde-misc/yakuake:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/yakuake/3.0.4/src/yakuake-3.0.4.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7d60ec3d4352566d22d6c33b209b54de
diff --git a/metadata/md5-cache/kde-misc/zanshin-0.4.1_p20170701 b/metadata/md5-cache/kde-misc/zanshin-0.4.1_p20170701
index e2d6dc7e7027..13ea5d9cf55f 100644
--- a/metadata/md5-cache/kde-misc/zanshin-0.4.1_p20170701
+++ b/metadata/md5-cache/kde-misc/zanshin-0.4.1_p20170701
@@ -9,5 +9,5 @@ LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-14.12.0:5 >=kde-apps/akonadi-calendar-14.12.0:5 >=kde-apps/akonadi-contacts-14.12.0:5 >=kde-apps/akonadi-notes-14.12.0:5 >=kde-apps/akonadi-search-14.12.0:5 >=kde-apps/kcalcore-14.12.0:5 >=kde-apps/kcontacts-14.12.0:5 >=kde-apps/kidentitymanagement-14.12.0:5 >=kde-apps/kldap-14.12.0:5 >=kde-apps/kmime-14.12.0:5 >=kde-apps/kontactinterface-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-misc/zanshin:4 >=kde-apps/kdepim-runtime-14.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/zanshin-0.4.1_p20170701.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=33cbc428c8de0d683b239e8e0533f56f
diff --git a/metadata/md5-cache/kde-misc/zanshin-0.5.0 b/metadata/md5-cache/kde-misc/zanshin-0.5.0
index a0b57964d44c..b3ccdf0f9e4c 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.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/akonadi-17.12.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.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-misc/zanshin:4 >=kde-apps/kdepim-runtime-17.12.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/zanshin/zanshin-0.5.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=37cdb146623439b74df3b7d049b62efe
diff --git a/metadata/md5-cache/kde-plasma/Manifest.gz b/metadata/md5-cache/kde-plasma/Manifest.gz
index 6cc80cd78dc4..5ccf996bee3a 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.10.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.10.5
index 278021b643d0..dc0854463d62 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.10.5
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://projects.kde.org/projects/extragear/base/bluedevil
 IUSE=debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-plasma/kde-cli-tools-5.10.5:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/bluez-qt-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-plasma/kde-cli-tools-5.10.5:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/bluedevil-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1f39dcd1e431b2223a9fdb4b77b274f1
diff --git a/metadata/md5-cache/kde-plasma/bluedevil-5.11.5 b/metadata/md5-cache/kde-plasma/bluedevil-5.11.5
index 1e720e8efeee..2e60f796efdb 100644
--- a/metadata/md5-cache/kde-plasma/bluedevil-5.11.5
+++ b/metadata/md5-cache/kde-plasma/bluedevil-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://cgit.kde.org/bluedevil.git
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/bluez-qt-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-plasma/kde-cli-tools-5.11.5:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/bluez-qt-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-plasma/kde-cli-tools-5.11.5:5 !app-mobilephone/obexd !app-mobilephone/obex-data-server !kde-plasma/bluedevil:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/bluedevil-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=327fe4aaf6cfe0f35575ffa20c84c8f0
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.10.5 b/metadata/md5-cache/kde-plasma/breeze-5.10.5
index b27c4ec62ef1..d0f4ef429b74 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.10.5
+++ b/metadata/md5-cache/kde-plasma/breeze-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze
 IUSE=qt4 wayland debug
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-plasma/kdecoration-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 ) >=kde-frameworks/breeze-icons-5.40.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-plasma/kdecoration-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 ) >=kde-frameworks/breeze-icons-5.40.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/breeze-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=195b950c57c6b3474c1c6ef9133254f9
diff --git a/metadata/md5-cache/kde-plasma/breeze-5.11.5 b/metadata/md5-cache/kde-plasma/breeze-5.11.5
index cd44f65aa319..dc66d57938fc 100644
--- a/metadata/md5-cache/kde-plasma/breeze-5.11.5
+++ b/metadata/md5-cache/kde-plasma/breeze-5.11.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://cgit.kde.org/breeze.git
 IUSE=qt4 wayland X debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-plasma/kdecoration-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/breeze-icons-5.40.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-plasma/kdecoration-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 qt4? ( kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb ) >=kde-frameworks/breeze-icons-5.40.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=qt4? ( X )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/breeze-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1aa3ed5ca2c367bae88b8bc81aac5de6
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.10.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.10.5
index c55e8f623784..80c7915f3294 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.10.5
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.10.5
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/breeze-grub-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1e5bc01c0d865dc73b7f25d4ebefc68f
diff --git a/metadata/md5-cache/kde-plasma/breeze-grub-5.11.5 b/metadata/md5-cache/kde-plasma/breeze-grub-5.11.5
index 9cb4bfcb1748..f91174dd9b32 100644
--- a/metadata/md5-cache/kde-plasma/breeze-grub-5.11.5
+++ b/metadata/md5-cache/kde-plasma/breeze-grub-5.11.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3+
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/breeze-grub-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6fdf18bfe569ca5ec4b257cbf248a838
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.10.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.10.5
index 762c5d2a9087..624cd4e04493 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.10.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://projects.kde.org/projects/kde/workspace/breeze-gtk
 IUSE=debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1+
-RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/breeze-gtk-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=692e21f36ad4da1f6c36efea17dba4ab
diff --git a/metadata/md5-cache/kde-plasma/breeze-gtk-5.11.5 b/metadata/md5-cache/kde-plasma/breeze-gtk-5.11.5
index c6f72eb4812c..5c77c90ee0d6 100644
--- a/metadata/md5-cache/kde-plasma/breeze-gtk-5.11.5
+++ b/metadata/md5-cache/kde-plasma/breeze-gtk-5.11.5
@@ -6,8 +6,8 @@ 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.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/breeze-gtk-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aa4e75ba1788ac8e8c89c738a570dca9
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.10.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.10.5
index 205dfbb47b77..1dfd46738fac 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.10.5
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.10.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/breeze-plymouth-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=aed58461608da12764666eb7d1c7f4e5
diff --git a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.11.5 b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.11.5
index d2fe3eb031d6..1fa980f098e8 100644
--- a/metadata/md5-cache/kde-plasma/breeze-plymouth-5.11.5
+++ b/metadata/md5-cache/kde-plasma/breeze-plymouth-5.11.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ GPL-3+
 RDEPEND=sys-boot/plymouth
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/breeze-plymouth-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=71cd4b752982067f0bf4291ced279e2e
diff --git a/metadata/md5-cache/kde-plasma/drkonqi-5.11.5 b/metadata/md5-cache/kde-plasma/drkonqi-5.11.5
index 3adfb698d371..6d2a1f59006c 100644
--- a/metadata/md5-cache/kde-plasma/drkonqi-5.11.5
+++ b/metadata/md5-cache/kde-plasma/drkonqi-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=X debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlrpcclient-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) !kde-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlrpcclient-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 X? ( >=dev-qt/qtx11extras-5.7.1:5 ) !kde-apps/drkonqi:4 !<kde-plasma/plasma-workspace-5.10.95:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/drkonqi-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b3a79f6755041330faa6dc33acd064e7
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.10.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.10.5
index 35509414a5fe..29c0ac43c4a4 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kactivitymanagerd-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3a287a931e758fcd3c19c190b1e9d32e
diff --git a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.11.5 b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.11.5
index ab4db10b5c96..2eaeb5193257 100644
--- a/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.11.5
+++ b/metadata/md5-cache/kde-plasma/kactivitymanagerd-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( GPL-2 GPL-3 )
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 !<kde-frameworks/kactivities-4.13.3-r2:4 !kde-plasma/kactivitymanagerd:4 !<kde-plasma/plasma-desktop-5.6.1 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/kactivitymanagerd-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b6fdb8174cb3217164ff429319cfda0f
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.10.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.10.5
index 3e07c4bb425e..066d47bdb004 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.10.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kde-cli-tools
 IUSE=+kdesu X test debug +handbook test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kdesu? ( >=kde-frameworks/kdesu-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kdesu? ( >=kde-frameworks/kdesu-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kde-cli-tools-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=67b630310b3a69568062a4cb48bbb966
diff --git a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.11.5 b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.11.5
index b1c2a1572e2e..23467a110b06 100644
--- a/metadata/md5-cache/kde-plasma/kde-cli-tools-5.11.5
+++ b/metadata/md5-cache/kde-plasma/kde-cli-tools-5.11.5
@@ -6,9 +6,9 @@ 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.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kdesu? ( >=kde-frameworks/kdesu-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 kdesu? ( >=kde-frameworks/kdesu-5.40.0:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 ) !kde-apps/kdesu >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/kde-cli-tools-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5807799b6d44ebef7fb664e5104119d3
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.10.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.10.5
index e74ee618aa21..22a075da5269 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.10.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://projects.kde.org/kde-gtk-config
 IUSE=+gtk3 test debug test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXcursor gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXcursor gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kde-gtk-config-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2650c6d654ab8c32cebc4387b9ce9d5f
diff --git a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.11.5 b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.11.5
index 286973591eb5..bdfac91dfaea 100644
--- a/metadata/md5-cache/kde-plasma/kde-gtk-config-5.11.5
+++ b/metadata/md5-cache/kde-plasma/kde-gtk-config-5.11.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://cgit.kde.org/kde-gtk-config.git
 IUSE=+gtk3 test debug test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-3
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXcursor gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.11.5:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 x11-libs/gtk+:2 x11-libs/libXcursor gtk3? ( x11-libs/gtk+:3 ) >=kde-plasma/kde-cli-tools-5.11.5:5 !kde-plasma/kde-gtk-config:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/kde-gtk-config-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5564505f8d9757acf92b3e7526d8c7bf
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.10.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.10.5
index 5d1558c265b9..38da8e565a78 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kdecoration-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5b65e8b1e8a2c5673a2dd8bceb149127
diff --git a/metadata/md5-cache/kde-plasma/kdecoration-5.11.5 b/metadata/md5-cache/kde-plasma/kdecoration-5.11.5
index 3b06edfb3415..1b197e8e6514 100644
--- a/metadata/md5-cache/kde-plasma/kdecoration-5.11.5
+++ b/metadata/md5-cache/kde-plasma/kdecoration-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=|| ( LGPL-2.1 LGPL-3 )
-RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=dev-qt/qtgui-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/kdecoration-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=788f380fd9a38e6680fa287d99c3bc1c
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.10.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.10.5
index 02d933b5cee9..9d42e772f8e8 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=share debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 share? ( dev-libs/purpose:5 ) >=kde-plasma/plasma-workspace-5.10.5:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 share? ( dev-libs/purpose:5 ) >=kde-plasma/plasma-workspace-5.10.5:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kdeplasma-addons-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=221a2a660b353f0a80a6eb5b44f62956
diff --git a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.11.5 b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.11.5
index 0c7f583fbc79..8ce2e6b6156b 100644
--- a/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.11.5
+++ b/metadata/md5-cache/kde-plasma/kdeplasma-addons-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=share debug
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2 LGPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-plasma/plasma-workspace-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 share? ( dev-libs/purpose:5 ) >=kde-plasma/plasma-workspace-5.11.5:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kunitconversion-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-plasma/plasma-workspace-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 share? ( dev-libs/purpose:5 ) >=kde-plasma/plasma-workspace-5.11.5:5 !kde-plasma/kdeplasma-addons:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/kdeplasma-addons-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7c7d5271d963584c875f0e2ba86981b5
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.10.5 b/metadata/md5-cache/kde-plasma/kgamma-5.10.5
index 2b29a5a0a783..116c14b5ac4a 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kgamma5-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d880a779541666add886c5d72d14aa9f
diff --git a/metadata/md5-cache/kde-plasma/kgamma-5.11.5 b/metadata/md5-cache/kde-plasma/kgamma-5.11.5
index 86519648ffe0..58f3413daeae 100644
--- a/metadata/md5-cache/kde-plasma/kgamma-5.11.5
+++ b/metadata/md5-cache/kde-plasma/kgamma-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 x11-libs/libXxf86vm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/kgamma5-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f672d76d1d69f858a381c81b3c74e0a0
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.10.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.10.5
index d958dcf807b6..c275658bceb2 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.10.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5[X] >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.40.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5[X] >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.40.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/khotkeys-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=265236eaa880c42added78d352782767
diff --git a/metadata/md5-cache/kde-plasma/khotkeys-5.11.5 b/metadata/md5-cache/kde-plasma/khotkeys-5.11.5
index 5997a7ced9e6..a378583cf9f3 100644
--- a/metadata/md5-cache/kde-plasma/khotkeys-5.11.5
+++ b/metadata/md5-cache/kde-plasma/khotkeys-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5[X] >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-plasma/plasma-workspace-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.40.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5[X] >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-plasma/plasma-workspace-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXtst >=kde-frameworks/kded-5.40.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 !kde-plasma/khotkeys:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/khotkeys-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=58882fc0b6ba2de6db261972bced8f17
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.10.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.10.5
index ad99464d7cb3..fa6e5f653849 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.10.5
@@ -6,9 +6,9 @@ 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.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.7.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.7.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.10.5:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kinfocenter-5.10.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d8c0baccc01a9728aed81dd4a61288c1
diff --git a/metadata/md5-cache/kde-plasma/kinfocenter-5.11.5 b/metadata/md5-cache/kde-plasma/kinfocenter-5.11.5
index a6d3c81ce995..dfe8a64a933e 100644
--- a/metadata/md5-cache/kde-plasma/kinfocenter-5.11.5
+++ b/metadata/md5-cache/kde-plasma/kinfocenter-5.11.5
@@ -6,9 +6,9 @@ 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.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.7.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.11.5:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 x11-libs/libX11 ieee1394? ( sys-libs/libraw1394 ) opengl? ( >=dev-qt/qtgui-5.7.1:5[gles2=] media-libs/mesa[gles2?] !gles2? ( media-libs/glu ) ) pci? ( sys-apps/pciutils ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 media-libs/mesa[egl] ) >=kde-plasma/kde-cli-tools-5.11.5:5 !kde-apps/kcontrol:4 !kde-misc/about-distro !kde-plasma/kinfocenter:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=wayland? ( || ( gles2 opengl ) )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/kinfocenter-5.11.5.tar.xz https://www.gentoo.org/assets/img/logo/gentoo-3d-small.png -> glogo-small.png
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=96571c9fb82294701052d16ead931c6a
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.10.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.10.5
index 9331c6b00138..48e9d6e5251a 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kmenuedit
 IUSE=+hotkeys debug +handbook
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.10.5:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.10.5:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kmenuedit-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=beb873fa98b129d97f47df0ebfb42906
diff --git a/metadata/md5-cache/kde-plasma/kmenuedit-5.11.5 b/metadata/md5-cache/kde-plasma/kmenuedit-5.11.5
index bf5522405913..0dc9b1848358 100644
--- a/metadata/md5-cache/kde-plasma/kmenuedit-5.11.5
+++ b/metadata/md5-cache/kde-plasma/kmenuedit-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://cgit.kde.org/kmenuedit.git
 IUSE=+hotkeys debug +handbook
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.11.5:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 hotkeys? ( >=kde-plasma/khotkeys-5.11.5:5 ) !kde-plasma/kmenuedit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/kmenuedit-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=79dd695df3d092cb71cb68fa0a40922e
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.10.5 b/metadata/md5-cache/kde-plasma/kscreen-5.10.5
index 1754395a4120..30cb3fe2dfa4 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.10.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://projects.kde.org/projects/extragear/base/kscreen
 IUSE=debug test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-plasma/libkscreen-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-plasma/libkscreen-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kscreen-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=40ded9b4815cd3106b4335f969e48c03
diff --git a/metadata/md5-cache/kde-plasma/kscreen-5.11.5 b/metadata/md5-cache/kde-plasma/kscreen-5.11.5
index f00a3e2571b5..996a88ebc34c 100644
--- a/metadata/md5-cache/kde-plasma/kscreen-5.11.5
+++ b/metadata/md5-cache/kde-plasma/kscreen-5.11.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://cgit.kde.org/kscreen.git
 IUSE=debug test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-plasma/libkscreen-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-plasma/libkscreen-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 !kde-plasma/kscreen:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/kscreen-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=94c8193016f342b3a45303dadb4a720f
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.10.5.1 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.10.5.1
index c539746ede8d..851ad64da976 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.10.5.1
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.10.5.1
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=+pam seccomp test debug test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[-gles2] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) >=kde-plasma/kde-cli-tools-5.10.5:5 !<kde-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[-gles2] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) >=kde-plasma/kde-cli-tools-5.10.5:5 !<kde-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kscreenlocker-5.10.5.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7bb1b1f113660f3c2cc38cb95f489ffb
diff --git a/metadata/md5-cache/kde-plasma/kscreenlocker-5.11.5 b/metadata/md5-cache/kde-plasma/kscreenlocker-5.11.5
index d40bc343a0ce..8ecd1285a5e9 100644
--- a/metadata/md5-cache/kde-plasma/kscreenlocker-5.11.5
+++ b/metadata/md5-cache/kde-plasma/kscreenlocker-5.11.5
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.kde.org/
 IUSE=+pam seccomp test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) >=kde-plasma/kde-cli-tools-5.11.5:5 !<kde-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 dev-libs/wayland x11-libs/libX11 x11-libs/libXi x11-libs/libxcb x11-libs/xcb-util-keysyms pam? ( virtual/pam ) seccomp? ( sys-libs/libseccomp ) >=kde-plasma/kde-cli-tools-5.11.5:5 !<kde-plasma/kcheckpass-4.11.22-r1:4 !kde-plasma/kdebase-pam:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=seccomp? ( pam )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/kscreenlocker-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8b313205c390646d420878fa599889e4
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.10.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.10.5
index e597495b68e4..8727b7a9e992 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.10.5
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://projects.kde.org/projects/kde/workspace/ksshaskpass
 IUSE=debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/ksshaskpass-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b1bcd759e0f8b231653597c58900bdd7
diff --git a/metadata/md5-cache/kde-plasma/ksshaskpass-5.11.5 b/metadata/md5-cache/kde-plasma/ksshaskpass-5.11.5
index 0b3c4d553029..c51c4bd3df2e 100644
--- a/metadata/md5-cache/kde-plasma/ksshaskpass-5.11.5
+++ b/metadata/md5-cache/kde-plasma/ksshaskpass-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://cgit.kde.org/ksshaskpass.git
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/ksshaskpass:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/ksshaskpass-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=49a7fbc618003d798a48ed7a5583f88a
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.10.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.10.5
index fc3b207a41f0..3898f91f48bf 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.10.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=lm_sensors debug +handbook
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-plasma/libksysguard-5.10.5:5[-minimal(-)] >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-plasma/libksysguard-5.10.5:5[-minimal(-)] >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/ksysguard-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=6b989bc5383deef9ae1375ebb6ae7578
diff --git a/metadata/md5-cache/kde-plasma/ksysguard-5.11.5 b/metadata/md5-cache/kde-plasma/ksysguard-5.11.5
index 76d31bef0ad9..30273d1eeb58 100644
--- a/metadata/md5-cache/kde-plasma/ksysguard-5.11.5
+++ b/metadata/md5-cache/kde-plasma/ksysguard-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=lm_sensors debug +handbook
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-plasma/libksysguard-5.11.5:5[-minimal(-)] >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-plasma/libksysguard-5.11.5:5[-minimal(-)] >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 lm_sensors? ( sys-apps/lm_sensors ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/ksysguard-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=422e45360735caf62d25b7cc991f0c4b
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.10.5-r1 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.10.5-r1
index a30df3bd1a95..8d4e80efac1d 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.10.5-r1
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.10.5-r1
@@ -6,8 +6,8 @@ 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.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kwallet-pam-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ecd473f4112ef349aa27c5181a1b3238
diff --git a/metadata/md5-cache/kde-plasma/kwallet-pam-5.11.5 b/metadata/md5-cache/kde-plasma/kwallet-pam-5.11.5
index fc3e9a5cc1de..415be85bd8c2 100644
--- a/metadata/md5-cache/kde-plasma/kwallet-pam-5.11.5
+++ b/metadata/md5-cache/kde-plasma/kwallet-pam-5.11.5
@@ -6,8 +6,8 @@ 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.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=dev-libs/libgcrypt:0= virtual/pam net-misc/socat >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/kwallet-pam-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=08268d68786c887fb10c1371dbf55a14
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.10.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.10.5
index 040f1fa372d0..47a992c2ddd7 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://projects.kde.org/projects/kde/workspace/kwayland-integration
 IUSE=debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kwayland-integration-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=74c80d00e005ddebbb9a13c553e84b75
diff --git a/metadata/md5-cache/kde-plasma/kwayland-integration-5.11.5 b/metadata/md5-cache/kde-plasma/kwayland-integration-5.11.5
index 917646735d71..278a52effdf2 100644
--- a/metadata/md5-cache/kde-plasma/kwayland-integration-5.11.5
+++ b/metadata/md5-cache/kde-plasma/kwayland-integration-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://cgit.kde.org/kwayland-integration.git
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=LGPL-2.1
-RDEPEND=>=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/kwayland-integration-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b16aa1be100a377eab4994c0259dfc82
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.10.5 b/metadata/md5-cache/kde-plasma/kwin-5.10.5
index 808f2548703e..3796ecaba16b 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kwin-5.10.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=gles2 multimedia test debug +handbook test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5[X] >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-plasma/breeze-5.10.5:5 >=kde-plasma/kdecoration-5.10.5:5 >=kde-plasma/kscreenlocker-5.10.5:5 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=kde-plasma/kde-cli-tools-5.10.5:5 multimedia? ( >=dev-qt/qtmultimedia-5.7.1:5[gstreamer,qml] ) !<kde-apps/kdeartwork-meta-15.08.3-r1:4 !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5[X] >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-plasma/breeze-5.10.5:5 >=kde-plasma/kdecoration-5.10.5:5 >=kde-plasma/kscreenlocker-5.10.5:5 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms >=kde-plasma/kde-cli-tools-5.10.5:5 multimedia? ( >=dev-qt/qtmultimedia-5.7.1:5[gstreamer,qml] ) !<kde-apps/kdeartwork-meta-15.08.3-r1:4 !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kwin-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3272cdb9fc5608f633e0f537d60965af
diff --git a/metadata/md5-cache/kde-plasma/kwin-5.11.5 b/metadata/md5-cache/kde-plasma/kwin-5.11.5
index 6444aa41e9ad..32f8e260dedc 100644
--- a/metadata/md5-cache/kde-plasma/kwin-5.11.5
+++ b/metadata/md5-cache/kde-plasma/kwin-5.11.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=gles2 multimedia test debug +handbook test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5[X] >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-plasma/breeze-5.11.5:5 >=kde-plasma/kdecoration-5.11.5:5 >=kde-plasma/kscreenlocker-5.11.5:5 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm >=kde-plasma/kde-cli-tools-5.11.5:5 >=dev-qt/qtvirtualkeyboard-5.7.1:5 multimedia? ( >=dev-qt/qtmultimedia-5.7.1:5[gstreamer,qml] ) !<kde-apps/kdeartwork-meta-15.08.3-r1:4 !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5[X] >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-plasma/breeze-5.11.5:5 >=kde-plasma/kdecoration-5.11.5:5 >=kde-plasma/kscreenlocker-5.11.5:5 >=dev-qt/qtcore-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5[gles2=] >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-libs/libinput-1.5 >=dev-libs/wayland-1.2 media-libs/fontconfig media-libs/freetype media-libs/libepoxy media-libs/mesa[egl,gbm,gles2?,wayland] virtual/libudev:= x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXi x11-libs/libdrm >=x11-libs/libxcb-1.10 >=x11-libs/libxkbcommon-0.7.0 x11-libs/xcb-util-cursor x11-libs/xcb-util-image x11-libs/xcb-util-keysyms x11-libs/xcb-util-wm >=kde-plasma/kde-cli-tools-5.11.5:5 >=dev-qt/qtvirtualkeyboard-5.7.1:5 multimedia? ( >=dev-qt/qtmultimedia-5.7.1:5[gstreamer,qml] ) !<kde-apps/kdeartwork-meta-15.08.3-r1:4 !kde-plasma/kwin:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/kwin-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b6e25d2262fbcd94b69f7693815303c6
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=43737398248f3ccf1a36ac761be5a3ca
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.10.5 b/metadata/md5-cache/kde-plasma/kwrited-5.10.5
index 883f85b22780..70ac0f1f8dfd 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.10.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/kwrited-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9cd3b2c07f7e11bdaeb45958dfc4269c
diff --git a/metadata/md5-cache/kde-plasma/kwrited-5.11.5 b/metadata/md5-cache/kde-plasma/kwrited-5.11.5
index 2d809f27f0f5..7bafab88dca4 100644
--- a/metadata/md5-cache/kde-plasma/kwrited-5.11.5
+++ b/metadata/md5-cache/kde-plasma/kwrited-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kpty-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/kwrited:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/kwrited-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=941469a5fbde947061e37aea560400cf
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.10.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.10.5
index 9be0e8027b5e..8d5acfc4c270 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.10.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.10.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kwayland-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kwayland-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.10.5/libkscreen-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8c4b1aa508d3c0b31d2179dd2bd760f8
diff --git a/metadata/md5-cache/kde-plasma/libkscreen-5.11.5 b/metadata/md5-cache/kde-plasma/libkscreen-5.11.5
index f0662ab93356..0b8e38aff63c 100644
--- a/metadata/md5-cache/kde-plasma/libkscreen-5.11.5
+++ b/metadata/md5-cache/kde-plasma/libkscreen-5.11.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kwayland-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kwayland-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb !x11-libs/libkscreen:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5/7
 SRC_URI=mirror://kde/stable/plasma/5.11.5/libkscreen-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0cbd0b147bc072fa9c56d5e7406a806d
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.10.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.10.5
index 49f6b97a9fda..16c7bd567aa9 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.10.5
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=+detailedmemory minimal X test debug test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/libksysguard-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9fa945764d0807fbbd033fda6f0a0902
diff --git a/metadata/md5-cache/kde-plasma/libksysguard-5.11.5 b/metadata/md5-cache/kde-plasma/libksysguard-5.11.5
index 043108bce429..260ef0fa5b87 100644
--- a/metadata/md5-cache/kde-plasma/libksysguard-5.11.5
+++ b/metadata/md5-cache/kde-plasma/libksysguard-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=+detailedmemory minimal X test debug test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-libs/zlib detailedmemory? ( >=dev-qt/qtwebkit-5.7.1:5 ) X? ( >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXres ) !kde-plasma/ksysguard:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/libksysguard-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5d79bdc3c7f4f62c1fee201df485ddc6
diff --git a/metadata/md5-cache/kde-plasma/milou-5.10.5 b/metadata/md5-cache/kde-plasma/milou-5.10.5
index 1686c4f44b9f..21b7d47943b7 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.10.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://projects.kde.org/projects/kde/workspace/milou
 IUSE=debug test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/milou-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=56a2ac1f36df09a6503b6f8395f57118
diff --git a/metadata/md5-cache/kde-plasma/milou-5.11.5 b/metadata/md5-cache/kde-plasma/milou-5.11.5
index 7c14d1e12071..f21e9075a980 100644
--- a/metadata/md5-cache/kde-plasma/milou-5.11.5
+++ b/metadata/md5-cache/kde-plasma/milou-5.11.5
@@ -6,8 +6,8 @@ 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.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !kde-plasma/milou:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/milou-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=71cb10636550c1dd4c981ad9f34d9512
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.10.5 b/metadata/md5-cache/kde-plasma/oxygen-5.10.5
index a260830842d5..138a67f87aab 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.10.5
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://projects.kde.org/projects/kde/workspace/oxygen
 IUSE=qt4 wayland debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-plasma/kdecoration-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 ) >=kde-plasma/kde-cli-tools-5.10.5:5 qt4? ( !kde-plasma/kstyles:4 !kde-plasma/liboxygenstyle:4 ) !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-plasma/kdecoration-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 ) >=kde-plasma/kde-cli-tools-5.10.5:5 qt4? ( !kde-plasma/kstyles:4 !kde-plasma/liboxygenstyle:4 ) !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/oxygen-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d3999f9a55d99da949c6a44c97e3e3e5
diff --git a/metadata/md5-cache/kde-plasma/oxygen-5.11.5 b/metadata/md5-cache/kde-plasma/oxygen-5.11.5
index 50d2bdf67bdb..260e3ef0ba50 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-5.11.5
+++ b/metadata/md5-cache/kde-plasma/oxygen-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://cgit.kde.org/oxygen.git
 IUSE=qt4 wayland debug
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/frameworkintegration-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-plasma/kdecoration-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 ) >=kde-plasma/kde-cli-tools-5.11.5:5 qt4? ( !kde-plasma/kstyles:4 !kde-plasma/liboxygenstyle:4 ) !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/frameworkintegration-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-plasma/kdecoration-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libxcb qt4? ( >=dev-qt/qtcore-4.8.7-r2:4 >=dev-qt/qtdbus-4.8.7:4 >=dev-qt/qtgui-4.8.7:4 kde-frameworks/kdelibs:4 x11-libs/libX11 ) wayland? ( >=kde-frameworks/kwayland-5.40.0:5 ) >=kde-plasma/kde-cli-tools-5.11.5:5 qt4? ( !kde-plasma/kstyles:4 !kde-plasma/liboxygenstyle:4 ) !kde-plasma/kdebase-cursors:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/oxygen-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=85185e5f57e6a6eccb18f13ffce9af4d
diff --git a/metadata/md5-cache/kde-plasma/oxygen-fonts-5.4.3 b/metadata/md5-cache/kde-plasma/oxygen-fonts-5.4.3
index 1aa73fb09f93..091b860e7ee7 100644
--- a/metadata/md5-cache/kde-plasma/oxygen-fonts-5.4.3
+++ b/metadata/md5-cache/kde-plasma/oxygen-fonts-5.4.3
@@ -9,5 +9,5 @@ LICENSE=OFL-1.1
 RDEPEND=!media-fonts/oxygen-fonts
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.4.3/oxygen-fonts-5.4.3.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	font	82836641e7d4639329d8c195234ad0e3	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=575ba8e2b44079fa5876585bc4a040e2
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.10.5
index b88799ab3244..df6fd375a5b6 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.10.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=appstream +fontconfig gtk2 gtk3 +input_devices_evdev input_devices_synaptics ibus legacy-systray pulseaudio +qt4 scim +semantic-desktop test debug +handbook test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-5.40.0:5 >=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-plasma/kwin-5.10.5:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.7.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) >=kde-plasma/breeze-5.10.5:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-plasma/oxygen-5.10.5:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.10.5:5 ) qt4? ( kde-plasma/qguiplatformplugin_kde:4 ) !kde-apps/kcontrol !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-misc/kcm-touchpad !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/attica-5.40.0:5 >=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-plasma/kwin-5.10.5:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.7.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) input_devices_synaptics? ( x11-drivers/xf86-input-synaptics ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) >=kde-plasma/breeze-5.10.5:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-plasma/oxygen-5.10.5:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.10.5:5 ) qt4? ( kde-plasma/qguiplatformplugin_kde:4 ) !kde-apps/kcontrol !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-misc/kcm-touchpad !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-desktop-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=796f21f0bc59e73073cfaf15984446fe
diff --git a/metadata/md5-cache/kde-plasma/plasma-desktop-5.11.5 b/metadata/md5-cache/kde-plasma/plasma-desktop-5.11.5
index 75e45841f29b..476ef9c6a89f 100644
--- a/metadata/md5-cache/kde-plasma/plasma-desktop-5.11.5
+++ b/metadata/md5-cache/kde-plasma/plasma-desktop-5.11.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=appstream +fontconfig gtk2 gtk3 ibus legacy-systray +mouse pulseaudio +qt4 scim +semantic-desktop touchpad test debug +handbook test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/attica-5.40.0:5 >=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-plasma/kwin-5.11.5:5 >=kde-plasma/plasma-workspace-5.11.5:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.7.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.40.0:5 >=kde-plasma/breeze-5.11.5:5 >=kde-plasma/kde-cli-tools-5.11.5:5 >=kde-plasma/oxygen-5.11.5:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.11.5:5 ) qt4? ( kde-plasma/qguiplatformplugin_kde:4 ) !kde-apps/kcontrol !<kde-apps/kde4-l10n-17.08.1-r1 !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-misc/kcm-touchpad !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/attica-5.40.0:5 >=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kpeople-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=kde-plasma/kwin-5.11.5:5 >=kde-plasma/plasma-workspace-5.11.5:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXfixes x11-libs/libXi x11-libs/libxcb x11-libs/libxkbfile appstream? ( dev-libs/appstream[qt5] ) fontconfig? ( media-libs/fontconfig media-libs/freetype x11-libs/libXft x11-libs/xcb-util-image ) ibus? ( >=dev-qt/qtx11extras-5.7.1:5 app-i18n/ibus dev-libs/glib:2 x11-libs/libxcb x11-libs/xcb-util-keysyms ) pulseaudio? ( dev-libs/glib:2 media-libs/libcanberra media-sound/pulseaudio ) scim? ( app-i18n/scim ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) touchpad? ( x11-drivers/xf86-input-synaptics ) >=kde-frameworks/qqc2-desktop-style-5.40.0:5 >=kde-plasma/breeze-5.11.5:5 >=kde-plasma/kde-cli-tools-5.11.5:5 >=kde-plasma/oxygen-5.11.5:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 sys-apps/accountsservice sys-apps/util-linux x11-apps/setxkbmap legacy-systray? ( gtk2? ( dev-libs/libappindicator:2 ) gtk3? ( dev-libs/libappindicator:3 ) qt4? ( dev-libs/sni-qt ) ) pulseaudio? ( >=kde-plasma/plasma-pa-5.11.5:5 ) qt4? ( kde-plasma/qguiplatformplugin_kde:4 ) !kde-apps/kcontrol !<kde-apps/kde4-l10n-17.08.1-r1 !kde-apps/knetattach[handbook] !kde-base/plasma-desktop:4 !kde-misc/kcm-touchpad !kde-plasma/plasma-workspace:4 !kde-plasma/solid-actions-kcm:4 !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=legacy-systray? ( || ( gtk2 gtk3 qt4 ) ) gtk2? ( legacy-systray ) gtk3? ( legacy-systray )
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/plasma-desktop-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=81692f9f0a1acdb730108d386ce706b4
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.10.5
index 5e95dbf5a5a4..50b8e8a9c866 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.10.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-plasma/breeze-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5=[dbus] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-plasma/breeze-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5=[dbus] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-integration-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9966c095cb64f9e659b3df701d391c49
diff --git a/metadata/md5-cache/kde-plasma/plasma-integration-5.11.5 b/metadata/md5-cache/kde-plasma/plasma-integration-5.11.5
index 6529ed1c303d..f71292a26196 100644
--- a/metadata/md5-cache/kde-plasma/plasma-integration-5.11.5
+++ b/metadata/md5-cache/kde-plasma/plasma-integration-5.11.5
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=LGPL-2+
-RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-plasma/breeze-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-plasma/breeze-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5=[dbus] >=dev-qt/qtquickcontrols2-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libXcursor x11-libs/libxcb media-fonts/hack media-fonts/noto >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/plasma-integration-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=49567c5d3af294f6eda67b114d1c7794
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.10.5
index ae26591c232c..48a588753891 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.10.5
@@ -7,5 +7,5 @@ KEYWORDS=amd64 ~arm x86
 LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.10.5:5 >=kde-plasma/kactivitymanagerd-5.10.5:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-plasma/kdecoration-5.10.5:5 >=kde-plasma/kdeplasma-addons-5.10.5:5 >=kde-plasma/kgamma-5.10.5:5 >=kde-plasma/khotkeys-5.10.5:5 >=kde-plasma/kinfocenter-5.10.5:5 >=kde-plasma/kmenuedit-5.10.5:5 >=kde-plasma/kscreen-5.10.5:5 >=kde-plasma/kscreenlocker-5.10.5:5 >=kde-plasma/ksshaskpass-5.10.5:5 >=kde-plasma/ksysguard-5.10.5:5 >=kde-plasma/kwayland-integration-5.10.5:5 >=kde-plasma/kwin-5.10.5:5 >=kde-plasma/kwrited-5.10.5:5 >=kde-plasma/libkscreen-5.10.5:5 >=kde-plasma/libksysguard-5.10.5:5 >=kde-plasma/milou-5.10.5:5 >=kde-plasma/oxygen-5.10.5:5 >=kde-plasma/plasma-desktop-5.10.5:5 >=kde-plasma/plasma-integration-5.10.5:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=kde-plasma/polkit-kde-agent-5.10.5:5 >=kde-plasma/powerdevil-5.10.5:5 >=kde-plasma/systemsettings-5.10.5:5 >=kde-plasma/user-manager-5.10.5:5 bluetooth? ( >=kde-plasma/bluedevil-5.10.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.10.5:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.10.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.10.5:5 >=kde-plasma/kde-gtk-config-5.10.5:5 ) handbook? ( >=kde-apps/khelpcenter-14.12.0:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.10.5:5 ) pam? ( >=kde-plasma/kwallet-pam-5.10.5:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.10.5:5 >=kde-plasma/plymouth-kcm-5.10.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.10.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.10.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.10.5:5 )
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=b6ceb6db9978153bcda2fb0f6ac82b06
diff --git a/metadata/md5-cache/kde-plasma/plasma-meta-5.11.5 b/metadata/md5-cache/kde-plasma/plasma-meta-5.11.5
index dd45ff5124c3..bd5b7effb15f 100644
--- a/metadata/md5-cache/kde-plasma/plasma-meta-5.11.5
+++ b/metadata/md5-cache/kde-plasma/plasma-meta-5.11.5
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=metapackage
 RDEPEND=>=kde-plasma/breeze-5.11.5:5 >=kde-plasma/drkonqi-5.11.5:5 >=kde-plasma/kactivitymanagerd-5.11.5:5 >=kde-plasma/kde-cli-tools-5.11.5:5 >=kde-plasma/kdecoration-5.11.5:5 >=kde-plasma/kdeplasma-addons-5.11.5:5 >=kde-plasma/kgamma-5.11.5:5 >=kde-plasma/khotkeys-5.11.5:5 >=kde-plasma/kinfocenter-5.11.5:5 >=kde-plasma/kmenuedit-5.11.5:5 >=kde-plasma/kscreen-5.11.5:5 >=kde-plasma/kscreenlocker-5.11.5:5 >=kde-plasma/ksshaskpass-5.11.5:5 >=kde-plasma/ksysguard-5.11.5:5 >=kde-plasma/kwayland-integration-5.11.5:5 >=kde-plasma/kwin-5.11.5:5 >=kde-plasma/kwrited-5.11.5:5 >=kde-plasma/libkscreen-5.11.5:5 >=kde-plasma/libksysguard-5.11.5:5 >=kde-plasma/milou-5.11.5:5 >=kde-plasma/oxygen-5.11.5:5 >=kde-plasma/plasma-desktop-5.11.5:5 >=kde-plasma/plasma-integration-5.11.5:5 >=kde-plasma/plasma-workspace-5.11.5:5 >=kde-plasma/polkit-kde-agent-5.11.5:5 >=kde-plasma/powerdevil-5.11.5:5 >=kde-plasma/systemsettings-5.11.5:5 >=kde-plasma/user-manager-5.11.5:5 bluetooth? ( >=kde-plasma/bluedevil-5.11.5:5 ) crypt? ( >=kde-plasma/plasma-vault-5.11.5:5 ) display-manager? ( sddm? ( >=kde-plasma/sddm-kcm-5.11.5:5 x11-misc/sddm ) !sddm? ( x11-misc/lightdm ) ) grub? ( >=kde-plasma/breeze-grub-5.11.5:5 ) gtk? ( >=kde-plasma/breeze-gtk-5.11.5:5 >=kde-plasma/kde-gtk-config-5.11.5:5 ) handbook? ( >=kde-apps/khelpcenter-14.12.0:5 ) networkmanager? ( >=kde-plasma/plasma-nm-5.11.5:5 ) pam? ( >=kde-plasma/kwallet-pam-5.11.5:5 ) plymouth? ( >=kde-plasma/breeze-plymouth-5.11.5:5 >=kde-plasma/plymouth-kcm-5.11.5:5 ) pulseaudio? ( >=kde-plasma/plasma-pa-5.11.5:5 ) sdk? ( >=kde-plasma/plasma-sdk-5.11.5:5 ) wallpapers? ( >=kde-plasma/plasma-workspace-wallpapers-5.11.5:5 )
 SLOT=5
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	kde5-functions	25992fae542d6ffb06a9da87653236e7	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1499ef9e17bbd58d04f3f400c3875d20
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.10.5
index ae375c0cf9c0..5ef451433f95 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.10.5
@@ -6,8 +6,8 @@ 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.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/networkmanager-qt-5.40.0:5[teamd=] >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.40.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/plasma-workspace-5.10.5:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/networkmanager-qt-5.40.0:5[teamd=] >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.40.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/plasma-workspace-5.10.5:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-nm-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=de7528d2741473bbe168594a40db5543
diff --git a/metadata/md5-cache/kde-plasma/plasma-nm-5.11.5 b/metadata/md5-cache/kde-plasma/plasma-nm-5.11.5
index a497278f4cb4..4c1409b3a57d 100644
--- a/metadata/md5-cache/kde-plasma/plasma-nm-5.11.5
+++ b/metadata/md5-cache/kde-plasma/plasma-nm-5.11.5
@@ -6,8 +6,8 @@ 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.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/networkmanager-qt-5.40.0-r1:5[teamd=] >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.40.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/plasma-workspace-5.11.5:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/networkmanager-qt-5.40.0-r1:5[teamd=] >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=app-crypt/qca-2.1.1:2[qt5] >=net-misc/networkmanager-0.9.10.0[teamd=] modemmanager? ( >=kde-frameworks/modemmanager-qt-5.40.0:5 >=dev-qt/qtxml-5.7.1:5 net-misc/mobile-broadband-provider-info ) openconnect? ( >=dev-qt/qtxml-5.7.1:5 net-misc/networkmanager-openconnect net-vpn/openconnect:= ) >=kde-plasma/plasma-workspace-5.11.5:5 !kde-plasma/plasma-nm:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/plasma-nm-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=07efcfda80200f4de76004b6cca76a4a
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.10.5
index 523937bf05e4..d65c3b83ba00 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-pa-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a2a78d30e348ddf7755a98ff3c15d7b3
diff --git a/metadata/md5-cache/kde-plasma/plasma-pa-5.11.5 b/metadata/md5-cache/kde-plasma/plasma-pa-5.11.5
index 077a6b4cc619..a202866789d9 100644
--- a/metadata/md5-cache/kde-plasma/plasma-pa-5.11.5
+++ b/metadata/md5-cache/kde-plasma/plasma-pa-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug +handbook
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/glib:2 gnome-base/gconf:2 media-libs/libcanberra media-sound/pulseaudio[gnome] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/plasma-pa-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f39cb635ae9089f4733931df18e86ecd
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.10.5
index fd8498cb53f6..930701122171 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-2.2.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-2.2.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-sdk-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9a23d9828d36e4e6d59e0375b1b13702
diff --git a/metadata/md5-cache/kde-plasma/plasma-sdk-5.11.5 b/metadata/md5-cache/kde-plasma/plasma-sdk-5.11.5
index 3d7feb94ed46..a7d2c39fdec7 100644
--- a/metadata/md5-cache/kde-plasma/plasma-sdk-5.11.5
+++ b/metadata/md5-cache/kde-plasma/plasma-sdk-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=test debug test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-5.40.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 !dev-util/plasmate >=kde-frameworks/kirigami-5.40.0:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/plasma-sdk-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1912402c18a065c9290e91bbcae8aa35
diff --git a/metadata/md5-cache/kde-plasma/plasma-vault-5.11.5 b/metadata/md5-cache/kde-plasma/plasma-vault-5.11.5
index f4e00d138aed..1f149a1618e4 100644
--- a/metadata/md5-cache/kde-plasma/plasma-vault-5.11.5
+++ b/metadata/md5-cache/kde-plasma/plasma-vault-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/ http://cukic.co/2017/02/03/vaults-encryption-in-pl
 IUSE=debug
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-3
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-plasma/libksysguard-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( sys-fs/cryfs >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-plasma/libksysguard-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( sys-fs/cryfs >=sys-fs/encfs-1.9.2 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/plasma-vault-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3611b4eedb68da4543bae8e5fc6da5ae
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.5-r1 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.5-r1
index 28823f314f52..1022bf5caa36 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.5-r1
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.10.5-r1
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.kde.org/
 IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop test debug +handbook test
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kjsembed-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/kxmlrpcclient-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/kscreenlocker-5.10.5:5 >=kde-plasma/kwin-5.10.5:5 >=kde-plasma/libksysguard-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.40.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.40.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-plasma/ksysguard-5.10.5:5 >=kde-plasma/milou-5.10.5:5 >=kde-plasma/plasma-integration-5.10.5:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kjsembed-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/kxmlrpcclient-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/kscreenlocker-5.10.5:5 >=kde-plasma/kwin-5.10.5:5 >=kde-plasma/libksysguard-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.40.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.40.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-plasma/ksysguard-5.10.5:5 >=kde-plasma/milou-5.10.5:5 >=kde-plasma/plasma-integration-5.10.5:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=gps? ( geolocation )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-workspace-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1b9f53cd4eb1ef8f7bd24e08409bc9a8
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.5
index 98f52f7bc5fe..7837d0a23823 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-5.11.5
@@ -6,10 +6,10 @@ HOMEPAGE=https://www.kde.org/
 IUSE=appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd test debug +handbook test
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kjsembed-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/kscreenlocker-5.11.5:5 >=kde-plasma/kwin-5.11.5:5 >=kde-plasma/libksysguard-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.40.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.40.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 >=kde-plasma/ksysguard-5.11.5:5 >=kde-plasma/milou-5.11.5:5 >=kde-plasma/plasma-integration-5.11.5:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemmodels-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kjs-5.40.0:5 >=kde-frameworks/kjsembed-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/krunner-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/kscreenlocker-5.11.5:5 >=kde-plasma/kwin-5.11.5:5 >=kde-plasma/libksysguard-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5[jpeg] >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/phonon[qt5(+)] sys-libs/zlib x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libxcb x11-libs/libXfixes x11-libs/libXrender x11-libs/libXtst x11-libs/xcb-util x11-libs/xcb-util-image appstream? ( dev-libs/appstream[qt5] ) calendar? ( >=kde-apps/kholidays-14.12.0:5 ) geolocation? ( >=kde-frameworks/networkmanager-qt-5.40.0:5 ) gps? ( sci-geosciences/gpsd ) prison? ( >=kde-frameworks/prison-5.40.0:5 ) qalculate? ( sci-libs/libqalculate:= ) semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 ) >=kde-frameworks/kded-5.40.0:5 >=kde-frameworks/kdesu-5.40.0:5 >=kde-apps/kio-extras-14.12.0:5 >=kde-plasma/kde-cli-tools-5.11.5:5 >=kde-plasma/ksysguard-5.11.5:5 >=kde-plasma/milou-5.11.5:5 >=kde-plasma/plasma-integration-5.11.5:5 >=dev-qt/qdbus-5.7.1:5 >=dev-qt/qtgraphicaleffects-5.7.1:5 >=dev-qt/qtpaths-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5[widgets] app-text/iso-codes x11-apps/mkfontdir x11-apps/xmessage x11-apps/xprop x11-apps/xrdb x11-apps/xset x11-apps/xsetroot systemd? ( sys-apps/dbus[user-session] ) !systemd? ( sys-apps/dbus ) !dev-libs/xembed-sni-proxy !kde-plasma/freespacenotifier:4 !kde-plasma/libtaskmanager:4 !kde-plasma/kcminit:4 !kde-plasma/kdebase-startkde:4 !kde-plasma/klipper:4 !kde-plasma/krunner:4 !kde-plasma/ksmserver:4 !kde-plasma/ksplash:4 !kde-plasma/plasma-workspace:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 REQUIRED_USE=gps? ( geolocation )
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/plasma-workspace-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=261788e530748824aa39239b77fed476
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.10.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.10.5
index 125ab853b482..f38da36e28a3 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.10.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plasma-workspace-wallpapers-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=38482e7ac7a0917ad0cfebfd3de91d14
diff --git a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.11.5 b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.11.5
index d72f81a6a909..b79fa601911a 100644
--- a/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.11.5
+++ b/metadata/md5-cache/kde-plasma/plasma-workspace-wallpapers-5.11.5
@@ -8,5 +8,5 @@ LICENSE=GPL-2
 RDEPEND=!<kde-apps/kde-wallpapers-15.08.3-r2
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/plasma-workspace-wallpapers-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=559e4cfa25aecf42bc8d9147eb1f8802
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.10.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.10.5
index a266b548ce04..1c4d9880302d 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.10.5
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://projects.kde.org/projects/kde/workspace/plymouth-kcm
 IUSE=debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.10.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/plymouth-kcm-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=1afca2081421a8093d95da37d8d05bd0
diff --git a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.11.5 b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.11.5
index afa55c1041a0..c3e11bffcee9 100644
--- a/metadata/md5-cache/kde-plasma/plymouth-kcm-5.11.5
+++ b/metadata/md5-cache/kde-plasma/plymouth-kcm-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://cgit.kde.org/plymouth-kcm.git
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.11.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtquickcontrols-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-boot/plymouth >=kde-plasma/kde-cli-tools-5.11.5:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/plymouth-kcm-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=80e3cae09e6e4b2b7c840ce4dd99cc81
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.10.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.10.5
index 02a70db086e4..63c90b9e55b6 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.10.5
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org
 IUSE=debug
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( >=kde-frameworks/polkit-qt-5.40.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( >=kde-frameworks/polkit-qt-5.40.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/polkit-kde-agent-1-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=752cbf4a956713009941b46b2cd58ed3
diff --git a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.11.5 b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.11.5
index 20f611a8c4d1..30c6bcfd9d10 100644
--- a/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.11.5
+++ b/metadata/md5-cache/kde-plasma/polkit-kde-agent-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( >=kde-frameworks/polkit-qt-5.40.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 || ( >=kde-frameworks/polkit-qt-5.40.0:5 >=sys-auth/polkit-qt-0.112.0[qt5(+)] ) !sys-auth/polkit-kde-agent:4[-minimal(-)] !sys-auth/polkit-kde-agent:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/polkit-kde-agent-1-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bfa697d74b6fe8b1e700795e0b445a69
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.10.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.10.5
index b49a304cda8d..d04d228791f9 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.10.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://projects.kde.org/projects/kde/workspace/powerdevil
 IUSE=consolekit +wireless debug +handbook
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5[policykit] >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/libkscreen-5.10.5:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 virtual/libudev:= x11-libs/libxcb wireless? ( >=kde-frameworks/bluez-qt-5.40.0:5 >=kde-frameworks/networkmanager-qt-5.40.0:5 ) >=kde-plasma/kde-cli-tools-5.10.5:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-auth/polkit-pkla-compat sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5[policykit] >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/libkscreen-5.10.5:5 >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 virtual/libudev:= x11-libs/libxcb wireless? ( >=kde-frameworks/bluez-qt-5.40.0:5 >=kde-frameworks/networkmanager-qt-5.40.0:5 ) >=kde-plasma/kde-cli-tools-5.10.5:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-auth/polkit-pkla-compat sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/powerdevil-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b9b5ce826cde5cfb25ab67f7aeeb694f
diff --git a/metadata/md5-cache/kde-plasma/powerdevil-5.11.5 b/metadata/md5-cache/kde-plasma/powerdevil-5.11.5
index 8f69de2f3495..0f6781d2acb3 100644
--- a/metadata/md5-cache/kde-plasma/powerdevil-5.11.5
+++ b/metadata/md5-cache/kde-plasma/powerdevil-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://cgit.kde.org/powerdevil.git
 IUSE=consolekit +wireless debug +handbook
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5[policykit] >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/libkscreen-5.11.5:5 >=kde-plasma/plasma-workspace-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 virtual/libudev:= x11-libs/libxcb wireless? ( >=kde-frameworks/bluez-qt-5.40.0:5 >=kde-frameworks/networkmanager-qt-5.40.0:5 ) >=kde-plasma/kde-cli-tools-5.11.5:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-auth/polkit-pkla-compat sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5[policykit] >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwayland-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-plasma/libkscreen-5.11.5:5 >=kde-plasma/plasma-workspace-5.11.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 virtual/libudev:= x11-libs/libxcb wireless? ( >=kde-frameworks/bluez-qt-5.40.0:5 >=kde-frameworks/networkmanager-qt-5.40.0:5 ) >=kde-plasma/kde-cli-tools-5.11.5:5 >=sys-power/upower-0.9.23 consolekit? ( >=sys-auth/consolekit-1.0.1 sys-auth/polkit-pkla-compat sys-power/pm-utils ) !kde-plasma/powerdevil:4 !kde-plasma/systemsettings:4[handbook] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/powerdevil-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dd7bd72f3c94983a8633b2df0595dbfe
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.10.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.10.5
index 5b62592d0527..6d71b1fce0f8 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.10.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://projects.kde.org/projects/kdereview/sddm-kcm
 IUSE=debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.10.5:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.10.5:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/sddm-kcm-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8e2d652e7c4dcd320dc9313a685127d0
diff --git a/metadata/md5-cache/kde-plasma/sddm-kcm-5.11.5 b/metadata/md5-cache/kde-plasma/sddm-kcm-5.11.5
index cd64fc146ae6..fbba1dd08264 100644
--- a/metadata/md5-cache/kde-plasma/sddm-kcm-5.11.5
+++ b/metadata/md5-cache/kde-plasma/sddm-kcm-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://cgit.kde.org/sddm-kcm.git
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2+
-RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.11.5:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 x11-libs/libX11 x11-libs/libXcursor >=kde-plasma/kde-cli-tools-5.11.5:5 x11-misc/sddm !kde-misc/sddm-kcm >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/sddm-kcm-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ea6912c8a78f1d0f346c2a08f71d50dc
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.10.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.10.5
index 7de11793de58..ea2428fb7343 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.10.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=classic gtk debug +handbook
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 classic? ( >=kde-frameworks/khtml-5.40.0:5 ) gtk? ( >=kde-plasma/kde-gtk-config-5.10.5:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 classic? ( >=kde-frameworks/khtml-5.40.0:5 ) gtk? ( >=kde-plasma/kde-gtk-config-5.10.5:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/systemsettings-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4cc443e8bf1be98a7d469295e4ba87ca
diff --git a/metadata/md5-cache/kde-plasma/systemsettings-5.11.5 b/metadata/md5-cache/kde-plasma/systemsettings-5.11.5
index 556a9ce73cb9..ba79dbe8929e 100644
--- a/metadata/md5-cache/kde-plasma/systemsettings-5.11.5
+++ b/metadata/md5-cache/kde-plasma/systemsettings-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=classic gtk debug +handbook
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 classic? ( >=kde-frameworks/khtml-5.40.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.40.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.11.5:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kactivities-5.40.0:5 >=kde-frameworks/kactivities-stats-5.40.0:5 >=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kpackage-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5[widgets] >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 classic? ( >=kde-frameworks/khtml-5.40.0:5 ) !kde-plasma/systemsettings:4 >=kde-frameworks/kirigami-5.40.0:5 gtk? ( >=kde-plasma/kde-gtk-config-5.11.5:5 ) >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/systemsettings-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3cb82929bda234b27d230c4d5d7c773c
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.10.5 b/metadata/md5-cache/kde-plasma/user-manager-5.10.5
index 7692dece9c4f..92830ec65d7f 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.10.5
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.10.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=amd64 ~arm x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.10.5/user-manager-5.10.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f43cc8b39c1c460fca0817ca076d3fd8
diff --git a/metadata/md5-cache/kde-plasma/user-manager-5.11.5 b/metadata/md5-cache/kde-plasma/user-manager-5.11.5
index 16df91ae6f86..21fd28b66dca 100644
--- a/metadata/md5-cache/kde-plasma/user-manager-5.11.5
+++ b/metadata/md5-cache/kde-plasma/user-manager-5.11.5
@@ -6,8 +6,8 @@ HOMEPAGE=https://www.kde.org/
 IUSE=debug
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=GPL-2
-RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) !<kde-apps/kde4-l10n-15.12.3-r1 >=dev-qt/qtcore-5.7.1:5
+RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-libs/libpwquality-1.3.0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma/5.11.5/user-manager-5.11.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5303ae307bcec7f95030e927dfe2d521
diff --git a/metadata/md5-cache/mail-client/Manifest.gz b/metadata/md5-cache/mail-client/Manifest.gz
index bd5128603186..b1136382f1b7 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/kube-0.3.1 b/metadata/md5-cache/mail-client/kube-0.3.1
index 9db52b237a60..d300ab72651b 100644
--- a/metadata/md5-cache/mail-client/kube-0.3.1
+++ b/metadata/md5-cache/mail-client/kube-0.3.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/breeze-icons-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/kube/0.3.1/src/kube-0.3.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=de877ea84b14d0b00005cdbbc21d2928
diff --git a/metadata/md5-cache/mail-filter/Manifest.gz b/metadata/md5-cache/mail-filter/Manifest.gz
index c039bab95dd7..24f987f697be 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/rblcheck-1.5-r2 b/metadata/md5-cache/mail-filter/rblcheck-1.5-r2
index 1d7d057c7736..4ea105ac6004 100644
--- a/metadata/md5-cache/mail-filter/rblcheck-1.5-r2
+++ b/metadata/md5-cache/mail-filter/rblcheck-1.5-r2
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare
 DESCRIPTION=Perform lookups in RBL-styles services
 EAPI=5
 HOMEPAGE=http://rblcheck.sourceforge.net/
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~sparc ~x86
+KEYWORDS=~alpha amd64 ~hppa ~mips ppc ~sparc ~x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/rblcheck/rblcheck-1.5.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=38cad147c7c5f1fee4b4bebb49959b32
+_md5_=1bd09be41407befba0afac471f617e6f
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index afa5b0bf3789..6b1aeab0bd60 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/netqmail-1.06-r4 b/metadata/md5-cache/mail-mta/netqmail-1.06-r4
index 00f0c04b2fac..69c9d68c866b 100644
--- a/metadata/md5-cache/mail-mta/netqmail-1.06-r4
+++ b/metadata/md5-cache/mail-mta/netqmail-1.06-r4
@@ -4,7 +4,7 @@ DESCRIPTION=qmail -- a secure, reliable, efficient, simple message transfer agen
 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
+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
 REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume )
@@ -12,4 +12,4 @@ 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	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmail	0cddcd9f34297dbca4a09fbdafa7398a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=11da75d2249f9c88d52355affb944e72
+_md5_=3ebd48b3a211e8140f7116ce994a9ca8
diff --git a/metadata/md5-cache/mate-base/Manifest.gz b/metadata/md5-cache/mate-base/Manifest.gz
index 321d14b98114..67dbc104b211 100644
--- a/metadata/md5-cache/mate-base/Manifest.gz
+++ b/metadata/md5-cache/mate-base/Manifest.gz
diff --git a/metadata/md5-cache/mate-base/caja-1.16.1 b/metadata/md5-cache/mate-base/caja-1.16.1
deleted file mode 100644
index 5d9efb3860d3..000000000000
--- a/metadata/md5-cache/mate-base/caja-1.16.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf:0 >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.15.1:0[gtk3(-)=] >=media-libs/libexif-0.6.14:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=dev-libs/libunique-3:3 >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!mate-base/mate-file-manager >=dev-lang/perl-5:0= dev-util/gdbus-codegen:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.40.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Caja file manager for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 +introspection +mate packagekit xmp test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-PDEPEND=mate? ( >=x11-themes/mate-icon-theme-1.16 )
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf:0 >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.15.1:0[gtk3(-)=] >=media-libs/libexif-0.6.14:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=dev-libs/libunique-3:3 >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!mate-base/mate-file-manager
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/caja-1.16.1.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=27f85087304e324e173468fbdeeb398a
diff --git a/metadata/md5-cache/mate-base/caja-1.16.6 b/metadata/md5-cache/mate-base/caja-1.16.6
new file mode 100644
index 000000000000..173dbcd09183
--- /dev/null
+++ b/metadata/md5-cache/mate-base/caja-1.16.6
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf:0 >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.16.2:0[gtk3(-)=] >=media-libs/libexif-0.6.14:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=dev-libs/libunique-3:3 >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!mate-base/mate-file-manager >=dev-lang/perl-5:0= dev-util/gdbus-codegen:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.40.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Caja file manager for the MATE desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=gtk3 +introspection +mate packagekit xmp test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 LGPL-2 FDL-1.1
+PDEPEND=mate? ( >=x11-themes/mate-icon-theme-1.16 )
+RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2.4.7:2 gnome-base/dconf:0 >=gnome-base/gvfs-1.10.1:0[udisks] >=mate-base/mate-desktop-1.16.2:0[gtk3(-)=] >=media-libs/libexif-0.6.14:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXft:0 x11-libs/libXrender:0 >=x11-libs/pango-1.1.2:0 virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=dev-libs/libunique-3:3 >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.4:= ) packagekit? ( app-admin/packagekit-base ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!mate-base/mate-file-manager
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/caja-1.16.6.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=958bf97c96a68fb0153a7d6bc255e0e5
diff --git a/metadata/md5-cache/mate-base/mate-control-center-1.16.0 b/metadata/md5-cache/mate-base/mate-control-center-1.16.0
deleted file mode 100644
index 371eb4792844..000000000000
--- a/metadata/md5-cache/mate-base/mate-control-center-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.73:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.6[gtk3(-)=] >=mate-base/mate-desktop-1.15.1[gtk3(-)=] >=mate-base/caja-1.8[gtk3(-)=] >=mate-base/mate-menus-1.6 >=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=] >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 >=sys-apps/dbus-1:0 x11-apps/xmodmap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXScrnSaver:0 x11-libs/libXcursor:0 x11-libs/libXext:0 >=x11-libs/libXi-1.2:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-wm/marco-1.13.1[gtk3(-)=] virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 appindicator? ( dev-libs/libappindicator:2 ) ) gtk3? ( >=dev-libs/libunique-3:3 media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 appindicator? ( dev-libs/libappindicator:3 ) ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/desktop-file-utils:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* x11-proto/kbproto:0 x11-proto/randrproto:0 x11-proto/renderproto:0 x11-proto/scrnsaverproto:0 x11-proto/xextproto:0 x11-proto/xf86miscproto:0 x11-proto/xproto:0 virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=The MATE Desktop configuration tool
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=appindicator debug gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.73:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.6[gtk3(-)=] >=mate-base/mate-desktop-1.15.1[gtk3(-)=] >=mate-base/caja-1.8[gtk3(-)=] >=mate-base/mate-menus-1.6 >=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=] >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 >=sys-apps/dbus-1:0 x11-apps/xmodmap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXScrnSaver:0 x11-libs/libXcursor:0 x11-libs/libXext:0 >=x11-libs/libXi-1.2:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-wm/marco-1.13.1[gtk3(-)=] virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 appindicator? ( dev-libs/libappindicator:2 ) ) gtk3? ( >=dev-libs/libunique-3:3 media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 appindicator? ( dev-libs/libappindicator:3 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-control-center-1.16.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=23a40b35aca0a6209735549e3612de58
diff --git a/metadata/md5-cache/mate-base/mate-control-center-1.16.1 b/metadata/md5-cache/mate-base/mate-control-center-1.16.1
new file mode 100644
index 000000000000..8976e1834c41
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-control-center-1.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.73:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.6[gtk3(-)=] >=mate-base/mate-desktop-1.15.1[gtk3(-)=] >=mate-base/caja-1.8[gtk3(-)=] >=mate-base/mate-menus-1.6 >=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=] >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 >=sys-apps/dbus-1:0 x11-apps/xmodmap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXScrnSaver:0 x11-libs/libXcursor:0 x11-libs/libXext:0 >=x11-libs/libXi-1.2:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-wm/marco-1.13.1[gtk3(-)=] virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 appindicator? ( dev-libs/libappindicator:2 ) ) gtk3? ( >=dev-libs/libunique-3:3 media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 appindicator? ( dev-libs/libappindicator:3 ) ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/desktop-file-utils:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* x11-proto/kbproto:0 x11-proto/randrproto:0 x11-proto/renderproto:0 x11-proto/scrnsaverproto:0 x11-proto/xextproto:0 x11-proto/xf86miscproto:0 x11-proto/xproto:0 virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=The MATE Desktop configuration tool
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=appindicator debug gtk3
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.73:0 >=dev-libs/glib-2.36:2 dev-libs/libxml2:2 >=gnome-base/dconf-0.13.4:0 >=gnome-base/librsvg-2.0:2 >=mate-base/libmatekbd-1.6[gtk3(-)=] >=mate-base/mate-desktop-1.15.1[gtk3(-)=] >=mate-base/caja-1.8[gtk3(-)=] >=mate-base/mate-menus-1.6 >=mate-base/mate-settings-daemon-1.13.1[gtk3(-)=] >=media-libs/fontconfig-1:1.0 media-libs/freetype:2 >=sys-apps/dbus-1:0 x11-apps/xmodmap:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXScrnSaver:0 x11-libs/libXcursor:0 x11-libs/libXext:0 >=x11-libs/libXi-1.2:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-4:0 x11-libs/pango:0 >=x11-wm/marco-1.13.1[gtk3(-)=] virtual/libintl:0 !gtk3? ( >=dev-libs/libunique-1:1 media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 appindicator? ( dev-libs/libappindicator:2 ) ) gtk3? ( >=dev-libs/libunique-3:3 media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 appindicator? ( dev-libs/libappindicator:3 ) )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-control-center-1.16.1.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=92617131a3d7f45a7dc363f698033723
diff --git a/metadata/md5-cache/mate-base/mate-desktop-1.16.1 b/metadata/md5-cache/mate-base/mate-desktop-1.16.1
deleted file mode 100644
index 2f9edacae93a..000000000000
--- a/metadata/md5-cache/mate-base/mate-desktop-1.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/cairo:0 x11-libs/libX11:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 ) app-text/docbook-xml-dtd:4.1.2 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.40:* sys-devel/gettext:* >=x11-proto/randrproto-1.3:0 x11-proto/xproto:0 virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=Libraries for the MATE desktop that are not part of the UI
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug gtk3 +introspection startup-notification
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/cairo:0 x11-libs/libX11:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-desktop-1.16.1.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b9b8543d126bf44fda21ca282a8d12c8
diff --git a/metadata/md5-cache/mate-base/mate-desktop-1.16.2 b/metadata/md5-cache/mate-base/mate-desktop-1.16.2
new file mode 100644
index 000000000000..483dfe51d72d
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-desktop-1.16.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/cairo:0 x11-libs/libX11:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 ) app-text/docbook-xml-dtd:4.1.2 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.40:* sys-devel/gettext:* >=x11-proto/randrproto-1.3:0 x11-proto/xproto:0 virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=Libraries for the MATE desktop that are not part of the UI
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X debug gtk3 +introspection startup-notification
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 FDL-1.1 LGPL-2
+RDEPEND=>=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/cairo:0 x11-libs/libX11:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.7:= ) startup-notification? ( >=x11-libs/startup-notification-0.5:0 )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-desktop-1.16.2.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d9128f23c4ee03eeca5a4f874d99b05e
diff --git a/metadata/md5-cache/mate-base/mate-panel-1.16.0 b/metadata/md5-cache/mate-base/mate-panel-1.16.0
deleted file mode 100644
index 1128e3c8905b..000000000000
--- a/metadata/md5-cache/mate-base/mate-panel-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.7[gtk3(-)=] dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 >=gnome-base/librsvg-2.36.2:2 >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] x11-libs/libXau:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libwnck-2.30:1[introspection?] ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/libwnck-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=dev-lang/perl-5:0= dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=The MATE panel
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X gtk3 +introspection
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 FDL-1.1 LGPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.7[gtk3(-)=] dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 >=gnome-base/librsvg-2.36.2:2 >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] x11-libs/libXau:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libwnck-2.30:1[introspection?] ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/libwnck-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-panel-1.16.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=58d48c88bd0f914478faa2bf52900d6a
diff --git a/metadata/md5-cache/mate-base/mate-panel-1.16.2 b/metadata/md5-cache/mate-base/mate-panel-1.16.2
new file mode 100644
index 000000000000..b34e9e5bdadb
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-panel-1.16.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.7[gtk3(-)=] dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 >=gnome-base/librsvg-2.36.2:2 >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] x11-libs/libXau:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libwnck-2.30:1[introspection?] ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/libwnck-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools:0 >=dev-lang/perl-5:0= dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=The MATE panel
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X gtk3 +introspection
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 FDL-1.1 LGPL-2
+RDEPEND=dev-libs/atk:0 >=dev-libs/dbus-glib-0.80:0 >=dev-libs/glib-2.36:2 >=dev-libs/libmateweather-1.7[gtk3(-)=] dev-libs/libxml2:2 >=gnome-base/dconf-0.10:0 >=gnome-base/librsvg-2.36.2:2 >=mate-base/mate-desktop-1.9.3[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-1.1.2:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.7.1:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/pango-1.15.4:0[introspection?] x11-libs/libXau:0 >=x11-libs/libXrandr-1.3:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.19.7:2[introspection?] >=x11-libs/libwnck-2.30:1[introspection?] ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3[introspection?] >=x11-libs/libwnck-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.6.7:= )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-panel-1.16.2.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7d7375b9e1449fcef9ad13ed62cbbb24
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.16.0 b/metadata/md5-cache/mate-base/mate-session-manager-1.16.0
deleted file mode 100644
index 9607f0796720..000000000000
--- a/metadata/md5-cache/mate-base/mate-session-manager-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/xtrans virtual/libintl elibc_FreeBSD? ( dev-libs/libexecinfo ) >=x11-libs/gtk+-3.14:3 systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=MATE session manager
-EAPI=6
-HOMEPAGE=http://mate-desktop.org/
-IUSE=debug elibc_FreeBSD gnome-keyring ipv6 systemd upower
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2 FDL-1.1
-RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango x11-libs/xtrans virtual/libintl elibc_FreeBSD? ( dev-libs/libexecinfo ) >=x11-libs/gtk+-3.14:3 systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-session-manager-1.16.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=28fd6b64a189e724b532441638d7255e
diff --git a/metadata/md5-cache/mate-base/mate-session-manager-1.16.1 b/metadata/md5-cache/mate-base/mate-session-manager-1.16.1
new file mode 100644
index 000000000000..008bb989a7e5
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-session-manager-1.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( dev-libs/libexecinfo ) >=x11-libs/gtk+-3.14:3 systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) xtrans? ( x11-libs/xtrans ) >=dev-util/intltool-0.40:* >=dev-lang/perl-5 >=sys-devel/gettext-0.10.40:* virtual/pkgconfig:* !<gnome-base/gdm-2.20.4 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=MATE session manager
+EAPI=6
+HOMEPAGE=http://mate-desktop.org/
+IUSE=debug elibc_FreeBSD gnome-keyring ipv6 systemd upower +xtrans
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 LGPL-2 FDL-1.1
+RDEPEND=>=dev-libs/dbus-glib-0.76 >=dev-libs/glib-2.36:2 dev-libs/libxslt sys-apps/dbus x11-libs/gdk-pixbuf:2 x11-libs/libICE x11-libs/libSM x11-libs/libX11 x11-libs/libXau x11-libs/libXext x11-libs/libXrender x11-libs/libXtst x11-libs/pango virtual/libintl elibc_FreeBSD? ( dev-libs/libexecinfo ) >=x11-libs/gtk+-3.14:3 systemd? ( sys-apps/systemd ) upower? ( || ( >=sys-power/upower-0.9.23 >=sys-power/upower-pm-utils-0.9.23 ) ) xtrans? ( x11-libs/xtrans ) x11-apps/xdpyinfo x11-misc/xdg-user-dirs x11-misc/xdg-user-dirs-gtk gnome-keyring? ( gnome-base/gnome-keyring )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-session-manager-1.16.1.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=afeda98880fee286254a84a3e9ddec5b
diff --git a/metadata/md5-cache/mate-base/mate-settings-daemon-1.16.0 b/metadata/md5-cache/mate-base/mate-settings-daemon-1.16.0
deleted file mode 100644
index 81d2f9942bb2..000000000000
--- a/metadata/md5-cache/mate-base/mate-settings-daemon-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=gnome-base/dconf-0.13.4:0 >=mate-base/libmatekbd-1.7[gtk3(-)=] >=mate-base/mate-desktop-1.9[gtk3(-)=] media-libs/fontconfig:1.0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( >=media-libs/libmatemixer-1.10:0[pulseaudio] >=media-sound/pulseaudio-0.9.15:0 ) smartcard? ( >=dev-libs/nss-3.11.2:0 ) sound? ( >=media-libs/libmatemixer-1.9 !gtk3? ( media-libs/libcanberra:0[gtk] ) gtk3? ( media-libs/libcanberra:0[gtk3] ) ) >=dev-util/intltool-0.50.1:0 sys-devel/gettext:0 virtual/pkgconfig:0 x11-proto/inputproto:0 x11-proto/xproto:0 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=MATE Settings Daemon
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug gtk3 libnotify policykit pulseaudio smartcard +sound
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=gnome-base/dconf-0.13.4:0 >=mate-base/libmatekbd-1.7[gtk3(-)=] >=mate-base/mate-desktop-1.9[gtk3(-)=] media-libs/fontconfig:1.0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( >=media-libs/libmatemixer-1.10:0[pulseaudio] >=media-sound/pulseaudio-0.9.15:0 ) smartcard? ( >=dev-libs/nss-3.11.2:0 ) sound? ( >=media-libs/libmatemixer-1.9 !gtk3? ( media-libs/libcanberra:0[gtk] ) gtk3? ( media-libs/libcanberra:0[gtk3] ) )
-REQUIRED_USE=pulseaudio? ( sound )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-settings-daemon-1.16.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b8f00c4d88fdc961d01a15aae61640ee
diff --git a/metadata/md5-cache/mate-base/mate-settings-daemon-1.16.2 b/metadata/md5-cache/mate-base/mate-settings-daemon-1.16.2
new file mode 100644
index 000000000000..0546939dd040
--- /dev/null
+++ b/metadata/md5-cache/mate-base/mate-settings-daemon-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=gnome-base/dconf-0.13.4:0 >=mate-base/libmatekbd-1.7[gtk3(-)=] >=mate-base/mate-desktop-1.9[gtk3(-)=] media-libs/fontconfig:1.0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( >=media-libs/libmatemixer-1.10:0[pulseaudio] >=media-sound/pulseaudio-0.9.15:0 ) smartcard? ( >=dev-libs/nss-3.11.2:0 ) sound? ( >=media-libs/libmatemixer-1.9 !gtk3? ( media-libs/libcanberra:0[gtk] ) gtk3? ( media-libs/libcanberra:0[gtk3] ) ) >=dev-util/intltool-0.50.1:0 sys-devel/gettext:0 virtual/pkgconfig:0 x11-proto/inputproto:0 x11-proto/xproto:0 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=MATE Settings Daemon
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X debug gtk3 libnotify policykit pulseaudio smartcard +sound
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/dbus-glib-0.74:0 >=dev-libs/glib-2.17.3:2 >=gnome-base/dconf-0.13.4:0 >=mate-base/libmatekbd-1.7[gtk3(-)=] >=mate-base/mate-desktop-1.9[gtk3(-)=] media-libs/fontconfig:1.0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libX11:0 x11-libs/libXi:0 x11-libs/libXext:0 x11-libs/libXxf86misc:0 >=x11-libs/libxklavier-5:0 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) policykit? ( >=dev-libs/dbus-glib-0.71:0 >=sys-apps/dbus-1.1.2:0 >=sys-auth/polkit-0.97:0 ) pulseaudio? ( >=media-libs/libmatemixer-1.10:0[pulseaudio] >=media-sound/pulseaudio-0.9.15:0 ) smartcard? ( >=dev-libs/nss-3.11.2:0 ) sound? ( >=media-libs/libmatemixer-1.9 !gtk3? ( media-libs/libcanberra:0[gtk] ) gtk3? ( media-libs/libcanberra:0[gtk3] ) )
+REQUIRED_USE=pulseaudio? ( sound )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-settings-daemon-1.16.2.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b1ca88b3d2f747bddce691ed4a683c90
diff --git a/metadata/md5-cache/mate-extra/Manifest.gz b/metadata/md5-cache/mate-extra/Manifest.gz
index 561c11605642..4934480daba7 100644
--- a/metadata/md5-cache/mate-extra/Manifest.gz
+++ b/metadata/md5-cache/mate-extra/Manifest.gz
diff --git a/metadata/md5-cache/mate-extra/mate-netbook-1.16.1 b/metadata/md5-cache/mate-extra/mate-netbook-1.16.1
deleted file mode 100644
index 60e675c16078..000000000000
--- a/metadata/md5-cache/mate-extra/mate-netbook-1.16.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.8[gtk3(-)=] x11-libs/libfakekey:0 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/cairo:0 virtual/libintl:0 !gtk3? ( x11-libs/gtk+:2 x11-libs/libwnck:1 ) gtk3? ( x11-libs/gtk+:3 x11-libs/libwnck:3 ) x11-proto/xproto:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=MATE utilities for netbooks
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.8[gtk3(-)=] x11-libs/libfakekey:0 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/cairo:0 virtual/libintl:0 !gtk3? ( x11-libs/gtk+:2 x11-libs/libwnck:1 ) gtk3? ( x11-libs/gtk+:3 x11-libs/libwnck:3 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-netbook-1.16.1.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=ff8a03114e0c47c104a98277ae790001
diff --git a/metadata/md5-cache/mate-extra/mate-netbook-1.16.2 b/metadata/md5-cache/mate-extra/mate-netbook-1.16.2
new file mode 100644
index 000000000000..3cde00c42969
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-netbook-1.16.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.8[gtk3(-)=] x11-libs/libfakekey:0 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/cairo:0 virtual/libintl:0 !gtk3? ( x11-libs/gtk+:2 x11-libs/libwnck:1 ) gtk3? ( x11-libs/gtk+:3 x11-libs/libwnck:3 ) x11-proto/xproto:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=MATE utilities for netbooks
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=gtk3
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.8[gtk3(-)=] x11-libs/libfakekey:0 x11-libs/libXtst:0 x11-libs/libX11:0 x11-libs/cairo:0 virtual/libintl:0 !gtk3? ( x11-libs/gtk+:2 x11-libs/libwnck:1 ) gtk3? ( x11-libs/gtk+:3 x11-libs/libwnck:3 )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-netbook-1.16.2.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=6d54430432d447ba837bf255ecd302ef
diff --git a/metadata/md5-cache/mate-extra/mate-power-manager-1.16.0 b/metadata/md5-cache/mate-extra/mate-power-manager-1.16.0
deleted file mode 100644
index 936066d219eb..000000000000
--- a/metadata/md5-cache/mate-extra/mate-power-manager-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 >=x11-apps/xrandr-1.3:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.11:2 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXrandr:0 >=x11-libs/libnotify-0.7:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.10:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=media-libs/libcanberra-0.10:0[gtk3] >=x11-libs/gtk+-3.0:3 ) pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 ) !pm-utils? ( >=sys-power/upower-0.9.23:= ) app-text/docbook-xml-dtd:4.3 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* x11-proto/randrproto:0 >=x11-proto/xproto-7.0.15:0 sys-devel/gettext:* virtual/pkgconfig:* man? ( app-text/docbook-sgml-utils:0 >=app-text/docbook-sgml-dtd-4.3 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=A session daemon for MATE that makes it easy to manage your laptop or desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+applet gnome-keyring gtk3 man pm-utils policykit test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 >=x11-apps/xrandr-1.3:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.11:2 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXrandr:0 >=x11-libs/libnotify-0.7:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.10:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=media-libs/libcanberra-0.10:0[gtk3] >=x11-libs/gtk+-3.0:3 ) pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 ) !pm-utils? ( >=sys-power/upower-0.9.23:= ) policykit? ( >=mate-extra/mate-polkit-1.6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-power-manager-1.16.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c1a9b2931c26b5b8c8cfdbfd086c546f
diff --git a/metadata/md5-cache/mate-extra/mate-power-manager-1.16.2 b/metadata/md5-cache/mate-extra/mate-power-manager-1.16.2
new file mode 100644
index 000000000000..aa9f4eba7082
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-power-manager-1.16.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 >=x11-apps/xrandr-1.3:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.11:2 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXrandr:0 >=x11-libs/libnotify-0.7:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.10:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=media-libs/libcanberra-0.10:0[gtk3] >=x11-libs/gtk+-3.0:3 ) pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 ) !pm-utils? ( >=sys-power/upower-0.9.23:= ) app-text/docbook-xml-dtd:4.3 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* x11-proto/randrproto:0 >=x11-proto/xproto-7.0.15:0 sys-devel/gettext:* virtual/pkgconfig:* man? ( app-text/docbook-sgml-utils:0 >=app-text/docbook-sgml-dtd-4.3 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=A session daemon for MATE that makes it easy to manage your laptop or desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=+applet gnome-keyring gtk3 man pm-utils policykit test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/dbus-glib-0.70:0 >=dev-libs/glib-2.36:2 >=sys-apps/dbus-1:0 >=x11-apps/xrandr-1.3:0 >=x11-libs/cairo-1:0 >=x11-libs/gdk-pixbuf-2.11:2 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/libXrandr:0 >=x11-libs/libnotify-0.7:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) gnome-keyring? ( >=gnome-base/libgnome-keyring-3:0 ) !gtk3? ( >=dev-libs/libunique-1:1 >=media-libs/libcanberra-0.10:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=media-libs/libcanberra-0.10:0[gtk3] >=x11-libs/gtk+-3.0:3 ) pm-utils? ( >=sys-power/upower-pm-utils-0.9.23 ) !pm-utils? ( >=sys-power/upower-0.9.23:= ) policykit? ( >=mate-extra/mate-polkit-1.6 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-power-manager-1.16.2.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c97f64d2cbf3bba16c60053365215def
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.16.0 b/metadata/md5-cache/mate-extra/mate-screensaver-1.16.0
deleted file mode 100644
index 3cea61f7cdc6..000000000000
--- a/metadata/md5-cache/mate-extra/mate-screensaver-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.7.1[gtk3(-)=] >=mate-base/mate-desktop-1.9.4[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* x11-proto/randrproto:0 x11-proto/scrnsaverproto:0 x11-proto/xextproto:0 x11-proto/xf86miscproto:0 virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=Replaces xscreensaver, integrating with the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug consolekit gtk3 kernel_linux libnotify opengl pam systemd
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.7.1[gtk3(-)=] >=mate-base/mate-desktop-1.9.4[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0 >=mate-base/mate-session-manager-1.6
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-screensaver-1.16.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=84e9a705cbe8d1c7690b87abffd2e376
diff --git a/metadata/md5-cache/mate-extra/mate-screensaver-1.16.1 b/metadata/md5-cache/mate-extra/mate-screensaver-1.16.1
new file mode 100644
index 000000000000..5a07e7ae283e
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-screensaver-1.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.7.1[gtk3(-)=] >=mate-base/mate-desktop-1.9.4[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* x11-proto/randrproto:0 x11-proto/scrnsaverproto:0 x11-proto/xextproto:0 x11-proto/xf86miscproto:0 virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=Replaces xscreensaver, integrating with the MATE desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X debug consolekit gtk3 kernel_linux libnotify opengl pam systemd
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/dbus-glib-0.71:0 >=dev-libs/glib-2.36:2 gnome-base/dconf:0 >=mate-base/libmatekbd-1.7.1[gtk3(-)=] >=mate-base/mate-desktop-1.9.4[gtk3(-)=] >=mate-base/mate-menus-1.6 >=sys-apps/dbus-0.30:0 >=x11-libs/gdk-pixbuf-2.14:2 >=x11-libs/libX11-1:0 x11-libs/cairo:0 x11-libs/libXext:0 x11-libs/libXrandr:0 x11-libs/libXScrnSaver:0 x11-libs/libXxf86misc:0 x11-libs/libXxf86vm:0 x11-libs/libxklavier:0 x11-libs/pango:0 virtual/libintl:0 consolekit? ( sys-auth/consolekit:0 ) !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) opengl? ( virtual/opengl:0 ) pam? ( gnome-base/gnome-keyring:0 virtual/pam:0 ) !pam? ( kernel_linux? ( sys-apps/shadow:0 ) ) systemd? ( sys-apps/systemd:0= ) !!<gnome-extra/gnome-screensaver-3:0 >=mate-base/mate-session-manager-1.6
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-screensaver-1.16.1.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=84e9a705cbe8d1c7690b87abffd2e376
diff --git a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.16.0 b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.16.0
deleted file mode 100644
index e978e50155ad..000000000000
--- a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.6[gtk3(-)=] >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) hddtemp? ( dbus? ( >=dev-libs/dbus-glib-0.80:0 >=dev-libs/libatasmart-0.16:0 ) !dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) lm_sensors? ( sys-apps/lm_sensors:0 ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] media-video/nvidia-settings:0 ) ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=MATE panel applet to display readings from hardware sensors
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=+dbus gtk3 hddtemp libnotify lm_sensors video_cards_nvidia
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-PDEPEND=hddtemp? ( dbus? ( sys-fs/udisks:0 ) )
-RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.6[gtk3(-)=] >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) hddtemp? ( dbus? ( >=dev-libs/dbus-glib-0.80:0 >=dev-libs/libatasmart-0.16:0 ) !dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) lm_sensors? ( sys-apps/lm_sensors:0 ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] media-video/nvidia-settings:0 ) )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-sensors-applet-1.16.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6fead1f0f55e5d649527990029a19dd6
diff --git a/metadata/md5-cache/mate-extra/mate-sensors-applet-1.16.1 b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.16.1
new file mode 100644
index 000000000000..2b4533ef1b63
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-sensors-applet-1.16.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.6[gtk3(-)=] >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) hddtemp? ( dbus? ( >=dev-libs/dbus-glib-0.80:0 >=dev-libs/libatasmart-0.16:0 ) !dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) lm_sensors? ( sys-apps/lm_sensors:0 ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] media-video/nvidia-settings:0 ) ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=MATE panel applet to display readings from hardware sensors
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=+dbus gtk3 hddtemp libnotify lm_sensors video_cards_nvidia
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+PDEPEND=hddtemp? ( dbus? ( sys-fs/udisks:0 ) )
+RDEPEND=>=dev-libs/glib-2.36:2 >=mate-base/mate-panel-1.6[gtk3(-)=] >=x11-libs/cairo-1.0.4:0 x11-libs/gdk-pixbuf:2 virtual/libintl:0 !gtk3? ( >=x11-libs/gtk+-2.24:2 ) gtk3? ( >=x11-libs/gtk+-3.0:3 ) hddtemp? ( dbus? ( >=dev-libs/dbus-glib-0.80:0 >=dev-libs/libatasmart-0.16:0 ) !dbus? ( >=app-admin/hddtemp-0.3_beta13:0 ) ) libnotify? ( >=x11-libs/libnotify-0.7:0 ) lm_sensors? ( sys-apps/lm_sensors:0 ) video_cards_nvidia? ( || ( >=x11-drivers/nvidia-drivers-100.14.09:0[static-libs,tools] media-video/nvidia-settings:0 ) )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-sensors-applet-1.16.1.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f749dc5f32943cb8e1f48b9fbfdd8c6c
diff --git a/metadata/md5-cache/mate-extra/mate-utils-1.16.0 b/metadata/md5-cache/mate-extra/mate-utils-1.16.0
deleted file mode 100644
index 700d45a76c03..000000000000
--- a/metadata/md5-cache/mate-extra/mate-utils-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= sys-libs/zlib:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24:2 >=media-libs/libcanberra-0.4:0[gtk] ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=media-libs/libcanberra-0.4:0[gtk3] ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* x11-proto/xextproto:0 sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=Utilities for the MATE desktop
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X applet debug gtk3 ipv6 test
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= sys-libs/zlib:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24:2 >=media-libs/libcanberra-0.4:0[gtk] ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=media-libs/libcanberra-0.4:0[gtk3] )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-utils-1.16.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b18d5f2aa2d48a93b2b1d473236d9ea2
diff --git a/metadata/md5-cache/mate-extra/mate-utils-1.16.1 b/metadata/md5-cache/mate-extra/mate-utils-1.16.1
new file mode 100644
index 000000000000..5d82762ae403
--- /dev/null
+++ b/metadata/md5-cache/mate-extra/mate-utils-1.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= sys-libs/zlib:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24:2 >=media-libs/libcanberra-0.4:0[gtk] ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=media-libs/libcanberra-0.4:0[gtk3] ) app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* x11-proto/xextproto:0 sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=Utilities for the MATE desktop
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X applet debug gtk3 ipv6 test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/libgtop-2.12:2= sys-libs/zlib:0 x11-libs/cairo:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/libXext:0 x11-libs/pango:0 applet? ( >=mate-base/mate-panel-1.6[gtk3(-)=] ) !gtk3? ( >=x11-libs/gtk+-2.24:2 >=media-libs/libcanberra-0.4:0[gtk] ) gtk3? ( >=x11-libs/gtk+-3.0:3 >=media-libs/libcanberra-0.4:0[gtk3] )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-utils-1.16.1.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=1ee09b75cc842e742160757575ed4ea2
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 1d35caaff849..65a69b683436 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/digikam-5.7.0-r1 b/metadata/md5-cache/media-gfx/digikam-5.7.0-r1
index 51b9f9f7486c..43965caf6a6b 100644
--- a/metadata/md5-cache/media-gfx/digikam-5.7.0-r1
+++ b/metadata/md5-cache/media-gfx/digikam-5.7.0-r1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.7.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ce175362063e60c9e7884eb53e51828f
diff --git a/metadata/md5-cache/media-gfx/digikam-5.7.0-r3 b/metadata/md5-cache/media-gfx/digikam-5.7.0-r3
index 86d177f07b62..48ccaeaa24a3 100644
--- a/metadata/md5-cache/media-gfx/digikam-5.7.0-r3
+++ b/metadata/md5-cache/media-gfx/digikam-5.7.0-r3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.7.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9a01aae4ec48f004ac75ffe79faec3ac
diff --git a/metadata/md5-cache/media-gfx/ditaa-0.11.0 b/metadata/md5-cache/media-gfx/ditaa-0.11.0
new file mode 100644
index 000000000000..0de775e62012
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/ditaa-0.11.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install preinst prepare setup unpack
+DEPEND=dev-java/leiningen-bin >=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A utility that converts ascii-art diagrams to bitmap diagrams
+EAPI=6
+HOMEPAGE=https://github.com/stathissideris/ditaa
+IUSE=elibc_FreeBSD
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-3+
+RDEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3
+SLOT=0
+SRC_URI=https://github.com/stathissideris/ditaa/archive/v0.11.0.tar.gz -> ditaa-0.11.0.tar.gz https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4.jar https://repo.maven.apache.org/maven2/commons-cli/commons-cli/1.4/commons-cli-1.4.pom https://repo.maven.apache.org/maven2/commons-io/commons-io/1.3.1/commons-io-1.3.1.jar https://repo.maven.apache.org/maven2/commons-io/commons-io/1.3.1/commons-io-1.3.1.pom https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.jar https://repo.maven.apache.org/maven2/commons-logging/commons-logging/1.0.4/commons-logging-1.0.4.pom https://repo.maven.apache.org/maven2/net/htmlparser/jericho/jericho-html/3.4/jericho-html-3.4.jar https://repo.maven.apache.org/maven2/net/htmlparser/jericho/jericho-html/3.4/jericho-html-3.4.pom https://repo.maven.apache.org/maven2/org/apache/apache/18/apache-18.pom https://repo.maven.apache.org/maven2/org/apache/apache/3/apache-3.pom https://repo.maven.apache.org/maven2/org/apache/apache/4/apache-4.pom https://repo.maven.apache.org/maven2/org/apache/apache/7/apache-7.pom https://repo.maven.apache.org/maven2/org/apache/commons/commons-parent/42/commons-parent-42.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-anim/1.9/batik-anim-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-anim/1.9/batik-anim-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-awt-util/1.9/batik-awt-util-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-awt-util/1.9/batik-awt-util-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-bridge/1.9/batik-bridge-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-bridge/1.9/batik-bridge-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-codec/1.9/batik-codec-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-codec/1.9/batik-codec-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-constants/1.9/batik-constants-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-constants/1.9/batik-constants-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-css/1.9/batik-css-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-css/1.9/batik-css-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-dom/1.9/batik-dom-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-dom/1.9/batik-dom-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-ext/1.9/batik-ext-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-ext/1.9/batik-ext-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-gvt/1.9/batik-gvt-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-gvt/1.9/batik-gvt-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-i18n/1.9/batik-i18n-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-i18n/1.9/batik-i18n-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-parser/1.9/batik-parser-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-parser/1.9/batik-parser-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-script/1.9/batik-script-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-script/1.9/batik-script-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-svg-dom/1.9/batik-svg-dom-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-svg-dom/1.9/batik-svg-dom-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-svggen/1.9/batik-svggen-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-svggen/1.9/batik-svggen-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-transcoder/1.9/batik-transcoder-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-transcoder/1.9/batik-transcoder-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-util/1.9/batik-util-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-util/1.9/batik-util-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-xml/1.9/batik-xml-1.9.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/batik-xml/1.9/batik-xml-1.9.pom https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/xmlgraphics-commons/2.2/xmlgraphics-commons-2.2.jar https://repo.maven.apache.org/maven2/org/apache/xmlgraphics/xmlgraphics-commons/2.2/xmlgraphics-commons-2.2.pom https://repo.maven.apache.org/maven2/org/clojure/clojure/1.9.0/clojure-1.9.0.jar https://repo.maven.apache.org/maven2/org/clojure/clojure/1.9.0/clojure-1.9.0.pom https://repo.maven.apache.org/maven2/org/clojure/core.specs.alpha/0.1.24/core.specs.alpha-0.1.24.jar https://repo.maven.apache.org/maven2/org/clojure/core.specs.alpha/0.1.24/core.specs.alpha-0.1.24.pom https://repo.maven.apache.org/maven2/org/clojure/pom.contrib/0.2.2/pom.contrib-0.2.2.pom https://repo.maven.apache.org/maven2/org/clojure/spec.alpha/0.1.143/spec.alpha-0.1.143.jar https://repo.maven.apache.org/maven2/org/clojure/spec.alpha/0.1.143/spec.alpha-0.1.143.pom https://repo.maven.apache.org/maven2/xalan/serializer/2.7.2/serializer-2.7.2.jar https://repo.maven.apache.org/maven2/xalan/serializer/2.7.2/serializer-2.7.2.pom https://repo.maven.apache.org/maven2/xalan/xalan/2.7.2/xalan-2.7.2.jar https://repo.maven.apache.org/maven2/xalan/xalan/2.7.2/xalan-2.7.2.pom https://repo.maven.apache.org/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.jar https://repo.maven.apache.org/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.pom https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.jar https://repo.maven.apache.org/maven2/xml-apis/xml-apis/1.3.04/xml-apis-1.3.04.pom
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=d10fd237e4cb791ea8ec37a9d9bd3134
diff --git a/metadata/md5-cache/media-gfx/eom-1.16.0 b/metadata/md5-cache/media-gfx/eom-1.16.0
deleted file mode 100644
index b32a45f1441a..000000000000
--- a/metadata/md5-cache/media-gfx/eom-1.16.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2:2 gnome-base/dconf:0 >=mate-base/mate-desktop-1.9.1[gtk3(-)=] sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?] x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.13:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=The MATE image viewer
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2:2 gnome-base/dconf:0 >=mate-base/mate-desktop-1.9.1[gtk3(-)=] sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?] x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.13:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer
-REQUIRED_USE=gtk3? ( !python ) python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/eom-1.16.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=849a9c1ef99dca0c107f8cb374905cca
diff --git a/metadata/md5-cache/media-gfx/eom-1.16.1 b/metadata/md5-cache/media-gfx/eom-1.16.1
new file mode 100644
index 000000000000..68b6bfb56c6e
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/eom-1.16.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2:2 gnome-base/dconf:0 >=mate-base/mate-desktop-1.9.1[gtk3(-)=] sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?] x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.13:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer app-text/yelp-tools:0 dev-util/gtk-doc dev-util/gtk-doc-am >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=The MATE image viewer
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=X debug dbus exif gtk3 +introspection jpeg lcms python svg tiff xmp python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=dev-libs/libxml2-2:2 gnome-base/dconf:0 >=mate-base/mate-desktop-1.9.1[gtk3(-)=] sys-libs/zlib:0 x11-libs/cairo:0 >=x11-libs/gdk-pixbuf-2.4:2[introspection?,jpeg?,tiff?] x11-libs/libX11:0 >=x11-misc/shared-mime-info-0.20:0 virtual/libintl:0 dbus? ( >=dev-libs/dbus-glib-0.71:0 ) exif? ( >=media-libs/libexif-0.6.14:0 virtual/jpeg:0 ) !gtk3? ( >=x11-libs/gtk+-2.18:2[introspection?] ) gtk3? ( >=x11-libs/gtk+-3.0:3[introspection?] ) introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0 ) lcms? ( media-libs/lcms:2 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygobject-2.15.1:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.13:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) svg? ( >=gnome-base/librsvg-2.36.2:2 ) xmp? ( >=media-libs/exempi-1.99.5:2 ) !!media-gfx/mate-image-viewer
+REQUIRED_USE=gtk3? ( !python ) python? ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/eom-1.16.1.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=198ae8b0ad4aa5b01d9e9629d3e6786a
diff --git a/metadata/md5-cache/media-gfx/gimp-2.8.22-r1 b/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
index 67c4836fffd3..d75d39043b95 100644
--- a/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
+++ b/metadata/md5-cache/media-gfx/gimp-2.8.22-r1
@@ -4,11 +4,11 @@ DESCRIPTION=GNU Image Manipulation Program
 EAPI=5
 HOMEPAGE=https://www.gimp.org/
 IUSE=alsa aalib altivec aqua bzip2 curl dbus debug doc exif gnome postscript jpeg jpeg2k lcms cpu_flags_x86_mmx mng pdf png python smp cpu_flags_x86_sse svg tiff udev wmf xpm test debug python_targets_python2_7
-KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-3
 RDEPEND=>=dev-libs/glib-2.30.2:2 >=dev-libs/atk-2.2.0 >=x11-libs/gtk+-2.24.10:2 >=x11-libs/gdk-pixbuf-2.24.1:2 >=x11-libs/cairo-1.10.2 >=x11-libs/pango-1.29.4 xpm? ( x11-libs/libXpm ) >=media-libs/freetype-2.1.7 >=media-libs/fontconfig-2.2.0 sys-libs/zlib dev-libs/libxml2 dev-libs/libxslt x11-themes/hicolor-icon-theme >=media-libs/babl-0.1.10 >=media-libs/gegl-0.2.0:0 aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) aqua? ( x11-libs/gtk-mac-integration ) curl? ( net-misc/curl ) dbus? ( dev-libs/dbus-glib ) gnome? ( gnome-base/gvfs ) jpeg? ( virtual/jpeg:0 ) jpeg2k? ( media-libs/jasper:= ) exif? ( >=media-libs/libexif-0.6.15 ) lcms? ( >=media-libs/lcms-2.2:2 ) mng? ( media-libs/libmng ) pdf? ( >=app-text/poppler-0.12.4[cairo] ) png? ( >=media-libs/libpng-1.2.37:0 ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=dev-python/pygtk-2.10.4:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) tiff? ( >=media-libs/tiff-3.5.7:0 ) svg? ( >=gnome-base/librsvg-2.36.0:2 ) wmf? ( >=media-libs/libwmf-0.2.8 ) x11-libs/libXcursor sys-libs/zlib bzip2? ( app-arch/bzip2 ) postscript? ( app-text/ghostscript-gpl ) udev? ( virtual/libgudev:= )
 REQUIRED_USE=python? ( python_targets_python2_7 )
 SLOT=2
 SRC_URI=mirror://gimp/v2.8/gimp-2.8.22.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=439706c6643eaef38adbfb55613c6290
+_md5_=e02457aacd2342fdeceeda7587db6843
diff --git a/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1 b/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
index 594f8ae6260d..18d5aa3ac369 100644
--- a/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
+++ b/metadata/md5-cache/media-gfx/graphviz-2.40.1-r1
@@ -4,7 +4,7 @@ DESCRIPTION=Open Source Graph Visualization Software
 EAPI=6
 HOMEPAGE=https://www.graphviz.org/ https://gitlab.com/graphviz/graphviz/
 IUSE=+cairo devil doc examples gdk-pixbuf gtk gts guile java lasi nls pdf perl postscript python qt5 ruby static-libs svg tcl X elibc_FreeBSD elibc_FreeBSD java python_targets_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=CPL-1.0
 RDEPEND=>=dev-libs/expat-2 >=dev-libs/glib-2.11.1:2 dev-libs/libltdl:0 >=media-libs/fontconfig-2.3.95 >=media-libs/freetype-2.1.10 >=media-libs/gd-2.0.34:=[fontconfig,jpeg,png,truetype,zlib] >=media-libs/libpng-1.2:0 sys-libs/zlib virtual/jpeg:0 virtual/libiconv cairo? ( >=x11-libs/cairo-1.1.10[svg] >=x11-libs/pango-1.12 ) devil? ( media-libs/devil[png,jpeg] ) gtk? ( x11-libs/gtk+:2 ) gts? ( sci-libs/gts ) lasi? ( media-libs/lasi ) pdf? ( app-text/poppler ) perl? ( dev-lang/perl:= ) postscript? ( app-text/ghostscript-gpl ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 ) ruby? ( dev-lang/ruby:* ) svg? ( gnome-base/librsvg ) tcl? ( >=dev-lang/tcl-8.3:0= ) X? ( x11-libs/libX11 x11-libs/libXaw x11-libs/libXmu x11-libs/libXpm x11-libs/libXt ) !<=sci-chemistry/cluster-1.3.081231 java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=!cairo? ( !X !gtk !postscript !lasi ) python? ( python_targets_python2_7 )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://www.graphviz.org/pub/graphviz/stable/SOURCES/graphviz-2.40.1.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=65f0e63377fddb6c12ecccbc1b265ee2
+_md5_=d3887deaf4e5fc8e5350e5316a715c8c
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.91-r3 b/metadata/md5-cache/media-gfx/inkscape-0.91-r3
index 1d7f42796c4d..919cfd670f61 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.91-r3
+++ b/metadata/md5-cache/media-gfx/inkscape-0.91-r3
@@ -1,15 +1,15 @@
 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_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_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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) 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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) wpg? ( || ( ( app-text/libwpg:0.3 dev-libs/librevenge ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) >=dev-libs/boost-1.36 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+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_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_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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) 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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) wpg? ( || ( ( app-text/libwpg:0.3 dev-libs/librevenge ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) >=dev-libs/boost-1.36 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
 DESCRIPTION=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 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 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_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_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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) 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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) wpg? ( || ( ( app-text/libwpg:0.3 dev-libs/librevenge ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) 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_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 )
+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_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_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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) 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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) wpg? ( || ( ( app-text/libwpg:0.3 dev-libs/librevenge ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) 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_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.91.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=daf025fc118c0509a6b5be6a56dcd306
+_md5_=845f63fc643875240391d441082a7fa9
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.91-r4 b/metadata/md5-cache/media-gfx/inkscape-0.91-r4
index a740b6a0fa4b..fb967bf5faed 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.91-r4
+++ b/metadata/md5-cache/media-gfx/inkscape-0.91-r4
@@ -1,15 +1,15 @@
 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_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_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_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-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+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_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_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_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-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 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 ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
 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_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_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_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_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 )
+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_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_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_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_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.91.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6656b3ffdcda220ced4f2d20d729dc2e
+_md5_=04e76800fe8fefdc976c1aa95e732283
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.92.1-r1 b/metadata/md5-cache/media-gfx/inkscape-0.92.1-r1
index 9dea5b6a4d37..5fde2d314bcd 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.92.1-r1
+++ b/metadata/md5-cache/media-gfx/inkscape-0.92.1-r1
@@ -1,15 +1,15 @@
 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_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_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_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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) 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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) wpg? ( || ( ( app-text/libwpg:0.3 dev-libs/librevenge ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) >=dev-libs/boost-1.36 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+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_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_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_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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) 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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) wpg? ( || ( ( app-text/libwpg:0.3 dev-libs/librevenge ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) >=dev-libs/boost-1.36 >=dev-util/intltool-0.40 >=sys-devel/gettext-0.17 virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
 DESCRIPTION=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_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_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_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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) 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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) wpg? ( || ( ( app-text/libwpg:0.3 dev-libs/librevenge ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) 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_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 )
+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_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_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_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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) 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 ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) wpg? ( || ( ( app-text/libwpg:0.3 dev-libs/librevenge ) ( app-text/libwpd:0.9 app-text/libwpg:0.2 ) ) ) 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_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.1.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=18a0d58b9a7f40c5fc5f2cf75c1bea09
+_md5_=761ec7b05b70719b05c6b1b243b5c3ac
diff --git a/metadata/md5-cache/media-gfx/inkscape-0.92.2 b/metadata/md5-cache/media-gfx/inkscape-0.92.2
index 5f2182a28456..1d8b78a0f1a3 100644
--- a/metadata/md5-cache/media-gfx/inkscape-0.92.2
+++ b/metadata/md5-cache/media-gfx/inkscape-0.92.2
@@ -1,15 +1,15 @@
 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_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_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_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-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+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_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_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_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-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 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_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_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_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_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 )
+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_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_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_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_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	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0ade9223bad7bb0859d8a818481da16f
+_md5_=81858a821ab4c2ae64ea2c954adc5efa
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 de0b891baeaa..07292f791425 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.40.0 >=kde-frameworks/kcompletion-5.40.0 >=kde-frameworks/kconfig-5.40.0 >=kde-frameworks/kconfigwidgets-5.40.0 >=kde-frameworks/kcoreaddons-5.40.0 >=kde-frameworks/kdelibs4support-5.40.0 >=kde-frameworks/kguiaddons-5.40.0 >=kde-frameworks/ki18n-5.40.0 >=kde-frameworks/kiconthemes-5.40.0 >=kde-frameworks/kio-5.40.0 >=kde-frameworks/ktextwidgets-5.40.0 >=kde-frameworks/kwidgetsaddons-5.40.0 >=kde-frameworks/kxmlgui-5.40.0 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !media-gfx/kcoloredit:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=0
 SRC_URI=https://github.com/KDE/kcoloredit/archive/50ac0509891343bc01a0aeffda5a44a1e65d9d04.tar.gz -> kcoloredit-2.0.0_p20171121.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=26065694f81a2a0048ed593d292f2098
diff --git a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2 b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2
index 95c2f4eedbf8..f6c84d5d5986 100644
--- a/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2
+++ b/metadata/md5-cache/media-gfx/kgraphviewer-2.4.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2 FDL-1.2
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=media-gfx/graphviz-2.30 !media-gfx/kgraphviewer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kgraphviewer/2.4.2/kgraphviewer-2.4.2.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=711b98ebd3051f8258f7f95b48e710f5
diff --git a/metadata/md5-cache/media-gfx/kphotoalbum-5.2 b/metadata/md5-cache/media-gfx/kphotoalbum-5.2
index dd0e8611627b..c9f835979d4e 100644
--- a/metadata/md5-cache/media-gfx/kphotoalbum-5.2
+++ b/metadata/md5-cache/media-gfx/kphotoalbum-5.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ FDL-1.2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-gfx/exiv2:= media-libs/phonon[qt5(+)] virtual/jpeg:0 kipi? ( >=kde-apps/libkipi-14.12.0:5 ) map? ( >=kde-apps/libkgeomap-14.12.0:5 ) raw? ( >=kde-apps/libkdcraw-14.12.0:5 ) media-video/mplayer kipi? ( media-plugins/kipi-plugins:5 ) !media-gfx/kphotoalbum:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kphotoalbum/5.2/kphotoalbum-5.2.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=10ee1d76baa0ca04f028fd84cee31df3
diff --git a/metadata/md5-cache/media-gfx/krita-3.3.2.1 b/metadata/md5-cache/media-gfx/krita-3.3.2.1
index a8eb82896720..1f3f6ae1983e 100644
--- a/metadata/md5-cache/media-gfx/krita-3.3.2.1
+++ b/metadata/md5-cache/media-gfx/krita-3.3.2.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/3.3.2/krita-3.3.2.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=5d36db5b269335fb6601efe527f559a2
diff --git a/metadata/md5-cache/media-gfx/krita-3.3.3 b/metadata/md5-cache/media-gfx/krita-3.3.3
index e96079f54de6..90ad6e1ca630 100644
--- a/metadata/md5-cache/media-gfx/krita-3.3.3
+++ b/metadata/md5-cache/media-gfx/krita-3.3.3
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/krita/3.3.3/krita-3.3.3.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c6353c5f54ed0ea6a841bc6e5facadfb
diff --git a/metadata/md5-cache/media-gfx/kuickshow-0.10.0 b/metadata/md5-cache/media-gfx/kuickshow-0.10.0
new file mode 100644
index 000000000000..8821d06616d9
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/kuickshow-0.10.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 media-libs/imlib x11-libs/libX11 sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Image viewer based on KDE Frameworks
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/KuickShow
+IUSE=debug debug +handbook
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kinit-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 media-libs/imlib x11-libs/libX11 !media-gfx/kuickshow:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kuickshow-0.10.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=06454f573f903471418f17dea01cee40
diff --git a/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r3 b/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r3
deleted file mode 100644
index c294b6aee9ec..000000000000
--- a/metadata/md5-cache/media-gfx/kuickshow-0.9.1-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/imlib >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-3.7.2 dev-util/automoc virtual/pkgconfig >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-DESCRIPTION=KDE program to view images
-EAPI=6
-HOMEPAGE=https://userbase.kde.org/KuickShow
-IUSE=debug +handbook
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=media-libs/imlib kde-frameworks/oxygen-icons dev-lang/perl >=dev-qt/designer-4.8.5:4 >=dev-qt/qtcore-4.8.5:4[ssl] >=dev-qt/qtdbus-4.8.5:4 >=dev-qt/qtgui-4.8.5:4[accessibility,dbus(+)] >=dev-qt/qtscript-4.8.5:4 >=dev-qt/qtsvg-4.8.5:4 >=dev-qt/qttest-4.8.5:4 kde-frameworks/kdelibs:4
-SLOT=4
-SRC_URI=mirror://kde/Attic/4.4.0/src/extragear/kuickshow-0.9.1-kde4.4.0.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde4-base	18e8aba8f8143fa51dc0f48b9d19712e	kde4-functions	5d5c723ca3cbd3a92b826a68c3729969	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2858be985b4f4c061908e25b0845d8d8
diff --git a/metadata/md5-cache/media-gfx/kxstitch-2.0.0 b/metadata/md5-cache/media-gfx/kxstitch-2.0.0
index 94596c2c8d70..4e3f4f0f27b2 100644
--- a/metadata/md5-cache/media-gfx/kxstitch-2.0.0
+++ b/metadata/md5-cache/media-gfx/kxstitch-2.0.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-gfx/imagemagick[cxx] x11-libs/libX11 !media-gfx/kxstitch:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kxstitch/2.0.0/src/kxstitch-2.0.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f1552ceba0038a1bc114f4e60631bf8c
diff --git a/metadata/md5-cache/media-gfx/kxstitch-2.1.0 b/metadata/md5-cache/media-gfx/kxstitch-2.1.0
new file mode 100644
index 000000000000..13552581d9de
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/kxstitch-2.1.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install nofetch postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-gfx/imagemagick[cxx] x11-libs/libX11 sys-devel/gettext sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info >=kde-frameworks/extra-cmake-modules-5.40.0:5 handbook? ( >=kde-frameworks/kdoctools-5.40.0:5 ) >=dev-qt/qtcore-5.7.1:5 dev-util/desktop-file-utils app-arch/xz-utils
+DESCRIPTION=Program to create cross stitch patterns
+EAPI=6
+HOMEPAGE=https://userbase.kde.org/KXStitch
+IUSE=debug +handbook
+KEYWORDS=~amd64
+LICENSE=GPL-2+
+RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-gfx/imagemagick[cxx] x11-libs/libX11 !media-gfx/kxstitch:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
+SLOT=5
+SRC_URI=mirror://kde/stable/kxstitch/2.1.0/kxstitch-2.1.0.tar.xz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f216cc7dd140b9825c87c39c2c7dae36
diff --git a/metadata/md5-cache/media-gfx/librecad-2.1.3-r1 b/metadata/md5-cache/media-gfx/librecad-2.1.3-r1
deleted file mode 100644
index 78de7089e36f..000000000000
--- a/metadata/md5-cache/media-gfx/librecad-2.1.3-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qthelp:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost:= dev-cpp/muParser media-libs/freetype:2
-DESCRIPTION=Generic 2D CAD program
-EAPI=5
-HOMEPAGE=http://www.librecad.org/
-IUSE=3d debug doc tools qt4 +qt5
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qthelp:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost:= dev-cpp/muParser media-libs/freetype:2
-REQUIRED_USE=|| ( qt4 qt5 )
-SLOT=0
-SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.1.3.zip -> librecad-2.1.3.zip
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=106464523f817034ba5fbfdce28034c5
diff --git a/metadata/md5-cache/media-gfx/librecad-2.1.3-r2 b/metadata/md5-cache/media-gfx/librecad-2.1.3-r2
index 7a736a2db6fb..f2a26c12d8d7 100644
--- a/metadata/md5-cache/media-gfx/librecad-2.1.3-r2
+++ b/metadata/md5-cache/media-gfx/librecad-2.1.3-r2
@@ -1,14 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost:= dev-cpp/muParser media-libs/freetype:2
+DEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/freetype:2
 DESCRIPTION=Generic 2D CAD program
 EAPI=5
 HOMEPAGE=http://www.librecad.org/
-IUSE=3d debug doc tools qt4 +qt5
-KEYWORDS=~amd64 x86 ~amd64-linux ~x86-linux
+IUSE=3d debug doc tools
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost:= dev-cpp/muParser media-libs/freetype:2
-REQUIRED_USE=qt5
+RDEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/freetype:2
 SLOT=0
 SRC_URI=https://github.com/LibreCAD/LibreCAD/archive/2.1.3.zip -> librecad-2.1.3.zip
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=89b555a80306c543b2fdb05332f5901a
+_md5_=1e65756bed736b8c85ad140a6c86da43
diff --git a/metadata/md5-cache/media-gfx/librecad-9999 b/metadata/md5-cache/media-gfx/librecad-9999
index 8799076ceba3..fb0d55a82466 100644
--- a/metadata/md5-cache/media-gfx/librecad-9999
+++ b/metadata/md5-cache/media-gfx/librecad-9999
@@ -1,12 +1,11 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qthelp:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost dev-cpp/muParser media-libs/freetype >=dev-vcs/git-1.8.2.1
+DEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/freetype:2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Generic 2D CAD program
 EAPI=5
 HOMEPAGE=http://www.librecad.org/
-IUSE=3d debug doc tools qt4 +qt5
+IUSE=3d debug doc tools
 LICENSE=GPL-2
-RDEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qthelp:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 ) dev-libs/boost dev-cpp/muParser media-libs/freetype
-REQUIRED_USE=|| ( qt4 qt5 )
+RDEPEND=dev-cpp/muParser dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtprintsupport:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/freetype:2
 SLOT=0
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=985f17112034ce2a176418a0419ff6b0
+_md5_=20cdad17da8f8f7b11158aff09e6759e
diff --git a/metadata/md5-cache/media-gfx/meshlab-2016.12-r2 b/metadata/md5-cache/media-gfx/meshlab-2016.12-r2
new file mode 100644
index 000000000000..687e8ba258ed
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/meshlab-2016.12-r2
@@ -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	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e0e2c71c95ceed908d3664ce0a8d4cbb
diff --git a/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1 b/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1
index daa38ae5aa49..dc9592795e5a 100644
--- a/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1
+++ b/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1
@@ -1,11 +1,11 @@
 DEFINED_PHASES=-
-DEPEND=>=media-libs/libopenraw-0.0.9[gtk] x11-libs/gtk+:2 !media-gfx/gnome-raw-thumbnailer virtual/pkgconfig
+DEPEND=~media-libs/libopenraw-0.0.9[gtk] x11-libs/gtk+:2 !media-gfx/gnome-raw-thumbnailer virtual/pkgconfig
 DESCRIPTION=A lightweight and fast raw image thumbnailer
 EAPI=4
 HOMEPAGE=https://github.com/erlendd/raw-thumbnailer
 KEYWORDS=alpha amd64 arm hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libopenraw-0.0.9[gtk] x11-libs/gtk+:2 !media-gfx/gnome-raw-thumbnailer
+RDEPEND=~media-libs/libopenraw-0.0.9[gtk] x11-libs/gtk+:2 !media-gfx/gnome-raw-thumbnailer
 SLOT=0
 SRC_URI=https://raw-thumbnailer.googlecode.com/files/raw-thumbnailer-0.2.1.tar.gz
-_md5_=e04b75c308d30332a46948ed370da8cb
+_md5_=beee24c22a07ceb4aadce5233e5bfae4
diff --git a/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1-r1 b/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1-r1
new file mode 100644
index 000000000000..345a0d2c993d
--- /dev/null
+++ b/metadata/md5-cache/media-gfx/raw-thumbnailer-0.2.1-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=>=media-libs/libopenraw-0.1:=[gtk] x11-libs/gtk+:2 !media-gfx/gnome-raw-thumbnailer virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A lightweight and fast raw image thumbnailer
+EAPI=6
+HOMEPAGE=https://github.com/erlendd/raw-thumbnailer
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libopenraw-0.1:=[gtk] x11-libs/gtk+:2 !media-gfx/gnome-raw-thumbnailer
+SLOT=0
+SRC_URI=https://raw-thumbnailer.googlecode.com/files/raw-thumbnailer-0.2.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=aca41c79925421631cd47f6b9c34a5af
diff --git a/metadata/md5-cache/media-gfx/symboleditor-2.0.0 b/metadata/md5-cache/media-gfx/symboleditor-2.0.0
index d90028b1041b..58abe73a8d2b 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.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !media-gfx/symboleditor:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/symboleditor/2.0.0/src/SymbolEditor-2.0.0.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=096fa8c2f08cd4a870cc12b9e93ba8b5
diff --git a/metadata/md5-cache/media-gfx/xfig-3.2.6a b/metadata/md5-cache/media-gfx/xfig-3.2.6a
index b2d96a55a32e..b19c81ba83b9 100644
--- a/metadata/md5-cache/media-gfx/xfig-3.2.6a
+++ b/metadata/md5-cache/media-gfx/xfig-3.2.6a
@@ -4,9 +4,9 @@ DESCRIPTION=A menu-driven tool to draw and manipulate objects interactively in a
 EAPI=6
 HOMEPAGE=http://mcj.sourceforge.net/
 IUSE=jpeg nls postscript
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ppc ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=x11-libs/libXaw x11-libs/libXp x11-libs/libXaw3d x11-libs/libXi x11-libs/libXt media-libs/libpng:0= media-fonts/font-misc-misc media-fonts/urw-fonts >=media-gfx/transfig-3.2.5-r1 media-libs/netpbm jpeg? ( virtual/jpeg:0= ) nls? ( x11-libs/libXaw3d[unicode] ) postscript? ( app-text/ghostscript-gpl )
 SLOT=0
 SRC_URI=mirror://sourceforge/mcj/xfig-full-3.2.6a.tar.xz
-_md5_=97bd0b1d0847739ab086dbc5829f2090
+_md5_=b1e0cdf83d35b3eaba1ea9fb82a83376
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 49ba8f390a83..ad34d2e9cf67 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/babl-0.1.38 b/metadata/md5-cache/media-libs/babl-0.1.38
index bb4c76a4185b..de44293ae216 100644
--- a/metadata/md5-cache/media-libs/babl-0.1.38
+++ b/metadata/md5-cache/media-libs/babl-0.1.38
@@ -4,9 +4,9 @@ DESCRIPTION=A dynamic, any to any, pixel format conversion library
 EAPI=6
 HOMEPAGE=http://www.gegl.org/babl/
 IUSE=altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-3
 SLOT=0
 SRC_URI=http://ftp.gimp.org/pub/babl/0.1/babl-0.1.38.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=bd2909262c11a048c27c22508483beb8
+_md5_=5c5f1e4c900f1543e42a9cf9c9bf5e0b
diff --git a/metadata/md5-cache/media-libs/ctl-1.5.2 b/metadata/md5-cache/media-libs/ctl-1.5.2
deleted file mode 100644
index 6ea1c7c94cc8..000000000000
--- a/metadata/md5-cache/media-libs/ctl-1.5.2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/ilmbase:= media-libs/openexr:= media-libs/tiff:= !media-libs/openexr_ctl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=AMPAS' Color Transformation Language
-EAPI=6
-HOMEPAGE=https://github.com/ampas/CTL
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=AMPAS
-RDEPEND=media-libs/ilmbase:= media-libs/openexr:= media-libs/tiff:= !media-libs/openexr_ctl
-SLOT=0
-SRC_URI=https://github.com/ampas/CTL/archive/ctl-1.5.2.tar.gz -> ctl-1.5.2.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=957b5ffa53643a56411f0b9a83be4b04
diff --git a/metadata/md5-cache/media-libs/ctl-1.5.2-r1 b/metadata/md5-cache/media-libs/ctl-1.5.2-r1
new file mode 100644
index 000000000000..4d1db72d13e7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/ctl-1.5.2-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=media-libs/ilmbase:= media-libs/openexr:= media-libs/tiff:= !media-libs/openexr_ctl virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=AMPAS' Color Transformation Language
+EAPI=6
+HOMEPAGE=https://github.com/ampas/CTL
+KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
+LICENSE=AMPAS
+RDEPEND=media-libs/ilmbase:= media-libs/openexr:= media-libs/tiff:= !media-libs/openexr_ctl
+SLOT=0
+SRC_URI=https://github.com/ampas/CTL/archive/ctl-1.5.2.tar.gz -> ctl-1.5.2.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0d04922f16322521329c6345d1500d50
diff --git a/metadata/md5-cache/media-libs/gegl-0.3.26 b/metadata/md5-cache/media-libs/gegl-0.3.26
index 16a82fdead3a..2413dd0e446a 100644
--- a/metadata/md5-cache/media-libs/gegl-0.3.26
+++ b/metadata/md5-cache/media-libs/gegl-0.3.26
@@ -4,11 +4,11 @@ DESCRIPTION=A graph based image processing framework
 EAPI=6
 HOMEPAGE=http://www.gegl.org/
 IUSE=cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=dev-libs/glib-2.44:2 dev-libs/json-glib >=media-libs/babl-0.1.38 sys-libs/zlib >=x11-libs/gdk-pixbuf-2.32:2 x11-libs/pango cairo? ( >=x11-libs/cairo-1.12.2 ) ffmpeg? ( >=media-video/ffmpeg-2.8:0= ) introspection? ( >=dev-libs/gobject-introspection-1.32:= ) virtual/jpeg:0= jpeg2k? ( >=media-libs/jasper-1.900.1:= ) lcms? ( >=media-libs/lcms-2.8:2 ) lensfun? ( >=media-libs/lensfun-0.2.5 ) openexr? ( >=media-libs/openexr-1.6.1:= ) >=media-libs/libpng-1.6.0:0= raw? ( >=media-libs/libraw-0.15.4:0= ) sdl? ( >=media-libs/libsdl-1.2.0 ) svg? ( >=gnome-base/librsvg-2.40.6:2 ) tiff? ( >=media-libs/tiff-4:0 ) umfpack? ( sci-libs/umfpack ) v4l? ( >=media-libs/libv4l-1.0.1 ) webp? ( >=media-libs/libwebp-0.5.0:= )
 REQUIRED_USE=svg? ( cairo ) vala? ( introspection )
 SLOT=0.3
 SRC_URI=http://download.gimp.org/pub/gegl/0.3/gegl-0.3.26.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=133f9aa4e0b6aca1998943330fd69be0
+_md5_=fe5ca8c606b007076961154a867abfa5
diff --git a/metadata/md5-cache/media-libs/imlib-1.9.15-r4 b/metadata/md5-cache/media-libs/imlib-1.9.15-r4
deleted file mode 100644
index 4ac4f59011db..000000000000
--- a/metadata/md5-cache/media-libs/imlib-1.9.15-r4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/tiff-3.9.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/giflib-4.1.6-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.2.51[abi_x86_32(-)?,abi_x86_64(-)?,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-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(-)?] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-gtklibs-20140406 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Image loading and rendering library
-EAPI=4
-HOMEPAGE=http://ftp.acc.umu.se/pub/GNOME/sources/imlib/1.9/
-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 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=>=media-libs/tiff-3.9.7-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/giflib-4.1.6-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.2.51[abi_x86_32(-)?,abi_x86_64(-)?,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-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(-)?] >=x11-libs/libICE-1.0.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libSM-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=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(-)?] abi_x86_32? ( !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] !<=app-emulation/emul-linux-x86-gtklibs-20140406 )
-SLOT=0
-SRC_URI=mirror://gnome/sources/imlib/1.9/imlib-1.9.15.tar.bz2 mirror://gentoo/gtk-1-for-imlib.m4.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=569fc3cd05ecb0b15c8bbf5257e66bd8
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.2.13 b/metadata/md5-cache/media-libs/libdvdcss-1.2.13
deleted file mode 100644
index d06fc6357c31..000000000000
--- a/metadata/md5-cache/media-libs/libdvdcss-1.2.13
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A portable abstraction library for DVD decryption
-EAPI=5
-HOMEPAGE=https://www.videolan.org/developers/libdvdcss.html
-IUSE=doc static-libs
-KEYWORDS=alpha amd64 arm 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-2
-SLOT=1.2
-SRC_URI=https://www.videolan.org/pub/libdvdcss/1.2.13/libdvdcss-1.2.13.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=d927ef770919d9869edeaa3535545df7
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.2.13-r1 b/metadata/md5-cache/media-libs/libdvdcss-1.2.13-r1
deleted file mode 100644
index 3b4ea3823c58..000000000000
--- a/metadata/md5-cache/media-libs/libdvdcss-1.2.13-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A portable abstraction library for DVD decryption
-EAPI=5
-HOMEPAGE=https://www.videolan.org/developers/libdvdcss.html
-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 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-2
-SLOT=1.2
-SRC_URI=https://www.videolan.org/pub/libdvdcss/1.2.13/libdvdcss-1.2.13.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ab33a9495b7803be81fd556434175dda
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.3.99 b/metadata/md5-cache/media-libs/libdvdcss-1.3.99
deleted file mode 100644
index 26ded3e61761..000000000000
--- a/metadata/md5-cache/media-libs/libdvdcss-1.3.99
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422
-DESCRIPTION=A portable abstraction library for DVD decryption
-EAPI=5
-HOMEPAGE=https://www.videolan.org/developers/libdvdcss.html
-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 ~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-2
-SLOT=1.2
-SRC_URI=https://download.videolan.org/pub/libdvdcss/1.3.99/libdvdcss-1.3.99.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f7298f590868d6ce938acf803d3e964c
diff --git a/metadata/md5-cache/media-libs/libdvdcss-1.4.1 b/metadata/md5-cache/media-libs/libdvdcss-1.4.1
new file mode 100644
index 000000000000..5a1321eccd69
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libdvdcss-1.4.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( app-doc/doxygen ) >=app-portage/elt-patches-20170422
+DESCRIPTION=A portable abstraction library for DVD decryption
+EAPI=5
+HOMEPAGE=https://www.videolan.org/developers/libdvdcss.html
+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 ~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-2
+SLOT=1.2
+SRC_URI=https://download.videolan.org/pub/libdvdcss/1.4.1/libdvdcss-1.4.1.tar.bz2
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-multilib	f4848d9634439c7203cb7dd3b9650fff	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=74b364fa018663760038838d67607153
diff --git a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0 b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
index 3a5a97aae970..e960bd1fee50 100644
--- a/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
+++ b/metadata/md5-cache/media-libs/libqaccessibilityclient-0.2.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/libqaccessibilityclient/libqaccessibilityclient-0.2.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0ca9df105ad380c51356cf96084edb67
diff --git a/metadata/md5-cache/media-libs/libv4l-1.14.1 b/metadata/md5-cache/media-libs/libv4l-1.14.1
new file mode 100644
index 000000000000..1d9c5875f067
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libv4l-1.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=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(-)?] ) virtual/libudev !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2 sys-devel/gettext virtual/os-headers virtual/pkgconfig >=app-portage/elt-patches-20170422
+DESCRIPTION=Separate libraries ebuild from upstream v4l-utils package
+EAPI=6
+HOMEPAGE=https://git.linuxtv.org/v4l-utils.git
+IUSE=jpeg abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1+
+RDEPEND=jpeg? ( >=virtual/jpeg-0-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) virtual/libudev !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
+SLOT=0/0
+SRC_URI=https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.14.1.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=fffb9b27435df073cb9b896e38ff1ad1
diff --git a/metadata/md5-cache/media-libs/openal-1.17.2 b/metadata/md5-cache/media-libs/openal-1.17.2
deleted file mode 100644
index 0ba5d2355e0b..000000000000
--- a/metadata/md5-cache/media-libs/openal-1.17.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A software implementation of the OpenAL 3D audio API
-EAPI=5
-HOMEPAGE=http://kcat.strangesoft.net/openal.html
-IUSE=alsa coreaudio debug jack oss portaudio pulseaudio qt4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2+
-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(-)?] ) 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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.17.2.tar.bz2
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7a5b503ec577e555bd19a0b6bffa2a4d
diff --git a/metadata/md5-cache/media-libs/openal-1.18.1 b/metadata/md5-cache/media-libs/openal-1.18.1
deleted file mode 100644
index b19313a6b1c9..000000000000
--- a/metadata/md5-cache/media-libs/openal-1.18.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A software implementation of the OpenAL 3D audio API
-EAPI=6
-HOMEPAGE=http://kcat.strangesoft.net/openal.html
-IUSE=alsa coreaudio debug jack oss portaudio pulseaudio qt4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_arm_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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2+
-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(-)?] ) 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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.18.1.tar.bz2
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=851bece28c07fd1ecaf69b5b963c114e
diff --git a/metadata/md5-cache/media-libs/openal-1.18.2 b/metadata/md5-cache/media-libs/openal-1.18.2
deleted file mode 100644
index 52dbf994410c..000000000000
--- a/metadata/md5-cache/media-libs/openal-1.18.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A software implementation of the OpenAL 3D audio API
-EAPI=6
-HOMEPAGE=http://kcat.strangesoft.net/openal.html
-IUSE=alsa coreaudio debug jack oss portaudio pulseaudio qt4 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_arm_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 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
-LICENSE=LGPL-2+
-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(-)?] ) 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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) qt4? ( dev-qt/qtgui:4 dev-qt/qtcore:4 ) abi_x86_32? ( !<app-emulation/emul-linux-x86-sdl-20131008-r1 !app-emulation/emul-linux-x86-sdl[-abi_x86_32(-)] )
-SLOT=0
-SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.18.2.tar.bz2
-_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=851bece28c07fd1ecaf69b5b963c114e
diff --git a/metadata/md5-cache/media-libs/openal-1.18.2-r1 b/metadata/md5-cache/media-libs/openal-1.18.2-r1
new file mode 100644
index 000000000000..03a142b8ad78
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openal-1.18.2-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) oss? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A software implementation of the OpenAL 3D audio API
+EAPI=6
+HOMEPAGE=http://kcat.strangesoft.net/openal.html
+IUSE=alsa coreaudio debug jack oss portaudio pulseaudio qt5 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_arm_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 ~mips ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=LGPL-2+
+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(-)?] ) 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(-)?] ) portaudio? ( >=media-libs/portaudio-19_pre20111121-r1[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 )
+SLOT=0
+SRC_URI=http://kcat.strangesoft.net/openal-releases/openal-soft-1.18.2.tar.bz2
+_eclasses_=cmake-multilib	7bc2cc09a4a5082b915541d447be8e5e	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4046beb41dd9858a8f20e944189e97b9
diff --git a/metadata/md5-cache/media-libs/opencolorio-1.0.9_p20170719 b/metadata/md5-cache/media-libs/opencolorio-1.0.9_p20170719
deleted file mode 100644
index ed3128dff286..000000000000
--- a/metadata/md5-cache/media-libs/opencolorio-1.0.9_p20170719
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) >=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml virtual/pkgconfig doc? ( pdf? ( dev-python/sphinx[latex,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) !pdf? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=A color management framework for visual effects and animation
-EAPI=6
-HOMEPAGE=http://opencolorio.org/
-IUSE=doc opengl pdf python cpu_flags_x86_sse2 test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD
-RDEPEND=opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) >=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml
-REQUIRED_USE=doc? ( python ) 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/imageworks/OpenColorIO/archive/7e7f10afce97254cdc1295a3594ddd5e6fb555d6.tar.gz -> opencolorio-1.0.9_p20170719.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=6a9e2acac203267bdec5b78520185d0b
diff --git a/metadata/md5-cache/media-libs/opencolorio-1.1.0 b/metadata/md5-cache/media-libs/opencolorio-1.1.0
new file mode 100644
index 000000000000..f28fb8ee7b33
--- /dev/null
+++ b/metadata/md5-cache/media-libs/opencolorio-1.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) >=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml virtual/pkgconfig doc? ( pdf? ( dev-python/sphinx[latex,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) !pdf? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=A color management framework for visual effects and animation
+EAPI=6
+HOMEPAGE=http://opencolorio.org/
+IUSE=doc opengl pdf python cpu_flags_x86_sse2 test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=opengl? ( media-libs/lcms:2 media-libs/openimageio media-libs/glew:= media-libs/freeglut virtual/opengl ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) >=dev-cpp/yaml-cpp-0.5 dev-libs/tinyxml
+REQUIRED_USE=doc? ( python ) 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/imageworks/OpenColorIO/archive/v1.1.0.tar.gz -> opencolorio-1.1.0.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7b260f4f805978e5ad131e79cf161cf6
diff --git a/metadata/md5-cache/media-libs/openh264-1.4.0-r1 b/metadata/md5-cache/media-libs/openh264-1.4.0-r1
deleted file mode 100644
index 3a727113b26d..000000000000
--- a/metadata/md5-cache/media-libs/openh264-1.4.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-lang/nasm app-arch/unzip
-DESCRIPTION=Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages
-EAPI=5
-HOMEPAGE=http://www.openh264.org/
-IUSE=+plugin 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=amd64 x86
-LICENSE=BSD
-RDEPEND=!<www-client/firefox-38
-RESTRICT=bindist
-SLOT=0
-SRC_URI=https://github.com/cisco/openh264/archive/v1.4.0.tar.gz -> openh264-1.4.0.tar.gz https://github.com/mozilla/gmp-api/archive/Firefox38.tar.gz -> gmp-api-Firefox38.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=cf3b417452dcc2fdd1c909f3df1d0d6f
diff --git a/metadata/md5-cache/media-libs/openh264-1.5.0 b/metadata/md5-cache/media-libs/openh264-1.5.0
deleted file mode 100644
index cef35cb77958..000000000000
--- a/metadata/md5-cache/media-libs/openh264-1.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=abi_x86_32? ( dev-lang/nasm ) abi_x86_64? ( dev-lang/nasm ) app-arch/unzip
-DESCRIPTION=Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages
-EAPI=5
-HOMEPAGE=http://www.openh264.org/
-IUSE=+plugin 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 hppa ia64 ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=!<www-client/firefox-39
-RESTRICT=bindist
-SLOT=0
-SRC_URI=https://github.com/cisco/openh264/archive/v1.5.0.tar.gz -> openh264-1.5.0.tar.gz https://github.com/mozilla/gmp-api/archive/Firefox39.tar.gz -> gmp-api-Firefox39.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=08559d5e2104a7803804f850b1158ac9
diff --git a/metadata/md5-cache/media-libs/openh264-1.7.0 b/metadata/md5-cache/media-libs/openh264-1.7.0
deleted file mode 100644
index f2db6b6f7daf..000000000000
--- a/metadata/md5-cache/media-libs/openh264-1.7.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=abi_x86_32? ( dev-lang/nasm ) abi_x86_64? ( dev-lang/nasm ) app-arch/unzip
-DESCRIPTION=Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages
-EAPI=5
-HOMEPAGE=http://www.openh264.org/
-IUSE=+plugin 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 ppc ppc64 x86
-LICENSE=BSD
-RDEPEND=!<www-client/firefox-39
-RESTRICT=bindist
-SLOT=0
-SRC_URI=https://github.com/cisco/openh264/archive/v1.7.0.tar.gz -> openh264-1.7.0.tar.gz https://github.com/mozilla/gmp-api/archive/Firefox39.tar.gz -> gmp-api-Firefox39.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=52842d768344aa4f2bd923785712f1ca
diff --git a/metadata/md5-cache/media-libs/openh264-1.7.0-r1 b/metadata/md5-cache/media-libs/openh264-1.7.0-r1
new file mode 100644
index 000000000000..6214eb7eb0b0
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openh264-1.7.0-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=abi_x86_32? ( dev-lang/nasm ) abi_x86_64? ( dev-lang/nasm ) app-arch/unzip
+DESCRIPTION=Cisco OpenH264 library and Gecko Media Plugin for Mozilla packages
+EAPI=5
+HOMEPAGE=http://www.openh264.org/
+IUSE=+plugin 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 ppc ppc64 x86
+LICENSE=BSD
+RDEPEND=!<www-client/firefox-39
+RESTRICT=bindist
+SLOT=0
+SRC_URI=https://github.com/cisco/openh264/archive/v1.7.0.tar.gz -> openh264-1.7.0.tar.gz https://github.com/mozilla/gmp-api/archive/Firefox39.tar.gz -> gmp-api-Firefox39.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	mozextension	42c5ed513e5325a5d0629ad85bb27c23	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	nsplugins	2049586e425364a1c5bdb004205d1758	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=6a3990a4fce2bf9cf75f8f3ca1fceb18
diff --git a/metadata/md5-cache/media-libs/simage-1.7.0-r1 b/metadata/md5-cache/media-libs/simage-1.7.0-r1
index 76ff2bf17a50..bb1359788cd1 100644
--- a/metadata/md5-cache/media-libs/simage-1.7.0-r1
+++ b/metadata/md5-cache/media-libs/simage-1.7.0-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Image and video texturing library
 EAPI=6
 HOMEPAGE=https://bitbucket.org/Coin3D/simage
 IUSE=debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=public-domain mpeg2enc
 RDEPEND=gif? ( media-libs/giflib ) jpeg? ( virtual/jpeg:0= ) jpeg2k? ( media-libs/jasper ) png? ( media-libs/libpng:0= ) sndfile? ( media-libs/libsndfile ) tiff? ( media-libs/tiff:0= ) vorbis? ( media-libs/libogg media-libs/libvorbis ) zlib? ( sys-libs/zlib )
 RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=https://bitbucket.org/Coin3D/coin/downloads/simage-1.7.0.tar.gz
-_md5_=c7fe658908bdcef1a1f49832d3b0a9e2
+_md5_=d531b966d55f8bcc2cb580a2817b3bf8
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.9 b/metadata/md5-cache/media-libs/xine-lib-1.2.9
new file mode 100644
index 000000000000..ba891130b04b
--- /dev/null
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=nls? ( virtual/libintl ) dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) !libav? ( media-video/ffmpeg:0= ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) nls? ( sys-devel/gettext ) app-arch/xz-utils virtual/pkgconfig >=sys-devel/libtool-2.2.6b oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-libs/libXt x11-proto/xf86vidmodeproto x11-proto/xproto ) xv? ( x11-proto/videoproto ) xvmc? ( x11-proto/videoproto ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422
+DESCRIPTION=Core libraries for Xine movie player
+EAPI=6
+HOMEPAGE=http://xine.sourceforge.net/
+IUSE=a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc nls
+KEYWORDS=~amd64 ~arm64 ~hppa ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=nls? ( virtual/libintl ) dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) !libav? ( media-video/ffmpeg:0= ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
+REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
+SLOT=1
+SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.9.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=2ac7bee174d2872cb1eee897a74b43b7
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.9999 b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
index 5b0a35a163c9..c42c81061560 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.9999
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=virtual/libintl dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib !libav? ( media-video/ffmpeg:0= ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) sys-devel/gettext app-arch/xz-utils virtual/pkgconfig >=sys-devel/libtool-2.2.6b oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-libs/libXt x11-proto/xf86vidmodeproto x11-proto/xproto ) xv? ( x11-proto/videoproto ) xvmc? ( x11-proto/videoproto ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/mercurial
+DEPEND=virtual/libintl dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) !libav? ( media-video/ffmpeg:0= ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC ) sys-devel/gettext app-arch/xz-utils virtual/pkgconfig >=sys-devel/libtool-2.2.6b oss? ( virtual/os-headers ) v4l? ( virtual/os-headers ) X? ( x11-libs/libXt x11-proto/xf86vidmodeproto x11-proto/xproto ) xv? ( x11-proto/videoproto ) xvmc? ( x11-proto/videoproto ) xinerama? ( x11-proto/xineramaproto ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 dev-vcs/mercurial
 DESCRIPTION=Core libraries for Xine movie player
 EAPI=6
 HOMEPAGE=http://xine.sourceforge.net/
 IUSE=a52 aac aalib +alsa altivec bluray +css directfb dts dvb dxr3 fbcon flac fusionsound gtk imagemagick ipv6 jack jpeg libav libcaca mad +mmap mng modplug musepack opengl oss pulseaudio samba sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack +X +xcb xinerama +xv xvmc
 LICENSE=GPL-2
-RDEPEND=virtual/libintl dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib !libav? ( media-video/ffmpeg:0= ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
+RDEPEND=virtual/libintl dev-libs/libxdg-basedir media-libs/libdvdnav sys-libs/zlib virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) directfb? ( dev-libs/DirectFB ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) fusionsound? ( >=dev-libs/DirectFB-1.7.1[fusionsound] ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( >=media-sound/jack-audio-connection-kit-0.100 ) jpeg? ( virtual/jpeg:0 ) !libav? ( media-video/ffmpeg:0= ) libav? ( media-libs/libpostproc:0= media-video/libav:0= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva[X,opengl] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) X? ( x11-libs/libX11 x11-libs/libXext ) xcb? ( x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mercurial	0bdc9ce12272665fa3749c8408b4d389	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=aa8d8891ba67123ee81f8bea2136376a
+_md5_=373b2f4d4a9b5c22486f44b0cb83cc04
diff --git a/metadata/md5-cache/media-plugins/Manifest.gz b/metadata/md5-cache/media-plugins/Manifest.gz
index 215457ebcebc..5f650e9b7e39 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/kipi-plugins-5.5.0 b/metadata/md5-cache/media-plugins/kipi-plugins-5.5.0
index 2469ba06d942..5ab02c6b9a6b 100644
--- a/metadata/md5-cache/media-plugins/kipi-plugins-5.5.0
+++ b/metadata/md5-cache/media-plugins/kipi-plugins-5.5.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkipi-14.12.0:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 flashexport? ( >=kde-frameworks/karchive-5.40.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.40.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !media-plugins/kipi-plugins:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.5.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=15c90518768d93b179b14e37112d6666
diff --git a/metadata/md5-cache/media-plugins/kipi-plugins-5.7.0 b/metadata/md5-cache/media-plugins/kipi-plugins-5.7.0
index 5f7d6b759153..67213746d913 100644
--- a/metadata/md5-cache/media-plugins/kipi-plugins-5.7.0
+++ b/metadata/md5-cache/media-plugins/kipi-plugins-5.7.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-apps/libkipi-14.12.0:5= >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 flashexport? ( >=kde-frameworks/karchive-5.40.0:5 ) mediawiki? ( net-libs/libmediawiki:5 ) remotestorage? ( >=kde-frameworks/kio-5.40.0:5 ) vkontakte? ( net-libs/libkvkontakte:5 ) !media-plugins/kipi-plugins:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/digikam/digikam-5.7.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=54fbcde8179da8073b6feb824ff71e40
diff --git a/metadata/md5-cache/media-radio/Manifest.gz b/metadata/md5-cache/media-radio/Manifest.gz
index eb734c9fb0f9..f539d7f8b824 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/fldigi-4.0.14 b/metadata/md5-cache/media-radio/fldigi-4.0.14
new file mode 100644
index 000000000000..d104db2a1671
--- /dev/null
+++ b/metadata/md5-cache/media-radio/fldigi-4.0.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl >=media-libs/portaudio-19_pre20071207 hamlib? ( media-libs/hamlib ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10 nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=Sound card based multimode software modem for Amateur Radio use
+EAPI=5
+HOMEPAGE=http://www.w1hkj.com
+IUSE=hamlib nls pulseaudio
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl >=media-libs/portaudio-19_pre20071207 hamlib? ( media-libs/hamlib ) pulseaudio? ( media-sound/pulseaudio ) >=media-libs/libsndfile-1.0.10
+SLOT=0
+SRC_URI=mirror://sourceforge/fldigi/fldigi-4.0.14.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=601ebb41c26c9a7b03ae8be831485930
diff --git a/metadata/md5-cache/media-radio/flrig-1.3.38 b/metadata/md5-cache/media-radio/flrig-1.3.38
new file mode 100644
index 000000000000..c125a585ec66
--- /dev/null
+++ b/metadata/md5-cache/media-radio/flrig-1.3.38
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install prepare
+DEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils sys-devel/gettext >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Transceiver control program for Amateur Radio use
+EAPI=5
+HOMEPAGE=http://www.w1hkj.com/flrig-help/index.html
+IUSE=nls
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=x11-libs/libX11 x11-libs/fltk:1 x11-misc/xdg-utils
+SLOT=0
+SRC_URI=mirror://sourceforge/fldigi/flrig-1.3.38.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=4a43d7207588bf29a0db799c98ca0e3f
diff --git a/metadata/md5-cache/media-radio/qsstv-9.2.6 b/metadata/md5-cache/media-radio/qsstv-9.2.6
index 3609749497a6..30ea49328562 100644
--- a/metadata/md5-cache/media-radio/qsstv-9.2.6
+++ b/metadata/md5-cache/media-radio/qsstv-9.2.6
@@ -3,10 +3,10 @@ DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-
 DESCRIPTION=Amateur radio SSTV software
 EAPI=6
 HOMEPAGE=http://users.telenet.be/on4qz/
-KEYWORDS=~amd64 x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 media-libs/hamlib media-libs/openjpeg:2 media-libs/alsa-lib media-sound/pulseaudio media-libs/libv4l sci-libs/fftw:3.0= x11-misc/xdg-utils
 SLOT=0
 SRC_URI=http://users.telenet.be/on4qz/qsstv/downloads/qsstv_9.2.6.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=82f81973712a7209e8cffaa276e27aae
+_md5_=102581b71b90b12238823f29fc56b111
diff --git a/metadata/md5-cache/media-radio/svxlink-17.12.1 b/metadata/md5-cache/media-radio/svxlink-17.12.1
new file mode 100644
index 000000000000..c874f8206c1b
--- /dev/null
+++ b/metadata/md5-cache/media-radio/svxlink-17.12.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-lang/tcl:0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-sound/gsm dev-libs/libgcrypt:0 media-libs/speex media-libs/opus dev-libs/libsigc++:2 dev-libs/popt virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 virtual/pkgconfig
+DESCRIPTION=Multi Purpose Voice Services System, including Qtel for EchoLink
+EAPI=6
+HOMEPAGE=http://www.svxlink.org
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=dev-lang/tcl:0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/alsa-lib media-sound/gsm dev-libs/libgcrypt:0 media-libs/speex media-libs/opus dev-libs/libsigc++:2 dev-libs/popt
+SLOT=0
+SRC_URI=https://github.com/sm0svx/svxlink/archive/17.12.1.tar.gz -> svxlink-17.12.1.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4e360f688ea74609dd6ab11e480d0808
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index f7f138d215e5..966cab0b1735 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/audex-0.95_pre20170727 b/metadata/md5-cache/media-sound/audex-0.95_pre20170727
index 1bd9ae878b62..36a3a2081f6c 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.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-apps/libkcddb-14.12.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-sound/cdparanoia !media-sound/audex:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/audex-0.95_pre20170727.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=e6e1204b0330f02df081a493aacd3e07
diff --git a/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806 b/metadata/md5-cache/media-sound/kaudiocreator-1.3_p20170806
index bb9537ff2a2d..bb14dfdb997c 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.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-apps/libkcddb-14.12.0:5 >=kde-apps/libkcompactdisc-14.12.0:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 media-libs/libdiscid media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 >=kde-apps/audiocd-kio-14.12.0:5 !media-sound/kaudiocreator:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/distfiles/kaudiocreator-1.3_p20170806.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=3ae24318560fdaf05599d14215feb15f
diff --git a/metadata/md5-cache/media-sound/kid3-3.5.0 b/metadata/md5-cache/media-sound/kid3-3.5.0
index a444ddf012db..1f0c9311a858 100644
--- a/metadata/md5-cache/media-sound/kid3-3.5.0
+++ b/metadata/md5-cache/media-sound/kid3-3.5.0
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.
 REQUIRED_USE=flac? ( vorbis )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.5.0.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=14fa4a648645abcdaebb98090a3c7377
diff --git a/metadata/md5-cache/media-sound/kid3-3.5.1 b/metadata/md5-cache/media-sound/kid3-3.5.1
index 1e06a41d4cee..60a34524993d 100644
--- a/metadata/md5-cache/media-sound/kid3-3.5.1
+++ b/metadata/md5-cache/media-sound/kid3-3.5.1
@@ -10,5 +10,5 @@ RDEPEND=>=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.
 REQUIRED_USE=flac? ( vorbis )
 SLOT=5
 SRC_URI=mirror://sourceforge/kid3/kid3-3.5.1.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=01c1192c835300a5fbb1fd3993967f09
diff --git a/metadata/md5-cache/media-sound/qtagger-1.0.1-r2 b/metadata/md5-cache/media-sound/qtagger-1.0.1-r2
deleted file mode 100644
index 39362c0050eb..000000000000
--- a/metadata/md5-cache/media-sound/qtagger-1.0.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/taglib sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Simple Qt4 ID3v2 tag editor
-EAPI=5
-HOMEPAGE=https://github.com/DOOMer/qtagger
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 media-libs/taglib
-SLOT=0
-SRC_URI=https://github.com/DOOMer/qtagger/archive/v1.0.1.tar.gz -> qtagger-1.0.1.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9de7554732caaf95deb9b933188216a7
diff --git a/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402 b/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
index e7880c7a7843..227e36a5fef5 100644
--- a/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
+++ b/metadata/md5-cache/media-sound/qtagger-1.0.1_p20150402
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/taglib sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Simple Qt4 ID3v2 tag editor
+DESCRIPTION=Simple Qt5 ID3v2 tag editor
 EAPI=6
 HOMEPAGE=https://github.com/DOOMer/qtagger
 KEYWORDS=~amd64 ~x86
@@ -9,4 +9,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 media-libs/taglib
 SLOT=0
 SRC_URI=https://github.com/DOOMer/qtagger/archive/0e74fe022ddbb689f7bae0460a21be303114029b.tar.gz -> qtagger-1.0.1_p20150402.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=12c9f3f81b79e272b4536c1c0d4f052f
+_md5_=0c6012011bdf321be1c75bcd8d5b2c7b
diff --git a/metadata/md5-cache/media-sound/soundkonverter-3.0.1 b/metadata/md5-cache/media-sound/soundkonverter-3.0.1
index 5ea7caa6c19a..a31d736109b6 100644
--- a/metadata/md5-cache/media-sound/soundkonverter-3.0.1
+++ b/metadata/md5-cache/media-sound/soundkonverter-3.0.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=kde-apps/libkcddb-14.12.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.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	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=66f1c2bd3c6010ecf3bbe46a9e0f694d
diff --git a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20170808 b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20170808
index ed3c17b05fc7..85356ae65db9 100644
--- a/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20170808
+++ b/metadata/md5-cache/media-sound/tomahawk-0.9.0_pre20170808
@@ -9,5 +9,5 @@ LICENSE=GPL-3 BSD
 RDEPEND=>=kde-frameworks/attica-5.40.0 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.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.0.9-r1[qt5(+)] >=media-libs/taglib-1.8.0 media-video/vlc:=[flac,dvbpsi,ffmpeg,mp3] >=net-libs/gnutls-3.2:= x11-libs/libX11 hatchet? ( dev-cpp/websocketpp ) telepathy? ( >=net-libs/telepathy-qt-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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=0
 SRC_URI=https://github.com/tomahawk-player/tomahawk/archive/00f602e10203b76fc28b4615868c567e6bd4ced4.tar.gz -> tomahawk-0.9.0_pre20170808.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=4f42e77b90e858b152bd7d6d42d01b6f
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 9ecaf836f1ad..632d00b4fa8b 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-17.6-r2 b/metadata/md5-cache/media-tv/kodi-17.6-r2
index 9845c1b484ad..927441fd5f4c 100644
--- a/metadata/md5-cache/media-tv/kodi-17.6-r2
+++ b/metadata/md5-cache/media-tv/kodi-17.6-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid 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 x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] !~media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) app-arch/bzip2 app-arch/unzip app-arch/xz-utils app-arch/zip dev-lang/swig dev-libs/crossguid 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 x86? ( dev-lang/nasm ) java? ( virtual/jre ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=Kodi is a free and open source media-player and entertainment hub
 EAPI=6
 HOMEPAGE=https://kodi.tv/ http://kodi.wiki/
 IUSE=airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf java python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] <media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] airplay? ( app-pda/libplist net-libs/shairplay ) alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-0.7.0 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/expat dev-libs/fribidi cec? ( >=dev-libs/libcec-4.0 ) dev-libs/libpcre[cxx] dev-libs/libxml2 >=dev-libs/lzo-2.04 dev-libs/tinyxml[stl] >=dev-libs/yajl-2 dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/libcdio gles? ( media-libs/mesa[gles2] ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts >=media-fonts/noto-20160531 media-fonts/roboto media-libs/fontconfig media-libs/freetype >=media-libs/libass-0.13.4 media-libs/mesa[egl] >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-3.1.11:=[encode,openssl,postproc] !~media-video/ffmpeg-3.4 ) mysql? ( virtual/mysql ) >=net-misc/curl-7.51.0 nfs? ( net-fs/libnfs:= ) opengl? ( media-libs/glu ) !libressl? ( >=dev-libs/openssl-1.0.2j:0= ) libressl? ( dev-libs/libressl:0= ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) sftp? ( net-libs/libssh[sftp] ) sys-libs/zlib udev? ( virtual/udev ) vaapi? ( x11-libs/libva:=[opengl] ) vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] ) X? ( x11-libs/libdrm x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender ) xslt? ( dev-libs/libxslt ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( || ( app-misc/lirc app-misc/inputlircd ) ) !media-tv/xbmc udisks? ( sys-fs/udisks:0 ) upower? ( systemd? ( sys-power/upower ) !systemd? ( || ( sys-power/upower-pm-utils sys-power/upower ) ) )
 REQUIRED_USE=python_targets_python2_7 || ( gles opengl ) gles? ( X ) opengl? ( X ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz -> libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz https://github.com/xbmc/libdvdread/archive/17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz -> libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz https://github.com/xbmc/libdvdnav/archive/43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz -> libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/3.1.11-Krypton-17.5.tar.gz -> ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz ) https://github.com/xbmc/xbmc/archive/17.6-Krypton.tar.gz -> kodi-17.6.tar.gz !java? ( https://github.com/candrews/gentoo-kodi/raw/master/kodi-17.6-generated-addons.tar.xz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e8470a8f28ddabd8f8a0271334bfa554
+_md5_=f65e6fba16d4841fc882502607e2da81
diff --git a/metadata/md5-cache/media-tv/v4l-utils-1.14.1 b/metadata/md5-cache/media-tv/v4l-utils-1.14.1
new file mode 100644
index 000000000000..799e5a9a851d
--- /dev/null
+++ b/metadata/md5-cache/media-tv/v4l-utils-1.14.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=>=media-libs/libv4l-1.14.1 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 virtual/opengl media-libs/alsa-lib ) virtual/libudev !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2 sys-devel/gettext virtual/pkgconfig virtual/pkgconfig
+DESCRIPTION=Separate utilities ebuild from upstream v4l-utils package
+EAPI=6
+HOMEPAGE=http://git.linuxtv.org/v4l-utils.git
+IUSE=qt5
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2+ LGPL-2.1+
+RDEPEND=>=media-libs/libv4l-1.14.1 qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 virtual/opengl media-libs/alsa-lib ) virtual/libudev !media-tv/v4l2-ctl !<media-tv/ivtv-utils-1.4.0-r2
+SLOT=0
+SRC_URI=http://linuxtv.org/downloads/v4l-utils/v4l-utils-1.14.1.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c522d7aae9c17199b4896b7bbcbbf4a1
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 21892dd7a279..1b023bce2b92 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/dvdstyler-2.9.6-r1 b/metadata/md5-cache/media-video/dvdstyler-2.9.6-r1
deleted file mode 100644
index 12519bdb7a3d..000000000000
--- a/metadata/md5-cache/media-video/dvdstyler-2.9.6-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-cdr/dvd+rw-tools-7.1 media-libs/libexif:= >=media-libs/wxsvg-1.5.5:= >=media-video/dvdauthor-0.7.1 >=media-video/xine-ui-0.99.7 virtual/cdrtools libav? ( >=media-video/libav-9:0=[encode] ) !libav? ( >=media-video/ffmpeg-2.6:0=[encode] ) virtual/jpeg:0 x11-libs/wxGTK:3.0=[gstreamer,X] sys-apps/dbus udev? ( >=virtual/libudev-215:= ) app-arch/zip app-text/xmlto sys-devel/gettext virtual/yacc virtual/pkgconfig
-DESCRIPTION=A cross-platform free DVD authoring application
-EAPI=5
-HOMEPAGE=http://www.dvdstyler.org/
-IUSE=debug libav +udev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-cdr/dvd+rw-tools-7.1 media-libs/libexif:= >=media-libs/wxsvg-1.5.5:= >=media-video/dvdauthor-0.7.1 >=media-video/xine-ui-0.99.7 virtual/cdrtools libav? ( >=media-video/libav-9:0=[encode] ) !libav? ( >=media-video/ffmpeg-2.6:0=[encode] ) virtual/jpeg:0 x11-libs/wxGTK:3.0=[gstreamer,X] sys-apps/dbus udev? ( >=virtual/libudev-215:= ) >=app-cdr/dvdisaster-0.72.4 media-video/mjpegtools
-SLOT=0
-SRC_URI=mirror://sourceforge/dvdstyler/DVDStyler-2.9.6.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=5be7eb130b01cd6f43c1525964cc01a2
diff --git a/metadata/md5-cache/media-video/dvdstyler-3.0.2 b/metadata/md5-cache/media-video/dvdstyler-3.0.2
deleted file mode 100644
index daf580d131a0..000000000000
--- a/metadata/md5-cache/media-video/dvdstyler-3.0.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=app-cdr/dvd+rw-tools-7.1 media-libs/libexif:= >=media-libs/wxsvg-1.5.9:= >=media-video/dvdauthor-0.7.1 >=media-video/xine-ui-0.99.7 virtual/cdrtools libav? ( >=media-video/libav-9:0=[encode] ) !libav? ( >=media-video/ffmpeg-2.6:0=[encode] ) virtual/jpeg:0 x11-libs/wxGTK:3.0=[gstreamer,X] sys-apps/dbus udev? ( >=virtual/libudev-215:= ) app-arch/zip app-text/xmlto sys-devel/gettext virtual/yacc virtual/pkgconfig
-DESCRIPTION=A cross-platform free DVD authoring application
-EAPI=5
-HOMEPAGE=http://www.dvdstyler.org/
-IUSE=debug libav +udev
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=>=app-cdr/dvd+rw-tools-7.1 media-libs/libexif:= >=media-libs/wxsvg-1.5.9:= >=media-video/dvdauthor-0.7.1 >=media-video/xine-ui-0.99.7 virtual/cdrtools libav? ( >=media-video/libav-9:0=[encode] ) !libav? ( >=media-video/ffmpeg-2.6:0=[encode] ) virtual/jpeg:0 x11-libs/wxGTK:3.0=[gstreamer,X] sys-apps/dbus udev? ( >=virtual/libudev-215:= ) >=app-cdr/dvdisaster-0.72.4 media-video/mjpegtools
-SLOT=0
-SRC_URI=mirror://sourceforge/dvdstyler/DVDStyler-3.0.2.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
-_md5_=fde38bbff7a5da6639046e528c9a0a2c
diff --git a/metadata/md5-cache/media-video/dvdstyler-3.0.4 b/metadata/md5-cache/media-video/dvdstyler-3.0.4
new file mode 100644
index 000000000000..a96d92424e61
--- /dev/null
+++ b/metadata/md5-cache/media-video/dvdstyler-3.0.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=app-cdr/dvd+rw-tools-7.1 media-libs/libexif:= >=media-libs/wxsvg-1.5.11:= >=media-video/dvdauthor-0.7.1 >=media-video/xine-ui-0.99.7 virtual/cdrtools libav? ( >=media-video/libav-9:0=[encode] ) !libav? ( >=media-video/ffmpeg-2.6:0=[encode] ) virtual/jpeg:0 x11-libs/wxGTK:3.0=[gstreamer,X] sys-apps/dbus udev? ( >=virtual/libudev-215:= ) app-arch/zip app-text/xmlto sys-devel/gettext virtual/yacc virtual/pkgconfig
+DESCRIPTION=A cross-platform free DVD authoring application
+EAPI=5
+HOMEPAGE=http://www.dvdstyler.org/
+IUSE=debug libav +udev
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=app-cdr/dvd+rw-tools-7.1 media-libs/libexif:= >=media-libs/wxsvg-1.5.11:= >=media-video/dvdauthor-0.7.1 >=media-video/xine-ui-0.99.7 virtual/cdrtools libav? ( >=media-video/libav-9:0=[encode] ) !libav? ( >=media-video/ffmpeg-2.6:0=[encode] ) virtual/jpeg:0 x11-libs/wxGTK:3.0=[gstreamer,X] sys-apps/dbus udev? ( >=virtual/libudev-215:= ) >=app-cdr/dvdisaster-0.72.4 media-video/mjpegtools
+SLOT=0
+SRC_URI=mirror://sourceforge/dvdstyler/DVDStyler-3.0.4.tar.bz2
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	wxwidgets	04e063b0eff26daaea83d859dd9d6e05
+_md5_=318bab5d4e3cd4a390a89f2eede1233e
diff --git a/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r1 b/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r1
new file mode 100644
index 000000000000..d6d744a968fd
--- /dev/null
+++ b/metadata/md5-cache/media-video/ffdiaporama-2.2_pre20140701-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=media-gfx/exiv2 media-libs/taglib openclipart? ( media-gfx/openclipart[svg,-gzip] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtmultimedia:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtxml:5 libav? ( >=media-video/libav-11:0=[encode] ) !libav? ( >=media-video/ffmpeg-2.8:0=[encode] ) >=sys-apps/sed-4
+DESCRIPTION=Movie creator from photos and video clips
+EAPI=6
+HOMEPAGE=http://ffdiaporama.tuxfamily.org
+IUSE=libav openclipart texturemate
+KEYWORDS=amd64 ~x86
+LICENSE=GPL-2 texturemate? ( CC-BY-3.0 )
+RDEPEND=media-gfx/exiv2 media-libs/taglib openclipart? ( media-gfx/openclipart[svg,-gzip] ) dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qthelp:5 dev-qt/qtmultimedia:5 dev-qt/qtsql:5[sqlite] dev-qt/qtsvg:5 dev-qt/qtxml:5 libav? ( >=media-video/libav-11:0=[encode] ) !libav? ( >=media-video/ffmpeg-2.8:0=[encode] )
+SLOT=0
+SRC_URI=http://download.tuxfamily.org/ffdiaporama/Packages/Devel/ffdiaporama_bin_2.2.devel.2014.0701.tar.gz http://download.tuxfamily.org/ffdiaporama/Packages/Devel/ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-libav11.patch https://dev.gentoo.org/~jstein/dist/ffdiaporama-2.2-ffmpeg-3.0.patch texturemate? ( http://download.tuxfamily.org/ffdiaporama/Packages/Stable/ffdiaporama_texturemate_1.0.2014.0125.tar.gz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=560ae746cefd818ac9458bcbb32e2a1d
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.3.3 b/metadata/md5-cache/media-video/ffmpeg-3.3.3
deleted file mode 100644
index 183904d4d893..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-3.3.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sofalizer? ( >=sci-libs/netcdf-4.3.2-r1[hdf5] >=sci-libs/hdf5-1.8.18[hl] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( >=dev-lang/yasm-1.2 ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
-EAPI=6
-HOMEPAGE=http://ffmpeg.org/
-IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm mmal modplug opus libilbc librtmp ssh schroedinger speex vorbis vpx zvbi bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband sofalizer zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sofalizer? ( >=sci-libs/netcdf-4.3.2-r1[hdf5] >=sci-libs/hdf5-1.8.18[hl] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-SLOT=0/55.57.57
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.3.3.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=151a390bafcd034b994246d80db38f5b
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.3.6 b/metadata/md5-cache/media-video/ffmpeg-3.3.6
index 1019e9ad3006..825ffd771c23 100644
--- a/metadata/md5-cache/media-video/ffmpeg-3.3.6
+++ b/metadata/md5-cache/media-video/ffmpeg-3.3.6
@@ -4,7 +4,7 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video. Inc
 EAPI=6
 HOMEPAGE=http://ffmpeg.org/
 IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm mmal modplug opus libilbc librtmp ssh schroedinger speex vorbis vpx zvbi bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband sofalizer zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
 RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) schroedinger? ( >=media-libs/schroedinger-1.0.11-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sofalizer? ( >=sci-libs/netcdf-4.3.2-r1[hdf5] >=sci-libs/hdf5-1.8.18[hl] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
 REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
@@ -12,4 +12,4 @@ RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/55.57.57
 SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.3.6.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=af55ae9fe70c85030ba4909ec0b49549
+_md5_=93ba82f309b62d554dd7a189f289b5ff
diff --git a/metadata/md5-cache/media-video/ffmpeg-3.4 b/metadata/md5-cache/media-video/ffmpeg-3.4
deleted file mode 100644
index ce01e165bc58..000000000000
--- a/metadata/md5-cache/media-video/ffmpeg-3.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) >=sys-devel/make-3.81 doc? ( sys-apps/texinfo ) >=virtual/pkgconfig-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) test? ( net-misc/wget sys-devel/bc ) v4l? ( sys-kernel/linux-headers )
-DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec
-EAPI=6
-HOMEPAGE=http://ffmpeg.org/
-IUSE=alsa chromium doc +encode jack oss pic static-libs test v4l +bzip2 cpudetection debug gcrypt gnutls gmp +gpl +hardcoded-tables +iconv lzma +network openssl +postproc samba sdl sdl vaapi vdpau X xcb xcb xcb +zlib cdio iec61883 ieee1394 libcaca openal opengl libv4l pulseaudio amr amr fdk jpeg2k bluray celt gme gsm mmal modplug opus libilbc librtmp ssh speex svg vorbis vpx zvbi bs2b chromaprint flite frei0r fribidi fontconfig ladspa libass truetype rubberband zeromq zimg libsoxr +threads amrenc mp3 kvazaar nvenc openh264 snappy theora twolame wavpack webp x264 x265 xvid cpu_flags_arm_thumb cpu_flags_arm_v6 cpu_flags_arm_thumb2 cpu_flags_arm_neon cpu_flags_arm_vfp cpu_flags_arm_vfpv3 cpu_flags_arm_v8 mipsdspr1 mipsdspr2 mipsfpu altivec cpu_flags_x86_3dnow cpu_flags_x86_3dnowext cpu_flags_x86_aes cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 cpu_flags_x86_mmx cpu_flags_x86_mmxext cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_xop +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_ffhash +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_sidxindex +fftools_trasher abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=!gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) amr? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) gmp? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) encode? ( amrenc? ( gpl? ( GPL-3 ) !gpl? ( LGPL-3 ) ) ) samba? ( GPL-3 )
-RDEPEND=alsa? ( >=media-libs/alsa-lib-1.0.27.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) amr? ( >=media-libs/opencore-amr-0.1.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bluray? ( >=media-libs/libbluray-0.3.0-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bs2b? ( >=media-libs/libbs2b-3.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( >=app-arch/bzip2-1.0.6-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) celt? ( >=media-libs/celt-0.11.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) chromaprint? ( >=media-libs/chromaprint-1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) encode? ( amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kvazaar? ( media-libs/kvazaar[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mp3? ( >=media-sound/lame-3.99.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nvenc? ( media-video/nvidia_video_sdk ) openh264? ( >=media-libs/openh264-1.4.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) snappy? ( >=app-arch/snappy-1.1.2-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) theora? ( >=media-libs/libtheora-1.1.1[encode,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) twolame? ( >=media-sound/twolame-0.3.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) wavpack? ( >=media-sound/wavpack-4.60.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( >=media-libs/libwebp-0.3.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x264? ( >=media-libs/x264-0.0.20130506:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x265? ( >=media-libs/x265-1.6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xvid? ( >=media-libs/xvid-1.3.2-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) fdk? ( >=media-libs/fdk-aac-0.1.3:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) flite? ( >=app-accessibility/flite-1.4-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) frei0r? ( media-plugins/frei0r-plugins ) fribidi? ( >=dev-libs/fribidi-0.19.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gme? ( >=media-libs/game-music-emu-0.6.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gmp? ( >=dev-libs/gmp-6:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gsm? ( >=media-sound/gsm-1.0.13-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iec61883? ( >=media-libs/libiec61883-1.2.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libavc1394-0.5.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ieee1394? ( >=media-libs/libdc1394-2.2.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/libraw1394-2.1.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( >=media-libs/openjpeg-2:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libass? ( >=media-libs/libass-0.10.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libilbc? ( >=media-libs/libilbc-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libsoxr? ( >=media-libs/soxr-0.1.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libv4l? ( >=media-libs/libv4l-0.9.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) mmal? ( media-libs/raspberrypi-userland ) modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openal? ( >=media-libs/openal-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opengl? ( >=virtual/opengl-7.0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openssl? ( >=dev-libs/openssl-1.0.1h-r2:0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opus? ( >=media-libs/opus-1.0.2-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) librtmp? ( >=media-video/rtmpdump-2.4_p20131018[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) rubberband? ( >=media-libs/rubberband-1.8.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) samba? ( >=net-fs/samba-3.6.23-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sdl? ( media-libs/libsdl2[sound,video,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) speex? ( >=media-libs/speex-1.2_rc1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ssh? ( >=net-libs/libssh-0.5.5[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) svg? ( gnome-base/librsvg:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.2.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vdpau? ( >=x11-libs/libvdpau-0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vorbis? ( >=media-libs/libvorbis-1.3.3-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libogg-1.3.0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vpx? ( >=media-libs/libvpx-1.4.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXv-1.0.10[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xcb? ( >=x11-libs/libxcb-1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zeromq? ( >=net-libs/zeromq-4.1.6 ) zimg? ( >=media-libs/zimg-2.4:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zvbi? ( >=media-libs/zvbi-0.2.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !media-video/qt-faststart postproc? ( !media-libs/libpostproc ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20140508-r3 !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )
-REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc? ( gpl ) frei0r? ( gpl ) cdio? ( gpl ) samba? ( gpl ) encode? ( x264? ( gpl ) x265? ( gpl ) xvid? ( gpl ) X? ( !xcb? ( gpl ) ) ) arm64? ( cpu_flags_arm_v8 ) cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) cpu_flags_x86_xop? ( cpu_flags_x86_avx ) cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx )
-RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
-SLOT=0/55.57.57
-SRC_URI=http://ffmpeg.org/releases/ffmpeg-3.4.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=71dbf7ade55069e0c0bd56f7c2ded90e
diff --git a/metadata/md5-cache/media-video/ffmpeg-9999 b/metadata/md5-cache/media-video/ffmpeg-9999
index 4cb04485df0b..4c3fac139d01 100644
--- a/metadata/md5-cache/media-video/ffmpeg-9999
+++ b/metadata/md5-cache/media-video/ffmpeg-9999
@@ -10,4 +10,4 @@ REQUIRED_USE=libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode ) postproc
 RESTRICT=gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/56.58.58
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1ea6249957e6866233c921c048d52432
+_md5_=5469e49d4ae285a932fe8e48e9f504d3
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.13 b/metadata/md5-cache/media-video/kaffeine-2.0.13
index 1f9e7d2e21e2..465852f7bc5f 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.13
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.13
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.3 )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/libv4l media-video/vlc[X] x11-libs/libXScrnSaver !media-video/kaffeine:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kaffeine/kaffeine-2.0.13.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=20a869bfd7c8eb6e7dd50ffc448c18c1
diff --git a/metadata/md5-cache/media-video/kaffeine-2.0.14 b/metadata/md5-cache/media-video/kaffeine-2.0.14
index 68e6396ce35d..35609cc729c1 100644
--- a/metadata/md5-cache/media-video/kaffeine-2.0.14
+++ b/metadata/md5-cache/media-video/kaffeine-2.0.14
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ handbook? ( FDL-1.3 )
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kaffeine/kaffeine-2.0.14.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=18d2c7e5bb82934ae767ec9c4e553139
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 757e152e36b3..90c018389f0e 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.40.0 >=kde-frameworks/kconfig-5.40.0 >=kde-frameworks/kconfigwidgets-5.40.0 >=kde-frameworks/kcoreaddons-5.40.0 >=kde-frameworks/kdeclarative-5.40.0 >=kde-frameworks/kdelibs4support-5.40.0 >=kde-frameworks/ki18n-5.40.0 >=kde-frameworks/kio-5.40.0 >=kde-frameworks/knotifications-5.40.0 >=kde-frameworks/kwidgetsaddons-5.40.0 >=kde-frameworks/kxmlgui-5.40.0 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwidgets-5.7.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=0
 SRC_URI=https://github.com/dos1/kamerka/archive/a201df47a0849a09a20617fedfee26a407dc847c.tar.gz -> kamerka-0.12_p20161002.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a7eda9be7aac8329396db4044acf75b3
diff --git a/metadata/md5-cache/media-video/kamoso-3.2.4 b/metadata/md5-cache/media-video/kamoso-3.2.4
index 18d0623c5b9d..aac2405f18ca 100644
--- a/metadata/md5-cache/media-video/kamoso-3.2.4
+++ b/metadata/md5-cache/media-video/kamoso-3.2.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/purpose:5 media-libs/qt-gstreamer[qt5(+)] virtual/libudev:= media-plugins/gst-plugins-meta:1.0[alsa,theora,vorbis,v4l] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kamoso/3.2/src/kamoso-3.2.4.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=64b7af3691f7026b44b6b269df6401e6
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 09a16d3de523..8446da77384f 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.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kmediaplayer-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 >=dev-qt/qtxml-5.7.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kmplayer//kmplayer-0.12.0b.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=08c922b7de38c66b786d37168646ff68
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 57880375781a..3485ff476d96 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.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdeclarative-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 media-libs/taglib semantic-desktop? ( >=kde-frameworks/baloo-5.40.0:5 >=kde-frameworks/kfilemetadata-5.40.0:5 ) >=kde-plasma/plasma-workspace-5.10.5:5 >=dev-qt/qtmultimedia-5.7.1:5[qml] !media-video/plasma-mediacenter:0 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/plasma-mediacenter/5.7.5/plasma-mediacenter-5.7.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ce1fb81930d6da291322b3e379cf312a
diff --git a/metadata/md5-cache/media-video/subtitlecomposer-0.6.4 b/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
index 35cb5cb9d874..0ca24a4e22d9 100644
--- a/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
+++ b/metadata/md5-cache/media-video/subtitlecomposer-0.6.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=!media-video/subtitlecomposer:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://github.com/maxrd2/subtitlecomposer/archive/v0.6.4.tar.gz -> subtitlecomposer-0.6.4.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=7eb543448aad1bd4430484a207ed8eea
diff --git a/metadata/md5-cache/media-video/ttcut-0.19.6_p1 b/metadata/md5-cache/media-video/ttcut-0.19.6_p1
index d094796b754e..4127ef2e6bd3 100644
--- a/metadata/md5-cache/media-video/ttcut-0.19.6_p1
+++ b/metadata/md5-cache/media-video/ttcut-0.19.6_p1
@@ -3,10 +3,10 @@ DEPEND=>=media-libs/libmpeg2-0.4.0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopeng
 DESCRIPTION=Tool for cutting MPEG files especially for removing commercials
 EAPI=6
 HOMEPAGE=http://www.tritime.de/ttcut/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=>=media-libs/libmpeg2-0.4.0 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtopengl:5 dev-qt/qtwidgets:5 virtual/glu virtual/opengl media-video/mplayer >=media-video/ffmpeg-1.0.8[encode]
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~billie/distfiles/ttcut-0.19.6_p1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0fb400d8d0efb0cafe59075597a12d28
+_md5_=8190dad0fcc3cfdeca24084798f275c8
diff --git a/metadata/md5-cache/media-video/xine-ui-0.99.10 b/metadata/md5-cache/media-video/xine-ui-0.99.10
new file mode 100644
index 000000000000..086332dd2b84
--- /dev/null
+++ b/metadata/md5-cache/media-video/xine-ui-0.99.10
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=|| ( app-arch/tar app-arch/libarchive ) media-libs/libpng:0= >=media-libs/xine-lib-1.2:=[aalib?,libcaca?] virtual/jpeg:0 aalib? ( media-libs/aalib:= ) curl? ( >=net-misc/curl-7.10.2:= ) libcaca? ( media-libs/libcaca:= ) lirc? ( app-misc/lirc:= ) nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2:= ) X? ( x11-libs/libICE:= x11-libs/libSM:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXft:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/libXv:= x11-libs/libXxf86vm:= xinerama? ( x11-libs/libXinerama:= ) ) nls? ( >=sys-devel/gettext-0.18.3 ) X? ( x11-libs/libXt x11-proto/inputproto x11-proto/xf86vidmodeproto xinerama? ( x11-proto/xineramaproto ) ) virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=Xine movie player
+EAPI=5
+HOMEPAGE=http://xine.sourceforge.net/
+IUSE=aalib curl debug libcaca lirc nls readline vdr X xinerama
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=|| ( app-arch/tar app-arch/libarchive ) media-libs/libpng:0= >=media-libs/xine-lib-1.2:=[aalib?,libcaca?] virtual/jpeg:0 aalib? ( media-libs/aalib:= ) curl? ( >=net-misc/curl-7.10.2:= ) libcaca? ( media-libs/libcaca:= ) lirc? ( app-misc/lirc:= ) nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-6.2:= ) X? ( x11-libs/libICE:= x11-libs/libSM:= x11-libs/libX11:= x11-libs/libXext:= x11-libs/libXft:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/libXv:= x11-libs/libXxf86vm:= xinerama? ( x11-libs/libXinerama:= ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/xine/xine-ui-0.99.10.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=21f500f639f433a285f4c0ec7ce10e42
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index 1508358d558b..2358ebf6e4cd 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/etherape-0.9.16 b/metadata/md5-cache/net-analyzer/etherape-0.9.16
new file mode 100644
index 000000000000..96eef4360fad
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/etherape-0.9.16
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=gnome-base/libglade-2.0 gnome-base/libgnomecanvas[glade] net-libs/libpcap >=sys-devel/gettext-0.11.5 app-text/docbook-xml-dtd:4.1.2 app-text/gnome-doc-utils virtual/pkgconfig >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=A graphical network monitor for Unix modeled after etherman
+EAPI=6
+HOMEPAGE=http://etherape.sourceforge.net/
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnome-base/libglade-2.0 gnome-base/libgnomecanvas[glade] net-libs/libpcap
+SLOT=0
+SRC_URI=mirror://sourceforge/etherape/etherape-0.9.16.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=f5a2350fd61a70b03175f6429db41b01
diff --git a/metadata/md5-cache/net-analyzer/multimon-ng-1.0.0-r1 b/metadata/md5-cache/net-analyzer/multimon-ng-1.0.0-r1
deleted file mode 100644
index c80aa3a4d434..000000000000
--- a/metadata/md5-cache/net-analyzer/multimon-ng-1.0.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=pulseaudio? ( media-sound/pulseaudio ) dev-qt/qtcore:4 x11-libs/libX11
-DESCRIPTION=a fork of multimon, decodes multiple digital transmission modes
-EAPI=5
-HOMEPAGE=https://github.com/EliasOenal/multimonNG
-IUSE=pulseaudio
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=pulseaudio? ( media-sound/pulseaudio ) dev-qt/qtcore:4 x11-libs/libX11
-SLOT=0
-SRC_URI=https://github.com/EliasOenal/multimonNG/archive/1.0.0.tar.gz -> multimon-ng-1.0.0.tar.gz
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fa27cac9714c564fe5819f132a1ec952
diff --git a/metadata/md5-cache/net-analyzer/multimon-ng-1.1.4 b/metadata/md5-cache/net-analyzer/multimon-ng-1.1.4
new file mode 100644
index 000000000000..a08cd8d42e7d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/multimon-ng-1.1.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=pulseaudio? ( media-sound/pulseaudio ) X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=a fork of multimon, decodes multiple digital transmission modes
+EAPI=5
+HOMEPAGE=https://github.com/EliasOenal/multimon-ng
+IUSE=pulseaudio X
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=pulseaudio? ( media-sound/pulseaudio ) X? ( x11-libs/libX11 )
+SLOT=0
+SRC_URI=https://github.com/EliasOenal/multimonNG/archive/1.1.4.tar.gz -> multimon-ng-1.1.4.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9bddbdb2a9d1509e0ccb4f2ba40785aa
diff --git a/metadata/md5-cache/net-analyzer/multimon-ng-9999 b/metadata/md5-cache/net-analyzer/multimon-ng-9999
index 1ea4cf84731e..0c6772048a35 100644
--- a/metadata/md5-cache/net-analyzer/multimon-ng-9999
+++ b/metadata/md5-cache/net-analyzer/multimon-ng-9999
@@ -1,11 +1,11 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=pulseaudio? ( media-sound/pulseaudio ) dev-qt/qtcore:4 x11-libs/libX11 dev-vcs/git
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=pulseaudio? ( media-sound/pulseaudio ) X? ( x11-libs/libX11 ) sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=a fork of multimon, decodes multiple digital transmission modes
 EAPI=5
-HOMEPAGE=https://github.com/EliasOenal/multimonNG
-IUSE=pulseaudio
+HOMEPAGE=https://github.com/EliasOenal/multimon-ng
+IUSE=pulseaudio X
 LICENSE=GPL-2
-RDEPEND=pulseaudio? ( media-sound/pulseaudio ) dev-qt/qtcore:4 x11-libs/libX11
+RDEPEND=pulseaudio? ( media-sound/pulseaudio ) X? ( x11-libs/libX11 )
 SLOT=0
-_eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-2	195a672bfaf52d868442171c9469bbb6	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=fa27cac9714c564fe5819f132a1ec952
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=9bddbdb2a9d1509e0ccb4f2ba40785aa
diff --git a/metadata/md5-cache/net-analyzer/ostinato-0.9 b/metadata/md5-cache/net-analyzer/ostinato-0.9
new file mode 100644
index 000000000000..168c8273c81d
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/ostinato-0.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=dev-libs/protobuf:= >=net-libs/libpcap-1.8.1-r2 dev-qt/qtscript:4 dev-qt/qtcore:4 dev-qt/qtgui:4
+DESCRIPTION=A packet generator and analyzer
+EAPI=6
+HOMEPAGE=http://ostinato.org/
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/protobuf:= >=net-libs/libpcap-1.8.1-r2 dev-qt/qtscript:4 dev-qt/qtcore:4 dev-qt/qtgui:4
+SLOT=0
+SRC_URI=https://github.com/pstavirs/ostinato/archive/v0.9.tar.gz -> ostinato-0.9.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=bd6a5091b4f49dd5baf5828da804ff52
diff --git a/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.11.0 b/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.11.0
deleted file mode 100644
index 2e2c62342f68..000000000000
--- a/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.11.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
-DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/alertmanager
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.11.0.tar.gz -> prometheus-alertmanager-0.11.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=d03f2917e44872d461b9b171bba88d98
diff --git a/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.12.0 b/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.12.0
deleted file mode 100644
index 6acdb58ac8a2..000000000000
--- a/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.12.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
-DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/alertmanager
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.12.0.tar.gz -> prometheus-alertmanager-0.12.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b344bc2b3d7de1424f90e5d63b852b42
diff --git a/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.13.0 b/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.13.0
new file mode 100644
index 000000000000..95784cbd7c91
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/prometheus-alertmanager-0.13.0
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=dev-util/promu >=dev-lang/go-1.8
+DESCRIPTION=Alertmanager for alerts sent by client applications such as Prometheus
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/alertmanager
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/prometheus/alertmanager/archive/v0.13.0.tar.gz -> prometheus-alertmanager-0.13.0.tar.gz
+_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=5dfb4ef54d062a8c51acda3fb99fcce5
diff --git a/metadata/md5-cache/net-analyzer/prometheus-blackbox_exporter-0.10.0 b/metadata/md5-cache/net-analyzer/prometheus-blackbox_exporter-0.10.0
deleted file mode 100644
index f53d954ba3ad..000000000000
--- a/metadata/md5-cache/net-analyzer/prometheus-blackbox_exporter-0.10.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
-DESCRIPTION=Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/blackbox_exporter
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/prometheus/blackbox_exporter/archive/v0.10.0.tar.gz -> prometheus-blackbox_exporter-0.10.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=b6becbba630472d6460b16f3e914cd11
diff --git a/metadata/md5-cache/net-analyzer/prometheus-blackbox_exporter-0.11.0 b/metadata/md5-cache/net-analyzer/prometheus-blackbox_exporter-0.11.0
deleted file mode 100644
index 51c7d3c8e68c..000000000000
--- a/metadata/md5-cache/net-analyzer/prometheus-blackbox_exporter-0.11.0
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
-DESCRIPTION=Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/blackbox_exporter
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/prometheus/blackbox_exporter/archive/v0.11.0.tar.gz -> prometheus-blackbox_exporter-0.11.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=66caa972dea799512a9b2ed5b1eb42de
diff --git a/metadata/md5-cache/net-analyzer/prometheus-blackbox_exporter-0.11.0-r1 b/metadata/md5-cache/net-analyzer/prometheus-blackbox_exporter-0.11.0-r1
new file mode 100644
index 000000000000..3dc1050c9288
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/prometheus-blackbox_exporter-0.11.0-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst prepare setup test unpack
+DEPEND=dev-util/promu filecaps? ( sys-libs/libcap ) >=dev-lang/go-1.8
+DESCRIPTION=Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP
+EAPI=6
+HOMEPAGE=https://github.com/prometheus/blackbox_exporter
+IUSE=+filecaps
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/prometheus/blackbox_exporter/archive/v0.11.0.tar.gz -> prometheus-blackbox_exporter-0.11.0.tar.gz
+_eclasses_=fcaps	e80204189039ecc03f24151c518375f0	golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=5d57592117109c47a829379dffb40f86
diff --git a/metadata/md5-cache/net-analyzer/prometheus-node_exporter-0.15.1 b/metadata/md5-cache/net-analyzer/prometheus-node_exporter-0.15.1
deleted file mode 100644
index bd8f31b8cb7b..000000000000
--- a/metadata/md5-cache/net-analyzer/prometheus-node_exporter-0.15.1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-util/promu >=dev-lang/go-1.8
-DESCRIPTION=Prometheus exporter for machine metrics
-EAPI=6
-HOMEPAGE=https://github.com/prometheus/node_exporter
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-SLOT=0
-SRC_URI=https://github.com/prometheus/node_exporter/archive/v0.15.1.tar.gz -> prometheus-node_exporter-0.15.1.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=1212402502c22b74452430abffdeb6c7
diff --git a/metadata/md5-cache/net-analyzer/sarg-2.3.11 b/metadata/md5-cache/net-analyzer/sarg-2.3.11
new file mode 100644
index 000000000000..0abecb20a146
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/sarg-2.3.11
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure prepare
+DEPEND=gd? ( media-libs/gd[png,truetype] ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Squid Analysis Report Generator
+EAPI=6
+HOMEPAGE=http://sarg.sourceforge.net/
+IUSE=+gd ldap pcre
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=gd? ( media-libs/gd[png,truetype] ) ldap? ( net-nds/openldap ) pcre? ( dev-libs/libpcre )
+SLOT=0
+SRC_URI=mirror://sourceforge/sarg/sarg-2.3.11.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=3c579489f323e98c4923b26b37d7e7b3
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.4.3 b/metadata/md5-cache/net-analyzer/wireshark-2.4.3
index 359b4d4d5b87..e8931a1cf4c2 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-2.4.3
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.4.3
@@ -11,4 +11,4 @@ REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh )
 SLOT=0/2.4.3
 SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.4.3.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=13a038e02d39234458f654724a42cad1
+_md5_=d9c32b84a99d0a6f8d1d4110985095d3
diff --git a/metadata/md5-cache/net-analyzer/wireshark-2.4.4 b/metadata/md5-cache/net-analyzer/wireshark-2.4.4
new file mode 100644
index 000000000000..6b3cc0735cc1
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/wireshark-2.4.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=>=dev-libs/glib-2.14:2 dev-libs/libgcrypt:0 netlink? ( dev-libs/libnl:3 ) adns? ( >=net-dns/c-ares-1.5 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) 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 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) 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 !=sys-libs/zlib-1.2.4 ) dev-lang/perl !<virtual/perl-Pod-Simple-3.170 !<perl-core/Pod-Simple-3.170 doc? ( app-doc/doxygen app-text/asciidoc dev-libs/libxml2 dev-libs/libxslt doc-pdf? ( dev-java/fop ) www-client/lynx ) qt5? ( dev-qt/linguist-tools:5 ) sys-devel/bison sys-devel/flex virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 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 +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2 +dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap tfshark +tshark +udpdump zlib +filecaps
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+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 ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libssh? ( >=net-libs/libssh-0.6 ) libxml2? ( dev-libs/libxml2 ) lua? ( >=dev-lang/lua-5.1:* ) lz4? ( app-arch/lz4 ) 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 || ( media-libs/speexdsp <media-libs/speex-1.2.0 ) 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 !=sys-libs/zlib-1.2.4 ) gtk? ( virtual/freedesktop-icon-theme ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
+REQUIRED_USE=ciscodump? ( libssh ) sshdump? ( libssh )
+SLOT=0/2.4.4
+SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-2.4.4.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fcaps	e80204189039ecc03f24151c518375f0	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d6f6dc2a94c118c7af747af3b02c620e
diff --git a/metadata/md5-cache/net-analyzer/zabbix-2.2.21 b/metadata/md5-cache/net-analyzer/zabbix-2.2.21
new file mode 100644
index 000000000000..9d132a20fd8b
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-2.2.21
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=http://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-2.2.21.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=07095bc98fc5a83cfbb360e91c7b8822
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.0.14 b/metadata/md5-cache/net-analyzer/zabbix-3.0.14
new file mode 100644
index 000000000000..9d090c18f870
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.0.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=http://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping ) server? ( net-analyzer/fping app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.0.14.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=caad7a921e70a619aac438e8fb7795b9
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.2.11 b/metadata/md5-cache/net-analyzer/zabbix-3.2.11
new file mode 100644
index 000000000000..5f491b659cce
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.2.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=http://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres sqlite odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.2.11.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=d75ecf4c9c6de188d4887f11f7039d4a
diff --git a/metadata/md5-cache/net-analyzer/zabbix-3.4.5 b/metadata/md5-cache/net-analyzer/zabbix-3.4.5
new file mode 100644
index 000000000000..b1f834d2fc5a
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-3.4.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare prerm setup
+DEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) static? ( ldap? ( net-nds/openldap[static-libs] =dev-libs/cyrus-sasl-2*[static-libs] net-libs/gnutls[static-libs] ) mysql? ( >=virtual/mysql-5.0.3[static-libs] ) sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] ) postgres? ( dev-db/postgresql:*[static-libs] ) libxml2? ( dev-libs/libxml2[static-libs] ) curl? ( net-misc/curl[static-libs] ) ssh? ( net-libs/libssh2[static-libs] ) odbc? ( dev-db/unixODBC[static-libs] ) ) virtual/pkgconfig java? ( >=dev-java/java-config-2.2.0-r3 ) virtual/pkgconfig
+DESCRIPTION=ZABBIX is software for monitoring of your applications, network and servers
+EAPI=6
+HOMEPAGE=http://www.zabbix.com/
+IUSE=+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static elibc_FreeBSD java
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=snmp? ( net-analyzer/net-snmp ) ldap? ( net-nds/openldap =dev-libs/cyrus-sasl-2* net-libs/gnutls ) mysql? ( >=virtual/mysql-5.0.3 ) sqlite? ( >=dev-db/sqlite-3.3.5 ) postgres? ( dev-db/postgresql:* ) oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 ) xmpp? ( dev-libs/iksemel ) libxml2? ( dev-libs/libxml2 ) curl? ( net-misc/curl ) openipmi? ( sys-libs/openipmi ) ssh? ( net-libs/libssh2 ) java? ( virtual/jdk:* ) odbc? ( dev-db/unixODBC ) ssl? ( dev-libs/openssl:=[-bindist] ) proxy? ( net-analyzer/fping[suid] ) server? ( net-analyzer/fping[suid] app-admin/webapp-config dev-libs/libevent ) java? ( >=virtual/jre-1.4 dev-java/slf4j-api ) frontend? ( >=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode] || ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] ) mysql? ( dev-lang/php[mysqli] ) odbc? ( dev-lang/php[odbc] ) oracle? ( dev-lang/php[oci8-instant-client] ) postgres? ( dev-lang/php[postgres] ) sqlite? ( dev-lang/php[sqlite] ) media-libs/gd[png] app-admin/webapp-config ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( agent frontend proxy server ) proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) ) server? ( ^^ ( mysql oracle postgres odbc ) ) static? ( !oracle !snmp )
+SLOT=0
+SRC_URI=http://prdownloads.sourceforge.net/zabbix/zabbix-3.4.5.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=0a6a5ae7434ec5043ff03de6daed3c23
diff --git a/metadata/md5-cache/net-dialup/Manifest.gz b/metadata/md5-cache/net-dialup/Manifest.gz
index 44a86d906524..0e43e57aea8d 100644
--- a/metadata/md5-cache/net-dialup/Manifest.gz
+++ b/metadata/md5-cache/net-dialup/Manifest.gz
diff --git a/metadata/md5-cache/net-dialup/xc-4.3.2-r4 b/metadata/md5-cache/net-dialup/xc-4.3.2-r4
index 6fa6aee0359d..6fd6ede8af1d 100644
--- a/metadata/md5-cache/net-dialup/xc-4.3.2-r4
+++ b/metadata/md5-cache/net-dialup/xc-4.3.2-r4
@@ -3,10 +3,10 @@ DEPEND=sys-libs/ncurses virtual/pkgconfig
 DESCRIPTION=Modem dialout & serial terminal program
 EAPI=5
 HOMEPAGE=http://www.ibiblio.org/pub/Linux/apps/serialcomm/dialout/
-KEYWORDS=amd64 ~mips ppc ppc64 sparc x86
+KEYWORDS=amd64 ~ia64 ~mips ppc ppc64 sparc x86
 LICENSE=xc-radley
 RDEPEND=sys-libs/ncurses
 SLOT=0
 SRC_URI=http://www.ibiblio.org/pub/Linux/apps/serialcomm/dialout/xc-4.3.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7a8af67384926cbb961c6c8a8e8b96f9
+_md5_=c278838b44e72f79bb9fc16685e2771b
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index 3fd4f22dfb83..5207f0c309ed 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/libnfs-2.0.0 b/metadata/md5-cache/net-fs/libnfs-2.0.0
index 5dc379e8f014..b77d2f754d68 100644
--- a/metadata/md5-cache/net-fs/libnfs-2.0.0
+++ b/metadata/md5-cache/net-fs/libnfs-2.0.0
@@ -4,9 +4,9 @@ DESCRIPTION=Client library for accessing NFS shares over a network
 EAPI=5
 HOMEPAGE=https://github.com/sahlberg/libnfs
 IUSE=examples static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~x86
 LICENSE=LGPL-2.1 GPL-3
 SLOT=0/11
 SRC_URI=https://github.com/sahlberg/libnfs/archive/libnfs-2.0.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	autotools-utils	5a4611dfba155b1659528663fad4cd5e	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1004fb35fae1acb40f765e4aa5f2141a
+_md5_=92d463c90deed530cbca43c03df7031a
diff --git a/metadata/md5-cache/net-fs/samba-4.5.10-r1 b/metadata/md5-cache/net-fs/samba-4.5.10-r1
index 1d6bd0b188db..d364a3c65320 100644
--- a/metadata/md5-cache/net-fs/samba-4.5.10-r1
+++ b/metadata/md5-cache/net-fs/samba-4.5.10-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) gpg? ( ad
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.5.10.tar.gz https://dev.gentoo.org/~polynomial-c/samba-disable-python-patches-4.5.0_rc1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=e003f862a9b753e6e84d67ee1fa5ef28
+_md5_=99073552d3c5be0027178b192b430f46
diff --git a/metadata/md5-cache/net-fs/samba-4.5.15 b/metadata/md5-cache/net-fs/samba-4.5.15
index 23d05e138ce4..57e07db8ec1d 100644
--- a/metadata/md5-cache/net-fs/samba-4.5.15
+++ b/metadata/md5-cache/net-fs/samba-4.5.15
@@ -11,4 +11,4 @@ REQUIRED_USE=addc? ( gnutls !system-mitkrb5 ) ads? ( acl gnutls ldap ) gpg? ( ad
 SLOT=0
 SRC_URI=mirror://samba/stable/samba-4.5.15.tar.gz https://dev.gentoo.org/~polynomial-c/samba-4.5.11-disable-python-patches.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
-_md5_=eb5af3b2a9b0d73b43757c0d400ad65c
+_md5_=0b53e4fa420d64bec5d3bc8ed4023130
diff --git a/metadata/md5-cache/net-fs/samba-4.8.0_rc1 b/metadata/md5-cache/net-fs/samba-4.8.0_rc1
new file mode 100644
index 000000000000..d3c80029e8f5
--- /dev/null
+++ b/metadata/md5-cache/net-fs/samba-4.8.0_rc1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.1[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.35[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] app-text/docbook-xsl-stylesheets dev-libs/libxslt virtual/pkgconfig || ( net-libs/rpcsvc-proto <sys-libs/glibc-2.26[rpc(+)] ) test? ( !system-mitkrb5? ( >=sys-libs/nss_wrapper-1.1.3 >=net-dns/resolv_wrapper-1.1.4 >=net-libs/socket_wrapper-1.1.7 >=sys-libs/uid_wrapper-1.2.1 ) ) virtual/pkgconfig
+DESCRIPTION=Samba Suite Version 4
+EAPI=6
+HOMEPAGE=http://www.samba.org/
+IUSE=acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+LICENSE=GPL-3
+RDEPEND=>=app-arch/libarchive-3.1.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-lang/perl:= dev-libs/libaio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/iniparser:0 dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-python/subunit[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/ldb-1.3.1[ldap(+)?,python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0= >=sys-libs/talloc-2.1.11[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.35[python?,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libiconv pam? ( virtual/pam ) acl? ( virtual/acl ) addns? ( net-dns/bind-tools[gssapi] dev-python/dnspython:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) ceph? ( sys-cluster/ceph ) cluster? ( !dev-db/ctdb ) cups? ( net-print/cups ) debug? ( dev-util/lttng-ust ) dmapi? ( sys-apps/dmapi ) fam? ( virtual/fam ) gnutls? ( dev-libs/libgcrypt:0 >=net-libs/gnutls-1.4.0 ) gpg? ( app-crypt/gpgme ) ldap? ( net-nds/openldap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) systemd? ( sys-apps/systemd:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+),xml(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) client? ( net-fs/cifs-utils[ads?] ) selinux? ( sec-policy/selinux-samba ) !dev-perl/Parse-Yapp
+REQUIRED_USE=addc? ( python gnutls ) test? ( python ) addns? ( python ) ads? ( acl gnutls ldap ) gpg? ( addc ) ?? ( system-heimdal system-mitkrb5 ) python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://samba/rc/samba-4.8.0rc1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
+_md5_=6d80dfd122767c72796e951f81e51bf9
diff --git a/metadata/md5-cache/net-ftp/Manifest.gz b/metadata/md5-cache/net-ftp/Manifest.gz
index a0663fe945ce..d3ba89117cee 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/ftp-0.17.23.0.2.1 b/metadata/md5-cache/net-ftp/ftp-0.17.23.0.2.1
index a7a52ca5bfa5..f4c46a61c8d2 100644
--- a/metadata/md5-cache/net-ftp/ftp-0.17.23.0.2.1
+++ b/metadata/md5-cache/net-ftp/ftp-0.17.23.0.2.1
@@ -4,10 +4,10 @@ DESCRIPTION=Standard Linux FTP client
 EAPI=5
 HOMEPAGE=http://www.hcs.harvard.edu/~dholland/computers/netkit.html
 IUSE=ipv6 libressl readline ssl
-KEYWORDS=~alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
+KEYWORDS=~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
 LICENSE=BSD
 RDEPEND=>=sys-libs/ncurses-5.2:= readline? ( sys-libs/readline:0= ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/netkit-ftp-0.17.tar.gz mirror://debian/pool/main/n/netkit-ftp-ssl/netkit-ftp-ssl_0.17.23+0.2-1.debian.tar.gz mirror://gentoo/netkit-ftp-0.17-patches-2.tar.bz2
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c822eed4294fd20db2c6fcecf67ff18f
+_md5_=ea43291eb1c8c10709452233911ebdb3
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 76ddcc22a787..81f2c5546719 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 b/metadata/md5-cache/net-im/choqok-1.6.0
index e4024360f496..751d493c3e23 100644
--- a/metadata/md5-cache/net-im/choqok-1.6.0
+++ b/metadata/md5-cache/net-im/choqok-1.6.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/sonnet-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 app-crypt/qca[qt5] dev-libs/qoauth:5 attica? ( >=kde-frameworks/attica-5.40.0:5 ) konqueror? ( >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:5 >=dev-qt/qtwebkit-5.7.1:5 ) telepathy? ( net-libs/telepathy-qt[qt5(+)] ) !net-im/choqok:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/choqok/1.6/src/choqok-1.6.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=db2ce6d7e017250c403acb88c0363464
diff --git a/metadata/md5-cache/net-im/slack-bin-3.0.2 b/metadata/md5-cache/net-im/slack-bin-3.0.2
new file mode 100644
index 000000000000..d10fc6606ad4
--- /dev/null
+++ b/metadata/md5-cache/net-im/slack-bin-3.0.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=install postinst postrm unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=Team collaboration tool
+EAPI=6
+HOMEPAGE=http://www.slack.com/
+IUSE=pax_kernel abi_x86_64
+KEYWORDS=~amd64 -*
+LICENSE=all-rights-reserved
+RDEPEND=app-crypt/libsecret:0[abi_x86_64(-)?] dev-libs/atk:0[abi_x86_64(-)?] dev-libs/expat:0[abi_x86_64(-)?] dev-libs/glib:2[abi_x86_64(-)?] dev-libs/nspr:0[abi_x86_64(-)?] dev-libs/nss:0[abi_x86_64(-)?] gnome-base/gconf:2[abi_x86_64(-)?] media-libs/alsa-lib:0[abi_x86_64(-)?] media-libs/fontconfig:1.0[abi_x86_64(-)?] media-libs/freetype:2[abi_x86_64(-)?] net-misc/curl:0[abi_x86_64(-)?] net-print/cups:0[abi_x86_64(-)?] sys-apps/dbus:0[abi_x86_64(-)?] x11-libs/cairo:0[abi_x86_64(-)?] x11-libs/gdk-pixbuf:2[abi_x86_64(-)?] x11-libs/gtk+:2[abi_x86_64(-)?] x11-libs/libX11:0[abi_x86_64(-)?] x11-libs/libxcb:0/1.12[abi_x86_64(-)?] x11-libs/libXcomposite:0[abi_x86_64(-)?] x11-libs/libXcursor:0[abi_x86_64(-)?] x11-libs/libXdamage:0[abi_x86_64(-)?] x11-libs/libXext:0[abi_x86_64(-)?] x11-libs/libXfixes:0[abi_x86_64(-)?] x11-libs/libXi:0[abi_x86_64(-)?] x11-libs/libxkbfile:0[abi_x86_64(-)?] x11-libs/libXrandr:0[abi_x86_64(-)?] x11-libs/libXrender:0[abi_x86_64(-)?] x11-libs/libXScrnSaver:0[abi_x86_64(-)?] x11-libs/libXtst:0[abi_x86_64(-)?] x11-libs/pango:0[abi_x86_64(-)?]
+REQUIRED_USE=|| ( abi_x86_64 )
+RESTRICT=bindist mirror
+SLOT=0
+SRC_URI=https://downloads.slack-edge.com/linux_releases/slack-desktop-3.0.2-amd64.deb
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=fdcc5f588b7af7b6afc8b07956f3ea44
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index f20d5148008d..97443d4af34e 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/hexchat-2.12.4-r2 b/metadata/md5-cache/net-irc/hexchat-2.12.4-r2
index a8f01641ef08..18191c11625e 100644
--- a/metadata/md5-cache/net-irc/hexchat-2.12.4-r2
+++ b/metadata/md5-cache/net-irc/hexchat-2.12.4-r2
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=dev-libs/glib:2 dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) spell? ( app-text/iso-codes ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) app-arch/xz-utils virtual/pkgconfig dev-util/intltool sys-devel/autoconf-archive >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
+DEPEND=dev-libs/glib:2 dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( app-text/iso-codes ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) app-arch/xz-utils virtual/pkgconfig dev-util/intltool sys-devel/autoconf-archive >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4
 DESCRIPTION=Graphical IRC client based on XChat
 EAPI=6
 HOMEPAGE=https://hexchat.github.io/
-IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux
 LICENSE=GPL-2 plugin-fishlim? ( MIT )
-RDEPEND=dev-libs/glib:2 dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) spell? ( app-text/iso-codes ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) spell? ( app-text/enchant )
-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 ) )
+RDEPEND=dev-libs/glib:2 dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( app-text/iso-codes ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) spell? ( app-text/enchant )
+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://dl.hexchat.net/hexchat/hexchat-2.12.4.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=713d4a709267a6974594667be9ac25d1
+_md5_=e09e9ca0184c4dab8e1f954c1900feb1
diff --git a/metadata/md5-cache/net-irc/hexchat-9999 b/metadata/md5-cache/net-irc/hexchat-9999
index 57462e5432f1..824b2d01d9a9 100644
--- a/metadata/md5-cache/net-irc/hexchat-9999
+++ b/metadata/md5-cache/net-irc/hexchat-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=configure install postinst postrm preinst prepare setup unpack
-DEPEND=dev-libs/glib:2 dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) spell? ( app-text/iso-codes ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) app-arch/xz-utils virtual/pkgconfig dev-util/intltool theme-manager? ( dev-util/monodevelop ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
+DEPEND=dev-libs/glib:2 dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( app-text/iso-codes ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) app-arch/xz-utils virtual/pkgconfig dev-util/intltool theme-manager? ( dev-util/monodevelop ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 >=dev-vcs/git-1.8.2.1
 DESCRIPTION=Graphical IRC client based on XChat
 EAPI=6
 HOMEPAGE=https://hexchat.github.io/
-IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl theme-manager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+IUSE=dbus debug +gtk libcanberra libnotify libproxy libressl lua nls perl plugin-checksum plugin-fishlim plugin-sysinfo python spell ssl theme-manager python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
 LICENSE=GPL-2 plugin-fishlim? ( MIT )
-RDEPEND=dev-libs/glib:2 dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) spell? ( app-text/iso-codes ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) spell? ( app-text/enchant )
-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 ) )
+RDEPEND=dev-libs/glib:2 dbus? ( sys-apps/dbus ) gtk? ( x11-libs/gtk+:2 ) libcanberra? ( media-libs/libcanberra ) libproxy? ( net-libs/libproxy ) libnotify? ( x11-libs/libnotify ) lua? ( dev-lang/lua:= ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) plugin-sysinfo? ( sys-apps/pciutils ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) spell? ( app-text/iso-codes ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) theme-manager? ( || ( ( dev-lang/mono[minimal] dev-dotnet/libgdiplus ) dev-lang/mono[-minimal] ) ) spell? ( app-text/enchant )
+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
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mono-env	1f24c032c78290b0d9a07d5b343051a7	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=178ae04372b22bc0fda5e8f67068bfcb
+_md5_=359c0fd0e2f9c63fb056b27c6351f8b1
diff --git a/metadata/md5-cache/net-irc/konversation-1.7.4 b/metadata/md5-cache/net-irc/konversation-1.7.4
index 077246f6994e..0bd2c257432c 100644
--- a/metadata/md5-cache/net-irc/konversation-1.7.4
+++ b/metadata/md5-cache/net-irc/konversation-1.7.4
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kbookmarks-5.40.0:5 >=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kemoticons-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kidletime-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/konversation/1.7.4/src/konversation-1.7.4.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=f10324ab0cbce30f0f54548bd008c933
diff --git a/metadata/md5-cache/net-irc/shadowircd-6.3.3 b/metadata/md5-cache/net-irc/shadowircd-6.3.3
deleted file mode 100644
index 899bcf4bcb0d..000000000000
--- a/metadata/md5-cache/net-irc/shadowircd-6.3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare setup
-DEPEND=ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib ) virtual/yacc sys-devel/flex
-DESCRIPTION=An IRCd based on charybdis that adds several useful features
-EAPI=4
-HOMEPAGE=http://shadowircd.net
-IUSE=debug +ipv6 largenet ssl zlib
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=ssl? ( dev-libs/openssl ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=https://github.com/shadowircd/shadowircd/archive/shadowircd-6.3.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=63001aaf9bcffee679c4834975f45c67
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 28463be966d0..6a8919d5e0f4 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/kdav2-0.1.0 b/metadata/md5-cache/net-libs/kdav2-0.1.0
index f07170d70173..902e1abf02e8 100644
--- a/metadata/md5-cache/net-libs/kdav2-0.1.0
+++ b/metadata/md5-cache/net-libs/kdav2-0.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 >=dev-qt/qtxmlpatterns-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/unstable/kdav2/0.1.0/src/kdav2-0.1.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d19bd9b820593324b6bbd8047667ffc1
diff --git a/metadata/md5-cache/net-libs/kimap2-0.1.1 b/metadata/md5-cache/net-libs/kimap2-0.1.1
index 6a92da0e9b5d..2f28a4d92bee 100644
--- a/metadata/md5-cache/net-libs/kimap2-0.1.1
+++ b/metadata/md5-cache/net-libs/kimap2-0.1.1
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/unstable/kimap2/0.1.1/src/kimap2-0.1.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c78eca5def300bf3b0625ca8a1ae7e29
diff --git a/metadata/md5-cache/net-libs/kimap2-0.2.0 b/metadata/md5-cache/net-libs/kimap2-0.2.0
index 6b9de6d60c59..da235bc3c486 100644
--- a/metadata/md5-cache/net-libs/kimap2-0.2.0
+++ b/metadata/md5-cache/net-libs/kimap2-0.2.0
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcodecs-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.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	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=c78eca5def300bf3b0625ca8a1ae7e29
diff --git a/metadata/md5-cache/net-libs/libktorrent-2.1 b/metadata/md5-cache/net-libs/libktorrent-2.1
index afd8f4bcc250..129c4dad817f 100644
--- a/metadata/md5-cache/net-libs/libktorrent-2.1
+++ b/metadata/md5-cache/net-libs/libktorrent-2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtxml-5.7.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.1/libktorrent-2.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=0dd90fb41fdddfb042d4b5d870a0fcf3
diff --git a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0 b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0
index 1220601a747b..9ed746910f82 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.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:
 RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/libkvkontakte/5.0.0/src/libkvkontakte-5.0.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=8f8fb03993ccabd819ec98060259dd8c
diff --git a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0_pre20170128 b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0_pre20170128
index 3de098722015..57bddc7dd356 100644
--- a/metadata/md5-cache/net-libs/libkvkontakte-5.0.0_pre20170128
+++ b/metadata/md5-cache/net-libs/libkvkontakte-5.0.0_pre20170128
@@ -10,5 +10,5 @@ RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5
 RESTRICT=test
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/libkvkontakte-5.0.0_pre20170128.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bce276de2d0b6a566ace593132959eca
diff --git a/metadata/md5-cache/net-libs/libmediawiki-5.0.0_pre20170128 b/metadata/md5-cache/net-libs/libmediawiki-5.0.0_pre20170128
index c180293f350f..e257bb39f498 100644
--- a/metadata/md5-cache/net-libs/libmediawiki-5.0.0_pre20170128
+++ b/metadata/md5-cache/net-libs/libmediawiki-5.0.0_pre20170128
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=dev-qt/qtnetwork-5.7.1:5 !net-libs/libmediawiki:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~asturm/libmediawiki-5.0.0_pre20170128.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b73f0d69001522348c7aef7d4ab2299f
diff --git a/metadata/md5-cache/net-libs/libmediawiki-5.37.0 b/metadata/md5-cache/net-libs/libmediawiki-5.37.0
index d880b3738689..a70993c23d2b 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.40.0:5 >=dev-qt/qtnetwork-5.7.1:5 !net-libs/libmediawiki:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/libmediawiki/libmediawiki-5.37.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=b46571acd420b065383497ba2a595be0
diff --git a/metadata/md5-cache/net-libs/libpcap-1.8.1-r2 b/metadata/md5-cache/net-libs/libpcap-1.8.1-r2
new file mode 100644
index 000000000000..ee1615bc6e43
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libpcap-1.8.1-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) netlink? ( dev-libs/libnl:3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-devel/flex virtual/yacc dbus? ( 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(-)?] ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A system-independent library for user-level network packet capture
+EAPI=6
+HOMEPAGE=http://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap
+IUSE=bluetooth dbus netlink static-libs usb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,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(-)?] ) netlink? ( dev-libs/libnl: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(-)?] )
+SLOT=0
+SRC_URI=https://github.com/the-tcpdump-group/libpcap/archive/libpcap-1.8.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=15c204733bdc1b85cded45d51020de56
diff --git a/metadata/md5-cache/net-libs/nodejs-9.4.0 b/metadata/md5-cache/net-libs/nodejs-9.4.0
new file mode 100644
index 000000000000..76b8ba6b6ebb
--- /dev/null
+++ b/metadata/md5-cache/net-libs/nodejs-9.4.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=>=dev-libs/libuv-1.18.0:= >=net-libs/http-parser-2.7.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) 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_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.18.0:= >=net-libs/http-parser-2.7.0:= >=net-libs/nghttp2-1.29.0 sys-libs/zlib icu? ( >=dev-libs/icu-60.1:= ) ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
+REQUIRED_USE=python_targets_python2_7 inspector? ( icu ssl )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://nodejs.org/dist/v9.4.0/node-v9.4.0.tar.xz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=df5ef74dcbbdf8cfd998152df4684096
diff --git a/metadata/md5-cache/net-libs/polarssl-1.3.9 b/metadata/md5-cache/net-libs/polarssl-1.3.9
deleted file mode 100644
index 531e471ee837..000000000000
--- a/metadata/md5-cache/net-libs/polarssl-1.3.9
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=programs? ( dev-libs/openssl:0 ) 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(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Cryptographic library for embedded systems
-EAPI=5
-HOMEPAGE=http://polarssl.org/
-IUSE=doc havege programs cpu_flags_x86_sse2 static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=programs? ( dev-libs/openssl:0 ) 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(-)?] )
-SLOT=0/7
-SRC_URI=http://polarssl.org/download/polarssl-1.3.9-gpl.tgz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=952f199d17d5057bfffc55d64d57af5c
diff --git a/metadata/md5-cache/net-libs/polarssl-1.3.9-r1 b/metadata/md5-cache/net-libs/polarssl-1.3.9-r1
deleted file mode 100644
index fed592147996..000000000000
--- a/metadata/md5-cache/net-libs/polarssl-1.3.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=programs? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) 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(-)?] ) doc? ( app-doc/doxygen media-gfx/graphviz ) test? ( dev-lang/perl ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Cryptographic library for embedded systems
-EAPI=5
-HOMEPAGE=http://polarssl.org/
-IUSE=doc havege libressl programs cpu_flags_x86_sse2 static-libs test threads zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=programs? ( !libressl? ( dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) 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(-)?] )
-SLOT=0/7
-SRC_URI=http://polarssl.org/download/polarssl-1.3.9-gpl.tgz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2fc2355c7ac4be3a5a9d34a5056e84c8
diff --git a/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1 b/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1
new file mode 100644
index 000000000000..908c9bf27d0f
--- /dev/null
+++ b/metadata/md5-cache/net-libs/rpcsvc-proto-1.3.1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=>=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=rpcsvc protocol definitions from glibc
+EAPI=6
+HOMEPAGE=https://github.com/thkukuk/rpcsvc-proto
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=LGPL-2.1+ BSD
+RDEPEND=!<sys-libs/glibc-2.26
+SLOT=0
+SRC_URI=https://github.com/thkukuk/rpcsvc-proto/archive/v1.3.1.tar.gz -> rpcsvc-proto-1.3.1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=43cb1be1f0bc1cd189074eeb81814026
diff --git a/metadata/md5-cache/net-libs/telepathy-logger-qt-15.04.0 b/metadata/md5-cache/net-libs/telepathy-logger-qt-15.04.0
index 4e5d2a3807b7..0f6e1431afb3 100644
--- a/metadata/md5-cache/net-libs/telepathy-logger-qt-15.04.0
+++ b/metadata/md5-cache/net-libs/telepathy-logger-qt-15.04.0
@@ -9,5 +9,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=dev-qt/qtdbus-5.7.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/telepathy-logger-qt/15.04/src/telepathy-logger-qt-15.04.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ec39519b79155d7961281673aca47a18
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 bd317a0352b6..d7b46bdcbd54 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.7.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.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	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a0481d6515fffaa2cc909b506ef121d6
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.18.4 b/metadata/md5-cache/net-libs/webkit-gtk-2.18.4
deleted file mode 100644
index 5544a042dcff..000000000000
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.18.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup test
-DEPEND=>=x11-libs/cairo-1.10.2:= >=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 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.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( x11-libs/cairo[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 x11-libs/cairo[opengl] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage ) || ( >=dev-lang/python-2.7.5-r2:2.7 ) || ( dev-lang/ruby:2.2 dev-lang/ruby:2.3 dev-lang/ruby:2.4 ) virtual/rubygems >=app-accessibility/at-spi2-core-2.5.3 >=dev-lang/perl-5.10 >=dev-util/gtk-doc-am-1.10 >=dev-util/gperf-3.0.1 >=sys-devel/bison-2.4.3 || ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 ) sys-devel/gettext virtual/pkgconfig dev-lang/perl virtual/perl-Data-Dumper virtual/perl-Carp doc? ( >=dev-util/gtk-doc-1.10 ) geolocation? ( dev-util/gdbus-codegen ) introspection? ( jit? ( sys-apps/paxctl ) ) test? ( dev-lang/python:2.7 dev-python/pygobject:3[python_targets_python2_7] x11-themes/hicolor-icon-theme jit? ( sys-apps/paxctl ) ) dev-util/ninja >=dev-util/cmake-3.7.2 >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Open source web browser engine
-EAPI=6
-HOMEPAGE=http://www.webkitgtk.org/
-IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X test
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
-LICENSE=LGPL-2+ BSD
-RDEPEND=>=x11-libs/cairo-1.10.2:= >=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 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.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( x11-libs/cairo[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 x11-libs/cairo[opengl] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage )
-REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl ) introspection? ( gstreamer ) nsplugin? ( X ) webgl? ( ^^ ( gles2 opengl ) ) !webgl? ( ?? ( gles2 opengl ) ) webgl? ( gstreamer ) wayland? ( egl ) || ( aqua wayland X )
-RESTRICT=test
-SLOT=4/37
-SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.18.4.tar.xz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=277c331947303659e9c12e001e30a569
diff --git a/metadata/md5-cache/net-libs/webkit-gtk-2.18.5 b/metadata/md5-cache/net-libs/webkit-gtk-2.18.5
index f933faa60f49..912452375501 100644
--- a/metadata/md5-cache/net-libs/webkit-gtk-2.18.5
+++ b/metadata/md5-cache/net-libs/webkit-gtk-2.18.5
@@ -4,7 +4,7 @@ DESCRIPTION=Open source web browser engine
 EAPI=6
 HOMEPAGE=http://www.webkitgtk.org/
 IUSE=aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2+ BSD
 RDEPEND=>=x11-libs/cairo-1.10.2:= >=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 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.2.3:1.0 >=media-libs/gst-plugins-base-1.2.3:1.0 >=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] ) X? ( x11-libs/cairo[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 x11-libs/cairo[opengl] ) webgl? ( x11-libs/cairo[opengl] x11-libs/libXcomposite x11-libs/libXdamage )
 REQUIRED_USE=geolocation? ( introspection ) gles2? ( egl ) introspection? ( gstreamer ) nsplugin? ( X ) webgl? ( ^^ ( gles2 opengl ) ) !webgl? ( ?? ( gles2 opengl ) ) webgl? ( gstreamer ) wayland? ( egl ) || ( aqua wayland X )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4/37
 SRC_URI=http://www.webkitgtk.org/releases/webkitgtk-2.18.5.tar.xz
 _eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ruby-single	7435c1687c234eb8cf5b212756f6381e	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3bd5fd18205f8be1cbf9ee2406224f4b
+_md5_=0ef902092bfbeffbee3b9c655544eeb1
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 5955c7b210fb..0e180e106cac 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/rss2email-3.10_pre20171001 b/metadata/md5-cache/net-mail/rss2email-3.10_pre20171001
new file mode 100644
index 000000000000..bd37a32a8b0b
--- /dev/null
+++ b/metadata/md5-cache/net-mail/rss2email-3.10_pre20171001
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/patchutils python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A python script that converts RSS/Atom newsfeeds to email
+EAPI=6
+HOMEPAGE=https://github.com/rss2email/rss2email
+IUSE=python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=|| ( GPL-2 GPL-3 )
+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/feedparser-5.0.1 >=dev-python/html2text-3.01 python_targets_python3_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://github.com/rss2email/rss2email/archive/e21e803a158a90ed784ee61ce7226e5c3a593a28.tar.gz -> rss2email-3.10_pre20171001.tar.gz
+_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4b82647cde8789b470bc8324db36609d
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index b8f8301be329..45218ac63df0 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.4.5 b/metadata/md5-cache/net-misc/bird-1.4.5
deleted file mode 100644
index 9f8490098294..000000000000
--- a/metadata/md5-cache/net-misc/bird-1.4.5
+++ /dev/null
@@ -1,12 +0,0 @@
-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=5
-HOMEPAGE=http://bird.network.cz
-IUSE=debug ipv6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses sys-libs/readline
-SLOT=0
-SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.4.5.tar.gz
-_md5_=d179dd131f4b64f3d0e48b136e13a8ec
diff --git a/metadata/md5-cache/net-misc/bird-1.5.0 b/metadata/md5-cache/net-misc/bird-1.5.0
deleted file mode 100644
index b39a7c2d7f6f..000000000000
--- a/metadata/md5-cache/net-misc/bird-1.5.0
+++ /dev/null
@@ -1,12 +0,0 @@
-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=5
-HOMEPAGE=http://bird.network.cz
-IUSE=debug ipv6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses sys-libs/readline
-SLOT=0
-SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.5.0.tar.gz
-_md5_=8868fe32e3ee993fd93bd6b37b16d01e
diff --git a/metadata/md5-cache/net-misc/bird-1.6.0 b/metadata/md5-cache/net-misc/bird-1.6.0
deleted file mode 100644
index d1a3f540e2c9..000000000000
--- a/metadata/md5-cache/net-misc/bird-1.6.0
+++ /dev/null
@@ -1,12 +0,0 @@
-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=6
-HOMEPAGE=http://bird.network.cz
-IUSE=debug ipv6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses sys-libs/readline
-SLOT=0
-SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.6.0.tar.gz
-_md5_=dc47d2a79021d6668ee543caabfd4655
diff --git a/metadata/md5-cache/net-misc/bird-1.6.1 b/metadata/md5-cache/net-misc/bird-1.6.1
deleted file mode 100644
index 0b850684dfdb..000000000000
--- a/metadata/md5-cache/net-misc/bird-1.6.1
+++ /dev/null
@@ -1,12 +0,0 @@
-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=6
-HOMEPAGE=http://bird.network.cz
-IUSE=debug ipv6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses sys-libs/readline
-SLOT=0
-SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.6.1.tar.gz
-_md5_=dc47d2a79021d6668ee543caabfd4655
diff --git a/metadata/md5-cache/net-misc/bird-1.6.2 b/metadata/md5-cache/net-misc/bird-1.6.2
deleted file mode 100644
index e94b997b22c9..000000000000
--- a/metadata/md5-cache/net-misc/bird-1.6.2
+++ /dev/null
@@ -1,12 +0,0 @@
-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=6
-HOMEPAGE=http://bird.network.cz
-IUSE=debug ipv6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-libs/ncurses sys-libs/readline
-SLOT=0
-SRC_URI=ftp://bird.network.cz/pub/bird/bird-1.6.2.tar.gz
-_md5_=dc47d2a79021d6668ee543caabfd4655
diff --git a/metadata/md5-cache/net-misc/bird-1.6.3-r1 b/metadata/md5-cache/net-misc/bird-1.6.3-r1
new file mode 100644
index 000000000000..cf1f26e35302
--- /dev/null
+++ b/metadata/md5-cache/net-misc/bird-1.6.3-r1
@@ -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=6
+HOMEPAGE=http://bird.network.cz
+IUSE=+client debug ipv6
+KEYWORDS=~amd64 ~x86
+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.3.tar.gz
+_md5_=f68b7843da684ff7fbb688965bbaa7e2
diff --git a/metadata/md5-cache/net-misc/igmpproxy-0.2 b/metadata/md5-cache/net-misc/igmpproxy-0.2
new file mode 100644
index 000000000000..59084f735ce5
--- /dev/null
+++ b/metadata/md5-cache/net-misc/igmpproxy-0.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install setup
+DEPEND=virtual/pkgconfig
+DESCRIPTION=Multicast Routing Daemon using only IGMP signalling
+EAPI=6
+HOMEPAGE=https://github.com/pali/igmpproxy
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 Stanford
+SLOT=0
+SRC_URI=https://github.com/pali/igmpproxy/releases/download/0.2/igmpproxy-0.2.tar.gz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	multilib	97f470f374f2e94ccab04a2fb21d811e	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=ea0636a4866d005e3cfa87a05e604b38
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 7bc2bca966fa..91fd4ff74c14 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.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kglobalaccel-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/plasma-5.40.0:5 >=kde-plasma/libksysguard-5.10.5:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsql-5.7.1:5[sqlite] >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~johu/distfiles/knemo-0.8.0_pre20161211.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d451d074a7508e7f7b64b7f374745bbf
diff --git a/metadata/md5-cache/net-misc/rsync-3.1.2 b/metadata/md5-cache/net-misc/rsync-3.1.2
deleted file mode 100644
index 0fec21bd5204..000000000000
--- a/metadata/md5-cache/net-misc/rsync-3.1.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) static? ( acl? ( virtual/acl[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) >=dev-libs/popt-1.5[static-libs(+)] ) virtual/pkgconfig
-DESCRIPTION=File transfer program to keep remote files into sync
-EAPI=5
-HOMEPAGE=https://rsync.samba.org/
-IUSE=acl examples iconv ipv6 static stunnel xattr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
-SLOT=0
-SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=75cec1cf4d15d2acdf60079266866b33
diff --git a/metadata/md5-cache/net-misc/rsync-3.1.2-r1 b/metadata/md5-cache/net-misc/rsync-3.1.2-r1
deleted file mode 100644
index 8feed0040922..000000000000
--- a/metadata/md5-cache/net-misc/rsync-3.1.2-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst
-DEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) static? ( acl? ( virtual/acl[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) >=dev-libs/popt-1.5[static-libs(+)] ) virtual/pkgconfig
-DESCRIPTION=File transfer program to keep remote files into sync
-EAPI=6
-HOMEPAGE=https://rsync.samba.org/
-IUSE=acl examples iconv ipv6 static stunnel xattr
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
-SLOT=0
-SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e7fc71f15c1e49a66d05866e7eae21a4
diff --git a/metadata/md5-cache/net-misc/rsync-3.1.2-r2 b/metadata/md5-cache/net-misc/rsync-3.1.2-r2
index f35fd52b9531..00efdf803b2c 100644
--- a/metadata/md5-cache/net-misc/rsync-3.1.2-r2
+++ b/metadata/md5-cache/net-misc/rsync-3.1.2-r2
@@ -4,10 +4,10 @@ DESCRIPTION=File transfer program to keep remote files into sync
 EAPI=6
 HOMEPAGE=https://rsync.samba.org/
 IUSE=acl examples iconv ipv6 static stunnel xattr
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
 SLOT=0
 SRC_URI=https://rsync.samba.org/ftp/rsync/src/rsync-3.1.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=b8b873d9369631bb573ea31abd06a89a
+_md5_=91bbe1ff4912a278d06fecd6988c9acb
diff --git a/metadata/md5-cache/net-misc/rsync-3.1.3_pre1 b/metadata/md5-cache/net-misc/rsync-3.1.3_pre1
new file mode 100644
index 000000000000..31e18c5e5c41
--- /dev/null
+++ b/metadata/md5-cache/net-misc/rsync-3.1.3_pre1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst
+DEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv ) static? ( acl? ( virtual/acl[static-libs(+)] ) xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) ) >=dev-libs/popt-1.5[static-libs(+)] ) virtual/pkgconfig
+DESCRIPTION=File transfer program to keep remote files into sync
+EAPI=6
+HOMEPAGE=https://rsync.samba.org/
+IUSE=acl examples iconv ipv6 static stunnel xattr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=!static? ( acl? ( virtual/acl ) xattr? ( kernel_linux? ( sys-apps/attr ) ) >=dev-libs/popt-1.5 ) iconv? ( virtual/libiconv )
+SLOT=0
+SRC_URI=https://rsync.samba.org/ftp/rsync/src-previews/rsync-3.1.3pre1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=b8459a08e5241343a1335423d35db3d6
diff --git a/metadata/md5-cache/net-misc/smb4k-2.0.2 b/metadata/md5-cache/net-misc/smb4k-2.0.2
index afee6ebb0432..a7d9d6d7d2ed 100644
--- a/metadata/md5-cache/net-misc/smb4k-2.0.2
+++ b/metadata/md5-cache/net-misc/smb4k-2.0.2
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kauth-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdeclarative-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qttest-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-misc/smb4k:4 >=net-fs/samba-3.4.2[cups] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/smb4k/smb4k-2.0.2.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=51fbacf2a3141bef2d13fae14aa81671
diff --git a/metadata/md5-cache/net-misc/uftp-3.7 b/metadata/md5-cache/net-misc/uftp-3.7
deleted file mode 100644
index c00575a23866..000000000000
--- a/metadata/md5-cache/net-misc/uftp-3.7
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=ssl? ( dev-libs/openssl )
-DESCRIPTION=Encrypted UDP based FTP with multicast
-EAPI=4
-HOMEPAGE=http://www.tcnj.edu/~bush/uftp.html
-IUSE=+server ssl
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=ssl? ( dev-libs/openssl )
-SLOT=0
-SRC_URI=http://www.tcnj.edu/~bush/downloads/uftp-3.7.tar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=332f3efa656dcd98401c98d2e5b5dcad
diff --git a/metadata/md5-cache/net-misc/uftp-3.7.1 b/metadata/md5-cache/net-misc/uftp-3.7.1
index b1f716823b5a..02ef0b91672a 100644
--- a/metadata/md5-cache/net-misc/uftp-3.7.1
+++ b/metadata/md5-cache/net-misc/uftp-3.7.1
@@ -1,13 +1,13 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=ssl? ( dev-libs/openssl )
+DEFINED_PHASES=compile install
+DEPEND=ssl? ( dev-libs/openssl:0= )
 DESCRIPTION=Encrypted UDP based FTP with multicast
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.tcnj.edu/~bush/uftp.html
 IUSE=+server ssl
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3
-RDEPEND=ssl? ( dev-libs/openssl )
+RDEPEND=ssl? ( dev-libs/openssl:0= )
 SLOT=0
 SRC_URI=http://www.tcnj.edu/~bush/downloads/uftp-3.7.1.tar
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=05b2d0f3e4589c4dbd3637582b41e001
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=78e9f4b7dad8faae0641bfb721ae82e5
diff --git a/metadata/md5-cache/net-misc/uftp-4.9.4 b/metadata/md5-cache/net-misc/uftp-4.9.4
new file mode 100644
index 000000000000..8c056762724d
--- /dev/null
+++ b/metadata/md5-cache/net-misc/uftp-4.9.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst
+DEPEND=ssl? ( dev-libs/openssl:0= )
+DESCRIPTION=Encrypted UDP based FTP with multicast
+EAPI=6
+HOMEPAGE=http://uftp-multicast.sourceforge.net/
+IUSE=+server ssl
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=ssl? ( dev-libs/openssl:0= )
+SLOT=0
+SRC_URI=mirror://sourceforge/uftp-multicast/uftp-4.9.4.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=29e21cf551ad4eb7effeee6a4701bdbd
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2017.12.31 b/metadata/md5-cache/net-misc/youtube-dl-2017.12.31
deleted file mode 100644
index 9b5dbc34facc..000000000000
--- a/metadata/md5-cache/net-misc/youtube-dl-2017.12.31
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-DESCRIPTION=Download videos from YouTube.com (and more sites...)
-EAPI=6
-HOMEPAGE=https://rg3.github.com/youtube-dl/
-IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
-LICENSE=public-domain
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=http://youtube-dl.org/downloads/2017.12.31/youtube-dl-2017.12.31.tar.gz
-_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=9ede6c578c939c2592ea2933977a5399
diff --git a/metadata/md5-cache/net-misc/youtube-dl-2018.01.14 b/metadata/md5-cache/net-misc/youtube-dl-2018.01.14
new file mode 100644
index 000000000000..68c5c5516b70
--- /dev/null
+++ b/metadata/md5-cache/net-misc/youtube-dl-2018.01.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/nose[coverage(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=Download videos from YouTube.com (and more sites...)
+EAPI=6
+HOMEPAGE=https://rg3.github.com/youtube-dl/
+IUSE=+offensive test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x86-solaris
+LICENSE=public-domain
+RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=https://youtube-dl.org/downloads/2018.01.14/youtube-dl-2018.01.14.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c95d17b3ee9606122fbffdd9f9be4467
diff --git a/metadata/md5-cache/net-news/Manifest.gz b/metadata/md5-cache/net-news/Manifest.gz
index 9ff3a43b609d..c223f5b54a0a 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/snownews-1.5.12-r1 b/metadata/md5-cache/net-news/snownews-1.5.12-r1
index 61d43199da6c..d6a2d13c4135 100644
--- a/metadata/md5-cache/net-news/snownews-1.5.12-r1
+++ b/metadata/md5-cache/net-news/snownews-1.5.12-r1
@@ -2,12 +2,12 @@ DEFINED_PHASES=compile configure install prepare
 DEPEND=>=dev-libs/libxml2-2.5.6 >=sys-libs/ncurses-5.3[unicode?] dev-libs/openssl virtual/pkgconfig
 DESCRIPTION=Snownews, a text-mode RSS/RDF newsreader
 EAPI=5
-HOMEPAGE=http://snownews.kcore.de/
+HOMEPAGE=https://kiza.eu/software/snownews/
 IUSE=unicode
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~x86-macos
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/libxml2-2.5.6 >=sys-libs/ncurses-5.3[unicode?] dev-libs/openssl dev-perl/XML-LibXML dev-perl/libwww-perl
 SLOT=0
-SRC_URI=http://home.kcore.de/~kiza/software/snownews/download/snownews-1.5.12.tar.gz
+SRC_URI=https://kiza.eu/media/software/snownews/snownews-1.5.12.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=4df2c6b9aef8331bba58d461b3b56599
+_md5_=2a832d90d49cee82299f1524c1797c65
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index a678150ab679..fe51fe16ce6e 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 1408d25e5fa7..ea49ea405638 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.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kguiaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwallet-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 !net-nntp/kwooty:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~kensington/distfiles/kwooty-1.1.0_p20150623.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=ad545b56a8a48303e63c0c9c7452bdd2
diff --git a/metadata/md5-cache/net-p2p/Manifest.gz b/metadata/md5-cache/net-p2p/Manifest.gz
index 842b7bd88010..2fc10f80f840 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/ktorrent-5.1.0 b/metadata/md5-cache/net-p2p/ktorrent-5.1.0
index 1448c475b674..aef86b3aa6b4 100644
--- a/metadata/md5-cache/net-p2p/ktorrent-5.1.0
+++ b/metadata/md5-cache/net-p2p/ktorrent-5.1.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/kcmutils-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdbusaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/knotifyconfig-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=kde-frameworks/solid-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 =net-libs/libktorrent-2.1*:5 infowidget? ( dev-libs/geoip ) kross? ( >=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kitemviews-5.40.0:5 >=kde-frameworks/kross-5.40.0:5 ) mediaplayer? ( media-libs/phonon[qt5(+)] >=media-libs/taglib-1.5 ) rss? ( >=kde-frameworks/kdewebkit-5.40.0:5 >=kde-apps/syndication-14.12.0:5 ) search? ( >=kde-frameworks/kdewebkit-5.40.0:5 >=dev-qt/qtwebkit-5.7.1:5 ) shutdown? ( >=kde-plasma/plasma-workspace-5.10.5:5 ) stats? ( >=kde-frameworks/kplotting-5.40.0:5 ) upnp? ( >=kde-frameworks/kcompletion-5.40.0:5 ) zeroconf? ( >=kde-frameworks/kdnssd-5.40.0:5 ) ipfilter? ( app-arch/bzip2 app-arch/unzip >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-apps/kio-extras-14.12.0:5 ) !net-p2p/ktorrent:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/ktorrent/5.1/ktorrent-5.1.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=bb30bb43f5dffa2e67ebd19ea8db9e20
diff --git a/metadata/md5-cache/net-p2p/transmission-2.92-r3 b/metadata/md5-cache/net-p2p/transmission-2.92-r3
new file mode 100644
index 000000000000..bc458fc34a21
--- /dev/null
+++ b/metadata/md5-cache/net-p2p/transmission-2.92-r3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/libevent-2.0.10:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) systemd? ( >=sys-apps/systemd-209:= ) >=dev-libs/glib-2.32 dev-util/intltool sys-devel/gettext virtual/os-headers virtual/pkgconfig qt5? ( dev-qt/linguist-tools:5 ) xfs? ( sys-fs/xfsprogs ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=sys-apps/sed-4 virtual/pkgconfig
+DESCRIPTION=A Fast, Easy and Free BitTorrent client
+EAPI=6
+HOMEPAGE=http://www.transmissionbt.com/
+IUSE=ayatana gtk libressl lightweight systemd qt5 xfs
+KEYWORDS=~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux
+LICENSE=|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT
+RDEPEND=>=dev-libs/libevent-2.0.10:= !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libnatpmp >=net-libs/miniupnpc-1.7:= >=net-misc/curl-7.16.3[ssl] sys-libs/zlib:= gtk? ( >=dev-libs/dbus-glib-0.100 >=dev-libs/glib-2.32:2 >=x11-libs/gtk+-3.4:3 ayatana? ( >=dev-libs/libappindicator-0.4.90:3 ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) systemd? ( >=sys-apps/systemd-209:= )
+REQUIRED_USE=ayatana? ( gtk )
+SLOT=0
+SRC_URI=http://download.transmissionbt.com/transmission/files/transmission-2.92.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c6d2a467b0d3572a541da8b07eb039b6
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 15e1988a5046..b1773f954ae6 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/cups-filters-1.19.0 b/metadata/md5-cache/net-print/cups-filters-1.19.0
new file mode 100644
index 000000000000..efff14589988
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-filters-1.19.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] ) dev-util/gdbus-codegen test? ( media-fonts/dejavu ) virtual/pkgconfig
+DESCRIPTION=Cups filters
+EAPI=6
+HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
+IUSE=dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint
+LICENSE=MIT GPL-2
+RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
+SLOT=0
+SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.19.0.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e46eed5c6b88f096b6451e612041a251
diff --git a/metadata/md5-cache/net-print/kyocera-1x2x-mfp-driver-1.1203-r1 b/metadata/md5-cache/net-print/kyocera-1x2x-mfp-driver-1.1203-r1
index 2e153702dcd1..5ef5d33f1ad7 100644
--- a/metadata/md5-cache/net-print/kyocera-1x2x-mfp-driver-1.1203-r1
+++ b/metadata/md5-cache/net-print/kyocera-1x2x-mfp-driver-1.1203-r1
@@ -3,7 +3,7 @@ DEPEND=app-arch/unzip
 DESCRIPTION=Printer descriptions (PPDs) and filters for Kyocera 1x2x MFP
 EAPI=6
 HOMEPAGE=http://www.kyoceradocumentsolutions.eu
-IUSE=+rastertokpsl-fix l10n_en l10n_ar l10n_cs l10n_de l10n_el l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ko l10n_pl l10n_pt l10n_ro l10n_ru l10n_th l10n_tr l10n_vi l10n_zh-CN l10n_zh-TW
+IUSE=+rastertokpsl-fix +l10n_en l10n_ar l10n_cs l10n_de l10n_el l10n_es l10n_fr l10n_he l10n_hu l10n_it l10n_ko l10n_pl l10n_pt l10n_ro l10n_ru l10n_th l10n_tr l10n_vi l10n_zh-CN l10n_zh-TW
 KEYWORDS=-* ~amd64
 LICENSE=GPL-2 kyocera-mita-ppds
 RDEPEND=net-print/cups
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( l10n_en l10n_ar l10n_cs l10n_de l10n_el l10n_es l10n_fr l10n_h
 RESTRICT=fetch mirror
 SLOT=0
 SRC_URI=LinuxDrv_1.1203_FS-1x2xMFP.zip
-_md5_=81496704a129dcb080ebc12e3e9f4286
+_md5_=22112cedd346f8b56ef4bfa99f30a2bb
diff --git a/metadata/md5-cache/net-vpn/Manifest.gz b/metadata/md5-cache/net-vpn/Manifest.gz
index fcae5f7c0036..81eb8b7e008c 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/freelan-2.0 b/metadata/md5-cache/net-vpn/freelan-2.0
deleted file mode 100644
index 38272b127eb6..000000000000
--- a/metadata/md5-cache/net-vpn/freelan-2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-libs/boost:=[threads] dev-libs/openssl:0= net-misc/curl:= virtual/libiconv dev-util/scons
-DESCRIPTION=Peer-to-peer VPN software that abstracts a LAN over the Internet
-EAPI=5
-HOMEPAGE=http://www.freelan.org/
-IUSE=debug
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-libs/boost:=[threads] dev-libs/openssl:0= net-misc/curl:= virtual/libiconv
-SLOT=0
-SRC_URI=https://github.com/freelan-developers/freelan/archive/2.0.tar.gz -> freelan-2.0.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=614021ab16f862635e656e9ef53fd46f
diff --git a/metadata/md5-cache/net-vpn/freelan-2.1 b/metadata/md5-cache/net-vpn/freelan-2.1
new file mode 100644
index 000000000000..f414eb9d0896
--- /dev/null
+++ b/metadata/md5-cache/net-vpn/freelan-2.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install prepare
+DEPEND=dev-libs/boost:=[threads] dev-libs/openssl:0= net-misc/curl:= virtual/libiconv net-libs/miniupnpc:= dev-util/scons
+DESCRIPTION=Peer-to-peer VPN software that abstracts a LAN over the Internet
+EAPI=6
+HOMEPAGE=http://www.freelan.org/
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=dev-libs/boost:=[threads] dev-libs/openssl:0= net-misc/curl:= virtual/libiconv net-libs/miniupnpc:=
+SLOT=0
+SRC_URI=https://github.com/freelan-developers/freelan/archive/2.1.tar.gz -> freelan-2.1.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=88329cf1b0de5f0e0ee719095dc3d617
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index fd733c95f524..6e41e2baa48e 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/gr-specest-9999 b/metadata/md5-cache/net-wireless/gr-specest-9999
new file mode 100644
index 000000000000..7c3710741b3b
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/gr-specest-9999
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=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_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] doc? ( app-doc/doxygen ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1
+DESCRIPTION=A module adding spectral estimation routines to GNU Radio
+EAPI=6
+HOMEPAGE=https://github.com/kit-cel/gr-specest
+IUSE=doc python_targets_python2_7
+LICENSE=GPL-3
+RDEPEND=>=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_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=0821b550f11404e2b840108474873dfe
diff --git a/metadata/md5-cache/ros-meta/Manifest.gz b/metadata/md5-cache/ros-meta/Manifest.gz
index 78473cc1e3fa..9920baed66be 100644
--- a/metadata/md5-cache/ros-meta/Manifest.gz
+++ b/metadata/md5-cache/ros-meta/Manifest.gz
diff --git a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.7.3 b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.7.3
new file mode 100644
index 000000000000..288fc3a58e0c
--- /dev/null
+++ b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-2.7.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Interface for using ROS with the gazebo simulator
+EAPI=5
+HOMEPAGE=http://wiki.ros.org/gazebo_ros_pkgs
+IUSE=python_targets_python2_7 test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.7.3.tar.gz -> gazebo_ros_pkgs-2.7.3.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e5853080c56266c20fbfe41755efb859
diff --git a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999 b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999
index 8fd1fa38ebff..a6edc0d9ca37 100644
--- a/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999
+++ b/metadata/md5-cache/ros-meta/gazebo_ros_pkgs-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-util/catkin[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/empy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 DESCRIPTION=Interface for using ROS with the gazebo simulator
 EAPI=5
 HOMEPAGE=http://wiki.ros.org/gazebo_ros_pkgs
 IUSE=python_targets_python2_7 test
 LICENSE=BSD
-RDEPEND=dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+RDEPEND=dev-ros/gazebo_dev dev-ros/gazebo_msgs dev-ros/gazebo_plugins dev-ros/gazebo_ros dev-ros/gazebo_ros_control python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 )
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	ros-catkin	eff12e024f16913cfb3da0e96a045552	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=0b97ccaf6a193155bd1090aba2a78e5b
+_md5_=e5853080c56266c20fbfe41755efb859
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 9ed69e7f5b93..6921c8db1fce 100644
--- a/metadata/md5-cache/sci-biology/Manifest.gz
+++ b/metadata/md5-cache/sci-biology/Manifest.gz
diff --git a/metadata/md5-cache/sci-biology/amos-3.1.0-r3 b/metadata/md5-cache/sci-biology/amos-3.1.0-r3
index 7440d913dc66..6dfe244a6713 100644
--- a/metadata/md5-cache/sci-biology/amos-3.1.0-r3
+++ b/metadata/md5-cache/sci-biology/amos-3.1.0-r3
@@ -1,4 +1,4 @@
-DEFINED_PHASES=install prepare setup
+DEFINED_PHASES=configure install prepare setup
 DEPEND=qt4? ( dev-qt/qtcore:4 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=A Modular, Open-Source whole genome assembler
 EAPI=6
@@ -10,5 +10,5 @@ RDEPEND=qt4? ( dev-qt/qtcore:4 ) python_targets_python2_7? ( >=dev-lang/python-2
 REQUIRED_USE=python_targets_python2_7
 SLOT=0
 SRC_URI=mirror://sourceforge/amos/amos-3.1.0.tar.gz https://dev.gentoo.org/~soap/distfiles/amos-3.1.0-fix-c++14.patch.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=df778f6981c64e06ab2354697c3fc4a6
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f8ce0df79839e77c09be71e9505f52e4
diff --git a/metadata/md5-cache/sci-calculators/Manifest.gz b/metadata/md5-cache/sci-calculators/Manifest.gz
index 384c0f06e453..8fbb4bae28a3 100644
--- a/metadata/md5-cache/sci-calculators/Manifest.gz
+++ b/metadata/md5-cache/sci-calculators/Manifest.gz
diff --git a/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0 b/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
index a9f55f41a6cb..9250517b6fad 100644
--- a/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
+++ b/metadata/md5-cache/sci-calculators/speedcrunch-0.12.0
@@ -4,10 +4,10 @@ DESCRIPTION=Fast and usable calculator for power users
 EAPI=6
 HOMEPAGE=http://speedcrunch.org/
 IUSE=doc l10n_ar l10n_ca l10n_cs l10n_da l10n_de l10n_el l10n_en-GB l10n_en-US l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_he l10n_hu l10n_id l10n_it l10n_ja l10n_ko l10n_lt l10n_lv l10n_nb l10n_nl l10n_pl l10n_pt-BR l10n_pt-PT l10n_ro l10n_ru l10n_sk l10n_sv l10n_tr l10n_uz l10n_vi l10n_zh-CN
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 RDEPEND=dev-qt/qtcore:5 dev-qt/qthelp:5 dev-qt/qtsql:5 dev-qt/qtwidgets:5
 SLOT=0
 SRC_URI=https://bitbucket.org/heldercorreia/speedcrunch/get/release-0.12.0.tar.gz -> speedcrunch-0.12.0.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=66b21bb475548f48ef8306d2aeed66c4
+_md5_=e76fd29155f0861c3703bdfcf3056283
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index fa29585e1fd8..c89ecbfdd5d4 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/avogadro-1.0.3-r2 b/metadata/md5-cache/sci-chemistry/avogadro-1.0.3-r2
deleted file mode 100644
index fe18bbe6b27e..000000000000
--- a/metadata/md5-cache/sci-chemistry/avogadro-1.0.3-r2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=sci-chemistry/openbabel-2.2.3 >=dev-qt/qtgui-4.5.3:4 >=dev-qt/qtopengl-4.5.3:4 x11-libs/gl2ps glsl? ( >=media-libs/glew-1.5.0:0= ) python? ( >=dev-libs/boost-1.35.0-r5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/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_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-cpp/eigen:2 sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Advanced molecular editor that uses Qt4 and OpenGL
-EAPI=5
-HOMEPAGE=http://avogadro.openmolecules.net/
-IUSE=+glsl python cpu_flags_x86_sse2 python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=sci-chemistry/openbabel-2.2.3 >=dev-qt/qtgui-4.5.3:4 >=dev-qt/qtopengl-4.5.3:4 x11-libs/gl2ps glsl? ( >=media-libs/glew-1.5.0:0= ) python? ( >=dev-libs/boost-1.35.0-r5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/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_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://sourceforge/avogadro/avogadro-1.0.3.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1c0862d00b05d8a7c351864e27db9d8d
diff --git a/metadata/md5-cache/sci-chemistry/avogadro-1.1.0 b/metadata/md5-cache/sci-chemistry/avogadro-1.1.0
deleted file mode 100644
index 9092ec494139..000000000000
--- a/metadata/md5-cache/sci-chemistry/avogadro-1.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=>=sci-chemistry/openbabel-2.3.0 >=dev-qt/qtgui-4.5.3:4 >=dev-qt/qtopengl-4.5.3:4 x11-libs/gl2ps glsl? ( >=media-libs/glew-1.5.0:0= ) python? ( >=dev-libs/boost-1.35.0-r5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/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_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-cpp/eigen:2 sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Advanced molecular editor that uses Qt4 and OpenGL
-EAPI=5
-HOMEPAGE=http://avogadro.openmolecules.net/
-IUSE=+glsl python cpu_flags_x86_sse2 test python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=sci-chemistry/openbabel-2.3.0 >=dev-qt/qtgui-4.5.3:4 >=dev-qt/qtopengl-4.5.3:4 x11-libs/gl2ps glsl? ( >=media-libs/glew-1.5.0:0= ) python? ( >=dev-libs/boost-1.35.0-r5[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/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_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python? ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/avogadro/avogadro-1.1.0.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=22c78f046b4aa5bf0253a302639c3da0
diff --git a/metadata/md5-cache/sci-chemistry/avogadro-1.1.1 b/metadata/md5-cache/sci-chemistry/avogadro-1.1.1
index b09ecb0ad4df..9d34f478ddab 100644
--- a/metadata/md5-cache/sci-chemistry/avogadro-1.1.1
+++ b/metadata/md5-cache/sci-chemistry/avogadro-1.1.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://sourceforge/project/avogadro/avogadro/1.1.1/avogadro-1.1.1.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=bd4587ace94a8bbc943813939f380590
+_md5_=e98d369f6c820ff511ffe21130bebd04
diff --git a/metadata/md5-cache/sci-chemistry/avogadro-1.2.0_p20170207 b/metadata/md5-cache/sci-chemistry/avogadro-1.2.0_p20170207
new file mode 100644
index 000000000000..6b823841ae67
--- /dev/null
+++ b/metadata/md5-cache/sci-chemistry/avogadro-1.2.0_p20170207
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
+DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/glew:= sci-chemistry/openbabel:= virtual/glu x11-libs/gl2ps glsl? ( >=media-libs/glew-1.5.0:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/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_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) dev-cpp/eigen:3 virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Advanced molecular editor that uses Qt4 and OpenGL
+EAPI=6
+HOMEPAGE=http://avogadro.openmolecules.net/
+IUSE=cpu_flags_x86_sse2 +glsl python test python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/glew:= sci-chemistry/openbabel:= virtual/glu x11-libs/gl2ps glsl? ( >=media-libs/glew-1.5.0:0= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/boost:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/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_python2_7(+)] dev-python/sip[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/cryos/avogadro/archive/258105b4d8957e0245a341cdf1dc12c72234c833.tar.gz -> avogadro-1.2.0_p20170207.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=b8795fa7dc952ffe9081f3b03a7ef971
diff --git a/metadata/md5-cache/sci-chemistry/molequeue-0.8.0 b/metadata/md5-cache/sci-chemistry/molequeue-0.8.0
index 89b981b8f9df..574a820a846f 100644
--- a/metadata/md5-cache/sci-chemistry/molequeue-0.8.0
+++ b/metadata/md5-cache/sci-chemistry/molequeue-0.8.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 zeromq? ( net-libs/cppzmq:0= ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 zeromq? ( net-libs/cppzmq:0= ) doc? ( app-doc/doxygen ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Abstract, manage and coordinate execution of tasks
-EAPI=5
-HOMEPAGE=http://www.openchemistry.org/OpenChemistry/project/molequeue.html
+EAPI=6
+HOMEPAGE=https://www.openchemistry.org/projects/molequeue/
 IUSE=+client doc server test +zeromq python_targets_python2_7 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 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_python2_7(+)] dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 zeromq? ( net-libs/cppzmq:0= )
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 zeromq? ( net-libs/cppzmq:0= )
 REQUIRED_USE=python_targets_python2_7 server? ( client ) test? ( server )
 SLOT=0
 SRC_URI=https://github.com/OpenChemistry/molequeue/archive/0.8.0.tar.gz -> molequeue-0.8.0.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2893a758e54e8bc01d0f1767335bea7d
+_md5_=bbfcb0263c616c8a8e05654d801bc1a0
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 30b671845fb7..a41f1afa6392 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/gpsd-3.17-r2 b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2
index f32dac7b890c..e038e73dbf5b 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.17-r2
@@ -4,11 +4,11 @@ DESCRIPTION=GPS daemon and library for USB/serial GPS devices and GPS/mapping cl
 EAPI=5
 HOMEPAGE=http://catb.org/gpsd/
 IUSE=gpsd_protocols_aivdm gpsd_protocols_ashtech gpsd_protocols_earthmate gpsd_protocols_evermore gpsd_protocols_fury gpsd_protocols_fv18 gpsd_protocols_garmin gpsd_protocols_garmintxt gpsd_protocols_geostar gpsd_protocols_gpsclock gpsd_protocols_isync gpsd_protocols_itrax gpsd_protocols_mtk3301 gpsd_protocols_navcom gpsd_protocols_nmea0183 gpsd_protocols_nmea2000 gpsd_protocols_ntrip gpsd_protocols_oceanserver gpsd_protocols_oncore gpsd_protocols_passthrough gpsd_protocols_rtcm104v2 gpsd_protocols_rtcm104v3 gpsd_protocols_sirf gpsd_protocols_skytraq gpsd_protocols_superstar2 gpsd_protocols_tnt gpsd_protocols_tripmate gpsd_protocols_tsip gpsd_protocols_ublox bluetooth dbus debug ipv6 latency_timing ncurses ntp python qt5 +shm +sockets static test udev usb X python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=bluetooth? ( net-wireless/bluez ) dbus? ( sys-apps/dbus dev-libs/dbus-glib ) ncurses? ( sys-libs/ncurses:= ) ntp? ( || ( net-misc/ntp net-misc/chrony ) ) qt5? ( dev-qt/qtcore:5 dev-qt/qtnetwork: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_python2_7(-)] ) usb? ( virtual/libusb:1 ) X? ( dev-python/pygobject:3[cairo,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) python? ( || ( python_targets_python2_7 ) )
 SLOT=0/23
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.17.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	scons-utils	fcace052aef60e6b0eb3023c26aa585a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=e66aeba0a5f9cff4396f83fab4f83936
+_md5_=63e4884b681944e0973c69e9f588a4c9
diff --git a/metadata/md5-cache/sci-geosciences/liblas-1.8.1 b/metadata/md5-cache/sci-geosciences/liblas-1.8.1
index b44e236de291..7765c2a70e67 100644
--- a/metadata/md5-cache/sci-geosciences/liblas-1.8.1
+++ b/metadata/md5-cache/sci-geosciences/liblas-1.8.1
@@ -4,11 +4,11 @@ DESCRIPTION=C/C++ library for manipulating the LAS LiDAR format common in GIS
 EAPI=6
 HOMEPAGE=http://www.liblas.org
 IUSE=gdal
-KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
 RDEPEND=dev-libs/boost:= sci-geosciences/laszip sci-libs/libgeotiff gdal? ( sci-libs/gdal )
 RESTRICT=test
 SLOT=0
 SRC_URI=http://download.osgeo.org/liblas/libLAS-1.8.1.tar.bz2
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5470ffa98071fe610be75951bf9b28e5
+_md5_=874e405594502d5cfc40e6ce5cc06b33
diff --git a/metadata/md5-cache/sci-geosciences/qgis-9999 b/metadata/md5-cache/sci-geosciences/qgis-9999
index 58eeb5cd703b..4203a70ca23c 100644
--- a/metadata/md5-cache/sci-geosciences/qgis-9999
+++ b/metadata/md5-cache/sci-geosciences/qgis-9999
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] designer? ( >=dev-qt/designer-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( 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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/future[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/httplib2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/jinja[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/markupsafe[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[sql,svg,webkit?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/python-dateutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pytz[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] postgres? ( dev-python/psycopg:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/linguist-tools-5.9.1:5 >=dev-qt/qttest-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 sys-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1 >=sys-apps/sed-4
+DEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] designer? ( >=dev-qt/designer-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[sql,svg,webkit?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) >=dev-qt/linguist-tools-5.9.1:5 >=dev-qt/qttest-5.9.1:5 >=dev-qt/qtxmlpatterns-5.9.1:5 sys-devel/bison sys-devel/flex sys-devel/make >=dev-util/cmake-3.7.2 >=dev-vcs/git-1.8.2.1 >=sys-apps/sed-4
 DESCRIPTION=User friendly Geographic Information System
 EAPI=6
 HOMEPAGE=https://www.qgis.org/
-IUSE=designer examples georeferencer grass mapserver oracle polar postgres python webkit 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
+IUSE=designer examples georeferencer grass mapserver oracle polar postgres python webkit python_targets_python3_5
 LICENSE=GPL-2+ GPL-3+
-RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] designer? ( >=dev-qt/designer-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( 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_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/future[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/httplib2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/jinja[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/markupsafe[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pygments[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/PyQt5[sql,svg,webkit?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/python-dateutil[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pytz[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/pyyaml[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/requests[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/sip:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] dev-python/six[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] postgres? ( dev-python/psycopg:2[python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
-REQUIRED_USE=mapserver? ( 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 ) )
+RDEPEND=app-crypt/qca:2[qt5(+),ssl] >=dev-db/spatialite-4.2.0 dev-db/sqlite:3 dev-libs/expat dev-libs/libzip:= dev-libs/qtkeychain[qt5(+)] >=dev-qt/qtconcurrent-5.9.1:5 >=dev-qt/qtcore-5.9.1:5 >=dev-qt/qtgui-5.9.1:5 >=dev-qt/qtnetwork-5.9.1:5 >=dev-qt/qtpositioning-5.9.1:5 >=dev-qt/qtprintsupport-5.9.1:5 >=dev-qt/qtsvg-5.9.1:5 >=dev-qt/qtsql-5.9.1:5 >=dev-qt/qtwidgets-5.9.1:5 >=dev-qt/qtxml-5.9.1:5 >=sci-libs/gdal-2.2.3:=[geos,python?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] sci-libs/geos sci-libs/libspatialindex:= sci-libs/proj >=x11-libs/qscintilla-2.10.1:=[qt5(+)] >=x11-libs/qwt-6.1.2:6=[qt5(+),svg] designer? ( >=dev-qt/designer-5.9.1:5 ) georeferencer? ( sci-libs/gsl:= ) grass? ( >=sci-geosciences/grass-7.0.0:= ) mapserver? ( dev-libs/fcgi ) oracle? ( dev-db/oracle-instantclient:= sci-libs/gdal:=[oracle] ) polar? ( >=x11-libs/qwtpolar-1.1.1-r1[qt5(+)] ) postgres? ( dev-db/postgresql:= ) python? ( python_targets_python3_5? ( dev-lang/python:3.5[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/future[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/httplib2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/jinja[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/markupsafe[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/owslib[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pygments[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/PyQt5[sql,svg,webkit?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/python-dateutil[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pytz[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/pyyaml[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] >=dev-python/qscintilla-python-2.10.1[qt5(+),python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/requests[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/sip:=[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] dev-python/six[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] postgres? ( dev-python/psycopg:2[python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_6(-),python_single_target_python3_5(+)] ) ) webkit? ( >=dev-qt/qtwebkit-5.9.1:5 ) sci-geosciences/gpsbabel
+REQUIRED_USE=mapserver? ( python ) python? ( python_targets_python3_5 )
 RESTRICT=test
 SLOT=0
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4452edc7b90440f176b80bf5d7ab27b4
+_md5_=38ff29867f9349e265c2963bffe976b9
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index f9705c2e86f3..ebc59a934946 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/ViSP-3.1.0 b/metadata/md5-cache/sci-libs/ViSP-3.1.0
new file mode 100644
index 000000000000..fcc25007d7c0
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/ViSP-3.1.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=coin? ( media-libs/coin virtual/opengl ) dmtx? ( media-libs/libdmtx ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) !qt4? ( motif? ( media-libs/SoXt ) ) ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv:= qt4? ( media-libs/opencv[-qt5(-)] ) ) png? ( media-libs/libpng:0= ) qt4? ( media-libs/SoQt dev-qt/qtgui:4 ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz ) virtual/pkgconfig test? ( sci-misc/ViSP-images ) v4l? ( virtual/os-headers ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=Visual Servoing Platform: visual tracking and visual servoing library
+EAPI=5
+HOMEPAGE=http://www.irisa.fr/lagadic/visp/visp.html
+IUSE=+coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=coin? ( media-libs/coin virtual/opengl ) dmtx? ( media-libs/libdmtx ) gsl? ( sci-libs/gsl ) ieee1394? ( media-libs/libdc1394 ) jpeg? ( virtual/jpeg:0 ) lapack? ( virtual/lapack ) !qt4? ( motif? ( media-libs/SoXt ) ) ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] ) opencv? ( media-libs/opencv:= qt4? ( media-libs/opencv[-qt5(-)] ) ) png? ( media-libs/libpng:0= ) qt4? ( media-libs/SoQt dev-qt/qtgui:4 ) usb? ( virtual/libusb:1 ) v4l? ( media-libs/libv4l ) X? ( x11-libs/libX11 ) xml? ( dev-libs/libxml2 ) zbar? ( media-gfx/zbar ) zlib? ( sys-libs/zlib ) demos? ( sci-misc/ViSP-images )
+REQUIRED_USE=ois? ( ogre ) qt4? ( coin ) motif? ( coin )
+SLOT=0/3.1
+SRC_URI=http://gforge.inria.fr/frs/download.php/latestfile/475/visp-3.1.0.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=19ef30a30afb116369bf105e4d340d5b
diff --git a/metadata/md5-cache/sci-libs/avogadrolibs-0.7.2-r1 b/metadata/md5-cache/sci-libs/avogadrolibs-0.7.2-r1
deleted file mode 100644
index ead0790e73a8..000000000000
--- a/metadata/md5-cache/sci-libs/avogadrolibs-0.7.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Advanced molecule editor and visualizer 2 - libraries
-EAPI=5
-HOMEPAGE=http://www.openchemistry.org/
-IUSE=doc opengl qt4 static-plugins test vtk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD GPL-2+
-RDEPEND=>=sci-chemistry/molequeue-0.7 sci-libs/chemkit sci-libs/hdf5:= opengl? ( dev-qt/qtopengl:4 media-libs/glew ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 ) vtk? ( sci-libs/vtk )
-REQUIRED_USE=qt4? ( opengl )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/avogadro/avogadro2/0.7.2/avogadrolibs-0.7.2.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=1d528be82428029686781a3a65173b9c
diff --git a/metadata/md5-cache/sci-libs/avogadrolibs-0.8.0 b/metadata/md5-cache/sci-libs/avogadrolibs-0.8.0
deleted file mode 100644
index 145b28ff6584..000000000000
--- a/metadata/md5-cache/sci-libs/avogadrolibs-0.8.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-cpp/eigen:3 test? ( dev-cpp/gtest ) sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Advanced molecule editor and visualizer 2 - libraries
-EAPI=5
-HOMEPAGE=http://www.openchemistry.org/
-IUSE=doc opengl qt5 static-plugins test vtk
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD GPL-2+
-RDEPEND=>=sci-chemistry/molequeue-0.7 sci-libs/chemkit sci-libs/hdf5:= opengl? ( dev-qt/qtopengl:5 media-libs/glew ) qt5? ( dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtnetwork:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 ) vtk? ( sci-libs/vtk )
-REQUIRED_USE=qt5? ( opengl )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/avogadro/avogadro2/0.8.0/avogadrolibs-0.8.0.tar.bz2
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=4f1e54ee0324efb4b6411756b5984520
diff --git a/metadata/md5-cache/sci-libs/chemkit-0.1-r1 b/metadata/md5-cache/sci-libs/chemkit-0.1-r1
deleted file mode 100644
index 2d9ee070cb89..000000000000
--- a/metadata/md5-cache/sci-libs/chemkit-0.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/boost dev-libs/rapidxml dev-cpp/eigen:3 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/glu sci-libs/inchi sci-libs/lemon virtual/opengl examples? ( x11-libs/libX11 x11-libs/libXext ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Library for chemistry applications
-EAPI=5
-HOMEPAGE=http://www.chemkit.org/
-IUSE=applications examples python test python_targets_python2_7 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD PSF-2.2
-RDEPEND=dev-libs/boost dev-libs/rapidxml dev-cpp/eigen:3 dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 media-libs/glu sci-libs/inchi sci-libs/lemon virtual/opengl examples? ( x11-libs/libX11 x11-libs/libXext ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
-REQUIRED_USE=python_targets_python2_7 test? ( applications python )
-SLOT=0
-SRC_URI=mirror://sourceforge/project/chemkit/chemkit-0.1.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=39c89fd45f3fffcada4f61bb7e9b6b1e
diff --git a/metadata/md5-cache/sci-libs/chemkit-0.1-r2 b/metadata/md5-cache/sci-libs/chemkit-0.1-r2
new file mode 100644
index 000000000000..7874abe90c13
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/chemkit-0.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/rapidxml media-libs/glu sci-libs/inchi sci-libs/lemon virtual/opengl examples? ( x11-libs/libX11 x11-libs/libXext ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 ) sys-devel/make >=dev-util/cmake-3.7.2 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=Library for chemistry applications
+EAPI=6
+HOMEPAGE=http://www.chemkit.org/
+IUSE=examples python qt4 test python_targets_python2_7 test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD PSF-2.2
+RDEPEND=dev-cpp/eigen:3 dev-libs/boost:= dev-libs/rapidxml media-libs/glu sci-libs/inchi sci-libs/lemon virtual/opengl examples? ( x11-libs/libX11 x11-libs/libXext ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 )
+REQUIRED_USE=python_targets_python2_7 test? ( python qt4 )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/chemkit/chemkit-0.1.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=652f09f8bb04714caba7252a16d48028
diff --git a/metadata/md5-cache/sci-libs/octomap-1.9.0 b/metadata/md5-cache/sci-libs/octomap-1.9.0
new file mode 100644
index 000000000000..24a65099f44d
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/octomap-1.9.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=qt5? ( virtual/opengl dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/libQGLViewer:= ) doc? ( app-doc/doxygen media-gfx/graphviz ) sys-devel/make >=dev-util/cmake-3.7.2
+DESCRIPTION=An Efficient Probabilistic 3D Mapping Framework Based on Octrees
+EAPI=5
+HOMEPAGE=http://octomap.github.io/
+IUSE=qt5 dynamicEDT3D doc
+KEYWORDS=~amd64 ~arm
+LICENSE=BSD qt5? ( GPL-2 )
+RDEPEND=qt5? ( virtual/opengl dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/libQGLViewer:= )
+SLOT=0/19
+SRC_URI=https://github.com/OctoMap/octomap/archive/v1.9.0.tar.gz -> octomap-1.9.0.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e48c8357363075137a96b5452bfe3661
diff --git a/metadata/md5-cache/sci-libs/octomap-9999 b/metadata/md5-cache/sci-libs/octomap-9999
index a372193de0f4..f699ca6a62ee 100644
--- a/metadata/md5-cache/sci-libs/octomap-9999
+++ b/metadata/md5-cache/sci-libs/octomap-9999
@@ -1,11 +1,11 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=qt4? ( virtual/opengl dev-qt/qtcore:4 dev-qt/qtgui:4 x11-libs/libQGLViewer:= ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2
+DEPEND=qt5? ( virtual/opengl dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/libQGLViewer:= ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-vcs/git-1.8.2.1 sys-devel/make >=dev-util/cmake-3.7.2
 DESCRIPTION=An Efficient Probabilistic 3D Mapping Framework Based on Octrees
 EAPI=5
 HOMEPAGE=http://octomap.github.io/
-IUSE=qt4 dynamicEDT3D doc
-LICENSE=BSD qt4? ( GPL-2 )
-RDEPEND=qt4? ( virtual/opengl dev-qt/qtcore:4 dev-qt/qtgui:4 x11-libs/libQGLViewer:= )
-SLOT=0
+IUSE=qt5 dynamicEDT3D doc
+LICENSE=BSD qt5? ( GPL-2 )
+RDEPEND=qt5? ( virtual/opengl dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 x11-libs/libQGLViewer:= )
+SLOT=0/19
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c4271f3380e2896cc997e9f6db918a31
+_md5_=5083699d475d58ad391f872745354dd7
diff --git a/metadata/md5-cache/sci-libs/rtabmap-0.13.2 b/metadata/md5-cache/sci-libs/rtabmap-0.13.2
deleted file mode 100644
index fb1c8eecba3c..000000000000
--- a/metadata/md5-cache/sci-libs/rtabmap-0.13.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394 ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.7.2
-DESCRIPTION=Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)
-EAPI=5
-HOMEPAGE=http://introlab.github.io/rtabmap/
-IUSE=examples ieee1394 openni2 qt5
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=media-libs/opencv:=[qt5(-)?] sci-libs/pcl:=[openni,vtk] sci-libs/vtk:=[qt5(-)?] sys-libs/zlib sci-libs/octomap:= dev-libs/boost:= ieee1394? ( media-libs/libdc1394 ) openni2? ( dev-libs/OpenNI2 ) qt5? ( dev-qt/qtwidgets:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 )
-SLOT=0
-SRC_URI=https://github.com/introlab/rtabmap/archive/0.13.2.tar.gz -> rtabmap-0.13.2.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=00b9dd26e98c9d5cdea40032fb53049e
diff --git a/metadata/md5-cache/sci-libs/scikits_image-0.11.3 b/metadata/md5-cache/sci-libs/scikits_image-0.11.3
deleted file mode 100644
index 243ae93006c2..000000000000
--- a/metadata/md5-cache/sci-libs/scikits_image-0.11.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-python/matplotlib-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/networkx-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/numpy-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pillow-1.7.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=sci-libs/scipy-0.9[sparse,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] freeimage? ( media-libs/freeimage ) gtk? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pyamg? ( dev-python/pyamg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt4? ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) >=dev-python/cython-0.21[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Image processing routines for SciPy
-EAPI=5
-HOMEPAGE=http://scikit-image.org/
-IUSE=doc freeimage gtk pyamg qt4 test python_targets_python2_7 python_targets_python3_4 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/matplotlib-1.1.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/networkx-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/numpy-1.6.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/pillow-1.7.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/six-1.3[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=sci-libs/scipy-0.9[sparse,python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] freeimage? ( media-libs/freeimage ) gtk? ( dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) pyamg? ( dev-python/pyamg[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) qt4? ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.11.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=32bf1ccafed2ea16034dc4fecf5ee75e
diff --git a/metadata/md5-cache/sci-libs/scikits_image-0.12.3 b/metadata/md5-cache/sci-libs/scikits_image-0.12.3
deleted file mode 100644
index 885ba391a554..000000000000
--- a/metadata/md5-cache/sci-libs/scikits_image-0.12.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sci-libs/scipy[sparse,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] freeimage? ( media-libs/freeimage ) pyamg? ( dev-python/pyamg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) qt4? ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) >=dev-python/cython-0.23[python_targets_python2_7(-)?,python_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(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Image processing routines for SciPy
-EAPI=6
-HOMEPAGE=http://scikit-image.org/
-IUSE=doc freeimage pyamg qt4 test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] sci-libs/scipy[sparse,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] freeimage? ( media-libs/freeimage ) pyamg? ( dev-python/pyamg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) qt4? ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.12.3.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=3f0f8094a748b3d236d67aef162d32fe
diff --git a/metadata/md5-cache/sci-libs/scikits_image-0.13.0 b/metadata/md5-cache/sci-libs/scikits_image-0.13.0
index 8e54757175ea..497ec235ac15 100644
--- a/metadata/md5-cache/sci-libs/scikits_image-0.13.0
+++ b/metadata/md5-cache/sci-libs/scikits_image-0.13.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pywavelets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[sparse,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] freeimage? ( media-libs/freeimage ) pyamg? ( dev-python/pyamg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt4? ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/cython-0.23[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pywavelets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[sparse,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] freeimage? ( media-libs/freeimage ) pyamg? ( dev-python/pyamg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) >=dev-python/cython-0.23[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Image processing routines for SciPy
 EAPI=6
 HOMEPAGE=http://scikit-image.org/
-IUSE=doc freeimage pyamg qt4 test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
+IUSE=doc freeimage pyamg test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
-RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pywavelets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[sparse,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] freeimage? ( media-libs/freeimage ) pyamg? ( dev-python/pyamg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) qt4? ( dev-python/PyQt4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_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(-)]
+RDEPEND=dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/pillow[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pywavelets[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] sci-libs/scipy[sparse,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] freeimage? ( media-libs/freeimage ) pyamg? ( dev-python/pyamg[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
 REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
 SLOT=0
 SRC_URI=mirror://pypi/s/scikit-image/scikit-image-0.13.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=5d1f2858acaa9793db4c4c63d08f7ad3
+_md5_=ca3da81561d0c2cbd3b6275d2cdba08e
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index e7d7918fa620..a8ac9f77103a 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/pari-2.5.4 b/metadata/md5-cache/sci-mathematics/pari-2.5.4
deleted file mode 100644
index 9f75f3fa09ac..000000000000
--- a/metadata/md5-cache/sci-mathematics/pari-2.5.4
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp:0= ) qt4? ( dev-qt/qtgui:4 ) X? ( x11-libs/libX11 ) doc? ( virtual/latex-base )
-DESCRIPTION=Computer-aided number theory C library and tools
-EAPI=5
-HOMEPAGE=http://pari.math.u-bordeaux.fr/
-IUSE=data doc fltk gmp qt4 X
-KEYWORDS=~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1 ) gmp? ( dev-libs/gmp:0= ) qt4? ( dev-qt/qtgui:4 ) X? ( x11-libs/libX11 )
-SLOT=0
-SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.5.4.tar.gz https://dev.gentoo.org/~mgorny/dist/pari-2.5.4-patchset.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0620a83563c861fcc0da737b8e1d34c2
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.7.1 b/metadata/md5-cache/sci-mathematics/pari-2.7.1
deleted file mode 100644
index ae32b2b85c80..000000000000
--- a/metadata/md5-cache/sci-mathematics/pari-2.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) qt4? ( dev-qt/qtgui:4= ) X? ( x11-libs/libX11:0= ) doc? ( virtual/latex-base )
-DESCRIPTION=Computer-aided number theory C library and tools
-EAPI=5
-HOMEPAGE=http://pari.math.u-bordeaux.fr/
-IUSE=data doc fltk gmp qt4 X
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) qt4? ( dev-qt/qtgui:4= ) X? ( x11-libs/libX11:0= )
-SLOT=0/4
-SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.7.1.tar.gz https://dev.gentoo.org/~mgorny/dist/pari-2.7.1-patchset.tar.bz2
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ea184120c113229addc54929b08f6517
diff --git a/metadata/md5-cache/sci-mathematics/pari-2.9.4 b/metadata/md5-cache/sci-mathematics/pari-2.9.4
new file mode 100644
index 000000000000..1a5f7fbcf89f
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/pari-2.9.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) X? ( x11-libs/libX11:0= ) doc? ( virtual/latex-base )
+DESCRIPTION=Computer-aided number theory C library and tools
+EAPI=6
+HOMEPAGE=http://pari.math.u-bordeaux.fr/
+IUSE=data doc fltk gmp X
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-libs/readline:0= data? ( sci-mathematics/pari-data ) doc? ( X? ( x11-misc/xdg-utils ) ) fltk? ( x11-libs/fltk:1= ) gmp? ( dev-libs/gmp:0= ) X? ( x11-libs/libX11:0= )
+SLOT=0/5
+SRC_URI=http://pari.math.u-bordeaux.fr/pub/pari/unix/pari-2.9.4.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=ccec06e17b56842892367e8fd6c2ccb1
diff --git a/metadata/md5-cache/sci-mathematics/rkward-0.6.5_p20170420 b/metadata/md5-cache/sci-mathematics/rkward-0.6.5_p20170420
index 3b39e2e87e77..0f1a179440a7 100644
--- a/metadata/md5-cache/sci-mathematics/rkward-0.6.5_p20170420
+++ b/metadata/md5-cache/sci-mathematics/rkward-0.6.5_p20170420
@@ -9,5 +9,5 @@ LICENSE=GPL-2+ LGPL-2
 RDEPEND=>=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/kdewebkit-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/knotifications-5.40.0:5 >=kde-frameworks/kparts-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/ktexteditor-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kwindowsystem-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtnetwork-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtscript-5.7.1:5 >=dev-qt/qtwebkit-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtxml-5.7.1:5 dev-lang/R virtual/libintl !sci-mathematics/rkward:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=https://dev.gentoo.org/~kensington/distfiles/rkward-0.6.5_p20170420.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=851e1b7b240866e9d0e508555be0138e
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index 27942a199bdd..0f770888ec36 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/gle-4.2.5 b/metadata/md5-cache/sci-visualization/gle-4.2.5
deleted file mode 100644
index 08ce7fb6248f..000000000000
--- a/metadata/md5-cache/sci-visualization/gle-4.2.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare unpack
-DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) qt4? ( dev-qt/qtopengl:4 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) doc? ( dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Graphics Layout Engine
-EAPI=5
-HOMEPAGE=http://glx.sourceforge.net/
-IUSE=X qt4 jpeg png tiff doc emacs vim-syntax
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 emacs? ( GPL-2 ) qt4? ( GPL-2 )
-RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) qt4? ( dev-qt/qtopengl:4 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) doc? ( dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) app-text/ghostscript-gpl virtual/latex-base vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )
-SLOT=0
-SRC_URI=mirror://sourceforge/glx/gle-graphics-4.2.5f-src.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	qt4-r2	b7985a3197fbc3a22d059f19904e735b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ec0fe580c4645ee4778e260c0efc1a75
diff --git a/metadata/md5-cache/sci-visualization/gle-4.2.5-r1 b/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
index 3e4b43421346..7122d0d828b6 100644
--- a/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
+++ b/metadata/md5-cache/sci-visualization/gle-4.2.5-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
 DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) jpeg? ( virtual/jpeg:0 ) png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0 ) doc? ( dev-texlive/texlive-latexextra ) emacs? ( virtual/emacs ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Graphics Layout Engine
-EAPI=5
+EAPI=6
 HOMEPAGE=http://glx.sourceforge.net/
 IUSE=X jpeg png tiff doc emacs vim-syntax
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) jpeg? ( virtual/jpeg:0 ) png?
 SLOT=0
 SRC_URI=mirror://sourceforge/glx/gle-graphics-4.2.5f-src.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=9929193052b31ad8216c88939cc67e28
+_md5_=f2c468d2147f07dbdb950e6cd01a160d
diff --git a/metadata/md5-cache/sci-visualization/labplot-2.4.0 b/metadata/md5-cache/sci-visualization/labplot-2.4.0
index 1edf20e0edd5..51c6ff84d1cd 100644
--- a/metadata/md5-cache/sci-visualization/labplot-2.4.0
+++ b/metadata/md5-cache/sci-visualization/labplot-2.4.0
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-14.12.0:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) netcdf? ( sci-libs/netcdf:= ) !sci-visualization/labplot:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/labplot/2.4.0/labplot-2.4.0-kf5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=47c01a51a03a09bb1a95c1ca3364fc5f
diff --git a/metadata/md5-cache/sci-visualization/labplot-9999 b/metadata/md5-cache/sci-visualization/labplot-9999
index 40688aabaa37..472388e04532 100644
--- a/metadata/md5-cache/sci-visualization/labplot-9999
+++ b/metadata/md5-cache/sci-visualization/labplot-9999
@@ -7,5 +7,5 @@ IUSE=cantor fftw fits hdf5 netcdf debug +handbook
 LICENSE=GPL-2
 RDEPEND=>=kde-frameworks/karchive-5.40.0:5 >=kde-frameworks/kcompletion-5.40.0:5 >=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/knewstuff-5.40.0:5 >=kde-frameworks/ktextwidgets-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtconcurrent-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtprintsupport-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=sci-libs/gsl-1.15:= cantor? ( >=kde-apps/cantor-14.12.0:5 ) fftw? ( sci-libs/fftw:3.0= ) fits? ( sci-libs/cfitsio:= ) hdf5? ( sci-libs/hdf5:= ) netcdf? ( sci-libs/netcdf:= ) !sci-visualization/labplot:4 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=dce661ac899ae534407324f9cff75034
diff --git a/metadata/md5-cache/sci-visualization/veusz-1.25.1 b/metadata/md5-cache/sci-visualization/veusz-1.25.1
deleted file mode 100644
index 0e92150dcf4c..000000000000
--- a/metadata/md5-cache/sci-visualization/veusz-1.25.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/PyQt4-4.11.4[compat,X,svg,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sip[python_targets_python2_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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Qt scientific plotting package with good Postscript output
-EAPI=5
-HOMEPAGE=http://home.gna.org/veusz/
-IUSE=dbus doc emf fits hdf5 minuit vo python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/PyQt4-4.11.4[compat,X,svg,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) emf? ( dev-python/pyemf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) fits? ( dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) hdf5? ( dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) minuit? ( dev-python/pyminuit[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) vo? ( dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sampy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://download.gna.org/veusz/veusz-1.25.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=72d098b276d8c3b64b252e9fc63fd452
diff --git a/metadata/md5-cache/sci-visualization/veusz-1.26.1 b/metadata/md5-cache/sci-visualization/veusz-1.26.1
deleted file mode 100644
index d48bed57a9e4..000000000000
--- a/metadata/md5-cache/sci-visualization/veusz-1.26.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm 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(-)] >=dev-python/PyQt4-4.11.4[compat,X,svg,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_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/sip[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,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(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Qt scientific plotting package with good Postscript output
-EAPI=5
-HOMEPAGE=https://veusz.github.io/
-IUSE=dbus doc emf fits hdf5 minuit vo python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-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(-)] >=dev-python/PyQt4-4.11.4[compat,X,svg,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) emf? ( dev-python/pyemf[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) fits? ( dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) hdf5? ( dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) minuit? ( || ( dev-python/iminuit[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/pyminuit[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) ) vo? ( dev-python/astropy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/sampy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=https://github.com/veusz/veusz/releases/download/veusz-1.26.1/veusz-1.26.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fdo-mime	995b19d3f30e956b4e1bc5a91fdc4ea7	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=dd8634158444641c04ec5163eaee5d49
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 1aee7d9dab6e..69cf658c2d2c 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/kmod-24 b/metadata/md5-cache/sys-apps/kmod-24
index 2a9f0d422cc2..a241f9ae685b 100644
--- a/metadata/md5-cache/sys-apps/kmod-24
+++ b/metadata/md5-cache/sys-apps/kmod-24
@@ -4,7 +4,7 @@ DESCRIPTION=library and tools for managing linux kernel modules
 EAPI=5
 HOMEPAGE=https://git.kernel.org/?p=utils/kernel/kmod/kmod.git
 IUSE=debug doc lzma python static-libs +tools zlib 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=LGPL-2
 RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) 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(-)] ) zlib? ( >=sys-libs/zlib-1.2.6 )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/kernel/kmod/kmod-24.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=0d750340900a7b027a25e514cc5f8155
+_md5_=58b5f3f4adab1eeee3729dde1f22a0d7
diff --git a/metadata/md5-cache/sys-apps/less-529 b/metadata/md5-cache/sys-apps/less-529
index c0d244b6820f..52ab743b0ec7 100644
--- a/metadata/md5-cache/sys-apps/less-529
+++ b/metadata/md5-cache/sys-apps/less-529
@@ -4,9 +4,9 @@ DESCRIPTION=Excellent text file viewer
 EAPI=6
 HOMEPAGE=http://www.greenwoodsoftware.com/less/
 IUSE=pcre unicode
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( GPL-3 BSD-2 )
 RDEPEND=>=app-misc/editor-wrapper-3 >=sys-libs/ncurses-5.2:0= pcre? ( dev-libs/libpcre )
 SLOT=0
 SRC_URI=http://www.greenwoodsoftware.com/less/less-529.tar.gz
-_md5_=8685795fe1c918cd9547c51389e21b12
+_md5_=86b3961ba5b770f02f6bbcc2f16676ba
diff --git a/metadata/md5-cache/sys-apps/sandbox-2.12 b/metadata/md5-cache/sys-apps/sandbox-2.12
index ca6e028ac905..dca322503f1a 100644
--- a/metadata/md5-cache/sys-apps/sandbox-2.12
+++ b/metadata/md5-cache/sys-apps/sandbox-2.12
@@ -4,9 +4,9 @@ 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 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mgorny/dist/sandbox-2.12.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1c183a7ddd2fdde622772bb3461de120
+_md5_=c3e5ad7aa633c1bce7a66f1b8a3c5427
diff --git a/metadata/md5-cache/sys-apps/smartmontools-6.6 b/metadata/md5-cache/sys-apps/smartmontools-6.6
index d00e04cd103d..4c5226378555 100644
--- a/metadata/md5-cache/sys-apps/smartmontools-6.6
+++ b/metadata/md5-cache/sys-apps/smartmontools-6.6
@@ -11,4 +11,4 @@ REQUIRED_USE=( caps? ( daemon ) )
 SLOT=0
 SRC_URI=mirror://sourceforge/smartmontools/smartmontools-6.6.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=3bcc9d7599ba3714a1b2832396cc3767
+_md5_=283572c46eb0b1a52def645beecdbddd
diff --git a/metadata/md5-cache/sys-apps/systemd-236-r5 b/metadata/md5-cache/sys-apps/systemd-236-r5
new file mode 100644
index 000000000000..6af5d61fd31e
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/systemd-236-r5
@@ -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(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) 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 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.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.40.0 >=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 policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge vanilla xkb abi_x86_32 abi_x86_64 abi_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 ~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(-)?] ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.1:0= ) selinux? ( sys-libs/libselinux:0= ) sysv-utils? ( !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] ) !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/v236.tar.gz -> systemd-236.tar.gz https://dev.gentoo.org/~floppym/dist/systemd-236-patches-2.tar.gz
+_eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=ef9b6db90b254ae365032c65bb58d9a5
diff --git a/metadata/md5-cache/sys-apps/texinfo-6.3 b/metadata/md5-cache/sys-apps/texinfo-6.3
index cd139e368f9a..ad4b805e3b00 100644
--- a/metadata/md5-cache/sys-apps/texinfo-6.3
+++ b/metadata/md5-cache/sys-apps/texinfo-6.3
@@ -4,10 +4,10 @@ DESCRIPTION=The GNU info program and utilities
 EAPI=5
 HOMEPAGE=https://www.gnu.org/software/texinfo/
 IUSE=nls static
-KEYWORDS=alpha amd64 arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-3
 RDEPEND=!=app-text/tetex-2* >=sys-libs/ncurses-5.2-r2:0= dev-lang/perl:= dev-perl/libintl-perl dev-perl/Unicode-EastAsianWidth dev-perl/Text-Unidecode nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/texinfo/texinfo-6.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a54b0d006ee5d2da547243b4afc938eb
+_md5_=8d8a87a785b21791611b1d61c3c72dbf
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.30.2 b/metadata/md5-cache/sys-apps/util-linux-2.30.2
index 0922478bf39d..bbcb01245dc7 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.30.2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.30.2
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
 IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.3-r2
+RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.3-r2 !<sys-apps/s390-tools-1.36.1-r1
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.30/util-linux-2.30.2.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=75dc42128fbebb8dcba609f788412927
+_md5_=ae765f525dc470c4c20142e7b5f45cbf
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.31-r1 b/metadata/md5-cache/sys-apps/util-linux-2.31-r1
index 06a7b9bd7d03..cf1947e2cac5 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.31-r1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.31-r1
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
 IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
+RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1 !<sys-apps/s390-tools-1.36.1-r1
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.31/util-linux-2.31.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e3a8995b3a8401de23a97ae259ad2561
+_md5_=6409867759e2b99d1c6b1509fce2cd96
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.31.1 b/metadata/md5-cache/sys-apps/util-linux-2.31.1
index 81ce8c21759d..4a5377f4ad5b 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.31.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.31.1
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.kernel.org/pub/linux/utils/util-linux/
 IUSE=build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux
 LICENSE=GPL-2 LGPL-2.1 BSD-4 MIT public-domain
-RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1
+RDEPEND=caps? ( sys-libs/libcap-ng ) cramfs? ( sys-libs/zlib ) ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] ) pam? ( sys-libs/pam ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) python_single_target_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] ) readline? ( sys-libs/readline:0= ) selinux? ( >=sys-libs/libselinux-2.2.2-r4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) slang? ( sys-libs/slang ) !build? ( systemd? ( sys-apps/systemd ) ) udev? ( virtual/libudev:= ) kill? ( !sys-apps/coreutils[kill] !sys-process/procps[kill] ) !net-wireless/rfkill !sys-process/schedutils !sys-apps/setarch !<sys-apps/sysvinit-2.88-r7 !sys-block/eject !<sys-libs/e2fsprogs-libs-1.41.8 !<sys-fs/e2fsprogs-1.41.8 !<app-shells/bash-completion-2.7-r1 !<sys-apps/s390-tools-1.36.1-r1
 REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) python_single_target_python3_6? ( python_targets_python3_6 ) )
 SLOT=0
 SRC_URI=mirror://kernel/linux/utils/util-linux/v2.31/util-linux-2.31.1.tar.xz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=19d1e0a16226d14bd154468bd077a5b6
+_md5_=d9874de4750aa497712677f5bf77717a
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 644512ce4f16..bc6037b61d97 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/elogind-235.2 b/metadata/md5-cache/sys-auth/elogind-235.2
new file mode 100644
index 000000000000..b5ff72b54985
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/elogind-235.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-util/gperf dev-util/intltool sys-devel/libtool virtual/pkgconfig >=dev-util/meson-0.40.0 >=dev-util/ninja-1.7.2 virtual/pkgconfig
+DESCRIPTION=The systemd project's logind, extracted to a standalone package
+EAPI=6
+HOMEPAGE=https://github.com/elogind/elogind
+IUSE=+acl debug doc +pam +policykit selinux
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=CC0-1.0 LGPL-2.1+ public-domain
+PDEPEND=sys-apps/dbus policykit? ( sys-auth/polkit )
+RDEPEND=sys-apps/util-linux sys-libs/libcap virtual/libudev:= acl? ( sys-apps/acl ) pam? ( virtual/pam ) selinux? ( sys-libs/libselinux ) !sys-apps/systemd
+SLOT=0
+SRC_URI=https://github.com/elogind/elogind/archive/v235.2.tar.gz -> elogind-235.2.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pam	3e788d86170dfcd5b06824d898315e18	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d1f9cd794ae120aa2d140afb71d60f67
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 732143fdfc63..85e9418d2757 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 35a1d0112b22..1236a8142e92 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.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kdelibs4support-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://sourceforge/kvpm/kvpm-0.9.10.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=2f189daf0432c2a30c10016436607262
diff --git a/metadata/md5-cache/sys-block/partitionmanager-3.2.1 b/metadata/md5-cache/sys-block/partitionmanager-3.2.1
index f2c89f3f3d60..49b717155de2 100644
--- a/metadata/md5-cache/sys-block/partitionmanager-3.2.1
+++ b/metadata/md5-cache/sys-block/partitionmanager-3.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-apps/util-linux >=sys-libs/kpmcore-3.2.0:5= >=kde-plasma/kde-cli-tools-5.10.5:5[kdesu] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/partitionmanager/3.2.1/src/partitionmanager-3.2.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=eca5f2d681c5cf5109f9995283d18824
diff --git a/metadata/md5-cache/sys-block/partitionmanager-3.3.1 b/metadata/md5-cache/sys-block/partitionmanager-3.3.1
index 1404e56308aa..b2952539bfcf 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.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kiconthemes-5.40.0:5 >=kde-frameworks/kio-5.40.0:5 >=kde-frameworks/kjobwidgets-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 sys-apps/util-linux >=sys-libs/kpmcore-3.3.0:5= >=kde-plasma/kde-cli-tools-5.10.5:5[kdesu] >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/partitionmanager/3.3.1/src/partitionmanager-3.3.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=25533efc603db9b9b2d0fc5b5fdd3d23
diff --git a/metadata/md5-cache/sys-block/raid-check-20140719-r1 b/metadata/md5-cache/sys-block/raid-check-20140719-r1
index 4f3275f1fab5..7a2252e0cc01 100644
--- a/metadata/md5-cache/sys-block/raid-check-20140719-r1
+++ b/metadata/md5-cache/sys-block/raid-check-20140719-r1
@@ -2,9 +2,9 @@ DEFINED_PHASES=compile install prepare test
 DESCRIPTION=Script to do "scrubbing" on software RAID systems
 EAPI=5
 HOMEPAGE=https://github.com/fukawi2/raid-check
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gentoo/raid-check-20140719.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=47626fff5974a4229346c3ff16a071ed
+_md5_=0dd0875e13acd9f00a39badf6a5fd0b5
diff --git a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.0 b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.0
index e32799de5480..14c5deff5ca9 100644
--- a/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.0
+++ b/metadata/md5-cache/sys-block/thin-provisioning-tools-0.7.0
@@ -4,10 +4,10 @@ DESCRIPTION=A suite of tools for thin provisioning on Linux
 EAPI=6
 HOMEPAGE=https://github.com/jthornber/thin-provisioning-tools
 IUSE=static test
-KEYWORDS=alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
 RDEPEND=!static? ( dev-libs/expat dev-libs/libaio )
 SLOT=0
 SRC_URI=https://github.com/jthornber/thin-provisioning-tools/archive/v0.7.0.tar.gz -> thin-provisioning-tools-0.7.0.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=89a1d88d2c7c4fb1a0867e092768dcc6
+_md5_=b159c378deeb3d1cf55c5538f34ee833
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 7c927d635f1d..c04d0165b7ca 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/grub-0.97-r18 b/metadata/md5-cache/sys-boot/grub-0.97-r18
index 5f5ce37ceeba..bde96f6d2468 100644
--- a/metadata/md5-cache/sys-boot/grub-0.97-r18
+++ b/metadata/md5-cache/sys-boot/grub-0.97-r18
@@ -4,10 +4,10 @@ DESCRIPTION=GNU GRUB Legacy boot loader
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/grub/
 IUSE=custom-cflags ncurses netboot static
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=!static? ( ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)] ) ) !sys-boot/grub:2[-multislot]
 SLOT=0
 SRC_URI=mirror://gentoo/grub-0.97.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz mirror://gentoo/splash.xpm.gz mirror://gentoo/grub-0.97-patches-1.15.tar.bz2 https://dev.gentoo.org/~whissi/dist/grub/grub-0.97-patches-1.15.tar.bz2
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	mount-boot	1e82d96b7a7dcb483b412497a90bb646	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6853f71aef8bb754fe7c682a464b9c94
+_md5_=5676a9b51ff1aaa667e157fde2366302
diff --git a/metadata/md5-cache/sys-boot/palo-2.00 b/metadata/md5-cache/sys-boot/palo-2.00
new file mode 100644
index 000000000000..d96fb0b2254e
--- /dev/null
+++ b/metadata/md5-cache/sys-boot/palo-2.00
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=PALO : PArisc Linux Loader
+EAPI=6
+HOMEPAGE=http://parisc-linux.org/ https://parisc.wiki.kernel.org/
+KEYWORDS=-* ~hppa
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=https://git.kernel.org/pub/scm/linux/kernel/git/deller/palo.git/snapshot/palo-2.00.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f2387e10563c812981f5284c9c5aa280
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index d07d8bd22a99..3add0cd489ca 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/drbd-utils-8.9.6-r1 b/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6-r1
index b4b2f671a707..cbe4dfde2a25 100644
--- a/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6-r1
+++ b/metadata/md5-cache/sys-cluster/drbd-utils-8.9.6-r1
@@ -4,10 +4,10 @@ DESCRIPTION=mirror/replicate block-devices across a network-connection
 EAPI=5
 HOMEPAGE=http://www.drbd.org
 IUSE=heartbeat pacemaker +udev xen
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=heartbeat? ( sys-cluster/heartbeat ) pacemaker? ( sys-cluster/pacemaker ) udev? ( virtual/udev ) !!sys-cluster/drbd
 SLOT=0
 SRC_URI=http://oss.linbit.com/drbd/drbd-utils-8.9.6.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=af33470d0727191c518a3f3edb675c2a
+_md5_=e227982f692bc40d7cd3b0f51b8bd250
diff --git a/metadata/md5-cache/sys-cluster/heat-2017.1.9999 b/metadata/md5-cache/sys-cluster/heat-2017.1.9999
index 505dc38d5a46..11794aa6caa8 100644
--- a/metadata/md5-cache/sys-cluster/heat-2017.1.9999
+++ b/metadata/md5-cache/sys-cluster/heat-2017.1.9999
@@ -1,6 +1,6 @@
 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_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1
-DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration engine.
+DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration engine.
 EAPI=6
 HOMEPAGE=https://launchpad.net/heat
 IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_t
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-2017.1.9999
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=a96594c2c3b1a26c38d12b3ea58c1ad2
+_md5_=a7d3ad84f1c92dbc9cdec51a8ea646fb
diff --git a/metadata/md5-cache/sys-cluster/heat-2017.2.9999 b/metadata/md5-cache/sys-cluster/heat-2017.2.9999
index 8b3c903584de..cf656e51fc20 100644
--- a/metadata/md5-cache/sys-cluster/heat-2017.2.9999
+++ b/metadata/md5-cache/sys-cluster/heat-2017.2.9999
@@ -1,6 +1,6 @@
 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_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-vcs/git-1.8.2.1
-DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration engine.
+DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration engine.
 EAPI=6
 HOMEPAGE=https://launchpad.net/heat
 IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
@@ -10,4 +10,4 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_t
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-2017.2.9999
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=32435e7ba30a9aa8122c9bb3ffc59f7f
+_md5_=bee699268df8a69754d1a1362d0648bc
diff --git a/metadata/md5-cache/sys-cluster/heat-8.0.6 b/metadata/md5-cache/sys-cluster/heat-8.0.6
index 6dbf5e3ec0f3..c569b0f78b8c 100644
--- a/metadata/md5-cache/sys-cluster/heat-8.0.6
+++ b/metadata/md5-cache/sys-cluster/heat-8.0.6
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-1.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration engine.
+DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration engine.
 EAPI=6
 HOMEPAGE=https://launchpad.net/heat
 IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_t
 SLOT=0
 SRC_URI=https://tarballs.openstack.org/heat/heat-8.0.6.tar.gz https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-8.0.6
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=627054cde1808dd07816aa2f63d63c26
+_md5_=a7333576bd0dd73edb05a47187e39869
diff --git a/metadata/md5-cache/sys-cluster/heat-9.0.2 b/metadata/md5-cache/sys-cluster/heat-9.0.2
index bb00dc448e2b..7a04d8b824b0 100644
--- a/metadata/md5-cache/sys-cluster/heat-9.0.2
+++ b/metadata/md5-cache/sys-cluster/heat-9.0.2
@@ -1,6 +1,6 @@
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pbr-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !~dev-python/pbr-2.1.0 app-admin/sudo python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchistration engine.
+DESCRIPTION=A CloudFormation-compatible openstack-native cloud orchestration engine.
 EAPI=6
 HOMEPAGE=https://launchpad.net/heat
 IUSE=+mysql +memcached postgres sqlite python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( mysql postgres sqlite ) || ( python_targets_python2_7 python_t
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-9.0.2 https://tarballs.openstack.org/heat/heat-9.0.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=07ccedbb18b82b6f9def28c1f7ad4134
+_md5_=9d58de484e09890d1d83c16580f612ff
diff --git a/metadata/md5-cache/sys-cluster/minikube-0.23.0 b/metadata/md5-cache/sys-cluster/minikube-0.23.0
deleted file mode 100644
index b12b4212a77b..000000000000
--- a/metadata/md5-cache/sys-cluster/minikube-0.23.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup test unpack
-DEPEND=dev-go/go-bindata || ( 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/go-1.8
-DESCRIPTION=Single Node Kubernetes Cluster
-EAPI=6
-HOMEPAGE=https://github.com/kubernetes/minikube https://kubernetes.io
-IUSE=hardened
-KEYWORDS=~amd64
-LICENSE=Apache-2.0
-RDEPEND=>=sys-cluster/kubectl-1.8.0
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/kubernetes/minikube/archive/v0.23.0.tar.gz -> minikube-0.23.0.tar.gz
-_eclasses_=golang-base	51a1f13e065f1cff4507685d9cc268c7	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	multilib	97f470f374f2e94ccab04a2fb21d811e	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=06af3b9a3803467065ecafc33305c197
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index 4421ce7bb2d8..5a8229a622e2 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-2.69-r4 b/metadata/md5-cache/sys-devel/autoconf-2.69-r4
index 904a4b893e78..f46de9bfd665 100644
--- a/metadata/md5-cache/sys-devel/autoconf-2.69-r4
+++ b/metadata/md5-cache/sys-devel/autoconf-2.69-r4
@@ -4,11 +4,11 @@ DESCRIPTION=Used to create autoconfiguration files
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
 IUSE=emacs
-KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 PDEPEND=emacs? ( app-emacs/autoconf-mode )
 RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 !~sys-devel/autoconf-2.69:2.5 >=sys-devel/autoconf-wrapper-13
 SLOT=2.69
 SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz ftp://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.69.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-autoconf	060906d07621f8c91c5ac52ede20858e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=912d500e408c9cc22f74b7c3725a7767
+_md5_=fc84206c69daf2bf7a0399d047a53d5e
diff --git a/metadata/md5-cache/sys-devel/binutils-2.28.1 b/metadata/md5-cache/sys-devel/binutils-2.28.1
index c7c2f49bdd1e..14f6984063a4 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.28.1
+++ b/metadata/md5-cache/sys-devel/binutils-2.28.1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=5
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=cxx multitarget nls static-libs test vanilla
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.28.1
 SRC_URI=mirror://gnu/binutils/binutils-2.28.1.tar.bz2 mirror://gentoo/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.28.1-patches-1.0.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.28.1-patches-1.0.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	836af54604b9fef015d2bfd165d4ca32	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=20a24bb0d5ff117a4fa3d150319d0fbc
+_md5_=f1f8c0d541091501e2d049f6668be0bf
diff --git a/metadata/md5-cache/sys-devel/binutils-2.29.1-r1 b/metadata/md5-cache/sys-devel/binutils-2.29.1-r1
index 9607729387b7..9d26eeed73c1 100644
--- a/metadata/md5-cache/sys-devel/binutils-2.29.1-r1
+++ b/metadata/md5-cache/sys-devel/binutils-2.29.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=Tools necessary to build programs
 EAPI=5
 HOMEPAGE=https://sourceware.org/binutils/
 IUSE=cxx multitarget nls static-libs test vanilla
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd
 LICENSE=|| ( GPL-3 LGPL-3 )
 RDEPEND=>=sys-devel/binutils-config-3 sys-libs/zlib
 SLOT=2.29.1
 SRC_URI=mirror://gnu/binutils/binutils-2.29.1.tar.bz2 mirror://gentoo/binutils-2.29.1-patches-3.tar.xz https://dev.gentoo.org/~vapier/dist/binutils-2.29.1-patches-3.tar.xz https://dev.gentoo.org/~tamiko/distfiles/binutils-2.29.1-patches-3.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/binutils-2.29.1-patches-3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-binutils	836af54604b9fef015d2bfd165d4ca32	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1ac32f55d611bd9b300fd87adc6c8d4f
+_md5_=fb9f3fd89d5b4cd5c96511e1b5c24c31
diff --git a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2 b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
index 83d54dfb92c5..1305a62ed8b0 100644
--- a/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
+++ b/metadata/md5-cache/sys-devel/gcc-apple-4.2.1_p5666-r2
@@ -12,4 +12,4 @@ RESTRICT=strip
 SLOT=42
 SRC_URI=http://www.opensource.apple.com/darwinsource/tarballs/other/gcc-5666.3.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-16.tar.gz http://www.opensource.apple.com/darwinsource/tarballs/other/libstdcxx-39.tar.gz fortran? ( mirror://gnu/gcc/gcc-4.2.4/gcc-fortran-4.2.4.tar.bz2 https://dev.gentoo.org/~grobian/distfiles/gcc-apple-4.2.1_p5646-gfortran.patch )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain	b818258ab006ded1bea3c3d24e013b8a	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=44e567078cca8396664cd702352f92ee
+_md5_=d1d79b3b67c2326bbc79509b553a94b0
diff --git a/metadata/md5-cache/sys-devel/gcc-config-1.8-r1 b/metadata/md5-cache/sys-devel/gcc-config-1.8-r1
index 834aab83b864..1ee51d5c533d 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-1.8-r1
+++ b/metadata/md5-cache/sys-devel/gcc-config-1.8-r1
@@ -2,10 +2,10 @@ DEFINED_PHASES=compile install postinst prepare unpack
 DESCRIPTION=utility to manage compilers
 EAPI=5
 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 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 SRC_URI=mirror://gentoo/gcc-config-1.8.tar.xz https://dev.gentoo.org/~vapier/dist/gcc-config-1.8.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=0ed9495dcee4efd3816d219d029d267c
+_md5_=d10b67e9a01e43a64cfde63bfd0a746e
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index f9a810a577f9..7438562fbf73 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/udev-233 b/metadata/md5-cache/sys-fs/udev-233
index 68b7ef3037e9..de1a84ac2106 100644
--- a/metadata/md5-cache/sys-fs/udev-233
+++ b/metadata/md5-cache/sys-fs/udev-233
@@ -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 abi_x86_32 abi_x86_64 abi_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.27.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v233.tar.gz -> systemd-233.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	libtool	0081a71a261724730ec4c248494f044d	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=1fbca599c0d223bd9bf6d174042cddbb
+_md5_=7670ff07ee697531446baaeca8d46d9e
diff --git a/metadata/md5-cache/sys-fs/udev-234-r1 b/metadata/md5-cache/sys-fs/udev-234-r1
index baede9f71d40..a2980183a15e 100644
--- a/metadata/md5-cache/sys-fs/udev-234-r1
+++ b/metadata/md5-cache/sys-fs/udev-234-r1
@@ -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 abi_x86_32 abi_x86_64 abi_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 ~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.27.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v234.tar.gz -> systemd-234.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=176d3515d4d24a1aa8cb25269bd42c4d
+_md5_=b45c6d7cdbf0ed8d11ed712bc3903775
diff --git a/metadata/md5-cache/sys-fs/udev-235 b/metadata/md5-cache/sys-fs/udev-235
index ece06f2aaca0..0fa26270ab53 100644
--- a/metadata/md5-cache/sys-fs/udev-235
+++ b/metadata/md5-cache/sys-fs/udev-235
@@ -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 abi_x86_32 abi_x86_64 abi_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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v235.tar.gz -> systemd-235.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=ac6b3b15ca47902b109424de89b4c0e1
+_md5_=91e621a017894a0a3f6b5d6e8db51487
diff --git a/metadata/md5-cache/sys-fs/udev-236 b/metadata/md5-cache/sys-fs/udev-236
index ee053c0f5a0d..751a7b26204a 100644
--- a/metadata/md5-cache/sys-fs/udev-236
+++ b/metadata/md5-cache/sys-fs/udev-236
@@ -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 abi_x86_32 abi_x86_64 abi_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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
 LICENSE=LGPL-2.1 MIT GPL-2
 PDEPEND=>=sys-apps/hwids-20140304[udev] >=sys-fs/udev-init-scripts-26
 RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl ) kmod? ( >=sys-apps/kmod-16 ) selinux? ( >=sys-libs/libselinux-2.1.9 ) !<sys-libs/glibc-2.11 !sys-apps/gentoo-systemd-integration !sys-apps/systemd abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r7 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] ) !<sys-fs/lvm2-2.02.103 !<sec-policy/selinux-base-2.20120725-r10
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/systemd/systemd/archive/v236.tar.gz -> systemd-236.tar.gz
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=040d9e7c8d3ffea28888dcbe747f2c35
+_md5_=49d5120d481a510f86f302f39ac9ca4e
diff --git a/metadata/md5-cache/sys-fs/udev-9999 b/metadata/md5-cache/sys-fs/udev-9999
index 6c6e86112d81..44a93ad36ec4 100644
--- a/metadata/md5-cache/sys-fs/udev-9999
+++ b/metadata/md5-cache/sys-fs/udev-9999
@@ -10,4 +10,4 @@ RDEPEND=>=sys-apps/util-linux-2.30[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?
 RESTRICT=test
 SLOT=0
 _eclasses_=bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	estack	43ddf5aaffa7a8d0482df54d25a66a1f	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	linux-info	ca370deef9d44125d829f2eb6ebc83e0	meson	f8e09b2b2ac1e9bb0bd374b6ad77a90d	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	udev	d91cac2c73b94629cad2daea66e0d182	user	8bc2845510e2109af75e3eeac607ec81	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=b66d6391e92fda1c1e7b96fb2cf5333f
+_md5_=49d5120d481a510f86f302f39ac9ca4e
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 63abb6fc2dfc..612d82e04c08 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/ck-sources-4.9.76-r1 b/metadata/md5-cache/sys-kernel/ck-sources-4.9.76-r1
new file mode 100644
index 000000000000..efd42f2cde55
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/ck-sources-4.9.76-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) ) !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 ) deblob? ( || ( >=dev-lang/python-2.7.5-r2:2.7 ) )
+DESCRIPTION=Con Kolivas' high performance patchset and Gentoo's genpatches for Linux 4.9
+EAPI=6
+HOMEPAGE=https://www.kernel.org/ https://www.gentoo.org/ https://dev.gentoo.org/~mpagano/genpatches/ http://kernel.kolivas.org/ http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags
+IUSE=symlink build deblob
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2 !deblob? ( linux-firmware )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.76-r1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz deblob? ( http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-4.9 http://www.fsfla.org/svn/fsfla/software/linux-libre/releases/tags/4.9-gnu/deblob-check -> deblob-check-4.9 ) mirror://gentoo/genpatches-4.9-79.base.tar.xz mirror://gentoo/genpatches-4.9-79.extras.tar.xz mirror://gentoo/genpatches-4.9-79.experimental.tar.xz http://ck.kolivas.org/patches/4.0/4.9/4.9-ck1/patch-4.9-ck1.xz https://github.com/ckolivas/linux/commit/7de569950716147ed436b27936628ee3ab5b45cc.patch -> ck-sources-4.9-freezer-fix.patch
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=14633e64293affeead38d6b0bc858167
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.111 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.111
index 959853cd95b2..6e5dce2881d4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.111
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.111
@@ -4,11 +4,11 @@ DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
 EAPI=6
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
 LICENSE=GPL-2 linux-firmware
 RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
 RESTRICT=binchecks strip
 SLOT=4.4.111
 SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-114.base.tar.xz mirror://gentoo/genpatches-4.4-114.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-114.experimental.tar.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=999010ba532c83e422c207d57ce958ed
+_md5_=ab0fc0c41830e55803522b65c4b94a41
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.111-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.111-r1
new file mode 100644
index 000000000000..13772dae8be6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.4.111-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.4 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.4.111-r1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.4.tar.xz mirror://gentoo/genpatches-4.4-115.base.tar.xz mirror://gentoo/genpatches-4.4-115.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.4-115.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=54461bf9b9d443c0fde7b508701b22e0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.76-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.76-r1
new file mode 100644
index 000000000000..9b34dfa247ec
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.76-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=!build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 kernel tree
+EAPI=6
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+IUSE=experimental symlink build
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.9.76-r1
+SRC_URI=mirror://kernel/linux/kernel/v4.x/linux-4.9.tar.xz mirror://gentoo/genpatches-4.9-79.base.tar.xz mirror://gentoo/genpatches-4.9-79.extras.tar.xz experimental? ( mirror://gentoo/genpatches-4.9-79.experimental.tar.xz )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=dba7ca39db4f3a48c7cf6d83055502d0
diff --git a/metadata/md5-cache/sys-kernel/git-sources-4.15_rc8 b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc8
new file mode 100644
index 000000000000..6ae38f42877d
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/git-sources-4.15_rc8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=>=sys-devel/patch-2.7.5 !build? ( sys-apps/sed >=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=The very latest -git version of the Linux kernel
+EAPI=5
+HOMEPAGE=https://www.kernel.org
+IUSE=symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86
+LICENSE=GPL-2 linux-firmware
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=4.15_rc8
+SRC_URI=https://git.kernel.org/torvalds/p/v4.15-rc8/v4.14 -> patch-4.15-rc8.patch mirror://kernel/linux/kernel/v4.x/linux-4.14.tar.xz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	kernel-2	7e15aacb412856eaa750db7b17a321b3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=7842dbd4e5c78e92fd722b28ca197c73
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20180103-r1 b/metadata/md5-cache/sys-kernel/linux-firmware-20180103-r1
index 74edf10bf578..1c00fd7ef4cd 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20180103-r1
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20180103-r1
@@ -3,10 +3,10 @@ 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 )
 SLOT=0
 SRC_URI=https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-2eefafb2e9dcbafdf4b83d8c43fcd6b75fd4ac78.tar.gz -> linux-firmware-20180103.tar.gz mirror://gentoo/microcode_amd_fam17h.tar.gz https://dev.gentoo.org/~whissi/dist/linux-firmware/microcode_amd_fam17h.tar.gz
 _eclasses_=portability	2b88d3ecc35035a3b8ab628b49cafb0e	savedconfig	e6948c872ff47e15a10e5ad1be15c18e
-_md5_=79584baf58d89c2b6a5916882447ff9e
+_md5_=cfd646c31e6efe376239c1a5e44cfd67
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 995501248790..4e3052783ef2 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/gdbm-1.13-r2 b/metadata/md5-cache/sys-libs/gdbm-1.13-r2
index 3b66840743b9..1f296da10ac0 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.13-r2
+++ b/metadata/md5-cache/sys-libs/gdbm-1.13-r2
@@ -4,10 +4,10 @@ DESCRIPTION=Standard GNU database libraries
 EAPI=6
 HOMEPAGE=https://www.gnu.org/software/gdbm/
 IUSE=+berkdb exporter nls +readline static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-3
 RDEPEND=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(-)?] )
 SLOT=0/1.13
 SRC_URI=mirror://gnu/gdbm/gdbm-1.13.tar.gz exporter? ( mirror://gnu/gdbm/gdbm-1.8.3.tar.gz )
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=7d284af6e1648f2a8e400d9c6bfa7e49
+_md5_=8c0322f3161b51fcb5a5ac3f274d4491
diff --git a/metadata/md5-cache/sys-libs/glibc-2.18-r1 b/metadata/md5-cache/sys-libs/glibc-2.18-r1
index 14c500108441..eb5a20a2b2d6 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.18-r1
+++ b/metadata/md5-cache/sys-libs/glibc-2.18-r1
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-d
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.18.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.18.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.18.tar.xz mirror://gentoo/glibc-2.18.tar.xz mirror://gentoo/glibc-2.18-patches-4.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.18-patches-4.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.18-patches-4.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	7b998066c478215058ec5e1aef69ad18	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	1a9c5bd1f2df386fb769880b03950ffc	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1cbf1782b7c957ed230766e119d05bc6
diff --git a/metadata/md5-cache/sys-libs/glibc-2.19-r1 b/metadata/md5-cache/sys-libs/glibc-2.19-r1
index 12fead0677b0..469623f7d0b9 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.19-r1
+++ b/metadata/md5-cache/sys-libs/glibc-2.19-r1
@@ -10,5 +10,5 @@ RDEPEND=!sys-kernel/ps3-sources selinux? ( sys-libs/libselinux ) !sys-libs/nss-d
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.19.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.19.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.19.tar.xz mirror://gentoo/glibc-2.19.tar.xz mirror://gentoo/glibc-2.19-patches-3.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.19-patches-3.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.19-patches-3.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	7b998066c478215058ec5e1aef69ad18	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	1a9c5bd1f2df386fb769880b03950ffc	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=90bc033ad1f0dfee53ea138b2d676162
diff --git a/metadata/md5-cache/sys-libs/glibc-2.20-r2 b/metadata/md5-cache/sys-libs/glibc-2.20-r2
index 51a42e9e9f3e..2d8efce3e67b 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.20-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.20-r2
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/ps3-sources sys-apps/gentoo-functions selinux? ( sys-libs/li
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.20.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.20.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.20.tar.xz mirror://gentoo/glibc-2.20.tar.xz mirror://gentoo/glibc-2.20-patches-5.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.20-patches-5.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.20-patches-5.tar.bz2 https://dev.gentoo.org/~blueness/glibc/glibc-2.20-patches-5.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~blueness/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	7b998066c478215058ec5e1aef69ad18	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	1a9c5bd1f2df386fb769880b03950ffc	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e6147849498c6daeb27b750c7bc21f03
diff --git a/metadata/md5-cache/sys-libs/glibc-2.21-r2 b/metadata/md5-cache/sys-libs/glibc-2.21-r2
index 7e0471aea41b..c4d16651d3d5 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.21-r2
+++ b/metadata/md5-cache/sys-libs/glibc-2.21-r2
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/ps3-sources sys-apps/gentoo-functions selinux? ( sys-libs/li
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.21.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.21.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.21.tar.xz mirror://gentoo/glibc-2.21.tar.xz mirror://gentoo/glibc-2.21-patches-7.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.21-patches-7.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.21-patches-7.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	7b998066c478215058ec5e1aef69ad18	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	1a9c5bd1f2df386fb769880b03950ffc	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=d3a4a78265eec2d24682cd7be90b0cd1
diff --git a/metadata/md5-cache/sys-libs/glibc-2.22-r4 b/metadata/md5-cache/sys-libs/glibc-2.22-r4
index c5cdb9edad41..98a24cb579de 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.22-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.22-r4
@@ -11,5 +11,5 @@ RDEPEND=!sys-kernel/ps3-sources sys-apps/gentoo-functions selinux? ( sys-libs/li
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.22.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.22.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.22.tar.xz mirror://gentoo/glibc-2.22.tar.xz mirror://gentoo/glibc-2.22-patches-13.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.22-patches-13.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.22-patches-13.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	7b998066c478215058ec5e1aef69ad18	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	1a9c5bd1f2df386fb769880b03950ffc	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2c4cd0326494e91e5f5bccc862dfa56d
diff --git a/metadata/md5-cache/sys-libs/glibc-2.23-r4 b/metadata/md5-cache/sys-libs/glibc-2.23-r4
index 3d90b24b8303..f87970829d1f 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.23-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.23-r4
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.23.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.23.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.23.tar.xz mirror://gentoo/glibc-2.23.tar.xz mirror://gentoo/glibc-2.23-patches-8.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.23-patches-8.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.23-patches-8.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.23-patches-8.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	7b998066c478215058ec5e1aef69ad18	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	1a9c5bd1f2df386fb769880b03950ffc	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=a45cea077c6a3981efd06e251857a930
diff --git a/metadata/md5-cache/sys-libs/glibc-2.24-r4 b/metadata/md5-cache/sys-libs/glibc-2.24-r4
index 4dff200a33cb..b23c941fc1fa 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.24-r4
+++ b/metadata/md5-cache/sys-libs/glibc-2.24-r4
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.24.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.24.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.24.tar.xz mirror://gentoo/glibc-2.24.tar.xz mirror://gentoo/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~azarah/glibc/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.24-patches-10.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.24-patches-10.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~azarah/glibc/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	7b998066c478215058ec5e1aef69ad18	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	1a9c5bd1f2df386fb769880b03950ffc	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=106c7cef0a5ccd988f9206420182391c
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r10 b/metadata/md5-cache/sys-libs/glibc-2.25-r10
index 442958e68883..bee96c1e3b74 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r10
+++ b/metadata/md5-cache/sys-libs/glibc-2.25-r10
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-13.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-13.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-13.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-13.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-13.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	7b998066c478215058ec5e1aef69ad18	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	1a9c5bd1f2df386fb769880b03950ffc	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=71a830c58be63687d5ed6dbdf5fbeded
diff --git a/metadata/md5-cache/sys-libs/glibc-2.25-r9 b/metadata/md5-cache/sys-libs/glibc-2.25-r9
index 0971ef6c0e44..827be3f15373 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.25-r9
+++ b/metadata/md5-cache/sys-libs/glibc-2.25-r9
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/releases/glibc-2.25.tar.xz ftp://sourceware.org/pub/glibc/snapshots/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25.tar.xz mirror://gentoo/glibc-2.25-patches-12.tar.bz2 https://dev.gentoo.org/~vapier/dist/glibc-2.25-patches-12.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.25-patches-12.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/glibc-2.25-patches-12.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/glibc-2.25-patches-12.tar.bz2 multilib? ( mirror://gentoo/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~vapier/dist/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~tamiko/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 https://dev.gentoo.org/~slyfox/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	7b998066c478215058ec5e1aef69ad18	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	1a9c5bd1f2df386fb769880b03950ffc	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=ccb18ed43d17dc5e1e497bfc6b75828c
diff --git a/metadata/md5-cache/sys-libs/glibc-2.26-r3 b/metadata/md5-cache/sys-libs/glibc-2.26-r3
index 81bfa7f1a433..8a442eb84c87 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.26-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.26-r3
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.26.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.26-patches-4.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	7b998066c478215058ec5e1aef69ad18	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	1a9c5bd1f2df386fb769880b03950ffc	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=e26320fed4ed7a9ae9b562b5ef6a7401
diff --git a/metadata/md5-cache/sys-libs/glibc-2.26-r5 b/metadata/md5-cache/sys-libs/glibc-2.26-r5
index cda02e6a6492..25cf19ba478e 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.26-r5
+++ b/metadata/md5-cache/sys-libs/glibc-2.26-r5
@@ -11,5 +11,5 @@ RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap
 RESTRICT=strip
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.26.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.26-patches-5.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	7b998066c478215058ec5e1aef69ad18	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	1a9c5bd1f2df386fb769880b03950ffc	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=1380b0eed00858d7cdba2cacb1649392
diff --git a/metadata/md5-cache/sys-libs/glibc-9999 b/metadata/md5-cache/sys-libs/glibc-9999
index 75a8413bbb25..6df1b32353e2 100644
--- a/metadata/md5-cache/sys-libs/glibc-9999
+++ b/metadata/md5-cache/sys-libs/glibc-9999
@@ -6,9 +6,9 @@ HOMEPAGE=https://www.gnu.org/software/libc/
 IUSE=audit caps compile-locales debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
-RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) !sys-kernel/ps3-sources sys-apps/gentoo-functions !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
+RDEPEND=nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) sys-apps/gentoo-functions !sys-kernel/ps3-sources !sys-libs/nss-db vanilla? ( !sys-libs/timezone-data )
 RESTRICT=strip
 SLOT=2.2
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/glibc-9999-patches-3.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	toolchain-glibc	7b998066c478215058ec5e1aef69ad18	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d5a7a472ff647d62262a1bf3411b0efd
+SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/glibc-9999-patches-4.tar.bz2 multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-4.7.3-r1-multilib-bootstrap.tar.bz2 )
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnuconfig	b8ec1c34be4ff9dac7ad4034d277936b	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
+_md5_=c8e3705599d9ab0faca87df18f287be1
diff --git a/metadata/md5-cache/sys-libs/kpmcore-3.2.1 b/metadata/md5-cache/sys-libs/kpmcore-3.2.1
index b48f8159d3e7..63628dc1e65f 100644
--- a/metadata/md5-cache/sys-libs/kpmcore-3.2.1
+++ b/metadata/md5-cache/sys-libs/kpmcore-3.2.1
@@ -9,5 +9,5 @@ LICENSE=GPL-3
 RDEPEND=>=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kservice-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.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.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/6
 SRC_URI=mirror://kde/stable/kpmcore/3.2.1/src/kpmcore-3.2.1.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=9e0f20cd8041439a2fef57101252d29f
diff --git a/metadata/md5-cache/sys-libs/kpmcore-3.3.0 b/metadata/md5-cache/sys-libs/kpmcore-3.3.0
index 62fd0d0d447e..8ee6933644e3 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.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 dev-libs/libatasmart >=sys-apps/util-linux-2.30 >=sys-block/parted-3 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5/7
 SRC_URI=mirror://kde/stable/kpmcore/3.3.0/src/kpmcore-3.3.0.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a57afd277920acbdd40ebed327e2190d
diff --git a/metadata/md5-cache/sys-libs/ldb-1.3.1 b/metadata/md5-cache/sys-libs/ldb-1.3.1
new file mode 100644
index 000000000000..14457e18ebda
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/ldb-1.3.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup test
+DEPEND=dev-libs/libxslt doc? ( app-doc/doxygen ) virtual/pkgconfig python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] !elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.11[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.35[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[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(-)?] ldap? ( net-nds/openldap ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+DESCRIPTION=An LDAP-like embedded database
+EAPI=6
+HOMEPAGE=http://ldb.samba.org
+IUSE=doc +ldap +python python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=LGPL-3
+RDEPEND=!elibc_FreeBSD? ( dev-libs/libbsd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dev-libs/popt[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-util/cmocka-1.1.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/talloc-2.1.11[python?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tevent-0.9.35[python(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/tdb-1.3.15[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(-)?] ldap? ( net-nds/openldap ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python? ( python_targets_python2_7 )
+SLOT=0/1.3.1
+SRC_URI=http://www.samba.org/ftp/pub/ldb/ldb-1.3.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
+_md5_=52711bf76bf41f700b34c346fef308ab
diff --git a/metadata/md5-cache/sys-libs/libunwind-1.2.1 b/metadata/md5-cache/sys-libs/libunwind-1.2.1
index dfceb20bd169..907c00be8a14 100644
--- a/metadata/md5-cache/sys-libs/libunwind-1.2.1
+++ b/metadata/md5-cache/sys-libs/libunwind-1.2.1
@@ -4,11 +4,11 @@ DESCRIPTION=Portable and efficient API to determine the call-chain of a program
 EAPI=6
 HOMEPAGE=https://savannah.nongnu.org/projects/libunwind
 IUSE=debug debug-frame doc libatomic lzma +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 ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=lzma? ( app-arch/xz-utils )
 RESTRICT=test
 SLOT=7
 SRC_URI=mirror://nongnu/libunwind/libunwind-1.2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=ba56d05214dca72e016e267f71fce0ad
+_md5_=e608ecb9520f49b62684d212ab617ed0
diff --git a/metadata/md5-cache/sys-libs/talloc-2.1.11 b/metadata/md5-cache/sys-libs/talloc-2.1.11
new file mode 100644
index 000000000000..c64420e7fcb1
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/talloc-2.1.11
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) !!<sys-libs/talloc-2.0.5 sys-devel/gettext dev-libs/libxslt python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+DESCRIPTION=Samba talloc library
+EAPI=6
+HOMEPAGE=https://talloc.samba.org/
+IUSE=compat +python python_targets_python2_7 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris
+LICENSE=GPL-3 LGPL-3+ LGPL-2
+RDEPEND=python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) !!<sys-libs/talloc-2.0.5
+REQUIRED_USE=python_targets_python2_7
+RESTRICT=test
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/talloc/talloc-2.1.11.tar.gz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
+_md5_=06bc602c6ff4460ff66c77abdc25fd9a
diff --git a/metadata/md5-cache/sys-libs/tevent-0.9.35 b/metadata/md5-cache/sys-libs/tevent-0.9.35
new file mode 100644
index 000000000000..e913605d3688
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/tevent-0.9.35
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=sys-libs/talloc-2.1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] ) >=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(-)?] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+DESCRIPTION=Samba tevent library
+EAPI=6
+HOMEPAGE=https://tevent.samba.org/
+IUSE=python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64 python_targets_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=>=sys-libs/talloc-2.1.11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] )
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://www.samba.org/ftp/tevent/tevent-0.9.35.tar.gz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	multiprocessing	cac3169468f893670dac3e7cb940e045	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	waf-utils	d1ea2758053cbb7c5b38b8f88654468d
+_md5_=8211a0accf9775987d47463336340103
diff --git a/metadata/md5-cache/sys-power/Manifest.gz b/metadata/md5-cache/sys-power/Manifest.gz
index 576c35dc03b3..ea07ef32dad7 100644
--- a/metadata/md5-cache/sys-power/Manifest.gz
+++ b/metadata/md5-cache/sys-power/Manifest.gz
diff --git a/metadata/md5-cache/sys-power/nut-2.7.4-r1 b/metadata/md5-cache/sys-power/nut-2.7.4-r1
index 85fcc7736a88..6aa860640ee3 100644
--- a/metadata/md5-cache/sys-power/nut-2.7.4-r1
+++ b/metadata/md5-cache/sys-power/nut-2.7.4-r1
@@ -4,11 +4,11 @@ DESCRIPTION=Network-UPS Tools
 EAPI=5
 HOMEPAGE=http://www.networkupstools.org/
 IUSE=cgi ipmi snmp +usb selinux ssl tcpd xml zeroconf +ups_drivers_al175 +ups_drivers_bcmxcp +ups_drivers_belkin +ups_drivers_belkinunv +ups_drivers_bestfcom +ups_drivers_bestfortress +ups_drivers_bestuferrups +ups_drivers_bestups +ups_drivers_dummy-ups +ups_drivers_etapro +ups_drivers_everups +ups_drivers_gamatronic +ups_drivers_genericups +ups_drivers_isbmex +ups_drivers_liebert +ups_drivers_liebert-esp2 +ups_drivers_masterguard +ups_drivers_metasys +ups_drivers_oldmge-shut +ups_drivers_mge-utalk +ups_drivers_microdowell +ups_drivers_mge-shut +ups_drivers_oneac +ups_drivers_optiups +ups_drivers_powercom +ups_drivers_rhino +ups_drivers_safenet +ups_drivers_solis +ups_drivers_tripplite +ups_drivers_tripplitesu +ups_drivers_upscode2 +ups_drivers_victronups +ups_drivers_powerpanel +ups_drivers_blazer_ser +ups_drivers_clone +ups_drivers_clone-outlet +ups_drivers_ivtscd +ups_drivers_apcsmart +ups_drivers_apcsmart-old +ups_drivers_apcupsd-ups +ups_drivers_riello_ser +ups_drivers_nutdrv_qx +ups_drivers_usbhid-ups +ups_drivers_bcmxcp_usb +ups_drivers_tripplite_usb +ups_drivers_blazer_usb +ups_drivers_richcomm_usb +ups_drivers_riello_usb +ups_drivers_nutdrv_qx ups_drivers_netxml-ups ups_drivers_snmp-ups ups_drivers_nut-ipmipsu
-KEYWORDS=~amd64 ~arm ppc ppc64 x86 ~x86-fbsd
+KEYWORDS=amd64 ~arm ppc ppc64 x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=cgi? ( >=media-libs/gd-2[png] ) snmp? ( net-analyzer/net-snmp ) usb? ( virtual/libusb:0 ) ssl? ( >=dev-libs/openssl-1 ) tcpd? ( sys-apps/tcp-wrappers ) xml? ( >=net-libs/neon-0.25.0 ) ipmi? ( sys-libs/freeipmi ) zeroconf? ( net-dns/avahi ) dev-libs/libltdl virtual/udev selinux? ( sec-policy/selinux-nut )
 REQUIRED_USE=ups_drivers_usbhid-ups? ( usb ) ups_drivers_bcmxcp_usb? ( usb ) ups_drivers_tripplite_usb? ( usb ) ups_drivers_blazer_usb? ( usb ) ups_drivers_richcomm_usb? ( usb ) ups_drivers_riello_usb? ( usb ) ups_drivers_nutdrv_qx? ( usb ) ups_drivers_netxml-ups? ( xml ) ups_drivers_snmp-ups? ( snmp ) ups_drivers_nut-ipmipsu? ( ipmi )
 SLOT=0
 SRC_URI=http://random.networkupstools.org/source/2.7/nut-2.7.4.tar.gz http://www.networkupstools.org/source/2.7/nut-2.7.4.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	bash-completion-r1	8e447753aaf658afa609fbf961d80ab7	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	fixheadtails	6b7b3d896b0b285c12a94f3105c2a06c	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81
-_md5_=86150e711e35b14d86552a45388aae28
+_md5_=c46dae06b8d16e9e923319fa210a1be8
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 5cb41013eb89..9cbfe8a63da4 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.12 b/metadata/md5-cache/sys-process/systemd-cron-1.5.12
deleted file mode 100644
index ef377d0e92ff..000000000000
--- a/metadata/md5-cache/sys-process/systemd-cron-1.5.12
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure prepare setup
-DEPEND=sys-process/cronbase test? ( sys-apps/man-db dev-python/pyflakes ) virtual/pkgconfig
-DESCRIPTION=systemd units to create timers for cron directories and crontab
-EAPI=5
-HOMEPAGE=https://github.com/systemd-cron/systemd-cron/
-IUSE=cron-boot etc-crontab-systemd minutely setgid test yearly python_targets_pypy3 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_pypy3 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( >=virtual/pypy3-5: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 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_python2_7(-),python_single_target_pypy3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-process/cronbase
-REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_pypy3? ( python_targets_pypy3 ) 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/systemd-cron/systemd-cron/archive/v1.5.12.tar.gz -> systemd-cron-1.5.12.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=32b4fa5781ba576be47dc0671ebace5d
diff --git a/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1 b/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
new file mode 100644
index 000000000000..a5d1a76e64b0
--- /dev/null
+++ b/metadata/md5-cache/sys-process/systemd-cron-1.5.12-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare setup
+DEPEND=sys-process/cronbase test? ( sys-apps/man-db dev-python/pyflakes ) virtual/pkgconfig
+DESCRIPTION=systemd units to create timers for cron directories and crontab
+EAPI=5
+HOMEPAGE=https://github.com/systemd-cron/systemd-cron/
+IUSE=cron-boot etc-crontab-systemd minutely setgid test yearly python_targets_pypy3 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 python_single_target_pypy3 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=sys-apps/systemd-217 sys-apps/debianutils !etc-crontab-systemd? ( !sys-process/dcron ) python_single_target_pypy3? ( >=virtual/pypy3-5: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 ) >=dev-lang/python-exec-2:=[python_targets_pypy3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_python2_7(-),python_single_target_pypy3(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?,python_single_target_python3_6(+)?] sys-process/cronbase
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_4 python_single_target_python3_5 python_single_target_python3_6 ) python_single_target_pypy3? ( python_targets_pypy3 ) 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/systemd-cron/systemd-cron/archive/v1.5.12.tar.gz -> systemd-cron-1.5.12.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=6083d4caa553078cf1d654c8cdd758fb
diff --git a/metadata/md5-cache/sys-process/time-1.7.2 b/metadata/md5-cache/sys-process/time-1.7.2
index 2ecfbda9ee00..72fe2c2ec80a 100644
--- a/metadata/md5-cache/sys-process/time-1.7.2
+++ b/metadata/md5-cache/sys-process/time-1.7.2
@@ -3,9 +3,9 @@ DEPEND=sys-apps/texinfo >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0
 DESCRIPTION=Displays info about resources used by a program
 EAPI=6
 HOMEPAGE=https://www.gnu.org/directory/time.html
-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
 SLOT=0
 SRC_URI=http://git.savannah.gnu.org/cgit/time.git/snapshot/time-1.7.2.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=f630a8a60a8124171f271a908f10007e
+_md5_=ce293e3fc5bc2e44f8518afde088b01c
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 53caf6bf4dd7..03b904c3a629 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/httpd-php-5.6 b/metadata/md5-cache/virtual/httpd-php-5.6
index bd6d8ec40346..3f42bdedd48d 100644
--- a/metadata/md5-cache/virtual/httpd-php-5.6
+++ b/metadata/md5-cache/virtual/httpd-php-5.6
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to provide PHP-enabled webservers
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( dev-lang/php:5.6[fpm] dev-lang/php:5.6[apache2] dev-lang/php:5.6[cgi] )
 SLOT=5.6
-_md5_=fa14cea41756e55897e14e47412547a3
+_md5_=2760f1d3e02cd9b150f6e28dd973be62
diff --git a/metadata/md5-cache/virtual/httpd-php-7.0 b/metadata/md5-cache/virtual/httpd-php-7.0
index 94d9c079f883..3967fb960507 100644
--- a/metadata/md5-cache/virtual/httpd-php-7.0
+++ b/metadata/md5-cache/virtual/httpd-php-7.0
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to provide PHP-enabled webservers
 EAPI=5
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( dev-lang/php:7.0[fpm] dev-lang/php:7.0[apache2] dev-lang/php:7.0[cgi] )
 SLOT=7.0
-_md5_=fa14cea41756e55897e14e47412547a3
+_md5_=2760f1d3e02cd9b150f6e28dd973be62
diff --git a/metadata/md5-cache/virtual/httpd-php-7.1 b/metadata/md5-cache/virtual/httpd-php-7.1
index a00d768d2f6f..2aeca17b52c4 100644
--- a/metadata/md5-cache/virtual/httpd-php-7.1
+++ b/metadata/md5-cache/virtual/httpd-php-7.1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to provide PHP-enabled webservers
 EAPI=6
-KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( dev-lang/php:7.1[fpm] dev-lang/php:7.1[apache2] dev-lang/php:7.1[cgi] )
 SLOT=7.1
-_md5_=27daadeaa23b954a28b2fbb3d7ed8918
+_md5_=67f902afbb5dc3ef2bf906588e0d6eff
diff --git a/metadata/md5-cache/virtual/httpd-php-7.2 b/metadata/md5-cache/virtual/httpd-php-7.2
index f02af270b12c..92b9e252dc7f 100644
--- a/metadata/md5-cache/virtual/httpd-php-7.2
+++ b/metadata/md5-cache/virtual/httpd-php-7.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=-
 DESCRIPTION=Virtual to provide PHP-enabled webservers
 EAPI=6
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
 RDEPEND=|| ( dev-lang/php:7.2[fpm] dev-lang/php:7.2[apache2] dev-lang/php:7.2[cgi] )
 SLOT=7.2
-_md5_=638f38bb94780945e6342d7651174f9d
+_md5_=ce8cda80dd58c589e688aebc8c45982c
diff --git a/metadata/md5-cache/virtual/libelf-2 b/metadata/md5-cache/virtual/libelf-2
index 02483ea6a0ac..2a052dc8957e 100644
--- a/metadata/md5-cache/virtual/libelf-2
+++ b/metadata/md5-cache/virtual/libelf-2
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libelf.so.0 provider dev-libs/libelf
 EAPI=6
 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 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -sparc-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 RDEPEND=>=dev-libs/libelf-0.8.13-r2: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/0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=e160ecce2854d03710108f0392a9af13
+_md5_=7f1adb30f97c6bb975cef9c87836522b
diff --git a/metadata/md5-cache/virtual/libelf-3 b/metadata/md5-cache/virtual/libelf-3
index 447079087bff..14359b400ab7 100644
--- a/metadata/md5-cache/virtual/libelf-3
+++ b/metadata/md5-cache/virtual/libelf-3
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libelf.so.1 provider dev-libs/elfutils
 EAPI=6
 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
+KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux
 RDEPEND=|| ( >=dev-libs/elfutils-0.155-r1:0/0[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-freebsd/freebsd-lib-9.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(-)?] )
 SLOT=0/1
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=1b84b2e9e9e7e36b2afd74d1e57fde0e
+_md5_=3245bb743888968961e89b54b790c5dd
diff --git a/metadata/md5-cache/virtual/libgudev-232 b/metadata/md5-cache/virtual/libgudev-232
index d18a2d19cca0..1421d57ebc15 100644
--- a/metadata/md5-cache/virtual/libgudev-232
+++ b/metadata/md5-cache/virtual/libgudev-232
@@ -2,8 +2,8 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual for libgudev providers
 EAPI=6
 IUSE=introspection 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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86
 RDEPEND=>=dev-libs/libgudev-232: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(-)?,introspection?,static-libs?]
 SLOT=0/0
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=454b8e44d8f0b8b7b5c2ababf3f81075
+_md5_=57958cd1783852a6aa5722cd3639b12d
diff --git a/metadata/md5-cache/virtual/pypy3-5.10.1 b/metadata/md5-cache/virtual/pypy3-5.10.1
new file mode 100644
index 000000000000..80a2456ac469
--- /dev/null
+++ b/metadata/md5-cache/virtual/pypy3-5.10.1
@@ -0,0 +1,8 @@
+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/udev-217 b/metadata/md5-cache/virtual/udev-217
index db549c50d38a..a6c6eabd7bd2 100644
--- a/metadata/md5-cache/virtual/udev-217
+++ b/metadata/md5-cache/virtual/udev-217
@@ -2,7 +2,7 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to select between different udev daemon providers
 EAPI=5
 IUSE=systemd
-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
 RDEPEND=!systemd? ( || ( >=sys-fs/eudev-2.1.1 >=sys-fs/udev-217 ) ) systemd? ( >=sys-apps/systemd-217:0 )
 SLOT=0
-_md5_=b8a185deb1113bd080a5e78163984aba
+_md5_=bedc212429513c080d29855e3183e971
diff --git a/metadata/md5-cache/www-apache/Manifest.gz b/metadata/md5-cache/www-apache/Manifest.gz
index 658b1e46327f..acdc5acad92d 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_gnutls-0.8.3 b/metadata/md5-cache/www-apache/mod_gnutls-0.8.3
deleted file mode 100644
index 3162e72f81c0..000000000000
--- a/metadata/md5-cache/www-apache/mod_gnutls-0.8.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=>=net-libs/gnutls-3.3.0:= test? ( app-crypt/monkeysphere ) =www-servers/apache-2.4* >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)
-EAPI=6
-HOMEPAGE=https://mod.gnutls.org/
-IUSE=test
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=net-libs/gnutls-3.3.0:= =www-servers/apache-2.4*
-RESTRICT=test
-SLOT=0
-SRC_URI=https://mod.gnutls.org/downloads/mod_gnutls-0.8.3.tar.bz2
-_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	dc412f38566b91012efd58b9c203e6c3	depend.apache	0917334d570e07f9743a04ff85b3bf1b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5b053e3e621155c0c31f3aaf58a4c01b
diff --git a/metadata/md5-cache/www-apache/mod_gnutls-0.8.3-r1 b/metadata/md5-cache/www-apache/mod_gnutls-0.8.3-r1
new file mode 100644
index 000000000000..b2cff2107740
--- /dev/null
+++ b/metadata/md5-cache/www-apache/mod_gnutls-0.8.3-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=>=net-libs/gnutls-3.3.0:= test? ( app-crypt/monkeysphere ) =www-servers/apache-2.4* >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)
+EAPI=5
+HOMEPAGE=https://mod.gnutls.org/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=net-libs/gnutls-3.3.0:= =www-servers/apache-2.4*
+RESTRICT=test
+SLOT=0
+SRC_URI=https://mod.gnutls.org/downloads/mod_gnutls-0.8.3.tar.bz2
+_eclasses_=apache-module	bd30ba4d834196e81cf2b76c52d26b93	autotools	dc412f38566b91012efd58b9c203e6c3	depend.apache	0917334d570e07f9743a04ff85b3bf1b	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=e11b8d68f2871e08bcb2e325f6ba73b9
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 4d4810c3636e..01473c841243 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/moodle-3.1.10 b/metadata/md5-cache/www-apps/moodle-3.1.10
new file mode 100644
index 000000000000..40b6d5a08591
--- /dev/null
+++ b/metadata/md5-cache/www-apps/moodle-3.1.10
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=The Moodle Course Management System
+EAPI=5
+HOMEPAGE=http://moodle.org
+IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/php-5.4.4[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysqli mssql postgres )
+SLOT=3.1.10
+SRC_URI=http://download.moodle.org/stable31/moodle-3.1.10.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=d25b7eaec8bce52346b348f668e1bfe1
diff --git a/metadata/md5-cache/www-apps/moodle-3.1.9 b/metadata/md5-cache/www-apps/moodle-3.1.9
deleted file mode 100644
index b6bde74499c2..000000000000
--- a/metadata/md5-cache/www-apps/moodle-3.1.9
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=5
-HOMEPAGE=http://moodle.org
-IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/php-5.4.4[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysqli mssql postgres )
-SLOT=3.1.9
-SRC_URI=http://download.moodle.org/stable31/moodle-3.1.9.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=73a0960ad4cbbe6f4b45f9e574f572d5
diff --git a/metadata/md5-cache/www-apps/moodle-3.2.6 b/metadata/md5-cache/www-apps/moodle-3.2.6
deleted file mode 100644
index ebc812d0bdb6..000000000000
--- a/metadata/md5-cache/www-apps/moodle-3.2.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=5
-HOMEPAGE=http://moodle.org
-IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/php-5.6.5[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysqli mssql postgres )
-SLOT=3.2.6
-SRC_URI=http://download.moodle.org/stable32/moodle-3.2.6.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=2f2f0ad093c6643148b6127f3d6fdbfb
diff --git a/metadata/md5-cache/www-apps/moodle-3.2.7 b/metadata/md5-cache/www-apps/moodle-3.2.7
new file mode 100644
index 000000000000..d61b7f201785
--- /dev/null
+++ b/metadata/md5-cache/www-apps/moodle-3.2.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=The Moodle Course Management System
+EAPI=5
+HOMEPAGE=http://moodle.org
+IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/php-5.6.5[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysqli mssql postgres )
+SLOT=3.2.7
+SRC_URI=http://download.moodle.org/stable32/moodle-3.2.7.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=56e1ed4fdccbc5128033b461167552e1
diff --git a/metadata/md5-cache/www-apps/moodle-3.3.3 b/metadata/md5-cache/www-apps/moodle-3.3.3
deleted file mode 100644
index 71ab5aab089e..000000000000
--- a/metadata/md5-cache/www-apps/moodle-3.3.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=6
-HOMEPAGE=http://moodle.org
-IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/php-5.6.5[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysqli mssql postgres )
-SLOT=3.3.3
-SRC_URI=http://download.moodle.org/stable33/moodle-3.3.3.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=8a9109ad0f000c03c831f9abd283f888
diff --git a/metadata/md5-cache/www-apps/moodle-3.3.4 b/metadata/md5-cache/www-apps/moodle-3.3.4
new file mode 100644
index 000000000000..e8ac7e0341da
--- /dev/null
+++ b/metadata/md5-cache/www-apps/moodle-3.3.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=The Moodle Course Management System
+EAPI=6
+HOMEPAGE=http://moodle.org
+IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/php-5.6.5[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysqli mssql postgres )
+SLOT=3.3.4
+SRC_URI=http://download.moodle.org/stable33/moodle-3.3.4.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=616acf58dea09efdfe3ae34823a93ca5
diff --git a/metadata/md5-cache/www-apps/moodle-3.4 b/metadata/md5-cache/www-apps/moodle-3.4
deleted file mode 100644
index c7bb23fcdb1f..000000000000
--- a/metadata/md5-cache/www-apps/moodle-3.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare prerm setup
-DEPEND=>=app-admin/webapp-config-1.50.15
-DESCRIPTION=The Moodle Course Management System
-EAPI=6
-HOMEPAGE=http://moodle.org
-IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
-KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/php-7.0[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
-REQUIRED_USE=|| ( mysqli mssql postgres )
-SLOT=3.4
-SRC_URI=http://download.moodle.org/stable34/moodle-3.4.tgz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
-_md5_=1c53cb33112298f27040feef568bbcc4
diff --git a/metadata/md5-cache/www-apps/moodle-3.4.1 b/metadata/md5-cache/www-apps/moodle-3.4.1
new file mode 100644
index 000000000000..422913cac398
--- /dev/null
+++ b/metadata/md5-cache/www-apps/moodle-3.4.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install postinst prepare prerm setup
+DEPEND=>=app-admin/webapp-config-1.50.15
+DESCRIPTION=The Moodle Course Management System
+EAPI=6
+HOMEPAGE=http://moodle.org
+IUSE=mysqli mssql postgres imap ldap odbc vhosts vhosts
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=dev-lang/php-7.0[mysqli?,mssql?,postgres?,imap?,ldap?,odbc?,ctype,curl,iconv,json,session,simplexml,xml,zip,gd,intl,soap,ssl,tokenizer,xmlrpc] virtual/httpd-php virtual/cron >=app-admin/webapp-config-1.50.15
+REQUIRED_USE=|| ( mysqli mssql postgres )
+SLOT=3.4.1
+SRC_URI=http://download.moodle.org/stable34/moodle-3.4.1.tgz
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37	webapp	a76ebd3cb5649737496e8238992dd7ca
+_md5_=fdacf8d6ff6bfc86e30966c0cd94092a
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 4dc6bf504c33..0e6c35a663a5 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/chromium-63.0.3239.132 b/metadata/md5-cache/www-client/chromium-63.0.3239.132
new file mode 100644
index 000000000000..df332e6a855a
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-63.0.3239.132
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59 <dev-libs/icu-60:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=6
+HOMEPAGE=http://chromium.org/
+IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59 <dev-libs/icu-60:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-63.0.3239.132.tar.xz
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c3af2baa318d738c5a5dfa42deccfeac
diff --git a/metadata/md5-cache/www-client/chromium-64.0.3282.39 b/metadata/md5-cache/www-client/chromium-64.0.3282.39
deleted file mode 100644
index 698669cd1c08..000000000000
--- a/metadata/md5-cache/www-client/chromium-64.0.3282.39
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=6
-HOMEPAGE=http://chromium.org/
-IUSE=component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-64.0.3282.39.tar.xz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=2202cc14151dfe51eb804c4ad199cecb
diff --git a/metadata/md5-cache/www-client/chromium-64.0.3282.85 b/metadata/md5-cache/www-client/chromium-64.0.3282.85
new file mode 100644
index 000000000000..b94f53933047
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-64.0.3282.85
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=6
+HOMEPAGE=http://chromium.org/
+IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-64.0.3282.85.tar.xz
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=75200032f56cfbf5036f961fd7ee5b6c
diff --git a/metadata/md5-cache/www-client/chromium-65.0.3294.5 b/metadata/md5-cache/www-client/chromium-65.0.3294.5
deleted file mode 100644
index 2ac055de1f9b..000000000000
--- a/metadata/md5-cache/www-client/chromium-65.0.3294.5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
-DEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=6
-HOMEPAGE=http://chromium.org/
-IUSE=component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD
-RDEPEND=app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.14.3:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.5.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
-SLOT=0
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3294.5.tar.xz
-_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=53931fca4c2d05a7ebea4e456fa7f6c1
diff --git a/metadata/md5-cache/www-client/chromium-65.0.3315.3 b/metadata/md5-cache/www-client/chromium-65.0.3315.3
new file mode 100644
index 000000000000..44984bb27037
--- /dev/null
+++ b/metadata/md5-cache/www-client/chromium-65.0.3315.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup
+DEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) >=app-arch/gzip-1.7 !arm? ( dev-lang/yasm ) dev-lang/perl >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 >=net-libs/nodejs-6.9.4 sys-apps/hwids[usb(+)] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig dev-vcs/git || ( ( >=dev-lang/python-2.7.5-r2:2.7 dev-python/beautifulsoup:python-2[python_targets_python2_7(-),python_single_target_python2_7(+)] >=dev-python/beautifulsoup-4.3.2:4[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/html5lib[python_targets_python2_7(-),python_single_target_python2_7(+)] dev-python/simplejson[python_targets_python2_7(-),python_single_target_python2_7(+)] ) ) >=sys-apps/sed-4
+DESCRIPTION=Open-source version of Google Chrome web browser
+EAPI=6
+HOMEPAGE=http://chromium.org/
+IUSE=component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine custom-cflags +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2:= cups? ( >=net-print/cups-1.3.11:= ) dev-libs/atk dev-libs/expat:= dev-libs/glib:2 system-icu? ( >=dev-libs/icu-59:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.26:= >=dev-libs/re2-0.2016.05.01:= gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= ) >=media-libs/alsa-lib-1.0.19:= media-libs/fontconfig:= media-libs/freetype:= >=media-libs/harfbuzz-1.6.0:=[icu(-)] media-libs/libjpeg-turbo:= media-libs/libpng:= system-libvpx? ( media-libs/libvpx:=[postproc,svc] ) >=media-libs/openh264-1.6.0:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) !=net-fs/samba-4.5.12 media-libs/opus:= ) sys-apps/dbus:= sys-apps/pciutils:= virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXext:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= x11-libs/pango:= app-arch/snappy:= media-libs/flac:= >=media-libs/libwebp-0.4.0:= sys-libs/zlib:=[minizip] kerberos? ( virtual/krb5 ) !=www-client/chromium-9999 !<www-plugins/chrome-binary-plugins-57 x11-misc/xdg-utils virtual/opengl virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium ) tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 ) widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+RESTRICT=!system-ffmpeg? ( proprietary-codecs? ( bindist ) )
+SLOT=0
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-65.0.3315.3.tar.xz
+_eclasses_=check-reqs	bd050ce908e4637604ee604ed4b78e8f	chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	pax-utils	4f95120230a315c8caaabeb2307b7eee	portability	2b88d3ecc35035a3b8ab628b49cafb0e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e8e834f5073495ed6cc80ff9d4b77328
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.71 b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.71
deleted file mode 100644
index 78379049852e..000000000000
--- a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.71
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
-DEPEND=>=sys-apps/sed-4
-DESCRIPTION=The web browser from Google
-EAPI=6
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
-RESTRICT=bindist mirror strip
-SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_64.0.3282.71-1_amd64.deb
-_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7383cd3d2d1fb2ee1a8519f2fecf0517
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.85 b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.85
new file mode 100644
index 000000000000..d77fa8d33a2c
--- /dev/null
+++ b/metadata/md5-cache/www-client/google-chrome-beta-64.0.3282.85
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install nofetch postinst postrm preinst pretend setup unpack
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=The web browser from Google
+EAPI=6
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+plugins +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=app-accessibility/at-spi2-atk:2 app-arch/bzip2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXScrnSaver x11-libs/libXtst x11-libs/libxcb x11-libs/pango x11-misc/xdg-utils
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_64.0.3282.85-1_amd64.deb
+_eclasses_=chromium-2	bb47c729513f3f0fde655928a9904ab0	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	4f95120230a315c8caaabeb2307b7eee	preserve-libs	ef207dc62baddfddfd39a164d9797648	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=7383cd3d2d1fb2ee1a8519f2fecf0517
diff --git a/metadata/md5-cache/www-client/otter-0.9.94 b/metadata/md5-cache/www-client/otter-0.9.94
new file mode 100644
index 000000000000..b5412639bfd3
--- /dev/null
+++ b/metadata/md5-cache/www-client/otter-0.9.94
@@ -0,0 +1,13 @@
+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/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet ) sys-devel/make >=dev-util/cmake-3.7.2 >=sys-apps/sed-4
+DESCRIPTION=Project aiming to recreate classic Opera (12.x) UI using Qt5
+EAPI=6
+HOMEPAGE=http://otter-browser.org/
+IUSE=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/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxmlpatterns:5 spell? ( kde-frameworks/sonnet )
+SLOT=0
+SRC_URI=https://github.com/OtterBrowser/otter-browser/archive/v0.9.94.tar.gz -> otter-0.9.94.tar.gz
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=e9867346a8b0ffef278d96d86f9c63b0
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.0.2 b/metadata/md5-cache/www-client/qutebrowser-1.0.2
deleted file mode 100644
index 7263250f46ab..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-1.0.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc test? ( dev-python/pytest[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(-)] >=sys-apps/sed-4
-DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
-EAPI=6
-HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,gui,network,opengl,printsupport,sql,webengine,widgets] >=dev-python/pyyaml-3.12[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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.0.2/qutebrowser-1.0.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=7f7974cbf6d05aacec986f0fd4144a13
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.0.3 b/metadata/md5-cache/www-client/qutebrowser-1.0.3
deleted file mode 100644
index 96752f3e1600..000000000000
--- a/metadata/md5-cache/www-client/qutebrowser-1.0.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc test? ( dev-python/pytest[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(-)] >=sys-apps/sed-4
-DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
-EAPI=6
-HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
-IUSE=test python_targets_python3_5 python_targets_python3_6
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,gui,network,opengl,printsupport,sql,webengine,widgets] >=dev-python/pyyaml-3.12[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 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.0.3/qutebrowser-1.0.3-1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=16343c2da51b0f2b9bd967860c5c9c8a
diff --git a/metadata/md5-cache/www-client/qutebrowser-1.1.0 b/metadata/md5-cache/www-client/qutebrowser-1.1.0
new file mode 100644
index 000000000000..563cb88aa575
--- /dev/null
+++ b/metadata/md5-cache/www-client/qutebrowser-1.1.0
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] app-text/asciidoc test? ( dev-python/pytest[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(-)] >=sys-apps/sed-4
+DESCRIPTION=A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine
+EAPI=6
+HOMEPAGE=https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser
+IUSE=test python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-python/setuptools[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/attrs[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/jinja-2.8[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pygments-2.1.3[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/pypeg2-2.15.2[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=dev-python/PyQt5-5.7.1[python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python3_5(-),-python_single_target_python3_6(-),declarative,gui,network,opengl,printsupport,sql,webengine,widgets] >=dev-python/pyyaml-3.12[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 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/qutebrowser/qutebrowser/releases/download/v1.1.0/qutebrowser-1.1.0.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=4649ad2b7da150f7c82044597fc91630
diff --git a/metadata/md5-cache/www-client/w3m-0.5.3-r9 b/metadata/md5-cache/www-client/w3m-0.5.3-r9
index 5a8993ac3d92..6ccfc4a3ae79 100644
--- a/metadata/md5-cache/www-client/w3m-0.5.3-r9
+++ b/metadata/md5-cache/www-client/w3m-0.5.3-r9
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare unpack
-DEPEND=>=sys-libs/ncurses-5.2-r3:0= >=sys-libs/zlib-1.1.3-r2 >=dev-libs/boehm-gc-6.2 X? ( x11-libs/libXext x11-libs/libXdmcp ) gtk? ( x11-libs/gdk-pixbuf ) !gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) ) xface? ( media-libs/compface ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=>=sys-libs/ncurses-5.2-r3:0= >=sys-libs/zlib-1.1.3-r2 >=dev-libs/boehm-gc-6.2:= X? ( x11-libs/libXext x11-libs/libXdmcp ) gtk? ( x11-libs/gdk-pixbuf ) !gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) ) xface? ( media-libs/compface ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Text based WWW browser, supports tables and frames
 EAPI=6
 HOMEPAGE=https://github.com/tats/w3m
 IUSE=X fbcon gpm gtk imlib libressl lynxkeymap nls nntp ssl unicode xface l10n_ja
 KEYWORDS=alpha amd64 ~arm ~arm64 ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris
 LICENSE=w3m
-RDEPEND=>=sys-libs/ncurses-5.2-r3:0= >=sys-libs/zlib-1.1.3-r2 >=dev-libs/boehm-gc-6.2 X? ( x11-libs/libXext x11-libs/libXdmcp ) gtk? ( x11-libs/gdk-pixbuf ) !gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) ) xface? ( media-libs/compface ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
+RDEPEND=>=sys-libs/ncurses-5.2-r3:0= >=sys-libs/zlib-1.1.3-r2 >=dev-libs/boehm-gc-6.2:= X? ( x11-libs/libXext x11-libs/libXdmcp ) gtk? ( x11-libs/gdk-pixbuf ) !gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) ) xface? ( media-libs/compface ) gpm? ( >=sys-libs/gpm-1.19.3-r5 ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://github.com/tats/w3m/archive/v0.5.3+git20161120.tar.gz -> w3m-0.5.3.git20161120.tar.gz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-snapshot	03289f51c769cf409d200d2d628cdd6e
-_md5_=b3d147922ccfb9fba493ba8cd1f61ff7
+_md5_=0ca1c9859420b832874f30b0bb66fba8
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 0ffd6f66e9b1..d94e94da7009 100644
--- a/metadata/md5-cache/www-plugins/Manifest.gz
+++ b/metadata/md5-cache/www-plugins/Manifest.gz
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.71_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.71_beta
deleted file mode 100644
index 1848344ece99..000000000000
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.71_beta
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install nofetch unpack
-DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
-EAPI=5
-HOMEPAGE=https://www.google.com/chrome
-IUSE=+widevine
-KEYWORDS=-* ~amd64
-LICENSE=google-chrome
-RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
-RESTRICT=bindist mirror strip
-SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_64.0.3282.71-1_amd64.deb
-_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
-_md5_=961944dc038e342d0f63b365c993ebb1
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.85_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.85_beta
new file mode 100644
index 000000000000..f0876e65cd9e
--- /dev/null
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-64.0.3282.85_beta
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install nofetch unpack
+DESCRIPTION=Binary plugins from Google Chrome for use in Chromium
+EAPI=5
+HOMEPAGE=https://www.google.com/chrome
+IUSE=+widevine
+KEYWORDS=-* ~amd64
+LICENSE=google-chrome
+RDEPEND=widevine? ( !<www-client/chromium-57[widevine(-)] ) !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
+RESTRICT=bindist mirror strip
+SLOT=beta
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_64.0.3282.85-1_amd64.deb
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	unpacker	f40f7b4bd5aa88c2a4ba7b0d1e0ded70
+_md5_=961944dc038e342d0f63b365c993ebb1
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index f8e9414d967f..f2f0c956bc93 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/puma-3.11.0 b/metadata/md5-cache/www-servers/puma-3.11.0
index 0dc2f23b4387..ec92aa2191d8 100644
--- a/metadata/md5-cache/www-servers/puma-3.11.0
+++ b/metadata/md5-cache/www-servers/puma-3.11.0
@@ -4,11 +4,11 @@ DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for
 EAPI=6
 HOMEPAGE=http://puma.io/
 IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64
+KEYWORDS=amd64 ~arm ~arm64
 LICENSE=BSD
 RDEPEND=dev-libs/openssl:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
 REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
 SLOT=3
 SRC_URI=https://github.com/puma/puma/archive/v3.11.0.tar.gz -> puma-3.11.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5cd3a18e33a5d1245a59bf28f60b8f9d
+_md5_=578ad6f5707854293e2ddb365fac56a0
diff --git a/metadata/md5-cache/www-servers/puma-3.6.2 b/metadata/md5-cache/www-servers/puma-3.6.2
deleted file mode 100644
index b0f8e9d33de4..000000000000
--- a/metadata/md5-cache/www-servers/puma-3.6.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] test? ( dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] test? ( dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/minitest-5.8:5[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) )
-DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
-EAPI=5
-HOMEPAGE=http://puma.io/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 doc test test
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 )
-SLOT=3
-SRC_URI=https://github.com/puma/puma/archive/v3.6.2.tar.gz -> puma-3.6.2.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=c2bdff0a28b90aaa9c04891c32f70a9d
diff --git a/metadata/md5-cache/www-servers/puma-3.9.1 b/metadata/md5-cache/www-servers/puma-3.9.1
deleted file mode 100644
index cc37c03e79e0..000000000000
--- a/metadata/md5-cache/www-servers/puma-3.9.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/openssl:0 test? ( net-misc/curl ) ruby_targets_ruby22? ( virtual/ruby-ssl[ruby_targets_ruby22] test? ( dev-ruby/rack[ruby_targets_ruby22] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby22] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( virtual/ruby-ssl[ruby_targets_ruby23] test? ( dev-ruby/rack[ruby_targets_ruby23] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby23] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] test? ( dev-ruby/rack[ruby_targets_ruby24] >=dev-ruby/minitest-5.9:5[ruby_targets_ruby24] >=dev-ruby/test-unit-3.0:2[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( test? ( dev-ruby/rake[ruby_targets_ruby22] ) ) ruby_targets_ruby23? ( test? ( dev-ruby/rake[ruby_targets_ruby23] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) test? ( ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) )
-DESCRIPTION=a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
-EAPI=6
-HOMEPAGE=http://puma.io/
-IUSE=elibc_FreeBSD ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 doc test test
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:0 ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby23? ( dev-lang/ruby:2.3 ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ruby_targets_ruby23? ( virtual/rubygems[ruby_targets_ruby23] ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] )
-REQUIRED_USE=|| ( ruby_targets_ruby22 ruby_targets_ruby23 ruby_targets_ruby24 )
-SLOT=3
-SRC_URI=https://github.com/puma/puma/archive/v3.9.1.tar.gz -> puma-3.9.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-fakegem	cf1343b57e8029745950b4b147ff4d3a	ruby-ng	2da44d50080e3d54e1a4ac7d91d149f8	ruby-utils	4ef362ae9cebac7c62680b608e2a675b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2d55634c069f76f1d170bcd0aaed8f9d
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 071a51634594..8f518828b030 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/gdk-pixbuf-2.36.11 b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
index 0dc0ef9540d7..11053bbaea64 100644
--- a/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
+++ b/metadata/md5-cache/x11-libs/gdk-pixbuf-2.36.11
@@ -4,10 +4,10 @@ DESCRIPTION=Image loading library for GTK+
 EAPI=6
 HOMEPAGE=https://git.gnome.org/browse/gdk-pixbuf
 IUSE=X debug +introspection jpeg jpeg2k tiff test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.48.0:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/libpng-1.4:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.3:= ) jpeg? ( virtual/jpeg:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg2k? ( media-libs/jasper:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) tiff? ( >=media-libs/tiff-3.9.2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( x11-libs/libX11[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<gnome-base/gail-1000 !<gnome-base/librsvg-2.31.0 !<x11-libs/gtk+-2.21.3:2 !<x11-libs/gtk+-2.90.4:3
 SLOT=2
 SRC_URI=mirror://gnome/sources/gdk-pixbuf/2.36/gdk-pixbuf-2.36.11.tar.xz
 _eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=404b63e3e811968c16b9fb3c464ff854
+_md5_=bf2c4f8a68a122a1b3caa903d36aa7f6
diff --git a/metadata/md5-cache/x11-libs/goocanvas-2.0.4 b/metadata/md5-cache/x11-libs/goocanvas-2.0.4
index b91811d3d07b..84c63562be90 100644
--- a/metadata/md5-cache/x11-libs/goocanvas-2.0.4
+++ b/metadata/md5-cache/x11-libs/goocanvas-2.0.4
@@ -4,11 +4,11 @@ DESCRIPTION=Canvas widget for GTK+ using the cairo 2D library for drawing
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/GooCanvas
 IUSE=examples +introspection python python_targets_python2_7
-KEYWORDS=alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd
+KEYWORDS=alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd
 LICENSE=LGPL-2
 RDEPEND=>=x11-libs/gtk+-3.0.0:3 >=dev-libs/glib-2.28.0:2 >=x11-libs/cairo-1.10.0 introspection? ( >=dev-libs/gobject-introspection-0.6.7:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pygobject-2.90.4:3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] )
 REQUIRED_USE=python? ( || ( python_targets_python2_7 ) )
 SLOT=2.0
 SRC_URI=mirror://gnome/sources/goocanvas/2.0/goocanvas-2.0.4.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=90caa3e7487bbf03878b4cf941e3b2ae
+_md5_=e7bb1c8fcac0a49eec708c7beb1a8868
diff --git a/metadata/md5-cache/x11-libs/gtk+-3.22.26 b/metadata/md5-cache/x11-libs/gtk+-3.22.26
new file mode 100644
index 000000000000..63c9c9ddc14c
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/gtk+-3.22.26
@@ -0,0 +1,16 @@
+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-proto/xextproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/xproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/inputproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-proto/damageproto[abi_x86_32(-)?,abi_x86_64(-)?,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-proto/xineramaproto[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) test? ( media-fonts/font-misc-misc media-fonts/font-cursor-misc ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info 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 ~arm-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.26.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=021197a35a52a4259c10e7cc86d1c6bd
diff --git a/metadata/md5-cache/x11-libs/gtksourceview-3.24.6 b/metadata/md5-cache/x11-libs/gtksourceview-3.24.6
index a79eebaf0b57..80cead695d1c 100644
--- a/metadata/md5-cache/x11-libs/gtksourceview-3.24.6
+++ b/metadata/md5-cache/x11-libs/gtksourceview-3.24.6
@@ -4,11 +4,11 @@ DESCRIPTION=A text widget implementing syntax highlighting and other features
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/Projects/GtkSourceView
 IUSE=glade +introspection vala test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.48:2 >=dev-libs/libxml2-2.6:2 >=x11-libs/gtk+-3.20:3[introspection?] glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-1.42:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=3.0/3
 SRC_URI=mirror://gnome/sources/gtksourceview/3.24/gtksourceview-3.24.6.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=72698221e197cc27652a9ed39838d5bc
+_md5_=b883f65b69d4e0ae4167c3524f23d539
diff --git a/metadata/md5-cache/x11-libs/libQGLViewer-2.7.1 b/metadata/md5-cache/x11-libs/libQGLViewer-2.7.1
new file mode 100644
index 000000000000..c62de103b909
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/libQGLViewer-2.7.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=virtual/opengl virtual/glu dev-qt/qtopengl:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtgui:5
+DESCRIPTION=C++ library based on Qt that eases the creation of OpenGL 3D viewers
+EAPI=5
+HOMEPAGE=http://www.libqglviewer.com
+IUSE=designer examples
+KEYWORDS=~amd64 ~arm
+LICENSE=GPL-2
+RDEPEND=virtual/opengl virtual/glu dev-qt/qtopengl:5 dev-qt/qtcore:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtgui:5 designer? ( dev-qt/designer:5 )
+SLOT=0/qt5
+SRC_URI=http://www.libqglviewer.com/src/libQGLViewer-2.7.1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=43913de248e5d12a580ee10e408c799f
diff --git a/metadata/md5-cache/x11-libs/libwnck-3.24.1 b/metadata/md5-cache/x11-libs/libwnck-3.24.1
index a9b18800388c..64b9803268ed 100644
--- a/metadata/md5-cache/x11-libs/libwnck-3.24.1
+++ b/metadata/md5-cache/x11-libs/libwnck-3.24.1
@@ -4,10 +4,10 @@ DESCRIPTION=A window navigation construction kit
 EAPI=6
 HOMEPAGE=https://developer.gnome.org/libwnck/stable/
 IUSE=+introspection startup-notification tools
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~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 ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=x11-libs/cairo[X] >=x11-libs/gtk+-3.22:3[introspection?] >=dev-libs/glib-2.32:2 x11-libs/libX11 x11-libs/libXres x11-libs/libXext introspection? ( >=dev-libs/gobject-introspection-0.6.14:= ) startup-notification? ( >=x11-libs/startup-notification-0.4 )
 SLOT=3
 SRC_URI=mirror://gnome/sources/libwnck/3.24/libwnck-3.24.1.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=d57b89a34c6a0ebd04a7b7f3a0c99c4c
+_md5_=b5636abad135916252725e7dcf4b0d1f
diff --git a/metadata/md5-cache/x11-libs/pango-1.40.14 b/metadata/md5-cache/x11-libs/pango-1.40.14
index 9dd610c10257..f173ae6cf3ed 100644
--- a/metadata/md5-cache/x11-libs/pango-1.40.14
+++ b/metadata/md5-cache/x11-libs/pango-1.40.14
@@ -4,10 +4,10 @@ DESCRIPTION=Internationalized text layout and rendering library
 EAPI=6
 HOMEPAGE=http://www.pango.org/
 IUSE=X +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=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+ FTL
 RDEPEND=>=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_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:1.0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/cairo-1.12.14-r4:=[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(-)?] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libXrender-0.9.8[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/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/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(-)?] )
 SLOT=0
 SRC_URI=mirror://gnome/sources/pango/1.40/pango-1.40.14.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=be6b3d7a1c444c322aad88f51b621d3a
+_md5_=1ce686c02035c4271d10eee0b8d379dc
diff --git a/metadata/md5-cache/x11-libs/vte-0.48.4 b/metadata/md5-cache/x11-libs/vte-0.48.4
index 40ed0405ec75..c6ccb84c037b 100644
--- a/metadata/md5-cache/x11-libs/vte-0.48.4
+++ b/metadata/md5-cache/x11-libs/vte-0.48.4
@@ -4,11 +4,11 @@ DESCRIPTION=Library providing a virtual terminal emulator widget
 EAPI=6
 HOMEPAGE=https://wiki.gnome.org/action/show/Apps/Terminal/VTE
 IUSE=+crypt debug glade +introspection vala vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2+
 RDEPEND=>=dev-libs/glib-2.40:2 >=dev-libs/libpcre2-10.21 >=x11-libs/gtk+-3.16:3[introspection?] >=x11-libs/pango-1.22.0 sys-libs/ncurses:0= sys-libs/zlib crypt? ( >=net-libs/gnutls-3.2.7:0= ) glade? ( >=dev-util/glade-3.9:3.10 ) introspection? ( >=dev-libs/gobject-introspection-0.9.0:= ) !x11-libs/vte:2.90[glade]
 REQUIRED_USE=vala? ( introspection )
 SLOT=2.91
 SRC_URI=mirror://gnome/sources/vte/0.48/vte-0.48.4.tar.xz !vanilla? ( https://dev.gentoo.org/~eva/distfiles/vte/vte-0.48.4-command-notify.patch.xz )
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=43c88258a3f826357e8294761650d50c
+_md5_=e24d2b93c0a3355e804791c7b7f65dda
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index f958624321b9..f837c6c8f538 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/evolvotron-0.7.1 b/metadata/md5-cache/x11-misc/evolvotron-0.7.1
index e595b7ceefa4..e6dc621b88fa 100644
--- a/metadata/md5-cache/x11-misc/evolvotron-0.7.1
+++ b/metadata/md5-cache/x11-misc/evolvotron-0.7.1
@@ -3,10 +3,10 @@ DEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5
 DESCRIPTION=Generative art image evolver
 EAPI=6
 HOMEPAGE=http://www.bottlenose.net/share/evolvotron/index.htm https://sourceforge.net/projects/evolvotron/
-KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd
+KEYWORDS=amd64 ~ppc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=dev-libs/boost:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtxml:5
 SLOT=0
 SRC_URI=mirror://sourceforge/evolvotron/evolvotron-0.7.1.tar.gz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=62ae68efa8c95291fd3b336e8758f43f
+_md5_=56c8f11aa3c48d0b26ae535dda1ea8e3
diff --git a/metadata/md5-cache/x11-misc/kronometer-2.1.5 b/metadata/md5-cache/x11-misc/kronometer-2.1.5
index 982b1952e01e..83d7763e9421 100644
--- a/metadata/md5-cache/x11-misc/kronometer-2.1.5
+++ b/metadata/md5-cache/x11-misc/kronometer-2.1.5
@@ -9,5 +9,5 @@ LICENSE=GPL-2+
 RDEPEND=>=kde-frameworks/kconfig-5.40.0:5 >=kde-frameworks/kconfigwidgets-5.40.0:5 >=kde-frameworks/kcoreaddons-5.40.0:5 >=kde-frameworks/kcrash-5.40.0:5 >=kde-frameworks/ki18n-5.40.0:5 >=kde-frameworks/kwidgetsaddons-5.40.0:5 >=kde-frameworks/kxmlgui-5.40.0:5 >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=kde-frameworks/kf-env-4 || ( >=kde-frameworks/breeze-icons-5.40.0:5 kde-frameworks/oxygen-icons:* ) >=dev-qt/qtcore-5.7.1:5
 SLOT=5
 SRC_URI=mirror://kde/stable/kronometer/2.1.5/src/kronometer-2.1.5.tar.xz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=d3875ecfce882b2a31d7f7e4666abe27
diff --git a/metadata/md5-cache/x11-misc/qtfm-5.9 b/metadata/md5-cache/x11-misc/qtfm-5.9
new file mode 100644
index 000000000000..338db02c7d15
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/qtfm-5.9
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-apps/file dev-qt/qtchooser
+DESCRIPTION=A small, lightweight file manager for desktops based on pure Qt
+EAPI=6
+HOMEPAGE=http://www.qtfm.org/
+IUSE=l10n_da l10n_de l10n_es l10n_fr l10n_it l10n_pl l10n_ru l10n_sr l10n_sv l10n_zh l10n_zh-TW
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 sys-apps/file
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~jer/qtfm-5.9.zip
+_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	multilib	97f470f374f2e94ccab04a2fb21d811e	qmake-utils	990448b067cb3cfe1443bc25fb57239c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=d73cbfde760183cc289cf8969a7322a1
diff --git a/metadata/md5-cache/x11-misc/screengrab-1.97 b/metadata/md5-cache/x11-misc/screengrab-1.97
index 5173d94befb1..2ab4adf83669 100644
--- a/metadata/md5-cache/x11-misc/screengrab-1.97
+++ b/metadata/md5-cache/x11-misc/screengrab-1.97
@@ -3,10 +3,10 @@ DEPEND=dev-libs/libqtxdg dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/q
 DESCRIPTION=Qt application for getting screenshots
 EAPI=6
 HOMEPAGE=https://github.com/QtDesktop/screengrab/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libqtxdg dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 dev-qt/qtnetwork:5 kde-frameworks/kwindowsystem:5[X] x11-libs/libxcb x11-libs/libX11
 SLOT=0
 SRC_URI=https://github.com/QtDesktop/screengrab/archive/1.97.tar.gz -> screengrab-1.97.tar.gz
 _eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=b0e9de007cc45e88465ab124a42f29b2
+_md5_=411009ae37958d96023b11c9f8c69166
diff --git a/metadata/md5-cache/x11-misc/zim-0.68_rc1 b/metadata/md5-cache/x11-misc/zim-0.68_rc1
new file mode 100644
index 000000000000..843a38010966
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/zim-0.68_rc1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-misc/xdg-utils test? ( dev-vcs/bzr dev-vcs/git dev-vcs/mercurial ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DESCRIPTION=A desktop wiki
+EAPI=6
+HOMEPAGE=http://zim-wiki.org/
+IUSE=test python_targets_python2_7 test
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD GPL-2+
+RDEPEND=dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[sqlite] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=http://zim-wiki.org/downloads/zim-0.68-rc1.tar.gz
+_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome2-utils	4d211d7614f303710fca59db6ec12c88	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=386e04585adf631c1bbb8f89ee95ff64
diff --git a/metadata/md5-cache/x11-plugins/Manifest.gz b/metadata/md5-cache/x11-plugins/Manifest.gz
index c6993b18d039..2e3b7e22efbf 100644
--- a/metadata/md5-cache/x11-plugins/Manifest.gz
+++ b/metadata/md5-cache/x11-plugins/Manifest.gz
diff --git a/metadata/md5-cache/x11-plugins/pidgin-sipe-1.21.1 b/metadata/md5-cache/x11-plugins/pidgin-sipe-1.21.1
deleted file mode 100644
index 3eb9e0e091c4..000000000000
--- a/metadata/md5-cache/x11-plugins/pidgin-sipe-1.21.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-util/intltool virtual/pkgconfig >=dev-libs/gmime-2.4.16 dev-libs/libxml2 openssl? ( dev-libs/openssl:= ) !openssl? ( dev-libs/nss ) kerberos? ( virtual/krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer:0.10 >=net-im/pidgin-2.8.0 ) !voice? ( >=dev-libs/glib-2.12.0:2 net-im/pidgin ) telepathy? ( >=sys-apps/dbus-1.1.0 >=dev-libs/dbus-glib-0.61 >=dev-libs/glib-2.28:2 >=net-libs/telepathy-glib-0.18.0 ) >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Pidgin Plug-in SIPE (Sip Exchange Protocol)
-EAPI=5
-HOMEPAGE=http://sipe.sourceforge.net/
-IUSE=debug kerberos ocs2005-message-hack openssl telepathy voice
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/gmime-2.4.16 dev-libs/libxml2 openssl? ( dev-libs/openssl:= ) !openssl? ( dev-libs/nss ) kerberos? ( virtual/krb5 ) voice? ( >=dev-libs/glib-2.28.0 >=net-libs/libnice-0.1.0 media-libs/gstreamer:0.10 >=net-im/pidgin-2.8.0 ) !voice? ( >=dev-libs/glib-2.12.0:2 net-im/pidgin ) telepathy? ( >=sys-apps/dbus-1.1.0 >=dev-libs/dbus-glib-0.61 >=dev-libs/glib-2.28:2 >=net-libs/telepathy-glib-0.18.0 )
-SLOT=0
-SRC_URI=mirror://sourceforge/sipe/pidgin-sipe-1.21.1.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=13ffc42e0c62bc7d8bc2873d37962bc4
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index e6aec55c6e43..b0e908e12eaf 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/guake-0.8.11 b/metadata/md5-cache/x11-terms/guake-0.8.11
deleted file mode 100644
index c2a81dbf59c6..000000000000
--- a/metadata/md5-cache/x11-terms/guake-0.8.11
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm 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_python2_7(+)] dev-libs/keybinder:0[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gconf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/vte:0[python] dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Drop-down terminal for GTK+ desktops
-EAPI=6
-HOMEPAGE=https://github.com/Guake/guake
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/keybinder:0[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gconf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/vte:0[python]
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=https://github.com/guake/guake/archive/0.8.11.tar.gz -> guake-0.8.11.tar.gz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=364161358de2c8be49a0bd97a560ac48
diff --git a/metadata/md5-cache/x11-terms/guake-0.8.13 b/metadata/md5-cache/x11-terms/guake-0.8.13
new file mode 100644
index 000000000000..4d16f8f36508
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/guake-0.8.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm 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_python2_7(+)] dev-libs/keybinder:0[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gconf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/vte:0[python] dev-util/intltool virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
+DESCRIPTION=Drop-down terminal for GTK+ desktops
+EAPI=6
+HOMEPAGE=https://github.com/Guake/guake
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-libs/keybinder:0[python,python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/gconf-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/notify-python[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pygtk[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] dev-python/pyxdg[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),python_single_target_python2_7(+)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/vte:0[python]
+REQUIRED_USE=python_targets_python2_7
+SLOT=0
+SRC_URI=https://github.com/guake/guake/archive/0.8.13.tar.gz -> guake-0.8.13.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-single-r1	317a2557b4d7319a7418225f65accf77	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=256c116e4efe8024a4ab39d5a7466b24
diff --git a/metadata/md5-cache/x11-terms/mate-terminal-1.16.1-r2 b/metadata/md5-cache/x11-terms/mate-terminal-1.16.1-r2
deleted file mode 100644
index a98975b72162..000000000000
--- a/metadata/md5-cache/x11-terms/mate-terminal-1.16.1-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/gtk+-3.14:3[X] >=x11-libs/vte-0.38:2.91 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=The MATE Terminal
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/gtk+-3.14:3[X] >=x11-libs/vte-0.38:2.91 >=mate-base/mate-desktop-1.6
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-terminal-1.16.1.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=8a1eebb460f302d6065179c311264ac6
diff --git a/metadata/md5-cache/x11-terms/mate-terminal-1.16.3 b/metadata/md5-cache/x11-terms/mate-terminal-1.16.3
new file mode 100644
index 000000000000..f32b598668ef
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/mate-terminal-1.16.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/gtk+-3.14:3[X] >=x11-libs/vte-0.38:2.91 app-text/rarian:0 >=app-text/scrollkeeper-dtd-1:1.0 app-text/yelp-tools:0 >=dev-util/intltool-0.50.1:* sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=The MATE Terminal
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-3
+RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.36:2 >=gnome-base/dconf-0.13.4:0 x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 x11-libs/pango:0 >=x11-libs/gtk+-3.14:3[X] >=x11-libs/vte-0.38:2.91 >=mate-base/mate-desktop-1.6
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-terminal-1.16.3.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=a9047243133c61db09cc2cefff71a36d
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 9731b9a6cd5a..0bfb1777210e 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/adwaita-icon-theme-3.24.0 b/metadata/md5-cache/x11-themes/adwaita-icon-theme-3.24.0
index 61e1341995c8..0c0aa0acf150 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 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~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 ~arm-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	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=eed84b2eb356f2541ee505629ea94a9c
+_md5_=bdfa83e662ebf843a5ad1e3f3cd12070
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-1.16.0 b/metadata/md5-cache/x11-themes/mate-icon-theme-1.16.0
deleted file mode 100644
index ce339b57162a..000000000000
--- a/metadata/md5-cache/x11-themes/mate-icon-theme-1.16.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=dev-util/intltool-0.40:* >=x11-misc/icon-naming-utils-0.8.7:0 sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=MATE default icon themes
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
-RESTRICT=binchecks strip
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-icon-theme-1.16.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=874fa02a2c29ee3d76b131630a5db5a7
diff --git a/metadata/md5-cache/x11-themes/mate-icon-theme-1.16.2 b/metadata/md5-cache/x11-themes/mate-icon-theme-1.16.2
new file mode 100644
index 000000000000..794d90cf10c4
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/mate-icon-theme-1.16.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=x11-themes/hicolor-icon-theme-0.10 >=dev-util/intltool-0.40:* >=x11-misc/icon-naming-utils-0.8.7:0 sys-devel/gettext:* virtual/pkgconfig:* >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=MATE default icon themes
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=>=x11-themes/hicolor-icon-theme-0.10
+RESTRICT=binchecks strip
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/mate-icon-theme-1.16.2.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=bc12b7d5f83f11027f0e996630705f6f
diff --git a/metadata/md5-cache/x11-themes/mate-themes-meta-3-r2 b/metadata/md5-cache/x11-themes/mate-themes-meta-3-r2
index 9b9d1a71481b..a291305dc9d4 100644
--- a/metadata/md5-cache/x11-themes/mate-themes-meta-3-r2
+++ b/metadata/md5-cache/x11-themes/mate-themes-meta-3-r2
@@ -5,6 +5,6 @@ HOMEPAGE=https://wiki.gentoo.org/wiki/No_homepage
 IUSE=gtk2-only
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=metapackage
-RDEPEND=|| ( gtk2-only? ( !!x11-libs/gtk+:3 x11-themes/mate-themes:0 ) ( =x11-libs/gtk+-3.16*:3 =x11-themes/mate-themes-3.16*:0/3.16 ) ( =x11-libs/gtk+-3.18*:3 =x11-themes/mate-themes-3.18*:0/3.18 ) ( =x11-libs/gtk+-3.20*:3 =x11-themes/mate-themes-3.20*:0/3.20 ) ( =x11-libs/gtk+-3.22*:3 =x11-themes/mate-themes-3.22*:0/3.22 ) )
+RDEPEND=|| ( gtk2-only? ( !!x11-libs/gtk+:3 x11-themes/mate-themes:0 ) ( =x11-libs/gtk+-3.22*:3 =x11-themes/mate-themes-3.22*:0/3.22 ) )
 SLOT=0
-_md5_=c228ea863fe8eb844e6d07b30d874378
+_md5_=206ac1140cc12b1facff4ad29e571b1e
diff --git a/metadata/md5-cache/x11-themes/qtcurve-1.9.0_rc1-r1 b/metadata/md5-cache/x11-themes/qtcurve-1.9.0_rc1-r1
index 6b34496ddcf5..afdb8b8a877c 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-1.9.0_rc1-r1
+++ b/metadata/md5-cache/x11-themes/qtcurve-1.9.0_rc1-r1
@@ -10,5 +10,5 @@ RDEPEND=gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/q
 REQUIRED_USE=gtk? ( X ) || ( gtk qt4 qt5 ) plasma? ( qt5 )
 SLOT=0
 SRC_URI=https://github.com/KDE/qtcurve/archive/1.9.0-rc1.tar.gz -> qtcurve-1.9.0_rc1.tar.gz
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=60cf47407fe011be03aae1e019f48c4f
diff --git a/metadata/md5-cache/x11-themes/qtcurve-9999 b/metadata/md5-cache/x11-themes/qtcurve-9999
index 622d97c45813..4373248908fc 100644
--- a/metadata/md5-cache/x11-themes/qtcurve-9999
+++ b/metadata/md5-cache/x11-themes/qtcurve-9999
@@ -8,5 +8,5 @@ LICENSE=LGPL-2+
 RDEPEND=gtk? ( x11-libs/gtk+:2 ) qt4? ( dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 ) qt5? ( >=dev-qt/qtdbus-5.7.1:5 >=dev-qt/qtgui-5.7.1:5 >=dev-qt/qtsvg-5.7.1:5 >=dev-qt/qtwidgets-5.7.1:5 >=dev-qt/qtx11extras-5.7.1:5 ) plasma? ( >=kde-frameworks/frameworkintegration-5.40.0 >=kde-frameworks/karchive-5.40.0 >=kde-frameworks/kcompletion-5.40.0 >=kde-frameworks/kconfig-5.40.0 >=kde-frameworks/kconfigwidgets-5.40.0 >=kde-frameworks/kcoreaddons-5.40.0 >=kde-frameworks/kdelibs4support-5.40.0 >=kde-frameworks/kguiaddons-5.40.0 >=kde-frameworks/ki18n-5.40.0 >=kde-frameworks/kiconthemes-5.40.0 >=kde-frameworks/kio-5.40.0 >=kde-frameworks/kwidgetsaddons-5.40.0 >=kde-frameworks/kwindowsystem-5.40.0 >=kde-frameworks/kxmlgui-5.40.0 >=dev-qt/qtprintsupport-5.7.1:5 ) X? ( x11-libs/libX11 x11-libs/libxcb ) !x11-themes/gtk-engines-qtcurve
 REQUIRED_USE=gtk? ( X ) || ( gtk qt4 qt5 ) plasma? ( qt5 )
 SLOT=0
-_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	aeb3e2e5e6d47b055239967bc5beafd1	kde5-functions	32035c63585f9f5de8a6610e7dab0aa9	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_eclasses_=cmake-utils	202a2becc86cb78ba14baad148d06759	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	git-r3	fec09a83ae965b041b47f5ff7c8ba29a	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	25992fae542d6ffb06a9da87653236e7	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
 _md5_=a94e785c14ac1f6792c241f0fe6af3d8
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index a76e5d3af0c2..8af7c60c3086 100644
--- a/metadata/md5-cache/x11-wm/Manifest.gz
+++ b/metadata/md5-cache/x11-wm/Manifest.gz
diff --git a/metadata/md5-cache/x11-wm/i3-4.14.1 b/metadata/md5-cache/x11-wm/i3-4.14.1
index 5e83da5443c2..c948233a6aa2 100644
--- a/metadata/md5-cache/x11-wm/i3-4.14.1
+++ b/metadata/md5-cache/x11-wm/i3-4.14.1
@@ -11,5 +11,5 @@ REQUIRED_USE=test? ( debug )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://i3wm.org/downloads/i3-4.14.1.tar.bz2
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c
-_md5_=7bff004239033d87fe54351cad363587
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	out-of-source	599059fedc27d10d7e958a5966b6104c	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	virtualx	3a3c4637ea6d5a2113707a644766337c
+_md5_=1b37e4b192fffeb0b63fca5120201602
diff --git a/metadata/md5-cache/x11-wm/marco-1.16.0-r1 b/metadata/md5-cache/x11-wm/marco-1.16.0-r1
deleted file mode 100644
index bb273e8d5a8d..000000000000
--- a/metadata/md5-cache/x11-wm/marco-1.16.0-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager app-text/yelp-tools:0 >=dev-util/intltool-0.34.90:* sys-devel/gettext:* virtual/pkgconfig:* x11-proto/xextproto:0 x11-proto/xproto:0 test? ( app-text/docbook-xml-dtd:4.5 ) xinerama? ( x11-proto/xineramaproto:0 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
-DESCRIPTION=MATE default window manager
-EAPI=6
-HOMEPAGE=https://mate-desktop.org
-IUSE=gtk3 startup-notification test xinerama
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager gnome-extra/zenity:0 >=mate-base/mate-desktop-1.9[gtk3(-)=]
-SLOT=0
-SRC_URI=https://pub.mate-desktop.org/releases/1.16/marco-1.16.0.tar.xz
-_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=285f11b9308f9e858c926cc74e381098
diff --git a/metadata/md5-cache/x11-wm/marco-1.16.1 b/metadata/md5-cache/x11-wm/marco-1.16.1
new file mode 100644
index 000000000000..131f7c9e8984
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/marco-1.16.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager app-text/yelp-tools:0 >=dev-util/intltool-0.34.90:* sys-devel/gettext:* virtual/pkgconfig:* x11-proto/xextproto:0 x11-proto/xproto:0 test? ( app-text/docbook-xml-dtd:4.5 ) xinerama? ( x11-proto/xineramaproto:0 ) >=app-portage/elt-patches-20170422 app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 >=mate-base/mate-common-1.16
+DESCRIPTION=MATE default window manager
+EAPI=6
+HOMEPAGE=https://mate-desktop.org
+IUSE=gtk3 startup-notification test xinerama
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/atk:0 >=dev-libs/glib-2.32.10:2 >=gnome-base/libgtop-2:2= x11-libs/cairo:0 >=x11-libs/pango-1.2:0[X] x11-libs/gdk-pixbuf:2 x11-libs/libICE:0 x11-libs/libSM:0 x11-libs/libX11:0 >=x11-libs/libXcomposite-0.3:0 x11-libs/libXcursor:0 x11-libs/libXdamage:0 x11-libs/libXext:0 x11-libs/libXfixes:0 x11-libs/libXrandr:0 x11-libs/libXrender:0 >=x11-libs/startup-notification-0.7:0 virtual/libintl:0 !gtk3? ( media-libs/libcanberra:0[gtk] >=x11-libs/gtk+-2.24:2 ) gtk3? ( media-libs/libcanberra:0[gtk3] >=x11-libs/gtk+-3.0:3 ) xinerama? ( x11-libs/libXinerama:0 ) !!x11-wm/mate-window-manager gnome-extra/zenity:0 >=mate-base/mate-desktop-1.9[gtk3(-)=]
+SLOT=0
+SRC_URI=https://pub.mate-desktop.org/releases/1.16/marco-1.16.1.tar.xz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	mate	58aa134cca4a230873e4bde7fd57233c	mate-desktop.org	e10a19aa1a06b2fe47e07bf61d17f9ce	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=285f11b9308f9e858c926cc74e381098
diff --git a/metadata/md5-cache/x11-wm/xpra-1.0.9 b/metadata/md5-cache/x11-wm/xpra-1.0.9
index 06b59addfde1..26ddf1260363 100644
--- a/metadata/md5-cache/x11-wm/xpra-1.0.9
+++ b/metadata/md5-cache/x11-wm/xpra-1.0.9
@@ -4,11 +4,11 @@ DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on
 EAPI=6
 HOMEPAGE=http://xpra.org/ http://xpra.org/src/
 IUSE=+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_avcodec2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) enc_ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.2.2:0= ) libav? ( media-video/libav:0= ) ) enc_x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) enc_x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) webp? ( media-libs/libwebp ) ) dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rencode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/ssh x11-apps/xmodmap cups? ( dev-python/pycups[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lz4? ( dev-python/lz4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) pillow? ( dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) webcam? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python] dev-python/pyinotify[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(-)] virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python2_7 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-1.0.9.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=695b982ee94986daff456881635f63e0
+_md5_=9a8d1bec01afafa9ddc236ebcb4b6aa2
diff --git a/metadata/md5-cache/x11-wm/xpra-2.1.3 b/metadata/md5-cache/x11-wm/xpra-2.1.3
index 0b7515c360f0..c4c8b5114fc6 100644
--- a/metadata/md5-cache/x11-wm/xpra-2.1.3
+++ b/metadata/md5-cache/x11-wm/xpra-2.1.3
@@ -4,11 +4,11 @@ DESCRIPTION=X Persistent Remote Apps (xpra) and Partitioning WM (parti) based on
 EAPI=6
 HOMEPAGE=http://xpra.org/ http://xpra.org/src/
 IUSE=+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam python_targets_python2_7
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2 BSD
 RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygobject:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pygtk:2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst csc? ( !libav? ( >=media-video/ffmpeg-1.2.2:0= ) libav? ( media-video/libav:0= ) ) dec_avcodec2? ( !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) enc_ffmpeg? ( !libav? ( >=media-video/ffmpeg-3.2.2:0= ) libav? ( media-video/libav:0= ) ) enc_x264? ( media-libs/x264 !libav? ( >=media-video/ffmpeg-1.0.4:0= ) libav? ( media-video/libav:0= ) ) enc_x265? ( media-libs/x265 !libav? ( >=media-video/ffmpeg-2:0= ) libav? ( media-video/libav:0= ) ) jpeg? ( media-libs/libjpeg-turbo ) opengl? ( dev-python/pygtkglext ) pulseaudio? ( media-sound/pulseaudio ) sound? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 dev-python/gst-python:1.0 ) vpx? ( media-libs/libvpx virtual/ffmpeg ) dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/netifaces[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/rencode[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/ssh x11-apps/xmodmap cups? ( dev-python/pycups[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dbus? ( dev-python/dbus-python[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lz4? ( dev-python/lz4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) lzo? ( >=dev-python/python-lzo-0.7.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) opengl? ( client? ( dev-python/pyopengl_accelerate[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ) pillow? ( dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) server? ( x11-base/xorg-server[-minimal,xvfb] x11-drivers/xf86-input-void ) webcam? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/opencv[python] dev-python/pyinotify[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(-)] virtual/tmpfiles
 REQUIRED_USE=|| ( python_targets_python2_7 ) clipboard? ( || ( server client ) ) cups? ( dbus ) opengl? ( client ) || ( client server ) client? ( enc_x264? ( dec_avcodec2 ) enc_x265? ( dec_avcodec2 ) ) || ( python_targets_python2_7 )
 SLOT=0
 SRC_URI=http://xpra.org/src/xpra-2.1.3.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	distutils-r1	372bbe39047c0a2550319a3a82f3e063	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	tmpfiles	7bd1d7bf5261430a2d2991cff7958c52	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=23fc81aa504ab641c4c48b8219e710db
+_md5_=38f351e597deadb0fdfdd96b20d12fe9
diff --git a/metadata/news/2018-01-14-gnucash/2018-01-14-gnucash.en.txt b/metadata/news/2018-01-14-gnucash/2018-01-14-gnucash.en.txt
new file mode 100644
index 000000000000..334c1c078335
--- /dev/null
+++ b/metadata/news/2018-01-14-gnucash/2018-01-14-gnucash.en.txt
@@ -0,0 +1,31 @@
+Title: GnuCash 2.7+ Breaking Change
+Author: Aaron W. Swenson <titanofold@gentoo.org>
+Posted: 2018-01-14
+Revision: 1
+News-Item-Format: 2.0
+Display-If-Installed: <app-office/gnucash-4
+
+Along with changes to use modern libraries, GnuCash 2.7+ has changed the
+schema [1] it uses for both databases and files. GnuCash will
+automatically modify the file or database in place upon open.
+
+Therefore, it is imperative that you back up any files or databases
+before using GnuCash 2.7 in case you run into an issue and want or need
+to revert back to 2.6.
+
+Close any open session of GnuCash including remote sessions, then
+follow the relevant backup instructions as follows:
+
+For XML (plain files):
+$ cp /path/to/file.gnucash /path/to/file.gnucash.bak
+
+For MySQL:
+$ mysqldump gnucash_db | xz > gnucash-2.6.sql.xz
+
+For PostgreSQL:
+$ pg_dump -U gnucash_user -Z 5 gnucash_db > gnucash-2.6.sql.gz
+
+For SQLite:
+$ cp /path/to/sqlite.file.gnucash /path/to/sqlite.file.gnucash.bak
+
+[1] https://github.com/Gnucash/gnucash/releases/tag/2.7.0a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index efcbedfb7855..9556ca695a41 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 18679 BLAKE2B 5bd43b576965dc1f45da82f1afe37fa49a2eb07e9d5e4c0941c1b90f25f4218bf17f148235a2ec341964150680e225dfbb0525d344b68562e5e8edc681acad2e SHA512 f57a5ef7316f5f4f46b448cf9bf75256883ea888098b41c74f84b26ce00fc294dcc7a55602956716b676b9da249fadd47b8d626f6b985649799c2fa501effa8a
-TIMESTAMP 2018-01-13T05:38:57Z
+MANIFEST Manifest.files.gz 18854 BLAKE2B 87b0050631f3c4c24c9b0639af4ece994fec7be0d2b096756b772f110bed3e089caed28b068682fc1e59b2d49ca724c1aeb1b1e762441d2735c8ed578c49b235 SHA512 d74817471dfc770c83d507a02d98e619f164b9434c59172eb40d628909e1a35874200854447d622a24770df620539c1b2b48ffb719675bc7fa363b32a3553173
+TIMESTAMP 2018-01-16T16:39:21Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpZm3FfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAlpeKrpfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAkZxAAq3jbGWoD5As3pId28v2GUsOPwHKPpnlp0fVqAVs2vqRuYRFKRloh1OEv
-OKrHx11EVNCmVPd6+LYvGLRPlxGc8y+K7zYZEFKtVDrV18jkRDKUcVRWd+Y/U35W
-wOjWiGWrrpkMWjBupTS+y3xcWN+lYLUS1dksPWC367q2Gaa5DHyhq8gEbd3Jk2H7
-AXIxqDne7xyxFj5UcQtCcZ8BaU2hpFrKg/M0Q5gnpFyGLEP01y8Kt39g7rcv3DdL
-/5VU+7hHKcBsOwY8rwo30rghwHcUP4oqXqF3YDCwrzEe5EiixX9LI3wS+mjE+CEz
-U1lWfF+Lsohy91oYCFvG70XPX7WxL+WNuPZBarzjEB4gF5+yczboKZanJU0BFvia
-Af4SVIRApPP5b9+ZYi83T9l9SI0buA6PBtsmRuabxj27lWMerBlVR49JoK95jUld
-ZsERzO2JuaUHpF6q+9eNf5pEaYIiUaWUH28JZMX58i3AQICf+qrEAJr0ZuSDu7Io
-xDesrhjJ2MjuGRsiBOfms94w++zrSOPHnLFU3KU5D5Nh4jg0HIVtov/RLJ2ryzRO
-gHRB4OnEYcfKzpXIf/JEH6JP3VkKxW3k4ygZRZ6d64KGXSuXBXhN85tzjf5tlQ7y
-IhuuppqrN85li7UbLxjxoYaBD5ECIGq/RHrBTv5fkPZ9cpo0Txw=
-=Jnnp
+klA19Q//U9SBNk0zBZWgGfPzNOKeOS+b59xY7Gr/fjj/+FrFI/+IgH4JQ8z3Kn2l
+rhQ3haFtJUat9GUdBzU5xDrnCpIbobbfKyNbpUYh+6jJuTFigAXDYF4+134syQLd
+RkBuuwkKs9kVuO0c68vQALK8fHJHpJVD8xs10pcGZdS66Q79Gfxga+HA+IsN+pHM
+fyXUsZZXUxRQdAyB5oisOJTF1wIf/lNycbjpo0phtUPeB5w9QvWq2PoIvP9d6gNe
+BxYSprmXg0hHwuCGy3XioBPJtxOpR9ceSq4LzBHDZ5NFciAwyaKxKI5pOVyzGAdz
+wx8Je0cMvxWX3aGSsaJ89fniBEObpzyPYdvMon3fOo4lFDpxtC/D4YwrH/cQHawW
+wQJvTGLphv52qVtfhXtK5rPgbjUjCwekD+EN9zbZIBJxi09kPkb1FlzOWAYRZ4Am
+K/mIySZ0UkQ9oT35eKWuz768jKDrrZgNSUvW75jgsnDxMsw3b9IXzuw6523iqaSx
+YDidOcC6J9imi2PrhlDzBnh9/xr4e1PRrIUHda9r0QtWKRAUczceh3Gs8CsFZvfX
+STOv82aryULOzAhP6Im9bOEG6PjVGkJUuDsglVDEINh2mWcob1M8Qx0EpGCQrBS1
+B9YswRVbeL4nvKdYBrtRWTF+wLlgrfoQHtUFAS4iI/g8BOdhSxw=
+=QQAa
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/Manifest.files.gz b/metadata/news/Manifest.files.gz
index 6828d12a3260..0b01c4002860 100644
--- a/metadata/news/Manifest.files.gz
+++ b/metadata/news/Manifest.files.gz
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 749c873f8b58..f124a8652ca5 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Jan 2018 05:38:53 +0000
+Tue, 16 Jan 2018 16:39:18 +0000
diff --git a/metadata/news/timestamp.commit b/metadata/news/timestamp.commit
index 46ce69897a06..8d0ed9bf69ce 100644
--- a/metadata/news/timestamp.commit
+++ b/metadata/news/timestamp.commit
@@ -1 +1 @@
-49eb23dc2fabe8b786099e4f1c6d65b9c77d6486 1515516530 2018-01-09T16:48:50+00:00
+ed16527710bcde367ba3a4c7604c5aa6b2650034 1515985426 2018-01-15T03:03:46+00:00
diff --git a/metadata/timestamp b/metadata/timestamp
index 7dfec42d6bd8..d4591921ed28 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Jan 13 05:38:53 UTC 2018
+Tue Jan 16 16:39:18 UTC 2018
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b6785c170f5a..31f92b76d88f 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Jan 2018 05:45:01 +0000
+Tue, 16 Jan 2018 16:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index cd0c830f00d0..34e0fb209c4c 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-db30be30cd4053d0151fc99ac3926e6f595d7d95 1515817551 2018-01-13T04:25:51+00:00
+ece7319b130dc2f809585dce99a7911e95468a7d 1516119465 2018-01-16T16:17:45+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 4747001536d1..cc51442c5030 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1515821701 Sat 13 Jan 2018 05:35:01 AM UTC
+1516120501 Tue 16 Jan 2018 04:35:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 749c873f8b58..f124a8652ca5 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 13 Jan 2018 05:38:53 +0000
+Tue, 16 Jan 2018 16:39:18 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 884da13749cf..e2986ca3ae24 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
index b8b282290f1d..d8c1bc890e3d 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -1,5 +1,7 @@
 DIST etherape-0.9.14.tar.gz 1438255 BLAKE2B a34ca77cc8862b3de50ca0405d7de083653fb984de85feb7c575b6eb0f340d386add9c851cdd54d8cf5d3d1c3cdddb1c7522673687d94b30f2ab0f91d4251613 SHA512 26e018e49bbea9baf8b4056798e2acab1ad1aba51022ab1258d31499d612a7b12567c4d671da45f79785fbe3c1eda6698b4fe201b055e71e13c9f9b0275c91e3
 DIST etherape-0.9.15.tar.gz 1449612 BLAKE2B 45d3dc3230e1052abab72d7732fe681829b6e88068522ab3d6c67674a12b30b8c0da48ee3249cdf0ade7305fd5945270def177c7e9f380722ff1be182383453b SHA512 5a469b5994fa39a76c3966028f513db0a716cf5c447b73048e9d70c3e21824f9ed3f25b82e6d9ed7a88b7be49603311d81f567adfddc2776a44e809de5e0674a
+DIST etherape-0.9.16.tar.gz 1435235 BLAKE2B af6d0ba7d9532b383322546a42126fd456a2695ec7332cd082addc6ed72bb8e11d058854881157775e767c37c0ca3984074bdbe2f8a098622f48d38e9aa99281 SHA512 0c0b5e04cf1628fe22cfa35ee85b4ab4736265d071c9d179c0dc52e2894f022da7648f236e7ab29e28049a4afc8728ba639a6654da82e299938259fbe01e0d57
 EBUILD etherape-0.9.14.ebuild 611 BLAKE2B 028a91b19cc57e075b974bc1f80c39ce42ba0bac4f89e5afb1e48742e4d44816f5b5ab5e7236cf7a59aebc87a677b11391ebb6294b504dbf45333aa6fb52a142 SHA512 2aff3a594f3e24192554249bb6ebcc5002f47a76cd1c74b4913f33cc08bd824c78e89038d8d7a52a241a382479f8057102689be565544c1e96a0c880ef332ed5
 EBUILD etherape-0.9.15.ebuild 616 BLAKE2B ae5fc3dfce7836f1f796464226466982a4020b5bb87d17a1f6db8623f2e420cde0a2d39eae96ae188905bd0b958d99b6306a853f5fe1435f8945b7dd7c6e72d9 SHA512 2ab7802a907950422c7c6a475b22620634d51925f05d9f0301393ce5d0a179bfbfc6803daa46296cf386005f96b881cc7a1c96add60b574eb90fb128892b2dbb
+EBUILD etherape-0.9.16.ebuild 587 BLAKE2B 864c1f5317b245c009e7ee0111e33e91524452455df52a9d9d3fbbc165a41d9aa8d79b01abb4bcc040be763916f1fb0292cac7f51d2c0e571d3a6d30d815221f SHA512 74b56e34c907dd1020dbab8df0a11ada2031d5814d2bfecfd5634e479f5add007e8388ec9b81cb3c04e5d52363ba909df218d3c0ea56661abf27b0219af3ae68
 MISC metadata.xml 820 BLAKE2B 613982514b7fe5365b2eb8344cd1e7214d71636fec65aba0f4f2d226047e33ede0a0fb0f096f87d20077d0f1907375eaefbbc04bfc81904dd044bbc567cc887a SHA512 8e7b8953034f14069d5d2aad3c0a1b180ec182c9ae8be46bf2b837629e40f0122b4402c0adfeccb1967844c38b241a122a2735df0d63ad475c2355eb4b454e9b
diff --git a/net-analyzer/etherape/etherape-0.9.16.ebuild b/net-analyzer/etherape/etherape-0.9.16.ebuild
new file mode 100644
index 000000000000..4f8df6a0aae4
--- /dev/null
+++ b/net-analyzer/etherape/etherape-0.9.16.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit gnome2
+
+DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
+HOMEPAGE="http://etherape.sourceforge.net/"
+SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND="
+	>=gnome-base/libglade-2.0
+	gnome-base/libgnomecanvas[glade]
+	net-libs/libpcap
+"
+DEPEND="${RDEPEND}
+	>=sys-devel/gettext-0.11.5
+	app-text/docbook-xml-dtd:4.1.2
+	app-text/gnome-doc-utils
+	virtual/pkgconfig
+"
diff --git a/net-analyzer/multimon-ng/Manifest b/net-analyzer/multimon-ng/Manifest
index af63bbdb5c3c..c25e23e8e7c0 100644
--- a/net-analyzer/multimon-ng/Manifest
+++ b/net-analyzer/multimon-ng/Manifest
@@ -1,4 +1,4 @@
-DIST multimon-ng-1.0.0.tar.gz 67095 BLAKE2B 4859a03e3b07ebe95232233832dc45d070010c38de8ef687db561d57137d7bcef7b469da618f450954819e21715e00e46df1d51b44ee86f84c4ac105f4cf00c9 SHA512 0fa475c7908bc24a9558c5a7e0aa4737fca117ff323a012b4316ad02840eb97f917a02d1daec50645729c2ca834068467ddc409cbc36af9cd5ffb9e8f6e5e3e9
-EBUILD multimon-ng-1.0.0-r1.ebuild 875 BLAKE2B e08e18a21b6b7f89144084f6d3a9c4831fd79452d39a380c6951f13e09db8917b30d861994924038bb7610fa3f8df02a5ac26989f6d6b49e458bc0f3a27057e1 SHA512 4e0a8294293c3b33bf1c90ab0157d8d2e33e32286531e12fa5dd54e414fd27e00177a9dcfcb3ea10a3dc1e5d9fe348105e67928f7db7c8172fe00275feef32b3
-EBUILD multimon-ng-9999.ebuild 875 BLAKE2B e08e18a21b6b7f89144084f6d3a9c4831fd79452d39a380c6951f13e09db8917b30d861994924038bb7610fa3f8df02a5ac26989f6d6b49e458bc0f3a27057e1 SHA512 4e0a8294293c3b33bf1c90ab0157d8d2e33e32286531e12fa5dd54e414fd27e00177a9dcfcb3ea10a3dc1e5d9fe348105e67928f7db7c8172fe00275feef32b3
+DIST multimon-ng-1.1.4.tar.gz 2426821 BLAKE2B 36f5eda463afc08ed6848d86b27ccbe27897327ea585b4b42210b13a2ac17ec8b215f239cc626f3151f6ca029897f40db333285b5442c85112b338c78a854adc SHA512 575e920b3738ab00da2cecdea8a1b1fb809ea7870e0aae7a5f8940ae8eee70af202e062d4a624d9de677135a7561daed60f264c6047b58f348405cb2bd06b21a
+EBUILD multimon-ng-1.1.4.ebuild 830 BLAKE2B 4234b19564f64586300b9cdd806245a6bae44795aac3db76e747cd2acdffb7abca0604f0454622b3777e906637f30e38f81ec0d02f882f2318a7bd4f8ddfbee1 SHA512 fb1585abcfd3cc05e0d7799769c0f222a291a4fe10394d041c9120c25bc6157c0447eb3c06445445c54391639474b43a34d9efcb32cd23eefca935d04f401ca4
+EBUILD multimon-ng-9999.ebuild 830 BLAKE2B 4234b19564f64586300b9cdd806245a6bae44795aac3db76e747cd2acdffb7abca0604f0454622b3777e906637f30e38f81ec0d02f882f2318a7bd4f8ddfbee1 SHA512 fb1585abcfd3cc05e0d7799769c0f222a291a4fe10394d041c9120c25bc6157c0447eb3c06445445c54391639474b43a34d9efcb32cd23eefca935d04f401ca4
 MISC metadata.xml 432 BLAKE2B 18d6a22e90f20d23e46aa7f0c0875dc156ba6d0b141b2ac98674b44d05166bc9f48a74f2d885723b5e7838fd2f710488aace8e7c9927a3bd14103101729ec111 SHA512 f61a6ec965782d81ba149cd16df61d7334a8775a2624ba38408e7ca9660df9d69e40817eecfd17db5b819a68e178648ed440e69278223665e51c98a7c2535230
diff --git a/net-analyzer/multimon-ng/multimon-ng-1.0.0-r1.ebuild b/net-analyzer/multimon-ng/multimon-ng-1.0.0-r1.ebuild
deleted file mode 100644
index 6ba3057182a6..000000000000
--- a/net-analyzer/multimon-ng/multimon-ng-1.0.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit qt4-r2
-
-DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes"
-HOMEPAGE="https://github.com/EliasOenal/multimonNG"
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/EliasOenal/multimonNG.git"
-	KEYWORDS=""
-else
-	SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/multimonNG-${PV}
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="pulseaudio"
-
-DEPEND="pulseaudio? ( media-sound/pulseaudio )
-	dev-qt/qtcore:4
-	x11-libs/libX11"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	if use !pulseaudio; then
-		sed -i -e 's/-lpulse-simple//' -e 's/-lpulse//' -e 's/PULSE/DUMMY/' ${PN}.pro || die
-	fi
-	qt4-r2_src_prepare
-}
-src_install() {
-	dobin ${PN}
-}
diff --git a/net-analyzer/multimon-ng/multimon-ng-1.1.4.ebuild b/net-analyzer/multimon-ng/multimon-ng-1.1.4.ebuild
new file mode 100644
index 000000000000..669915a3a1f0
--- /dev/null
+++ b/net-analyzer/multimon-ng/multimon-ng-1.1.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes"
+HOMEPAGE="https://github.com/EliasOenal/multimon-ng"
+
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/EliasOenal/multimon-ng.git"
+	KEYWORDS=""
+else
+	SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="pulseaudio X"
+
+DEPEND="pulseaudio? ( media-sound/pulseaudio )
+		X? ( x11-libs/libX11 )"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	use pulseaudio && sed -i '/find_package( PulseAudio )/d' CMakeLists.txt
+	use X && sed -i '/find_package( X11 )/d' CMakeLists.txt
+	cmake-utils_src_prepare
+}
diff --git a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
index 6ba3057182a6..669915a3a1f0 100644
--- a/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
+++ b/net-analyzer/multimon-ng/multimon-ng-9999.ebuild
@@ -1,38 +1,32 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit qt4-r2
+inherit cmake-utils
 
 DESCRIPTION="a fork of multimon, decodes multiple digital transmission modes"
-HOMEPAGE="https://github.com/EliasOenal/multimonNG"
+HOMEPAGE="https://github.com/EliasOenal/multimon-ng"
 
 if [[ ${PV} == 9999* ]]; then
-	inherit git-2
-	EGIT_REPO_URI="https://github.com/EliasOenal/multimonNG.git"
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/EliasOenal/multimon-ng.git"
 	KEYWORDS=""
 else
 	SRC_URI="https://github.com/EliasOenal/multimonNG/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	S="${WORKDIR}"/multimonNG-${PV}
 	KEYWORDS="~amd64 ~arm ~x86"
 fi
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="pulseaudio"
+IUSE="pulseaudio X"
 
 DEPEND="pulseaudio? ( media-sound/pulseaudio )
-	dev-qt/qtcore:4
-	x11-libs/libX11"
+		X? ( x11-libs/libX11 )"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
-	if use !pulseaudio; then
-		sed -i -e 's/-lpulse-simple//' -e 's/-lpulse//' -e 's/PULSE/DUMMY/' ${PN}.pro || die
-	fi
-	qt4-r2_src_prepare
-}
-src_install() {
-	dobin ${PN}
+	use pulseaudio && sed -i '/find_package( PulseAudio )/d' CMakeLists.txt
+	use X && sed -i '/find_package( X11 )/d' CMakeLists.txt
+	cmake-utils_src_prepare
 }
diff --git a/net-analyzer/ostinato/Manifest b/net-analyzer/ostinato/Manifest
index d0dbf4b14f8a..c62536e915bd 100644
--- a/net-analyzer/ostinato/Manifest
+++ b/net-analyzer/ostinato/Manifest
@@ -1,5 +1,7 @@
 DIST ostinato-0.8.tar.gz 424104 BLAKE2B 5244ac9577da3fc99b714044a349e4003f0e64034fad04e241b43288a234f86f282ba0169c7e27c358d7ee3f4dc255b2408ef23f030d25f1edfec891e8ae17f7 SHA512 ecb3581736bd8dff44fe21082c270febc2ead4530cfb57997f218bd0b61a85993208937729374dd09c67fdc24eb2b9adfe5b3750ee6daef90b1e7dac2ea0737b
+DIST ostinato-0.9.tar.gz 413756 BLAKE2B cc1cb6d4db614b1968c27d7cdbebb977f39e6be8ec1a39b08f7e34d9a1a4d6b7c0c034f245b6b562c72b5dbdba9fc04c03b1cfc0c01044c249bcc2bc67af357d SHA512 a50f6e20d8a2a4d76ca43a89feaa774778981377ce1f4c731ad8b1a97aa658013082fb85cc3f4dfdd888d708c45c8093e55facaa7f02cecbd2ce5228f57e2e14
 DIST ostinato-src-0.5.1.tar.gz 291529 BLAKE2B 207a3b423040e82042e7e68e2c7ffaf304a0c7e7d1578a994caf090ee934e10f169b9fce96724c0527268fb9f656b25bf3baa19b5f1ab6a06ffc2b8925b1c952 SHA512 d06b59dc2129aba01e5a42a677339d6e8f353f9c7c027226e66c8a5af94ecb48e8450e7770ae5e179131fa4cfeefcc827fb9a18be4294ddfcd7a471ec26ee06a
 EBUILD ostinato-0.5.1.ebuild 508 BLAKE2B 6b9d53a7df309859e8023d796e39bd74fccae29327f8a71693838ade13d7690d8cbf997e81947722feef59d88835f78712b51bd884a94c1ddeb0a6647054d838 SHA512 3dd8623d7f875237d15b67e21a50af896ef71a248e806cb28bbdeb37c92d8499c55c6c858347aff303b43ba5dcf7b9161599863835f305c2201129c6f6f8d796
 EBUILD ostinato-0.8.ebuild 550 BLAKE2B 01b58bc17ecfb8ffe9a7a8d6bcf75646410206be56712663703de5afb975c19b53503a5fc4d58fefd8033dff57c7b21782e902f7ed1422f0ad042c4708e3c7a8 SHA512 34df775de08c0b3b9aef72d7b0b251985df7af67667dccff17486563f01db303bee00aa4767a93bef2b97afc3fd090dfdedbe9beead794911dc7dc87e474dd3d
+EBUILD ostinato-0.9.ebuild 654 BLAKE2B 68d076967bdb55df333698d10f543109df4449e98a2d218bb2544651bfeed4b60d9984ebe8c2d1d59184fdb34357f3e3ffb43cd08edbc7579c3c2132c2241be1 SHA512 b41e57f52c46d0105795812af573bbcc570348d8d527b5e8ef83304a8f02f248912a106b880586a1a7b59f3eac1d65452d0ccb0a4f01cda437132f28c8d4673e
 MISC metadata.xml 325 BLAKE2B 7deccc14079e605af5cd4a154a6d7ba4f69b2c7472c0f3ebb59c968bbb3c992216b0a367973d6ed729b0b117594ff47d1e9401c1750f5a6627aefca6008aab5f SHA512 65ed2d54f5a181004ea4900cd1b26b632fe57809f4903f9e4bb79b3440e7e3d72effc62725be9e788922e37b38f34b4363c30a3adda9f9483c0a983ff2f9fe09
diff --git a/net-analyzer/ostinato/ostinato-0.9.ebuild b/net-analyzer/ostinato/ostinato-0.9.ebuild
new file mode 100644
index 000000000000..fa2db04b283b
--- /dev/null
+++ b/net-analyzer/ostinato/ostinato-0.9.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qmake-utils
+
+DESCRIPTION="A packet generator and analyzer"
+HOMEPAGE="http://ostinato.org/"
+SRC_URI="https://github.com/pstavirs/ostinato/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+#https://github.com/pstavirs/ostinato/issues/173
+# libpcap dep is versioned to pull in the fix for #602098
+DEPEND="dev-libs/protobuf:=
+	>=net-libs/libpcap-1.8.1-r2
+	dev-qt/qtscript:4
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4"
+RDEPEND="${DEPEND}"
+
+src_configure(){
+	eqmake4 PREFIX="${ED}/usr" ost.pro
+}
diff --git a/net-analyzer/prometheus-alertmanager/Manifest b/net-analyzer/prometheus-alertmanager/Manifest
index d0e51e34a723..9d79cc1437bf 100644
--- a/net-analyzer/prometheus-alertmanager/Manifest
+++ b/net-analyzer/prometheus-alertmanager/Manifest
@@ -1,7 +1,5 @@
-AUX prometheus-alertmanager.confd 56 BLAKE2B ef4e238231a5ecfcfb87e99cb86661b267df17352f36ca2de7074d755c7d722674d49615361ba6dd730b6b54bcb132b89d4d9c65c7c41ab0104d4fd39bf527a5 SHA512 3ec5894fa121a3449f2b1c3f82283abc3fc31f39b4397760101a5d3c7c41a35cad50b03387542e4c950ae61bcc456b3ff4a92b52c53a04d12755005d0287d57e
-AUX prometheus-alertmanager.initd 587 BLAKE2B 64b5409b07e04567a5ecfd7928866f0287f4b70cda725f7d464d4a9a59f08dc54ee32e0c07375108b7ab12ccc8cc150a6a1f6162b7c316041620266cc48863a2 SHA512 7e19c82d62d9b226d2bc5926ba6a988bdd283bbeb911cb9339e451885ded5a1e9a4a1f5635f5d5266b23f3fbe896a334586c940ccc505ffbb84ff9fb9ff7d75f
-DIST prometheus-alertmanager-0.11.0.tar.gz 3683030 BLAKE2B b362c8d35762c13ae31597f9633378639061095e0ca1f9361a9c0376290bbb1534bd7ced2488c79d04b0c053d5a7930e39b12f309bd3a8e57660ead48264ef1d SHA512 33e6d5010979a7abab032019c1e50bc3e8f3630dd7e2453b1a1b37ce1035694bc78ae748ad1903afef95b6646aa167a3c0fa7f4e7b74bd3f1336106ca998b342
-DIST prometheus-alertmanager-0.12.0.tar.gz 3683962 BLAKE2B 92d968d85771d5921146e207040e03551826e72117f600a2d185c34f5e49e9d1a4da61c116656efd44ea1afbc94143bce1c786f569b77238aa973e48af128dfd SHA512 568031418bcfaa671531b0d4b96a9d60054ac7a8f8853c83edaf121d0502b1809d9981646e8d7575daba740b0aed221268e52b91506a3468bcf6fe27ccef17a7
-EBUILD prometheus-alertmanager-0.11.0.ebuild 1340 BLAKE2B c7e3f5ca4737612aaf4496517bae2fa80db9488e4367c2dcf7e64f6782d13eb48e5c0be5626485b1b31ceef7fe4bed8a119167c25dc73e58013ec87f028c2264 SHA512 f16322bbd9bdf3709debaadbe39e8bc33d8f9422ead655554b43b791a52275901798dc3a1e02769c238f4255061cde4a03fe4fbec89c321b90262aca6d1ee6f0
-EBUILD prometheus-alertmanager-0.12.0.ebuild 1340 BLAKE2B 95445d8c18170127d110ea80c08a4ad52fd6f126902d9f7c8f1d171a314c325c9f2709ff9e8282c60a38421efc8b2e6a37110ae8f9e4edf6a7b32cb2a1e21637 SHA512 2b7ddc41840416ea980e2a7251483b7bd799ef261927f622c9a8d9134ae7a2f15bd56ce1402a49055c169082b0ece363a7c2cef11088228521b9c5db29a44b0c
+AUX prometheus-alertmanager.confd 135 BLAKE2B 7a3dd341e63a73e9782d44dc59c8a65ea1c855ae0589ce80e616be6d8faf24224f804c564296955487760c155649c184b3132a2741cf30d171c88dcfdd469583 SHA512 391eb26d67310fba9371d274b1e9552cf0c9c02de1e3616c3e5514ae99bf7d36b52c6caa7e94a96f640b0f8542b15b4dded9d59154173c01d4e9a99ec2219fbc
+AUX prometheus-alertmanager.initd 817 BLAKE2B 74a7e6c292ac52f4d6d00644038e74624be41ed632a6db389a7c226b3a37d43f22f1c8c098d34f652d9b6b9cb407523b375c884e75fe3740578f26e822df21c7 SHA512 34ae9348f5e054543bdbffd29e30d1fb6147d47e74cecb1755c29bf4327bd56ac4fae4cecddf2c515b6ddffbce4ad7151ae3a3e7f283db2d6b74619f5faa44ac
+DIST prometheus-alertmanager-0.13.0.tar.gz 2782163 BLAKE2B 4918f84a8a8312a3fa53f03b78bb8acc6118e69048ff3fadb2676721340fa120360a636fc11485999e948965569241658eb8ee01204453120adcce6bd1da40d4 SHA512 3f402f577e42bfc9dd9ef2dc1cb634d3654776f3b13d698170e3ae3c1612a45115e0d188d0768880ca968ec9157e05a2082647ca1de132f8be3c7eb7ad0dad42
+EBUILD prometheus-alertmanager-0.13.0.ebuild 1340 BLAKE2B ef6bbcdf5c4fdcfe1f20771da1a2530d25c2fe5354472c02105fbe3b66cf162ff193b6d60c6859804e390878e05b84d210b58f3149996dcc4afdc5f184a490fe SHA512 fdd0595f982192c2c59c18fe0307ef8db1f28bd38a637c9b8826cf7d2955972615ca845467ec330ff2ecfee725a87a385d488d7b2301ab5363f48ddcfbb0c745
 MISC metadata.xml 333 BLAKE2B eb945c2d22a9d93154b7a021559038b9565f00d54dda86445c00156ddffd6754cd433026ff465a38864d00bf1c44a3c050835fd854dadce82ea92649613151ef SHA512 2059ca45e92e3a833d93097362e1ae79ef085c35f87ec2bcbde4ee2d20f8938cb27fb19647d083990c1224b3d0c06f163a3f1bedfabfb59a6b3b15a90697ac0f
diff --git a/net-analyzer/prometheus-alertmanager/files/prometheus-alertmanager.confd b/net-analyzer/prometheus-alertmanager/files/prometheus-alertmanager.confd
index a0ae34c4bc0d..57c769e41a76 100644
--- a/net-analyzer/prometheus-alertmanager/files/prometheus-alertmanager.confd
+++ b/net-analyzer/prometheus-alertmanager/files/prometheus-alertmanager.confd
@@ -1,2 +1,2 @@
 # arguments for prometheus alertmanager
-command_args=""
+command_args="--config.file=/etc/alertmanager/config.yml --storage.path=/var/lib/alertmanager"
diff --git a/net-analyzer/prometheus-alertmanager/files/prometheus-alertmanager.initd b/net-analyzer/prometheus-alertmanager/files/prometheus-alertmanager.initd
index ece8bf145876..5d625ac57bb8 100644
--- a/net-analyzer/prometheus-alertmanager/files/prometheus-alertmanager.initd
+++ b/net-analyzer/prometheus-alertmanager/files/prometheus-alertmanager.initd
@@ -1,5 +1,5 @@
 #!/sbin/openrc-run
-# Copyright 2016-2017 Gentoo Foundation
+# Copyright 2016-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 description="Prometheus alertmanager"
@@ -8,12 +8,21 @@ user=${user:-${RC_SVCNAME}}
 group=${group:-${RC_SVCNAME}}
 
 command="/usr/bin/alertmanager"
-command_args="${command_args:--config.file=/etc/alertmanager/config.yml}"
+command_args="${command_args:---config.file=/etc/alertmanager/config.yml --storage.path=/var/lib/alertmanager}"
 command_background="true"
 start_stop_daemon_args="--user ${user} --group ${group} \
 	--stdout /var/log/alertmanager/${RC_SVCNAME}.log \
 	--stderr /var/log/alertmanager/${RC_SVCNAME}.log"
 
+extra_started_commands="reload"
+
 depend() {
 	after net
 }
+
+reload() {
+        ebegin "Reloading ${SVCNAME}"
+        start-stop-daemon --signal HUP --pidfile "${pidfile}"
+        eend $? "Failed to stop ${SVCNAME}"
+}
+
diff --git a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.11.0.ebuild b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.11.0.ebuild
deleted file mode 100644
index e634cb981727..000000000000
--- a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.11.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/alertmanager"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-ALERTMANAGER_COMMIT="30dd042"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
-HOMEPAGE="https://github.com/prometheus/alertmanager"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix alertmanager || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin alertmanager/alertmanager
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	insinto /etc/alertmanager/
-	newins doc/examples/simple.yml config.yml.example
-	popd || die
-	keepdir /var/lib/alertmanager /var/log/alertmanager
-	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.12.0.ebuild b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.12.0.ebuild
deleted file mode 100644
index 10bd1927649b..000000000000
--- a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.12.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/alertmanager"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-ALERTMANAGER_COMMIT="fc33cc7"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
-HOMEPAGE="https://github.com/prometheus/alertmanager"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-RESTRICT="test"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix alertmanager || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin alertmanager/alertmanager
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	insinto /etc/alertmanager/
-	newins doc/examples/simple.yml config.yml.example
-	popd || die
-	keepdir /var/lib/alertmanager /var/log/alertmanager
-	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.13.0.ebuild b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.13.0.ebuild
new file mode 100644
index 000000000000..bb54481780e1
--- /dev/null
+++ b/net-analyzer/prometheus-alertmanager/prometheus-alertmanager-0.13.0.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/alertmanager"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+ALERTMANAGER_COMMIT="fb713f6"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Alertmanager for alerts sent by client applications such as Prometheus"
+HOMEPAGE="https://github.com/prometheus/alertmanager"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+RESTRICT="test"
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${ALERTMANAGER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix alertmanager || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin alertmanager/alertmanager
+	dodoc {README,CHANGELOG,CONTRIBUTING}.md
+	insinto /etc/alertmanager/
+	newins doc/examples/simple.yml config.yml.example
+	popd || die
+	keepdir /var/lib/alertmanager /var/log/alertmanager
+	fowners ${PN}:${PN} /var/lib/alertmanager /var/log/alertmanager
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-analyzer/prometheus-blackbox_exporter/Manifest b/net-analyzer/prometheus-blackbox_exporter/Manifest
index 6bf1834a54b4..1c24df4c9976 100644
--- a/net-analyzer/prometheus-blackbox_exporter/Manifest
+++ b/net-analyzer/prometheus-blackbox_exporter/Manifest
@@ -1,7 +1,5 @@
 AUX prometheus-blackbox_exporter.confd 110 BLAKE2B c3cb7ed7d314ea8b347b4db9839e7c987c91c78378a6085473d687a5f3460f06ca6825567fbe832c3114906156290d00d505e15e3c2461eb844acb4e56937af0 SHA512 aa8720c03c4bf21ad5f789a4e9c6df6059fb71413cfdc605f8868bcd54eab899aa527afa9d847c7780042a8d4d72468145a97f8d732ef6aad861dcbf96bdf2ed
 AUX prometheus-blackbox_exporter.initd 614 BLAKE2B bc2a5d5b3a0383a35cd223c94169b57045f2dd2506753541dbf61b3003b042a5d43bb08237ec367e1d48104f0b30b7a50713e96e9b03c2fbb6e079c9858936eb SHA512 4a25f59d0fb95ac35c07ab15623c2c905db04cb5a14cccd316bd522e2b4892a08d67a4edb15c6c02fbc2b84e92dc48b67f5d14c7617cfccfa09babf22e4d1beb
-DIST prometheus-blackbox_exporter-0.10.0.tar.gz 530109 BLAKE2B 3b2208140814029cad9c33e8390a1135026e03b44dc96f8bdac479a7904f89c36f6f0c8dd9ed51cfaa6eaa4d241673b729a3444b8c44c61333d30a7adbef89f8 SHA512 497246b440b03b964c90f9bcf8ec1bca45c213bc4652ddb92c339b42586746b75a5145e87899381718ba628891faae3dfae39b0196272f572c7213e94ea7295b
 DIST prometheus-blackbox_exporter-0.11.0.tar.gz 2143849 BLAKE2B e9a35b4b5adca955c1ac5b2219dd892112f6b3bd2dfe825f6393daca9dee3cba943309be024cc56f3d682a8544a4f78949072de620a4e6b07da61a740a84d55f SHA512 9bc397b846cdaf8cc0054100adffb39bbe2e5cf6743a61565e90f2e4298d8a165a138c985431937083fd88ccac065e278d8c9eab8a83015bf58fddb6da8ea812
-EBUILD prometheus-blackbox_exporter-0.10.0.ebuild 1380 BLAKE2B f080af382d014b630c911a4e03e2ac3afbe875700ddff5dde3e1b42cba68ec31bc301c9486100096e4a94a1996e258bb5ddcdb1ecedcac9ebffdb52ca295fb3e SHA512 21303173f3959b17fb9643e96d8d63add677f811e7725c50ad7230da119cd0cb4c7767bd9d0ff91784b23676e408e9c347348223f8ced930dbe34218fd42e82a
-EBUILD prometheus-blackbox_exporter-0.11.0.ebuild 1380 BLAKE2B 73f4bcba463c32a65024696f6a7459472a4d01989a837ef552ee9aeed6340240b5d5cf63824cfb152f261a8ea7dec3e990827314e31efadc3144af5f7c4305e1 SHA512 ed4463d42a6498b0cb51eceeb1b77bb43624fd726c6c6f2224454b0a6d8836fec6d88ae99882d8f77585de4f51188f8c78c896c57a24591762ef3a6ed1fe6504
+EBUILD prometheus-blackbox_exporter-0.11.0-r1.ebuild 1439 BLAKE2B 46176482d2de58a7633d942a618609290685b7bc19241040cc89469d036b41319ddb6e3d2632af8ab7fa01a6fceb75319782c7c4f933e529ac9eb0baf7dc395a SHA512 6be9eb68a9d3b5158cf465dafb7b7ea7dc6e8f72976bb6b574314e55df06041126921bc7e95ef56a12508574fa6a4f2d0a6afa26bc5ba493dcd1b63a7c49a301
 MISC metadata.xml 338 BLAKE2B 117f205ecdd4c05aba1ce92846f59dc7790c9fdae79db5cc1eb912d34a9e1d83eaaea26feb24245a0c5fc4394552705aa7b23171920d9023ca8e4333b3c09650 SHA512 e431b2ef89e797b9cbb290a70683a4392f07559851550dd22f5410f09c979730c8dd35c095f855565df8d72adb42c6e4b9d03882adf37240b0da28cc508ee2ad
diff --git a/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.10.0.ebuild b/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.10.0.ebuild
deleted file mode 100644
index c5cf528c542b..000000000000
--- a/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.10.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/blackbox_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-BLACKBOX_EXPORTER_COMMIT="75681e3"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
-HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${BLACBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix blackbox_exporter || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin blackbox_exporter/blackbox_exporter
-	dodoc {README,CONFIGURATION}.md blackbox.yml
-	insinto /etc/blackbox_exporter
-	newins example.yml blackbox.yml.example
-	popd || die
-	keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
-	fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.11.0-r1.ebuild b/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.11.0-r1.ebuild
new file mode 100644
index 000000000000..a39ea0e22056
--- /dev/null
+++ b/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.11.0-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit fcaps user golang-build golang-vcs-snapshot
+
+EGO_PN="github.com/prometheus/blackbox_exporter"
+EGIT_COMMIT="v${PV/_rc/-rc.}"
+BLACKBOX_EXPORTER_COMMIT="200181b"
+ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+KEYWORDS="~amd64"
+
+DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
+HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
+SRC_URI="${ARCHIVE_URI}"
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+DEPEND="dev-util/promu"
+
+FILECAPS=(
+	cap_net_raw usr/bin/blackbox_exporter
+)
+
+pkg_setup() {
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_prepare() {
+	default
+	sed -i -e "s/{{.Revision}}/${BLACBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
+}
+
+src_compile() {
+	pushd src/${EGO_PN} || die
+	mkdir -p bin || die
+	GOPATH="${S}" promu build -v --prefix blackbox_exporter || die
+	popd || die
+}
+
+src_install() {
+	pushd src/${EGO_PN} || die
+	dobin blackbox_exporter/blackbox_exporter
+	dodoc {README,CONFIGURATION}.md blackbox.yml
+	insinto /etc/blackbox_exporter
+	newins example.yml blackbox.yml.example
+	popd || die
+	keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
+	fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.11.0.ebuild b/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.11.0.ebuild
deleted file mode 100644
index 5badbe7a59dd..000000000000
--- a/net-analyzer/prometheus-blackbox_exporter/prometheus-blackbox_exporter-0.11.0.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/blackbox_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-BLACKBOX_EXPORTER_COMMIT="200181b"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for blackbox probing via HTTP, HTTPS, DNS, TCP and ICMP"
-HOMEPAGE="https://github.com/prometheus/blackbox_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${BLACBOX_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix blackbox_exporter || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin blackbox_exporter/blackbox_exporter
-	dodoc {README,CONFIGURATION}.md blackbox.yml
-	insinto /etc/blackbox_exporter
-	newins example.yml blackbox.yml.example
-	popd || die
-	keepdir /var/lib/blackbox_exporter /var/log/blackbox_exporter
-	fowners ${PN}:${PN} /var/lib/blackbox_exporter /var/log/blackbox_exporter
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/prometheus-node_exporter/Manifest b/net-analyzer/prometheus-node_exporter/Manifest
index 8ddcb12cc68a..8b19f9e8e8f0 100644
--- a/net-analyzer/prometheus-node_exporter/Manifest
+++ b/net-analyzer/prometheus-node_exporter/Manifest
@@ -1,7 +1,5 @@
 AUX prometheus-node_exporter-1.initd 615 BLAKE2B 4d5d30126a1491b4771365b7db31a4849a3eeda3a09283a6befdf35614e6a3cf4cb1e20ab1d57a53c3715555fb0af73e62f76a4b99e58b83d77d44382f72edb3 SHA512 aecc8180b300660cb6b2882c45a99510d5c12aecaf1aaa24d62f2393c3f5c3e5dd9de6c5e73125f4eb6f3e18ca0d7b7e04e6338db2eed5ab06919e245f7e9d6a
 AUX prometheus-node_exporter.confd 111 BLAKE2B bb40370633c41a4f1283677ed16ad9734c7f180683e4d9d82be36ea5e63d3b8fc2a861a61c62e2e899209f7293588e3e7532ffe52ecb9aab4773a3943168d5dd SHA512 cce5db8eccf2ecfe1198aa8252b04fd6a96006f707e7132c2d01c5400d175551c3b9890c4d57fec9ccbe17594dfb937e1f99ead0e1c3fd8cf22930dabd70418d
-DIST prometheus-node_exporter-0.15.1.tar.gz 1327099 BLAKE2B 56d877ee0aea8c18150cca38a62ba6dc439e847188d887def3090b9e3272cb1a077aa451ac63784f8e94d1324630a1320ef5a83127914a4a3820fbf637361b83 SHA512 884f4b3a5e78ecf110e26fbceb6e431cf69f9d0e87ceae33ac767addac197230c2a0d34725fe1f5fe99cbb280e89e4dfea3a6d559027633a7fb071cfdc0f8539
 DIST prometheus-node_exporter-0.15.2.tar.gz 1327204 BLAKE2B ee694771ed6d736fd4bb6a10f713f31becc930fb8225499d4b3a2a2cc7416c1816605cd8f4205dc37a2264af8d9f85e3519bc01844d252b6a70d4ee5f6308ece SHA512 b39ce0801a5bf5a2a70c4034659d047d70b3763af3f18925b65c2b5f72832e261362aaeb9ce4c68cb7bf52e790d3fc710a6c8550ad7876e89fd9f5a055200a52
-EBUILD prometheus-node_exporter-0.15.1.ebuild 1226 BLAKE2B f6542569cd28ce6c692b10874c57cba249876e7b90e18f1b64ce92dda0a3d7a2c38bf34f27d16c909cb8b3b4fc2ba533d80b3a045dcfb4a4119d46ee80447a9e SHA512 b98a1095a3493a9172722bff45eedcbca1b3878f87209e122ba4689448be31013b409347345fca78a50c370d7ea41132f2c3b4fdbae897912cd1feaa226673b9
 EBUILD prometheus-node_exporter-0.15.2.ebuild 1226 BLAKE2B d01056a5f223bb1a55cd13632a022d973a81c267a36da1329c3d79e6c8bd35b062db653e7140915d1d154fa2858a3b048eedbd301d3b804a3a6eaad377afd01f SHA512 4d2c05f64754001828474ed77d58078a8b9cacdf159ce7e93b36f61900d33c396d36e11f67fd4de9faa79a3dee2a82f24c8a31b3627bb48affb55a25db675695
 MISC metadata.xml 334 BLAKE2B 4152458bd76dc5a5150cf8ec6e6b967d88b89b85c7145c158d981c92dad663df3259b2ee229298727e862139215e69ac97f9aecf3b66c182a13fc9bf6e651057 SHA512 da17eb8e555adf4d4922ba8e0a549248dc2adf391f4285ce0f6919f194de327d80205c1e09af073eee526b073aba26e5551aa41a83118961d9e6eddd2887b23e
diff --git a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.1.ebuild b/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.1.ebuild
deleted file mode 100644
index a300b0f49c9c..000000000000
--- a/net-analyzer/prometheus-node_exporter/prometheus-node_exporter-0.15.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit user golang-build golang-vcs-snapshot
-
-EGO_PN="github.com/prometheus/node_exporter"
-EGIT_COMMIT="v${PV/_rc/-rc.}"
-NODE_EXPORTER_COMMIT="ba5da2c"
-ARCHIVE_URI="https://${EGO_PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Prometheus exporter for machine metrics"
-HOMEPAGE="https://github.com/prometheus/node_exporter"
-SRC_URI="${ARCHIVE_URI}"
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-util/promu"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 -1 ${PN}
-}
-
-src_prepare() {
-	default
-	sed -i -e "s/{{.Revision}}/${NODE_EXPORTER_COMMIT}/" src/${EGO_PN}/.promu.yml || die
-}
-
-src_compile() {
-	pushd src/${EGO_PN} || die
-	mkdir -p bin || die
-	GOPATH="${S}" promu build -v --prefix node_exporter || die
-	popd || die
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin node_exporter/node_exporter
-	dodoc {README,CHANGELOG,CONTRIBUTING}.md
-	popd || die
-	keepdir /var/lib/node_exporter /var/log/node_exporter
-	fowners ${PN}:${PN} /var/lib/node_exporter /var/log/node_exporter
-	newinitd "${FILESDIR}"/${PN}-1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-}
diff --git a/net-analyzer/sarg/Manifest b/net-analyzer/sarg/Manifest
index 57031c4aeee1..f0a6a53dafa3 100644
--- a/net-analyzer/sarg/Manifest
+++ b/net-analyzer/sarg/Manifest
@@ -1,9 +1,12 @@
 AUX sarg-2.3.10-bool.patch 228 BLAKE2B 38c1ca6c03c316afab832c2680afc433d499a9f0218c004996b4f74ef24395c57bd3e2355d1af0244b31d1a50f017faf96ca8e75e142884a3b2ab5ac66bbb7e6 SHA512 f5f5aa42a16e01fe84c4f62715215ed960323b1c2525281c1433e20bde08c1ed4c0a460b635905d2fd7a0269cff232446b557c30dc49b4652988f660b832f618
 AUX sarg-2.3.10-config.patch 2612 BLAKE2B 8d0d6bdab60784dd9c289e974dba087b11234b3f961c951bd96ce76a59bdc36f8da5fe5f3c4268f238b5c25f34baa69f97c1e05fbd161abaecb2eb7949d9591d SHA512 e04a971a0838bef3e777708c3328ff940cce84d934de72014eafbcc5123cb8ff2075c30aafdb4ae4541778c6c0fcce38ac32b6dde57ed1a52fc03f1b1f980cda
 AUX sarg-2.3.10-format.patch 1541 BLAKE2B cfa03a3dad67f3ca8ec3b47db8755f5760b3780bedcb29549e04cecc955212003930e2a467749e964ab8073a404d55359826132e43ff6d1a01228a1a6fe79229 SHA512 d3c25d94da93dd1308b9c035fff3ddf6a241327596c182d85d79f183b659fa20ea8e806e5b1e3e8675dae843744b7329d03e572260c6932466694103180c8bd6
+AUX sarg-2.3.11-configure.patch 641 BLAKE2B 8afacc3e90ee7092b762c812dd7e2cab94e9bc6d63026818fb67b26c814b101695989d31e2b3bdd61a346334008afbe2b6f55493e68ecf5c55f7e23f16325253 SHA512 15dce8406ddcc4a4937743c9a6ee8cbe11eb95ef2d86f56f8e6a7b5f3288534a98cb0b3609332ef6b40a3d5d22dc879aaa750f0bbda64b3d5ecc66c606bad9d4
 AUX sarg-2.3.9-configure-bash.patch 4033 BLAKE2B 7f98a2fda63c4abe93ec80f5a068bdd99a647f811cb95c05f0a716167ca73b6ae4476b344cfe7f1d7d7b5e43e491790cbc8cb8aefc36bb0e0696cadb69a65350 SHA512 42f40db8b2d378888ce73aab0ab03e05f3bbad516d4db025fe6ce1377e1b1d97db2a857b99fb350c8e92a80de75a4c2c4012403546c3f4e5261972060be60b68
 AUX sarg-2.3.9-configure.patch 641 BLAKE2B dc4162b7180bc40692e779ddf1d1a1b48442e9814c4d043593f695062f132041102ec70807aad07119b9415a9e04776d5728cd2e73a646e4c2dcb4351d4bf9a5 SHA512 0da589199b6ea13589bc8cdc8504f6b4260a03bf1d8ab48093ada01e3be3a82961a2fad6f0abe301ed004bd9c642f0789ebb745d52044214e98211124c66f6ae
 DIST sarg-2.3.10.tar.gz 1278071 BLAKE2B a9412069826328a7828cc3759858160a8e9121fee30697b8c54bc2e6ca948255f297147ff8692e3a62fe6c0a2b596a1a73e1090d03ef1fdacdd692866e6ef27d SHA512 d0a61ac6d455feb8fff024c21f1b7547471ef8cf847fd54d9042881cac3ee14a41fe2a8ea9e0fc2bd2ea0448714ba457e9070282c31e4f3c879e4d83d00ecb2d
+DIST sarg-2.3.11.tar.gz 1346884 BLAKE2B f1ba5e5d3531b611cca1e18444b24772d5f6fb31622d3702ce34bf7e5208b7ff04000ed80c984ff103f785dd9b7015f56403b8389100bbd02cdbf936c8343be9 SHA512 a5bf5c0f696a9d58d9dd1d631d2b458e7a48f597e7a084b032b2feb6185440b08babe7ffaaefc04676f0dbc11301084d1896b6246a7e79a10acdbd7aa7882ff6
 EBUILD sarg-2.3.10-r1.ebuild 936 BLAKE2B f5e330e0c9b7e0a906c04c69e00676bce19a84d021186f3e99208a4bd2fd67895bc837191d0f774fd9488d547813b43e07a0ca8ff72eaadd46284e88bd92082f SHA512 c989ef3e90ae8d1e8852e50d08825efa7596e8c688332e38f648b716bda4cce1d6b35cf1cd249a84c0565284c0aafd9e57d1bfc7d4272219e33dea1156bb16a2
 EBUILD sarg-2.3.10.ebuild 1757 BLAKE2B 1e5d9122b9f9dc647971485eafc762155ed7cda0bcd24739a9b1d780d1c9e7f0880136e9ba0b88dc6e628dd2e2341414fa61f08aa92266b73530c5a3e40c391d SHA512 ceef1daa6e382ffa0095733f6747ad7480aab5dd39edbeef15812aa64ce44c87e56a475c5a29dc4878b0581ac1414b569361349e1446684f8aa7533a6405c182
+EBUILD sarg-2.3.11.ebuild 811 BLAKE2B b77585a018f52c9e223008125cbe4f06a8f9f3362c82b6846e6bb874409d57be78115d7d6cc045e5af9e946590b3a44503bbb1d7412acf9e856377ea0696d84a SHA512 52d85b1250e8121ef1bdfc07d37a0d97e332e74b68052cf9749ca9f81226bb250dc0caaa930d3565c548e59609dacaaece0528434e909eb8704949dadcfa6440
 MISC metadata.xml 856 BLAKE2B 0640133457b9035a7a30e4ec481ff092254902a21cb8f8cc9a91d0a0b13f99a484982787646e2367f7bcde5f3d2436371f588729acc35b638c289c09cddb2ff9 SHA512 3571bb6b4562fa58e9736ce48c4b3930bb33a3b38dec15b79b22b3cbd457ea7751819a2b45a7e728b02e641c187c085e813eb29d8644dc57e40b682f061b115a
diff --git a/net-analyzer/sarg/files/sarg-2.3.11-configure.patch b/net-analyzer/sarg/files/sarg-2.3.11-configure.patch
new file mode 100644
index 000000000000..583bfeb0e8e1
--- /dev/null
+++ b/net-analyzer/sarg/files/sarg-2.3.11-configure.patch
@@ -0,0 +1,31 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -2,6 +2,7 @@
+ AC_INIT([sarg],[2.3.9])
+ AC_CONFIG_SRCDIR([log.c])
+ AC_CONFIG_AUX_DIR(cfgaux)
++AC_CONFIG_MACRO_DIR(m4)
+ 
+ AC_CANONICAL_HOST
+ 
+@@ -26,6 +27,11 @@
+ dnl C99 support is required to define LLONG_MAX (at least on CentOS 5.7)
+ AC_PROG_CC_C99
+ 
++dnl mkdir_p / MKDIR_P
++AC_PROG_MKDIR_P
++mkdir_p="$MKDIR_P"
++AC_SUBST(mkdir_p)
++
+ # Report more warnings to improve code quality.
+ CFLAGS="${CFLAGS} -Wall -Wno-sign-compare"
+ 
+@@ -60,7 +66,7 @@
+ 
+ case "$host" in
+    *-solaris*)
+-   LDFLAGS="${LDFLAGS} -lsocket -lnsl"
++   LIBS="${LIBS} -lsocket -lnsl"
+    CFLAGS="-DSOLARIS ${CFLAGS}"
+    ;;
+ esac
diff --git a/net-analyzer/sarg/sarg-2.3.11.ebuild b/net-analyzer/sarg/sarg-2.3.11.ebuild
new file mode 100644
index 000000000000..33a65ab49a99
--- /dev/null
+++ b/net-analyzer/sarg/sarg-2.3.11.ebuild
@@ -0,0 +1,42 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools
+
+DESCRIPTION="Squid Analysis Report Generator"
+HOMEPAGE="http://sarg.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~ppc ~x86"
+SLOT="0"
+IUSE="+gd ldap pcre"
+
+DEPEND="
+	gd? ( media-libs/gd[png,truetype] )
+	ldap? ( net-nds/openldap )
+	pcre? ( dev-libs/libpcre )
+"
+RDEPEND="
+	${DEPEND}
+"
+DOCS=( BETA-TESTERS CONTRIBUTORS DONATIONS README ChangeLog htaccess )
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.3.10-config.patch
+	"${FILESDIR}"/${PN}-2.3.11-configure.patch
+)
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_with gd) \
+		$(use_with ldap) \
+		$(use_with pcre) \
+		--sysconfdir="${EPREFIX}/etc/sarg/"
+}
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 3626fba12a36..a21022986728 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,12 +1,15 @@
 AUX wireshark-1.99.8-qtchooser.patch 296 BLAKE2B 0a3f7a0aacf868e6af938bf4a67267c657838ff2bb09f51dca59d399fdbefdb0b86df6debdd6c244817586591d8e5dcb53136eb5be23eb96423fa61204276f75 SHA512 ecdbc5b3164cbef46d9f9e647deefc141ef2fa261fdab2e46df8a6235af544e8496b22a87ffefb60be34907a8432a6e6ec4d3a9fb3789404d946558cab7a0afc
 AUX wireshark-2.1.0-sse4_2-r1.patch 498 BLAKE2B 05af1325a8bb709676fc2e205b41790fd305555480d804c5c13915f1b46ddc1be8b4d967f1dd60fa70263a663d4f345386399dabc33c63c97a55ba8c43b565ac SHA512 1938754656a0654a3e40909c30c9416e65078b2d664b44d31ef9e75cd2d0dbb360982106c9300ffca60da81aeb27c8a37298c9aff762d0800d77d17e46b9a524
 AUX wireshark-2.4-androiddump.patch 1135 BLAKE2B 8126f920def5e6faf4691d639dc3dde7e32aca4b3dd11928a50ddbfdec9b53386957eb473fa93fc21bf791c052a4808b03e00a775d4c1e9f61a1c007c03b6953 SHA512 d18daa46b3ff8f0f4e3e468c65c33fd1bf9fb9a8e90f6318a64cc11b696520b07ccfcbc9921f3c932fcceb809c0406a5cd9773a157ed1bfd10e4c8873215b36b
+AUX wireshark-2.4.3-libsmi.patch 7153 BLAKE2B 33b7237eb213fcb2aab0a9db9c28a22dfbd6d0a3434c5c2dd849415cec7b5cbb3573bb95c8a81224fc5bca639103437aafcfa05ab3554bdfb3c866013e38b19a SHA512 4027b6fc313c2186f4eb2a9cb050dea1687c9cff64a83ec0cec2a122ca588cb6334064a2c46dc9c9d66e8fd41056f27548e7aacb5193f82734b04e15f4a17c67
 AUX wireshark-99999999-androiddump.patch 202 BLAKE2B 31548a778c4a3b799bad8f920221ca7ccf774702e8018f982e00318afbaac174d4e7ae961fefd448cc56dca6b7d0448a2ac99d1e5afacb61a37de0546ee3557e SHA512 a9794c5bcb1d288c113e84b03ac4f185e6fb7bccc16aefa3311ebd37aab7e9d5c715022f5b54032812ac2ab1244c65d9fd716c826ee27e677b011976f218f9da
 DIST wireshark-2.2.7.tar.bz2 32309420 BLAKE2B a4ec32fab15235c5bde9f03ceafc5760055a769dd40d96526a18ad16d5642e957f620fc58f42c3323745bd679d6ef7b006283e7b9ddc52ddadc2680789d957ea SHA512 417836810eb895b3f2a6ac1cfd138fb0275382ea2edc60fc5f5e5f8ce433b56b8120aa8b58b4f77296986630fdf49e4c5c3859b2c2c5e26b1ce0651393b7d716
 DIST wireshark-2.4.2.tar.xz 28791712 BLAKE2B 64a965f522478e2e5690a4439554764bd341c0b8017003af4b0d328094cf56a72462df9dfdb9c9318e4bfc1fe57e4caedc43e0d0c18c704c8342dbb3baa36d91 SHA512 212964482a1e45af490ef78b3f2465384f84c007a76c3a99e8de0e2c37d933fb34b0da5631f4a36ca12d2fa7cc4376d3d405cbe7f7113791ea09dba7e5915417
 DIST wireshark-2.4.3.tar.xz 28807920 BLAKE2B 831691d084fc9ed6198b23c0347efa487398df37ca0cf5972db64b0724fad04b3104a5faed104b5d4b560254b19a2e41118c8d7b71cce785f38ede077215e80f SHA512 4344b9efeda3afba4b13bb468f7a12c4565da96c6182a8203cc5815baa11e7d84f3f11003b4289c6c11391cfb590b8c0319268196cc646a8f0226c432e9bb433
+DIST wireshark-2.4.4.tar.xz 28818372 BLAKE2B 1a28cabdc8dfbed16244c6906ef360c2d3edee3cd75a5134ea7b21b138c3be08de9327a1415cb308f7a01c382e0aa5cf14e4466b4c3762c29a7f7cbc4683890e SHA512 b6625f860a10e10babd686820680a5e169594f171e7e176fc96325255ec096481da2e8a0fdff10b42cead82011740714a4331003dda0d48bf3b419da37834bdc
 EBUILD wireshark-2.2.7.ebuild 6481 BLAKE2B 167c80ea9d3f41234ec9324d37ed3886776fac88863fd47e264eebc35014cc1c8da5c191da741d2fa2d8d7239eb8de649819c544deed346102627bc723e5ae29 SHA512 f7c45d28f9b5dd2a10b1575e4f9d071e435dcd34d6b7638ea2d8fc0ec3ca7c8ac4e8d73d23b2bc093c623b87e32b25ac36d80ca0d309daa32a18ebe5813529bb
 EBUILD wireshark-2.4.2.ebuild 7379 BLAKE2B 6b2e91ce48323c78b8182774e87140e8f1b6db3187074d11d671ee3597aae4e6ba1a487458e144ece58a69bb89e2d254a73f4809714c0b5038bd488ca0a982f1 SHA512 219ada160e01d499ff48ec40e161a64ffc0e709169fafccf41d6b428ee10eb00e34c0d2db8198f151c893a425c9781583eb56f6216f3162c2e87dec63d0d8fcb
-EBUILD wireshark-2.4.3.ebuild 7338 BLAKE2B feca3a7305795ab5520ecebca28c426e6f65d2b1a25b1a58b7733d03ce5781a97be815a0d8d5b6a5e00bcfb863cd9265c1b7662959fcdeab1a531b39bf56bef3 SHA512 7e5259040b5b1ebc052f939f54e3e97d246c0a70b6e95e4627695d899c00b0335d255a9523494e81544df5bf8e5a9c73526d1eaaff1e6527e03a70f2a091ce0e
+EBUILD wireshark-2.4.3.ebuild 7378 BLAKE2B 1b79f8342f72b96831dc875072c90f53d903e6e750e0fadd0f39aa1787bce4ebbbc8073e47f9945b32e437a5dc1e2e04e98d3e6c5e4cadea10bdbe34fc497e52 SHA512 88aa8d2e67db9a8d309d412a890ff52c91ea296cf1592fe7445ebb9c8707cadbad44d66ccb3c9ea71ceb2cc23dd958028e51db88a3f65b3446c50f3c13c9ad0d
+EBUILD wireshark-2.4.4.ebuild 7384 BLAKE2B b721d072b55aa02654819c782bb0612bbbad0e96a08e76ed7aecb7dd305c2e107ff8b14ec197610254957f7d1facf77ae9458e5ed9e328754b9e4936f9ecb7ab SHA512 f04d308bfe6e84274b72f2718082e155030b7ebc3be6f5618b3a0c38129acf7c4092bd366c0a9e543e26e6c8a84825c1558a285997bd8b23228c8b5dfc531f1e
 EBUILD wireshark-99999999.ebuild 7259 BLAKE2B e6cd9d0222161c4280dbd722bf159e91b4659ab52eb9b3e0c549715734a1dcc610cebe9e22c4e5a3bd170457655160c88d5dcf4f8aac67a076d1c6b9f17f3a21 SHA512 edbf3a090c9af2531e9f0a4735ed38ed8e56b5fa2eb727a4866cfe3b6573846c24fa2ef8c67c087d4a768d3d38b8085f80d35c0981b75e9cb363ca1ca37bb718
 MISC metadata.xml 4780 BLAKE2B 57512cc79565297a5357767a663a93a49655de7d7ec8adbe7d0da21e0617c69255ca3a52153f7f2e2a21a3b96f378ab0c691666f5336896af422fc88ee5fada3 SHA512 60941d415e0733be68ab15af456f842e5793eeef6cf4459449cc919ff5255d1ab2b194ece2c4b4d90bdebc5f1601fd98952fe22bafff8918e25613180233dec5
diff --git a/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch b/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch
new file mode 100644
index 000000000000..288efb7d66f5
--- /dev/null
+++ b/net-analyzer/wireshark/files/wireshark-2.4.3-libsmi.patch
@@ -0,0 +1,233 @@
+From 72c2e53981a204d746737d8c01c4ad3738cd4880 Mon Sep 17 00:00:00 2001
+From: =?utf8?q?Jo=C3=A3o=20Valverde?= <joao.valverde@tecnico.ulisboa.pt>
+Date: Sun, 5 Nov 2017 12:05:43 +0000
+Subject: [PATCH 1/1] autotools: Use pkg-config to configure Libsmi
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf8
+Content-Transfer-Encoding: 8bit
+
+Change-Id: Icecea743739aa7e1a65753f623f311514260d373
+Reviewed-on: https://code.wireshark.org/review/24252
+Petri-Dish: João Valverde <j@v6e.pt>
+Tested-by: Petri Dish Buildbot
+Reviewed-by: João Valverde <j@v6e.pt>
+---
+ Makefile.am      |   2 +-
+ configure.ac     |  27 +++++++++---
+ epan/Makefile.am |   2 +-
+ m4/libsmi.m4     | 125 -------------------------------------------------------
+ 4 files changed, 24 insertions(+), 132 deletions(-)
+ delete mode 100644 m4/libsmi.m4
+
+diff --git a/Makefile.am b/Makefile.am
+index a2851e0..e6ed5eb 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -422,7 +422,7 @@ EPAN_EXTRA_LIBS = \
+ 	@KRB5_LIBS@			\
+ 	@LIBGCRYPT_LIBS@		\
+ 	@LIBGNUTLS_LIBS@		\
+-	@LIBSMI_LDFLAGS@
++	@LIBSMI_LIBS@
+ 
+ # Libraries and plugin flags with which to link wireshark.
+ #
+diff --git a/configure.ac b/configure.ac
+index 3b3475b..326561c 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -432,10 +432,6 @@ linux*)
+ 	fi
+ esac
+ 
+-# libsmi
+-# FIXME: currently the path argument to with-libsmi is being ignored
+-AX_LIBSMI
+-
+ #
+ # Check if we should build the Wireshark User's Guide
+ #
+@@ -2427,6 +2423,27 @@ else
+ fi
+ AM_CONDITIONAL(HAVE_LIBXML2, test "x$have_libxml2" = "xyes")
+ 
++#
++# Libsmi check
++#
++AC_ARG_WITH(libsmi,
++  AC_HELP_STRING([--with-libsmi=@<:@yes/no@:>@],
++		 [use libsmi MIB/PIB library @<:@default=yes, if available@:>@]),
++		 [], [with_libsmi="if_available"])
++
++have_libsmi=no
++if test "x$with_libsmi" != "xno"; then
++	PKG_CHECK_MODULES(LIBSMI, libsmi,
++		[have_libsmi=yes
++		 AC_DEFINE(HAVE_LIBSMI, 1, [Define if you have libsmi])
++		],
++		[if test "x$with_libsmi" = "xyes"; then
++			# Error out if the user explicitly requested libsmi
++			AC_MSG_ERROR([Libsmi was requested, but is not installed for development])
++		 fi
++		]
++	)
++fi
+ 
+ dnl
+ dnl check whether plugins should be enabled
+@@ -3012,7 +3029,7 @@ echo "                   Use pcap library : $want_pcap"
+ echo "                   Use zlib library : $zlib_message"
+ echo "               Use kerberos library : $krb5_message"
+ echo "                 Use c-ares library : $c_ares_message"
+-echo "                Use SMI MIB library : $libsmi_message"
++echo "                Use SMI MIB library : $have_libsmi"
+ echo "             Use GNU gcrypt library : yes"
+ echo "                 Use GnuTLS library : $tls_message"
+ echo "     Use POSIX capabilities library : $libcap_message"
+diff --git a/epan/Makefile.am b/epan/Makefile.am
+index 9f7de62..e85f97b 100644
+--- a/epan/Makefile.am
++++ b/epan/Makefile.am
+@@ -330,7 +330,7 @@ libwireshark_la_LIBADD = \
+ 	@KRB5_LIBS@		\
+ 	@LIBGCRYPT_LIBS@	\
+ 	@LIBGNUTLS_LIBS@	\
+-	@LIBSMI_LDFLAGS@	\
++	@LIBSMI_LIBS@	\
+ 	@LZ4_LIBS@		\
+ 	@NGHTTP2_LIBS@		\
+ 	@SNAPPY_LIBS@		\
+diff --git a/m4/libsmi.m4 b/m4/libsmi.m4
+deleted file mode 100644
+index d719438..0000000
+--- a/m4/libsmi.m4
++++ /dev/null
+@@ -1,125 +0,0 @@
+-# Configure paths for libsmi
+-# Shamelessly stolen from http://autoconf-archive.cryp.to/ax_lib_sqlite3.html
+-
+-# Synopsis: AX_LIBSMI([minimum library version])
+-# The default minimum library version is 2
+-
+-# This macro sets/substitutes the following:
+-# AC_DEFINE(HAVE_LIBSMI)
+-# AC_SUBST(LIBSMI_CFLAGS)
+-# AC_SUBST(LIBSMI_LDFLAGS)
+-# AC_SUBST(LIBSMI_VERSION)
+-# $libsmi_message is set to "yes" or "no"
+-
+-AC_DEFUN([AX_LIBSMI],
+-[
+-    AC_ARG_WITH([libsmi],
+-        AC_HELP_STRING(
+-            [--with-libsmi=@<:@DIR@:>@],
+-            [use libsmi MIB/PIB library @<:@default=yes@:>@, optionally specify the prefix for libsmi]
+-        ),
+-        [
+-        if test "$withval" = "no"; then
+-            WANT_LIBSMI="no"
+-        elif test "$withval" = "yes"; then
+-            WANT_LIBSMI="yes"
+-            ac_libsmi_path=""
+-        else
+-            WANT_LIBSMI="yes"
+-            ac_libsmi_path="$withval"
+-        fi
+-        ],
+-        [WANT_LIBSMI="yes"]
+-    )
+-
+-    libsmi_message="no"
+-    LIBSMI_CFLAGS=""
+-    LIBSMI_LDFLAGS=""
+-    LIBSMI_VERSION=""
+-
+-    if test "x$WANT_LIBSMI" = "xyes"; then
+-
+-        ac_libsmi_header="smi.h"
+-
+-        libsmi_version_req=ifelse([$1], [], [2], [$1])
+-
+-        AC_MSG_CHECKING([for libsmi >= $libsmi_version_req])
+-
+-        if test "$ac_libsmi_path" != ""; then
+-            ac_libsmi_ldflags="-L$ac_libsmi_path/lib"
+-            ac_libsmi_cflags="-I$ac_libsmi_path/include"
+-        else
+-            for ac_libsmi_path_tmp in /usr /usr/local /opt $prefix; do
+-                if test -f "$ac_libsmi_path_tmp/include/$ac_libsmi_header" \
+-                    && test -r "$ac_libsmi_path_tmp/include/$ac_libsmi_header"; then
+-                    ac_libsmi_path=$ac_libsmi_path_tmp
+-                    ac_libsmi_ldflags="-L$ac_libsmi_path_tmp/lib"
+-                    ac_libsmi_cflags="-I$ac_libsmi_path_tmp/include"
+-                    break;
+-                fi
+-            done
+-        fi
+-
+-        ac_libsmi_ldflags="$ac_libsmi_ldflags -lsmi"
+-
+-        saved_CFLAGS="$CFLAGS"
+-        CFLAGS="$CFLAGS $ac_libsmi_cflags"
+-
+-        AC_LANG_PUSH(C)
+-        AC_COMPILE_IFELSE(
+-            [
+-            AC_LANG_PROGRAM([[@%:@include <smi.h>]],
+-                [[
+-  int current, revision, age, n;
+-  const int required = $libsmi_version_req;
+-  if (smiInit(""))
+-    exit(1);
+-  if (strcmp(SMI_LIBRARY_VERSION, smi_library_version))
+-    exit(2);
+-  n = sscanf(smi_library_version, "%d:%d:%d", &current, &revision, &age);
+-  if (n != 3)
+-    exit(3);
+-  if (required < current - age || required > current)
+-    exit(4);
+-                ]]
+-            )
+-            ],
+-            [
+-            AC_MSG_RESULT([yes])
+-            libsmi_message="yes"
+-            ],
+-            [
+-            AC_MSG_RESULT([not found])
+-            libsmi_message="no"
+-            ]
+-        )
+-        AC_LANG_POP([C])
+-
+-        CFLAGS="$saved_CFLAGS"
+-
+-        if test "$libsmi_message" = "yes"; then
+-
+-            LIBSMI_CFLAGS="$ac_libsmi_cflags"
+-            LIBSMI_LDFLAGS="$ac_libsmi_ldflags"
+-
+-            ac_libsmi_header_path="$ac_libsmi_path/include/$ac_libsmi_header"
+-
+-            dnl Retrieve libsmi release version
+-            if test "x$ac_libsmi_header_path" != "x"; then
+-                ac_libsmi_version=`cat $ac_libsmi_header_path \
+-                    | grep '#define.*SMI_LIBRARY_VERSION.*\"' | sed -e 's/.* "//' \
+-                        | sed -e 's/"//'`
+-                if test $ac_libsmi_version != ""; then
+-                    LIBSMI_VERSION=$ac_libsmi_version
+-                else
+-                    AC_MSG_WARN([Can not find SMI_LIBRARY_VERSION macro in smi.h header to retrieve libsmi version!])
+-                fi
+-            fi
+-
+-            AC_SUBST(LIBSMI_CFLAGS)
+-            AC_SUBST(LIBSMI_LDFLAGS)
+-            AC_SUBST(LIBSMI_VERSION)
+-            AC_DEFINE(HAVE_LIBSMI, 1, [Define to 1 if you have the `smi' library (-lsmi).])
+-        fi
+-    fi
+-])
+-- 
+2.7.4
+
diff --git a/net-analyzer/wireshark/wireshark-2.4.3.ebuild b/net-analyzer/wireshark/wireshark-2.4.3.ebuild
index 246333277178..e63e4d8f74f3 100644
--- a/net-analyzer/wireshark/wireshark-2.4.3.ebuild
+++ b/net-analyzer/wireshark/wireshark-2.4.3.ebuild
@@ -98,6 +98,7 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.1.0-sse4_2-r1.patch
 	"${FILESDIR}"/${PN}-2.4-androiddump.patch
 	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+	"${FILESDIR}"/${PN}-2.4.3-libsmi.patch
 )
 
 pkg_setup() {
diff --git a/net-analyzer/wireshark/wireshark-2.4.4.ebuild b/net-analyzer/wireshark/wireshark-2.4.4.ebuild
new file mode 100644
index 000000000000..b56e421d4d18
--- /dev/null
+++ b/net-analyzer/wireshark/wireshark-2.4.4.ebuild
@@ -0,0 +1,293 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils fcaps flag-o-matic gnome2-utils 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="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+IUSE="
+	adns androiddump +capinfos +caps +captype ciscodump cpu_flags_x86_sse4_2
+	+dftest doc doc-pdf +dumpcap +editcap geoip gtk kerberos libssh libxml2 lua
+	lz4 +mergecap +netlink nghttp2 +pcap portaudio +qt5 +randpkt +randpktdump
+	+reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl +text2pcap
+	tfshark +tshark +udpdump zlib
+"
+REQUIRED_USE="
+	ciscodump? ( libssh )
+	sshdump? ( libssh )
+"
+
+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 )
+	caps? ( sys-libs/libcap )
+	geoip? ( dev-libs/geoip )
+	gtk? (
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:3
+		x11-libs/pango
+		x11-misc/xdg-utils
+	)
+	kerberos? ( virtual/krb5 )
+	libssh? ( >=net-libs/libssh-0.6 )
+	libxml2? ( dev-libs/libxml2 )
+	lua? ( >=dev-lang/lua-5.1:* )
+	lz4? ( app-arch/lz4 )
+	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
+		|| (
+			media-libs/speexdsp
+			<media-libs/speex-1.2.0
+		)
+		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 !=sys-libs/zlib-1.2.4 )
+"
+# 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
+		app-text/asciidoc
+		dev-libs/libxml2
+		dev-libs/libxslt
+		doc-pdf? ( dev-java/fop )
+		www-client/lynx
+	)
+	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.1.0-sse4_2-r1.patch
+	"${FILESDIR}"/${PN}-2.4-androiddump.patch
+	"${FILESDIR}"/${PN}-99999999-androiddump.patch
+	"${FILESDIR}"/${PN}-2.4.3-libsmi.patch
+)
+
+pkg_setup() {
+	enewgroup wireshark
+}
+
+src_prepare() {
+	default
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	# 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."
+				myconf+=( "--with-ssl" )
+				;;
+		esac
+	fi
+
+	# Enable wireshark binary with any supported GUI toolkit (bug #473188)
+	if use gtk || use qt5; then
+		myconf+=( "--enable-wireshark" )
+	else
+		myconf+=( "--disable-wireshark" )
+	fi
+
+	if ! use qt5; then
+		myconf+=( "--with-qt=no" )
+	fi
+
+	if use qt5; then
+		export QT_MIN_VERSION=5.3.0
+		append-cxxflags -fPIC -DPIC
+	fi
+
+	# Hack around inability to disable doxygen/fop doc generation
+	use doc || export ac_cv_prog_HAVE_DOXYGEN=false
+	use doc-pdf || export ac_cv_prog_HAVE_FOP=false
+
+	econf \
+		$(use androiddump && use pcap && echo --enable-androiddump-use-libpcap=yes) \
+		$(use dumpcap && use_with pcap dumpcap-group wireshark) \
+		$(use_enable androiddump) \
+		$(use_enable capinfos) \
+		$(use_enable captype) \
+		$(use_enable ciscodump) \
+		$(use_enable dftest) \
+		$(use_enable dumpcap) \
+		$(use_enable editcap) \
+		$(use_enable mergecap) \
+		$(use_enable randpkt) \
+		$(use_enable randpktdump) \
+		$(use_enable reordercap) \
+		$(use_enable sharkd) \
+		$(use_enable sshdump) \
+		$(use_enable text2pcap) \
+		$(use_enable tfshark) \
+		$(use_enable tshark) \
+		$(use_enable udpdump) \
+		$(use_with adns c-ares) \
+		$(use_with caps libcap) \
+		$(use_with geoip) \
+		$(use_with gtk gtk 3) \
+		$(use_with kerberos krb5) \
+		$(use_with libssh) \
+		$(use_with libxml2) \
+		$(use_with lua) \
+		$(use_with lz4) \
+		$(use_with nghttp2) \
+		$(use_with pcap) \
+		$(use_with portaudio) \
+		$(use_with sbc) \
+		$(use_with smi libsmi) \
+		$(use_with snappy) \
+		$(use_with spandsp) \
+		$(use_with ssl gnutls) \
+		$(use_with zlib) \
+		$(usex cpu_flags_x86_sse4_2 --enable-sse4_2 '') \
+		$(usex netlink --with-libnl=3 --without-libnl) \
+		$(usex qt5 --with-qt=5 '') \
+		$(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 '') \
+		--disable-profile-build \
+		--disable-warnings-as-errors \
+		--sysconfdir="${EPREFIX}"/etc/wireshark \
+		${myconf[@]}
+}
+
+src_compile() {
+	default
+
+	if use doc; then
+		emake -j1 -C docbook
+		if use doc-pdf; then
+			addpredict "/root/.java"
+			emake -C docbook all-pdf
+		fi
+	fi
+}
+
+src_install() {
+	default
+
+	# FAQ is not required as is installed from help/faq.txt
+	dodoc AUTHORS ChangeLog NEWS README{,.bsd,.linux,.macos,.vmware} \
+		doc/{randpkt.txt,README*}
+
+	if use doc; then
+		docinto /usr/share/doc/${PF}/html
+		dodoc -r docbook/{release-notes.html,ws{d,u}g_html{,_chunked}}
+		if use doc-pdf; then
+			docinto /usr/share/doc/${PF}/pdf/
+			dodoc docbook/{developer,user}-guide-{a4,us}.pdf docbook/release-notes.pdf
+		fi
+	fi
+
+	# install headers
+	local wsheader
+	for wsheader in \
+		config.h \
+		epan/*.h \
+		epan/crypt/*.h \
+		epan/dfilter/*.h \
+		epan/dissectors/*.h \
+		epan/ftypes/*.h \
+		epan/wmem/*.h \
+		register.h \
+		wiretap/*.h \
+		ws_diag_control.h \
+		ws_symbol_export.h \
+		wsutil/*.h
+	do
+		insinto /usr/include/wireshark/$( dirname ${wsheader} )
+		doins ${wsheader}
+	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 c d
+		for c in hi lo; do
+			for d in 16 32 48; do
+				insinto /usr/share/icons/${c}color/${d}x${d}/apps
+				newins image/${c}${d}-app-wireshark.png wireshark.png
+			done
+		done
+		for d in 16 24 32 48 64 128 256 ; do
+			insinto /usr/share/icons/hicolor/${d}x${d}/mimetypes
+			newins image/WiresharkDoc-${d}.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
+
+	if 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-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 4ccaf087e692..9adcda5ee1c6 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -27,14 +27,17 @@ DIST zabbix-2.2.17.tar.gz 15494053 BLAKE2B c55ea5a2641838067308a4b93609c2e5b67e3
 DIST zabbix-2.2.18.tar.gz 15495920 BLAKE2B bf3f452f3110841b4718fd5a7118063f7d143e493c89563c489186ffcf7981dd96a02094938a605403a19d668dfd13e42248850d54b0d945e350ac5aa092584a SHA512 3e24827b2739aefa12e3d189b856d836b85a1fa45928343c08620ce1ef16c664a8ad806d051f5cffed10837a326245dd5617034f83cdd00432b81eb05be40491
 DIST zabbix-2.2.19.tar.gz 15497840 BLAKE2B d56946296791948531555663e05135a3ad3576263873e83b4afac33e3069524559ef0a29fd435b8dfc11e72b60f27cfc7279caaf4802b8414203a112e3e4b0ba SHA512 f9a35093cd63fe433ae67a01d526e65387455cc0c82b33d4015ad428991289f711857e089c169fc46fad51697e3a07a2b310026789099e6f42fa88f2f573c560
 DIST zabbix-2.2.20.tar.gz 15503661 BLAKE2B 1303daf261694abba39e2ce86f532b09ddb422cf69a3db68c7f43055a891b03e0fa72b26890793867146e3f36b0b0b8ce7eb9faa7bcd217c02d9b8767dcce527 SHA512 ca63237c1eece870c2f54a1c35c5165062d0e875e9aa05ce9654657de59e52a131b2ddc1f94dbfb1e2d3f4e6f202e4d6424ba97de06fa008fc15ff859ab8e0c6
+DIST zabbix-2.2.21.tar.gz 15489747 BLAKE2B e00fe140977f0ce995497954a15ff647c813c048a706e536a12010a649d3467d6c63343c3c0d11b1900f91f8fcc5bb235f9e4a030362c93ad3c1c31e68699f54 SHA512 29e3cba0663e7160dce5141cc389959571e5e298206baed26209facab206cc4f66611d48d76306a53925a2096db6f0bed1753435ec1be20bd8db53862cb902a4
 DIST zabbix-3.0.10.tar.gz 15573988 BLAKE2B 81ab75246bf4a05fa4ee5cf1d6ebdeafe2351fa8f59f979a87c930c06712cd4499f1ae55d8107d0d6ee4b6bb664310901eccea87a3cfb39bb48e8f2c4133c28e SHA512 cb5602a6fdb78f4f5e3b6b0193e707497e8c04a7558da8345e2e9130f3058be670a48d501b36bca87d10a1964188ae81eb6cd83a573499086ce1f2152dfa9936
 DIST zabbix-3.0.11.tar.gz 15642949 BLAKE2B e4fea226b551db0e84998d2a1bd3b1c81a799028dda91057257bf2a8ec1351fec2a8565ece8a9db6e502b541dfada65beb1dc7ca08c6307c9c082560b8a163e6 SHA512 880b69677833ed636c866fec731d84540a0269975c767bbcb834ca0bb22b8b881095b80b359e30e965282935650e6533d0e930bb6c21b2f6245d57a0e6e73ec6
 DIST zabbix-3.0.12.tar.gz 15647628 BLAKE2B 01a21b0c3779d97428dc355884bd1cd8e0b1ab299aa3ba9d7049db76a8b8ad8b3a87035b8f24b247db4afb205350bb8fae55e3ff9859df6198f427656dfbd283 SHA512 2aea3def2a5a656afde9728c18cc92a201a3d04203f163d3e67c3cb283bb23b94eb3c4d98b1905343080b0740b9670a2efd10f60229f26bb0c9b82c368b3fabd
 DIST zabbix-3.0.13.tar.gz 15648338 BLAKE2B cd0a6530d74c0d3b49d034643779ba9d23e85243c0d226d5792d06cc698b85cbc87643035454952be7496ef5a524101106e177851c88912f6519f0f76ddc264d SHA512 824fba8d4a31919af358d6085e366a4d758c7fd12486a40de79595dff628467d1a46fa84d0af287ab06ad22da7dc855c5cce1a44b5033b0981cac0ca02686acc
+DIST zabbix-3.0.14.tar.gz 15643983 BLAKE2B 129bcde3318c049932ad24d6b20fcd3cdf3a0a0f246aadb81663265eb31550fd5966745486e4e863236801d41e6cefec3bdc82eca024be94bc2437f44b2d81a1 SHA512 b024de610b86bd45fc0be655e8275daf53b1de813e13a1e78cfad149b1191a7f118862646f5ded43938bc489ff0b0f325de36d4b2c076ce6fe768ee4234eb944
 DIST zabbix-3.0.6.tar.gz 15513412 BLAKE2B f478c608f5196c98bf7e646d5125047fa6a89ae3339f5e937141d1f9e105ebbb294172e2bec971e046b7c7e5c05dba640655314a1cc8631e83d1b661fd137c2b SHA512 ccffc58f3555bea62011bad272e8a3085d1723d8cb200e00a3e657696104c3fd055b8b963a26d9c726ef45a5381c7f9625498e99b756a3dd97b147d8b7884d1f
 DIST zabbix-3.0.8.tar.gz 15514547 BLAKE2B 72c57038e762662605ff850666d6f7bcb417b9ec696fd623cb8d9918171a29d2bcc76d1603808580d9fa94394c4a25e90535eabc8f2e86265a819baaad48dd3c SHA512 9f5fec7f3888f34ad9659a5d34d5fc089efc86a5fcf78f8cabf6704fbf95fd52a8caaab6f4291cb76d15cc2d69c986c95346fbe4fdfdc407c5506f3b8946aa1a
 DIST zabbix-3.0.9.tar.gz 15516440 BLAKE2B 4689a1d5ec2fbf5085fceda2bdf2507e46105bcb9fff8e8da9158abd18bf487b56775637837f259e6eda533d4648104c8a856c9b3260f808efae0566e4080d63 SHA512 f34d0fde48e64dfb6bea152ab6c63eb28be66e3647cc781d430b56b13bc91ac9f194ac80d264b2e837f8fceb929e0ebeda0221bf8363eb0a66e53461088a4ef9
 DIST zabbix-3.2.10.tar.gz 16089723 BLAKE2B c69b8b00781198b8e4845f94e5a42e3910950954bd240703165be15630788f22e486a2ebbd941902eb92b06b42bc7923869f7b885fcc7248508d9e535ad23170 SHA512 6413247ea0f47f410eadd970599dc4a0bfef4202b6f88bcb1636d1fad270a2d5545a90870052af5445a5219dab3b58867c23f3afaddb5d78e200fecbd987e545
+DIST zabbix-3.2.11.tar.gz 16099820 BLAKE2B 7038679ecc9ae1b6684d65b3dd0019865e587c82e5a3ffe55610c057f8516ebe34978101065ac31628e6fd54077877c447d64cb1d169e0ad7402e727c7e65d76 SHA512 a14e0af4b183c8deb524c8965700c2988c0c131844f7fbc748aa8d1703b9dad73c2cf6d77663799fbd455adf58fdd1ce8dc5fd6404a9269c1a42160ad0e33e6e
 DIST zabbix-3.2.2.tar.gz 15915015 BLAKE2B 1cfac6134da5464a1c7e850a62c9cd012496df449f18303177bcc807f9adb4bb812d063a691e41a9b993363510e954f05f82db52ce2998a83d4d981951e75f7f SHA512 1f6cb6344d24ed91c49fa116d6862cfd78caab9cd3297329369dd2df5cf9c83fda67bc9faa1a59f2b605bfeda73a69a3e29653fca320eda1b67f4d0931bfdb9b
 DIST zabbix-3.2.3.tar.gz 15922416 BLAKE2B 2f25b47b85332736eeaf2593b0c3ca674d5f777056e34cb2c51d3205e2ff93c2beb7c7e21352e662791a5d26f98000c027f4d8ff5f1b9a4aabd9cf6aff935ca2 SHA512 5a704282765fa66d1aa53ae546d3a49a35050d6830a25a3a9ad64d73f8aff48b31e8d13f37d147c8d6244bb0f2dab21bceb5d022f1c3ffa726c10edc6e7bd1f6
 DIST zabbix-3.2.4.tar.gz 15924840 BLAKE2B 95ceba99a7766aeedb0c9acc988875bcbb48927cd5112c4583c3f67c7d12779cb3354f6564f64ee79973b6fc335f7dd4b05d2e663a9197d9e548000e9a1487e2 SHA512 62e532bcf6a5ab82b1f943e28d46d1e64782758a405680d2c1a54e9c1092a340a50987045acbbad2b57439e3c2640d8a11fe1a29a234764859befa6a7fd779d1
@@ -47,19 +50,23 @@ DIST zabbix-3.4.1.tar.gz 17010519 BLAKE2B 54d2b576905d6b420fcbd8f31b5bd00d8f4c9c
 DIST zabbix-3.4.2.tar.gz 17113290 BLAKE2B d0458a035bf3dec7707eebc40752c31a9e85314c69242fa8b2c935310cbb806f9c449f6e78508fe9b9d36a89eab514edcb6b948991ca3f270b6ada016fefb8f7 SHA512 42feff59e1e1dd5d69a66cc857e9076b9a6f1410b5796a719cb660ea97ccd2544fe87f3cfabc27590cc53a321d24a7977daa320be1fdff31653b3650602dd385
 DIST zabbix-3.4.3.tar.gz 17130788 BLAKE2B 9f90242a4c86719e5a76e0057aec6f61481ae9fcd635034634251eb6ba317ab1c180dab7a88e33045429828cf392b57fdc5674d116a46f1a959c2652db77c9fd SHA512 338f4c367d906252ad762ffff60652f6f3d8f0027684e1562fbf26a4628002b72671dd6a2a3547c1681277a9cdef544d671b89edac886e96914a0b3850e639a8
 DIST zabbix-3.4.4.tar.gz 17132537 BLAKE2B c91a8248edc9d42c8a924fafa9a38903d8eb1c3f9c7f90dd188f615c0ca06859c8bfe902b3099d18fbd23bf19fb68313e71bf9cc20831debf2af523018aadc06 SHA512 2d9724ded1e3388c24ce9defbbe1ccd4804a925175ae76bc352a86332cfde3a692b4f447d6809a0d8394ffe51ad1a2fa3cff4459e850a6e8f7b1596811c441a2
+DIST zabbix-3.4.5.tar.gz 17170228 BLAKE2B bd799a3ad25256421bc2a8458019237da17e78d2dd5253485cebbc40df785e550e7cf15fcf8925a225c118e38e9aaad3f7532f909ba3eaff3a175136033ae81a SHA512 e77c8693d687c9f1e3c160f2f41161b5e4ac663f0db69f4bff424da4ba607815ad0148448c6f80a2b9357ad7472016610f4beed173e40c6fcf661874d75c69a4
 EBUILD zabbix-2.2.16.ebuild 9411 BLAKE2B 695aa532dcd84bc0ae58d065e5fe3b95a717462d126927981e19011918a92630a6fb2626598b6022f6f7677c9c8e31bb0a9b2d684bdff9f1f490c9120ac7682e SHA512 522fdcebd45a24c517c7a74b9e80969d4573f63205440ca61c0252d6280529f83019864c3ae24f89493974c06be09f7fe9872fc56332b1d8b950de6782b8d95c
 EBUILD zabbix-2.2.17.ebuild 9413 BLAKE2B 9681e219f482c0bec072e7cca624994bfeb9abfb30af512497fa48af4a0c1ffd0c2de02507ded989d3bb2c9435f8f66c306233ca863230bde30e59c95286b2d4 SHA512 183407027ea64f68e8f257637444a160e7b4e42a590b9dc31d58273fe0280e733f8d0b4e9285ced47a2e818acc145e1cb381c61691ea536ae913ed4ffffcc055
 EBUILD zabbix-2.2.18.ebuild 9413 BLAKE2B 9681e219f482c0bec072e7cca624994bfeb9abfb30af512497fa48af4a0c1ffd0c2de02507ded989d3bb2c9435f8f66c306233ca863230bde30e59c95286b2d4 SHA512 183407027ea64f68e8f257637444a160e7b4e42a590b9dc31d58273fe0280e733f8d0b4e9285ced47a2e818acc145e1cb381c61691ea536ae913ed4ffffcc055
 EBUILD zabbix-2.2.19.ebuild 9413 BLAKE2B 9681e219f482c0bec072e7cca624994bfeb9abfb30af512497fa48af4a0c1ffd0c2de02507ded989d3bb2c9435f8f66c306233ca863230bde30e59c95286b2d4 SHA512 183407027ea64f68e8f257637444a160e7b4e42a590b9dc31d58273fe0280e733f8d0b4e9285ced47a2e818acc145e1cb381c61691ea536ae913ed4ffffcc055
 EBUILD zabbix-2.2.20.ebuild 9413 BLAKE2B 9681e219f482c0bec072e7cca624994bfeb9abfb30af512497fa48af4a0c1ffd0c2de02507ded989d3bb2c9435f8f66c306233ca863230bde30e59c95286b2d4 SHA512 183407027ea64f68e8f257637444a160e7b4e42a590b9dc31d58273fe0280e733f8d0b4e9285ced47a2e818acc145e1cb381c61691ea536ae913ed4ffffcc055
+EBUILD zabbix-2.2.21.ebuild 9413 BLAKE2B eb875afcae273c71166dd96e3e06e438326ee692997a30a0bb73e3f14ae4a4ec24080ff8d0c8539a23a4b021e6dac291b6ce9d225e75c94ef0725d2ca4059d22 SHA512 1127ec9fba4f124bd506faaf6dd9679441a5defc726655a05520af818a8f226634bca5e3b73bb721c83554992731179a3dcfad15d3767e784099c9d89cffda55
 EBUILD zabbix-3.0.10.ebuild 9276 BLAKE2B d32757a485a0de3840d1b4840296eee7bf576ebabd61ab4db49fb040b058611952ef9784ed2a4ec10e877822b397138d60d67b764a515b8d65f8cbec5f9b22a3 SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c
 EBUILD zabbix-3.0.11.ebuild 9276 BLAKE2B d32757a485a0de3840d1b4840296eee7bf576ebabd61ab4db49fb040b058611952ef9784ed2a4ec10e877822b397138d60d67b764a515b8d65f8cbec5f9b22a3 SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c
 EBUILD zabbix-3.0.12.ebuild 9276 BLAKE2B d32757a485a0de3840d1b4840296eee7bf576ebabd61ab4db49fb040b058611952ef9784ed2a4ec10e877822b397138d60d67b764a515b8d65f8cbec5f9b22a3 SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c
 EBUILD zabbix-3.0.13.ebuild 9276 BLAKE2B d32757a485a0de3840d1b4840296eee7bf576ebabd61ab4db49fb040b058611952ef9784ed2a4ec10e877822b397138d60d67b764a515b8d65f8cbec5f9b22a3 SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c
+EBUILD zabbix-3.0.14.ebuild 9276 BLAKE2B cce198f1a7554d02976347c0bf80330fe564294de9566da18a8ad055e0ad73356abdd3f250fa53827298f2ba3abd8491e26d56d14e7e055f731e4eefbe45fdf9 SHA512 67895e8069a0c97517a3771d681a152aa333b876143a8d4c137d6997d19764e52b73bd45cbce58d1d1dbcc8793bbc987c749634cfb0c419c2505c4956166a623
 EBUILD zabbix-3.0.6.ebuild 9276 BLAKE2B ab51e9fc2e1a85ed145b01664230b57e8741b09812bb4a8690e1e332cdfe7ca2ef1bc229e971c102d6d3b5fe082e9cd9ad07649f4701710d2b7ee84138afc54e SHA512 4275953f472eb7a4e6fc0988f93eb1f3d1f133d15dd245120fe5e48a1f4a3276debf412667b248bead4045e9c067818f1a2aed03b9b14d18cc45515d8232881f
 EBUILD zabbix-3.0.8.ebuild 9276 BLAKE2B d32757a485a0de3840d1b4840296eee7bf576ebabd61ab4db49fb040b058611952ef9784ed2a4ec10e877822b397138d60d67b764a515b8d65f8cbec5f9b22a3 SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c
 EBUILD zabbix-3.0.9.ebuild 9276 BLAKE2B d32757a485a0de3840d1b4840296eee7bf576ebabd61ab4db49fb040b058611952ef9784ed2a4ec10e877822b397138d60d67b764a515b8d65f8cbec5f9b22a3 SHA512 6739ba08d11cd9c05f2ab55dd2d60c8f808636e4c7af6c188280b7a3ed41c8d976d4526f53064859d2bec3e4b8e32dc98e0ab4718691893dd6c68a28af2d3c3c
 EBUILD zabbix-3.2.10.ebuild 9240 BLAKE2B 6aebb13ffa636b4887b74d93b1493858a66ac0b6b41a1e56d25481cb517bcc84e5fddbbde1abc17533c02f373b928291c68f8e912305b48c7c5d398c77c78ba4 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016
+EBUILD zabbix-3.2.11.ebuild 9240 BLAKE2B 1a9bccc597365723fa97e1ae0ed072bebbf10d716f59be126c21dfc5bf440b9117e56990132efeaeba18c37d2a9bd8cc40f98c095eda6d66ccbe5fae447124fd SHA512 63d1cd271fc8603b0a0252e8d896a5af9f7d72c6cf4648426d76c9d7a6751582875fb91ecaf433c4da13fb6f823f0ec13b8190fb56b4b98231207a3d3d0a6d7f
 EBUILD zabbix-3.2.2.ebuild 9240 BLAKE2B 67d9734f61b8b5d5566e88eb995ce79d0de0ec8cc3898331f322cb10871ebee9ef831c07c3619e0a8d2530686a298180b3543895c9078087bcfbe2305563ba70 SHA512 6a72ef2a6cbcecd6474f38500b40ef54de31542e1885fc1bd76a3e285b4771c98d0827fa13b2e9c9996745b4f44446d3a89c7ba971806197c6a23bdf9386848a
 EBUILD zabbix-3.2.3.ebuild 9240 BLAKE2B 67d9734f61b8b5d5566e88eb995ce79d0de0ec8cc3898331f322cb10871ebee9ef831c07c3619e0a8d2530686a298180b3543895c9078087bcfbe2305563ba70 SHA512 6a72ef2a6cbcecd6474f38500b40ef54de31542e1885fc1bd76a3e285b4771c98d0827fa13b2e9c9996745b4f44446d3a89c7ba971806197c6a23bdf9386848a
 EBUILD zabbix-3.2.4.ebuild 9240 BLAKE2B 6aebb13ffa636b4887b74d93b1493858a66ac0b6b41a1e56d25481cb517bcc84e5fddbbde1abc17533c02f373b928291c68f8e912305b48c7c5d398c77c78ba4 SHA512 502e7299347bce819d47662096eeb5d5161f63777d0ba337bc18b75936d81b3a416c37703506dd342e40792051e3233dff168c3dc99aa611c4af7ae43dec8016
@@ -72,4 +79,5 @@ EBUILD zabbix-3.4.1.ebuild 9254 BLAKE2B 152492246e6d05c6761c3bc858e6467ebb30a8c5
 EBUILD zabbix-3.4.2.ebuild 9254 BLAKE2B 152492246e6d05c6761c3bc858e6467ebb30a8c53a3c4eaa9db06b8bd5e3d364c573afde7c6b1a1b13d01b42a8571ef3b87a2700b44b325fdb528b0225dd1987 SHA512 979b168af278b789bd0779f8762baa605dda2c2f109155a6f7ca45df23e4c0e922357975cd5dfbb861fc4497f9bf5a455f17c333da41414af196450a15ffcac0
 EBUILD zabbix-3.4.3.ebuild 9254 BLAKE2B 152492246e6d05c6761c3bc858e6467ebb30a8c53a3c4eaa9db06b8bd5e3d364c573afde7c6b1a1b13d01b42a8571ef3b87a2700b44b325fdb528b0225dd1987 SHA512 979b168af278b789bd0779f8762baa605dda2c2f109155a6f7ca45df23e4c0e922357975cd5dfbb861fc4497f9bf5a455f17c333da41414af196450a15ffcac0
 EBUILD zabbix-3.4.4.ebuild 9254 BLAKE2B 152492246e6d05c6761c3bc858e6467ebb30a8c53a3c4eaa9db06b8bd5e3d364c573afde7c6b1a1b13d01b42a8571ef3b87a2700b44b325fdb528b0225dd1987 SHA512 979b168af278b789bd0779f8762baa605dda2c2f109155a6f7ca45df23e4c0e922357975cd5dfbb861fc4497f9bf5a455f17c333da41414af196450a15ffcac0
+EBUILD zabbix-3.4.5.ebuild 9254 BLAKE2B afd0e2919599fce07c20692225d61be80d90773c30f90005137d604e9b588614fb24d29a5667c90c1b664041801606978950b1eef6a757beb471ba85c46fb4c7 SHA512 7f5034ab8296f755737f36cbbdf6873acd36f277d879ef94ee7837221637f19a3ae71f21ae8b5c5ea186e85cc6385315bd0d2e4d2d696f417ecd8b4e59cc3d51
 MISC metadata.xml 1402 BLAKE2B 02819796719872a78ba4f7f534344bcde607fd95d10ae0087d62b65490289946f81a70b6ae5341ed6579f4855e998fc46bcff6cc463aa7feb4e768736509128a SHA512 8d3ad204e8cfb4d2aa76f0af90c77d7b6e4cc13da54772d95fe43d68bf85eb96e9d96bc2b11b08421e4684b03ad53042a4f4c0a44817f0e4ea804b81996cda5a
diff --git a/net-analyzer/zabbix/zabbix-2.2.21.ebuild b/net-analyzer/zabbix/zabbix-2.2.21.ebuild
new file mode 100644
index 000000000000..8f1e563fd432
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-2.2.21.ebuild
@@ -0,0 +1,341 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/2.2"/zabbix_server.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd \
+			"${FILESDIR}/2.2"/init.d/zabbix-proxy
+		dosbin \
+			src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins \
+			"${FILESDIR}/2.2"/zabbix_agent.conf \
+			"${FILESDIR}/2.2"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/2.2"/init.d/zabbix-agentd
+		dosbin \
+			src/zabbix_agent/zabbix_agent \
+			src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		fperms 0640 \
+			/etc/zabbix/zabbix_agent.conf \
+			/etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agent.conf \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.0.14.ebuild b/net-analyzer/zabbix/zabbix-3.0.14.ebuild
new file mode 100644
index 000000000000..eb110121f1a1
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.0.14.ebuild
@@ -0,0 +1,331 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping )
+	server? ( net-analyzer/fping
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+	   dodir \
+	   	/${ZABBIXJAVA_BASE} \
+		/${ZABBIXJAVA_BASE}/bin \
+		/${ZABBIXJAVA_BASE}/lib
+	   keepdir /${ZABBIXJAVA_BASE}
+	   exeinto /${ZABBIXJAVA_BASE}/bin
+	   doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+	   exeinto /${ZABBIXJAVA_BASE}/lib
+	   doexe \
+	   	src/zabbix_java/lib/logback-classic-0.9.27.jar \
+		src/zabbix_java/lib/logback-console.xml \
+		src/zabbix_java/lib/logback-core-0.9.27.jar \
+		src/zabbix_java/lib/logback.xml \
+		src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+		src/zabbix_java/lib/slf4j-api-1.6.1.jar
+	   exeinto /${ZABBIXJAVA_BASE}/
+	   doexe \
+	   	src/zabbix_java/settings.sh \
+		src/zabbix_java/startup.sh \
+		src/zabbix_java/shutdown.sh
+	   fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.2.11.ebuild b/net-analyzer/zabbix/zabbix-3.2.11.ebuild
new file mode 100644
index 000000000000..7d7666c0eb6a
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.2.11.ebuild
@@ -0,0 +1,328 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-analyzer/zabbix/zabbix-3.4.5.ebuild b/net-analyzer/zabbix/zabbix-3.4.5.ebuild
new file mode 100644
index 000000000000..d51a6c625af6
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-3.4.5.ebuild
@@ -0,0 +1,329 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit flag-o-matic webapp java-pkg-opt-2 user systemd toolchain-funcs
+
+DESCRIPTION="ZABBIX is software for monitoring of your applications, network and servers"
+HOMEPAGE="http://www.zabbix.com/"
+MY_P=${P/_/}
+MY_PV=${PV/_/}
+SRC_URI="http://prdownloads.sourceforge.net/zabbix/${MY_P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent java curl frontend ipv6 xmpp ldap libxml2 mysql openipmi oracle +postgres proxy server ssh ssl snmp sqlite odbc static"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	proxy? ( ^^ ( mysql oracle postgres sqlite odbc ) )
+	server? ( ^^ ( mysql oracle postgres odbc ) )
+	static? ( !oracle !snmp )"
+
+COMMON_DEPEND="snmp? ( net-analyzer/net-snmp )
+	ldap? (
+		net-nds/openldap
+		=dev-libs/cyrus-sasl-2*
+		net-libs/gnutls
+	)
+	mysql? ( >=virtual/mysql-5.0.3 )
+	sqlite? ( >=dev-db/sqlite-3.3.5 )
+	postgres? ( dev-db/postgresql:* )
+	oracle? ( >=dev-db/oracle-instantclient-basic-10.0.0.0 )
+	xmpp? ( dev-libs/iksemel )
+	libxml2? ( dev-libs/libxml2 )
+	curl? ( net-misc/curl )
+	openipmi? ( sys-libs/openipmi )
+	ssh? ( net-libs/libssh2 )
+	java? ( virtual/jdk:* )
+	odbc? ( dev-db/unixODBC )
+	ssl? ( dev-libs/openssl:=[-bindist] )"
+
+RDEPEND="${COMMON_DEPEND}
+	proxy? ( net-analyzer/fping[suid] )
+	server? ( net-analyzer/fping[suid]
+		app-admin/webapp-config
+		dev-libs/libevent )
+	java?	(
+		>=virtual/jre-1.4
+		dev-java/slf4j-api
+	)
+	frontend? (
+		>=dev-lang/php-5.3.0[bcmath,ctype,sockets,gd,truetype,xml,session,xmlreader,xmlwriter,nls,sysvipc,unicode]
+		|| ( dev-lang/php[apache2] dev-lang/php[cgi] dev-lang/php[fpm] )
+		mysql? ( dev-lang/php[mysqli] )
+		odbc? ( dev-lang/php[odbc] )
+		oracle? ( dev-lang/php[oci8-instant-client] )
+		postgres? ( dev-lang/php[postgres] )
+		sqlite? ( dev-lang/php[sqlite] )
+		media-libs/gd[png]
+		app-admin/webapp-config )"
+DEPEND="${COMMON_DEPEND}
+	static? (
+		ldap? (
+			net-nds/openldap[static-libs]
+			=dev-libs/cyrus-sasl-2*[static-libs]
+			net-libs/gnutls[static-libs]
+		)
+	mysql? ( >=virtual/mysql-5.0.3[static-libs] )
+	sqlite? ( >=dev-db/sqlite-3.3.5[static-libs] )
+	postgres? ( dev-db/postgresql:*[static-libs] )
+	libxml2? ( dev-libs/libxml2[static-libs] )
+	curl? ( net-misc/curl[static-libs] )
+	ssh? ( net-libs/libssh2[static-libs] )
+	odbc? ( dev-db/unixODBC[static-libs] )
+	)
+	virtual/pkgconfig"
+
+S=${WORKDIR}/${MY_P}
+
+ZABBIXJAVA_BASE="opt/zabbix_java"
+
+pkg_setup() {
+	if use oracle; then
+		if [ -z "${ORACLE_HOME}" ]; then
+			eerror
+			eerror "The environment variable ORACLE_HOME must be set"
+			eerror "and point to the correct location."
+			eerror "It looks like you don't have Oracle installed."
+			eerror
+			die "Environment variable ORACLE_HOME is not set"
+		fi
+		if has_version 'dev-db/oracle-instantclient-basic'; then
+			ewarn
+			ewarn "Please ensure you have a full install of the Oracle client."
+			ewarn "dev-db/oracle-instantclient* is NOT sufficient."
+			ewarn
+		fi
+	fi
+
+	if use frontend; then
+		webapp_pkg_setup
+	fi
+
+	enewgroup zabbix
+	enewuser zabbix -1 -1 /var/lib/zabbix/home zabbix
+}
+
+java_prepare() {
+	cd "${S}/src/zabbix_java/lib"
+	rm -v *.jar || die
+
+	java-pkg_jar-from slf4j-api
+}
+
+src_prepare() {
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable server) \
+		$(use_enable proxy) \
+		$(use_enable agent) \
+		$(use_enable ipv6) \
+		$(use_enable static) \
+		$(use_enable java) \
+		$(use_with ldap) \
+		$(use_with snmp net-snmp) \
+		$(use_with mysql) \
+		$(use_with postgres postgresql) \
+		$(use_with oracle) \
+		$(use_with sqlite sqlite3) \
+		$(use_with xmpp jabber) \
+		$(use_with curl libcurl) \
+		$(use_with openipmi openipmi) \
+		$(use_with ssh ssh2) \
+		$(use_with libxml2) \
+		$(use_with odbc unixodbc) \
+		$(use_with ssl openssl) \
+		|| die "econf failed"
+}
+
+src_compile() {
+	if [ -f Makefile ] || [ -f GNUmakefile ] || [ -f makefile ]; then
+		emake AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" || die "emake failed"
+	fi
+}
+
+src_install() {
+	dodir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	keepdir \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	if use server; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_server.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-server
+		dosbin src/zabbix_server/zabbix_server
+		fowners zabbix:zabbix /etc/zabbix/zabbix_server.conf
+		fperms 0640 /etc/zabbix/zabbix_server.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-server.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-server.tmpfiles" zabbix-server.conf
+	fi
+
+	if use proxy; then
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-proxy
+		dosbin src/zabbix_proxy/zabbix_proxy
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_proxy.conf
+		dodir /usr/share/zabbix
+		/bin/cp -R "${S}/database/" "${D}"/usr/share/zabbix/
+		systemd_dounit "${FILESDIR}/zabbix-proxy.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-proxy.tmpfiles" zabbix-proxy.conf
+	fi
+
+	if use agent; then
+		insinto /etc/zabbix
+		doins "${FILESDIR}/3.0"/zabbix_agentd.conf
+		doinitd "${FILESDIR}/3.0"/init.d/zabbix-agentd
+		dosbin src/zabbix_agent/zabbix_agentd
+		dobin \
+			src/zabbix_sender/zabbix_sender \
+			src/zabbix_get/zabbix_get
+		fowners zabbix:zabbix /etc/zabbix/zabbix_agentd.conf
+		fperms 0640 /etc/zabbix/zabbix_agentd.conf
+		systemd_dounit "${FILESDIR}/zabbix-agentd.service"
+		systemd_newtmpfilesd "${FILESDIR}/zabbix-agentd.tmpfiles" zabbix-agentd.conf
+	fi
+
+	fowners zabbix:zabbix \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+	fperms 0750 \
+		/etc/zabbix \
+		/var/lib/zabbix \
+		/var/lib/zabbix/home \
+		/var/lib/zabbix/scripts \
+		/var/lib/zabbix/alertscripts \
+		/var/lib/zabbix/externalscripts \
+		/var/log/zabbix
+
+	dodoc README INSTALL NEWS ChangeLog \
+		conf/zabbix_agentd.conf \
+		conf/zabbix_proxy.conf \
+		conf/zabbix_agentd/userparameter_examples.conf \
+		conf/zabbix_agentd/userparameter_mysql.conf \
+		conf/zabbix_server.conf
+
+	if use frontend; then
+		webapp_src_preinst
+		cp -R frontends/php/* "${D}/${MY_HTDOCSDIR}"
+		webapp_configfile \
+			"${MY_HTDOCSDIR}"/include/db.inc.php \
+			"${MY_HTDOCSDIR}"/include/config.inc.php
+		webapp_src_install
+	fi
+
+	if use java; then
+		dodir \
+			/${ZABBIXJAVA_BASE} \
+			/${ZABBIXJAVA_BASE}/bin \
+			/${ZABBIXJAVA_BASE}/lib
+		keepdir /${ZABBIXJAVA_BASE}
+		exeinto /${ZABBIXJAVA_BASE}/bin
+		doexe src/zabbix_java/bin/zabbix-java-gateway-${MY_PV}.jar
+		exeinto /${ZABBIXJAVA_BASE}/lib
+		doexe \
+			src/zabbix_java/lib/logback-classic-0.9.27.jar \
+			src/zabbix_java/lib/logback-console.xml \
+			src/zabbix_java/lib/logback-core-0.9.27.jar \
+			src/zabbix_java/lib/logback.xml \
+			src/zabbix_java/lib/android-json-4.3_r3.1.jar \
+			src/zabbix_java/lib/slf4j-api-1.6.1.jar
+		fowners -R zabbix:zabbix /${ZABBIXJAVA_BASE}
+		doinitd "${FILESDIR}"/3.0/init.d/zabbix-jmx-proxy
+		doconfd "${FILESDIR}"/3.0/conf.d/zabbix-jmx-proxy
+	fi
+}
+
+pkg_postinst() {
+	if use server || use proxy ; then
+		elog
+		elog "You may need to configure your database for Zabbix,"
+		elog "if you have not already done so. "
+		elog
+
+		zabbix_homedir=$(egethome zabbix)
+		if [ -n "${zabbix_homedir}" ] && \
+		   [ "${zabbix_homedir}" != "/var/lib/zabbix/home" ]; then
+			ewarn
+			ewarn "The user 'zabbix' should have his homedir changed"
+			ewarn "to /var/lib/zabbix/home if you want to use"
+			ewarn "custom alert scripts."
+			ewarn
+			ewarn "A real homedir might be needed for configfiles"
+			ewarn "for custom alert scripts (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			ewarn
+			ewarn "To change the homedir use:"
+			ewarn "  usermod -d /var/lib/zabbix/home zabbix"
+			ewarn
+		fi
+	fi
+
+	if use server; then
+		elog
+		elog "For distributed monitoring you have to run:"
+		elog
+		elog "zabbix_server -n <nodeid>"
+		elog
+		elog "This will convert database data for use with Node ID"
+		elog "and also adds a local node."
+		elog
+	fi
+
+	elog "--"
+	elog
+	elog "You may need to add these lines to /etc/services:"
+	elog
+	elog "zabbix-agent     10050/tcp Zabbix Agent"
+	elog "zabbix-agent     10050/udp Zabbix Agent"
+	elog "zabbix-trapper   10051/tcp Zabbix Trapper"
+	elog "zabbix-trapper   10051/udp Zabbix Trapper"
+	elog
+
+	if use server || use proxy ; then
+		# check for fping
+		fping_perms=$(stat -c %a /usr/sbin/fping 2>/dev/null)
+		case "${fping_perms}" in
+			4[157][157][157])
+				;;
+			*)
+				ewarn
+				ewarn "If you want to use the checks 'icmpping' and 'icmppingsec',"
+				ewarn "you have to make /usr/sbin/fping setuid root and executable"
+				ewarn "by everyone. Run the following command to fix it:"
+				ewarn
+				ewarn "  chmod u=rwsx,g=rx,o=rx /usr/sbin/fping"
+				ewarn
+				ewarn "Please be aware that this might impose a security risk,"
+				ewarn "depending on the code quality of fping."
+				ewarn
+				;;
+		esac
+	fi
+}
diff --git a/net-dialup/Manifest.gz b/net-dialup/Manifest.gz
index e2f77a54d8e0..a1651a9e5b56 100644
--- a/net-dialup/Manifest.gz
+++ b/net-dialup/Manifest.gz
diff --git a/net-dialup/xc/Manifest b/net-dialup/xc/Manifest
index 1ae9e2050ec4..31eda610b659 100644
--- a/net-dialup/xc/Manifest
+++ b/net-dialup/xc/Manifest
@@ -4,5 +4,5 @@ AUX xc-4.3.2-gentoo.patch 3222 BLAKE2B 43b119862c643f480548cba7822c8d45b6a87ba4c
 AUX xc-4.3.2-implicit-decl.patch 434 BLAKE2B 7397c9e2e308093c99454eb22ffaa7f8fc7939500e419c809bfb14ef5369ab6ffcbf4385aa2e2cac141db62fc1d017959d827610307351058bca232fffefc299 SHA512 5c470a0b936576a3c90ca84317f4b1237855e475a5c63b62e94f55f2dc7f1c5561fa512ae1a46fa5b9d9df146abd1e58f04399b6b04c6fadf2a12cd6665855a6
 DIST xc-4.3.2.tar.gz 162098 BLAKE2B d3ce005bea46cff7673d8c9c4c288356cf340a04658917934a3553705f0554ffcc433379a8fdbbe2cb8a456cf15a73c5bcdd1719c0f9f3b7d41623b535b45ee6 SHA512 89de05a82f54ffd89a6950f9cb4aea732573ac1b15a27aaba4e25293a5d0b763052287700e4499f7f2adf9acc952ecea572239c8403c86c5871efd363d68710a
 EBUILD xc-4.3.2-r3.ebuild 990 BLAKE2B 6a0ca5d3aaae80bddf077bab7397887cc7c35ff10027c5c954dac58a61dd16fa81fc305999a5a8952fc190ccd0a98ad8af2e13304a9abf2d1026bf18af1a597b SHA512 0f14f2cf4c7103fb0db9926496edee7009f60f4aab5f22f4cf37d5e5f2dc667ac5db3cfc8c438eaa07a64c1f9875e13cc10cf3e5ad957d853541e718d4a0d9d5
-EBUILD xc-4.3.2-r4.ebuild 1044 BLAKE2B 8a83acd3e49ea2aba683f0b9cf9acb40a6a1f744d8004572d3e9222b6da4916571bbd96026101bb14da926e90f5634f71c3eb81bca18489f013284072d222f57 SHA512 3b9b605f19d4060b3b4004e50883d75ee8772e35c5afca4b7d1d4d23fd169589cc0ee372a6a8883eec1d6038b52108b8da20623d8091b77a1cb4bdc2b1f66f89
+EBUILD xc-4.3.2-r4.ebuild 1050 BLAKE2B 3659c8d0830e4512fe5c6609306373031fad08d87d89e90e59a30680e1b75989494ca496f8618a5f40e62e550d3f61ebe0c1807e3a8ba1caa14d6d752e135402 SHA512 6be6426d5944d9db01cec408675ffb77591f44ed3c899483e814e4a63a5813762c52e33b99030effeaec9f725961a37bcc9a0b5bd4c54a28ac5e6a0fb8d7d0d5
 MISC metadata.xml 358 BLAKE2B 3d76b6b9d649f45a1b31f5e1ec3238ed9ef233539d3fefdb07829b4b2845ba67f24ad34987912b92bd93c0566317b6cc381ec3b68f11b7025488b4fc0409d455 SHA512 4d695e92ba66886be964c96cabd894ef44cc93d62f053422f14909b953bf7bcf9321fcb745c33d5af716308f61df3154c1eadb78ce306439463cd2ee6528f6f0
diff --git a/net-dialup/xc/xc-4.3.2-r4.ebuild b/net-dialup/xc/xc-4.3.2-r4.ebuild
index 18c1e5a746db..abb2ee2a085e 100644
--- a/net-dialup/xc/xc-4.3.2-r4.ebuild
+++ b/net-dialup/xc/xc-4.3.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.ibiblio.org/pub/Linux/apps/serialcomm/dialout/${P}.tar.gz"
 
 LICENSE="xc-radley"
 SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="amd64 ~ia64 ~mips ppc ppc64 sparc x86"
 IUSE=""
 
 RDEPEND="sys-libs/ncurses"
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index f6056faa89fc..0b420958e55d 100644
--- a/net-fs/Manifest.gz
+++ b/net-fs/Manifest.gz
diff --git a/net-fs/libnfs/Manifest b/net-fs/libnfs/Manifest
index 3f9a9900efb4..c594d32e2773 100644
--- a/net-fs/libnfs/Manifest
+++ b/net-fs/libnfs/Manifest
@@ -11,6 +11,6 @@ EBUILD libnfs-1.11.0.ebuild 1076 BLAKE2B 6eef0f8a3dded31ab549e592d922821655f28cc
 EBUILD libnfs-1.9.5.ebuild 1104 BLAKE2B 35d57e11ee8bee13296749d1ffad4538b900c26be337e55ebf7ffdaf8cba6439859d11154c0767c02fe500b4e1ed68eef789a2b24d977c829b2b3ee6f676a620 SHA512 ab70f6ec1e3e80aeaca04a8c01c8a27d01bb2ff3bbfc0f656f4d70a9a7db73ab7c385c8a292aa5cbbc6f4517de9c52f385c66010de1775f28e36af2a69a2fbb6
 EBUILD libnfs-1.9.7.ebuild 1065 BLAKE2B f90f578433b843bdb46fa0620258d5c2e51517838d664fe8168145af224431ff258bf13c784babaacf484bb69b30e2e491b2e5bdb6fa3671ef205c72c16caa9e SHA512 27c789939b00ef3864474fd16ea24e337d53859c35ff0479b302d47ddea6e6e3d9321048be473602df865834248122c4232c72a6996a14a00b16c8bdf8641a60
 EBUILD libnfs-1.9.8.ebuild 1076 BLAKE2B 6eef0f8a3dded31ab549e592d922821655f28ccb19c55b7d832f10f6b10a6b4226d5716b2927fb47fd6d04841c193f8ffe51aa7fe00022b5ee8e63f15ae07bb7 SHA512 a98406e2047ef0f1f841af6874358125f58c12aef62f47d5259c5d38fd842c68807675d93f53a771d4bd11b1fe712df404ee074e64b694015e26b72efb10acf7
-EBUILD libnfs-2.0.0.ebuild 1118 BLAKE2B e0921c1767a521d3366ffc7318b4861ea7c1b8186c09e880f7520a1a4bedf705a9eb924e4a874cd33f3738e4f24b8a414459d263c166441447b22f6ed7b292ad SHA512 0bca1722a17557667b9c7c6996fee9fe98ccfeed7d9d74db0af1d265b99cdb2668c3a934398648c9615fd970972bad79234b28580bccee3a38eed934bd5ad7e0
+EBUILD libnfs-2.0.0.ebuild 1114 BLAKE2B be13cf89760e8b3c63d95e1e168e2dae1d5f8d60c37382ef1c54dd3fe9f33cac1ec3d618cc6f90f9c5530596ec0c1b876416dbb062a4dcec586fbe76be18c487 SHA512 18132b4ba42d185e1bc40fb88e4a3a209b3cbefbc46de15e628a419712003fc8e88b206fccccae22e01783e72f93878bade4737e45538d0ce33e3b969e5f348a
 EBUILD libnfs-9999.ebuild 1118 BLAKE2B e0921c1767a521d3366ffc7318b4861ea7c1b8186c09e880f7520a1a4bedf705a9eb924e4a874cd33f3738e4f24b8a414459d263c166441447b22f6ed7b292ad SHA512 0bca1722a17557667b9c7c6996fee9fe98ccfeed7d9d74db0af1d265b99cdb2668c3a934398648c9615fd970972bad79234b28580bccee3a38eed934bd5ad7e0
 MISC metadata.xml 337 BLAKE2B 0e7e5918d79634937e9d1ad6289fab93b11ff6330b554c52e76148120974b58cf586669ccfa579daef54d8b8b23a51b623582c50839ca8f6182619c1987ac368 SHA512 aabcd286aba9ba93d7e64759ef0fb49b4d5ac99182453b2bf68727d0f41638640d312355465b8862b4f070f5bd47b1debbca635a07d7e44dde841da99405206d
diff --git a/net-fs/libnfs/libnfs-2.0.0.ebuild b/net-fs/libnfs/libnfs-2.0.0.ebuild
index 6a1db823ef98..3b541741c9a8 100644
--- a/net-fs/libnfs/libnfs-2.0.0.ebuild
+++ b/net-fs/libnfs/libnfs-2.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="https://github.com/sahlberg/${PN}/archive/${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~x86"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~x86"
 fi
 
 DESCRIPTION="Client library for accessing NFS shares over a network"
diff --git a/net-fs/samba/Manifest b/net-fs/samba/Manifest
index c701f3139064..8a4dfd526187 100644
--- a/net-fs/samba/Manifest
+++ b/net-fs/samba/Manifest
@@ -25,13 +25,15 @@ DIST samba-4.6.12.tar.gz 21160637 BLAKE2B b12046423f103883fd2d9b5ce12af2bea25c2b
 DIST samba-4.6.7-disable-python-patches.tar.xz 8896 BLAKE2B 99496f91d015f10d111e2a8738c9e66b3c1f1958c0e0894d8e9d8f3ff141fbedaa25d93699b702ab69130fda770c80c3ed4280de0af1090dedbcfd5784b72222 SHA512 c45e548a49735e17b568bebf07dc7409de3de0f93256d1dcf345d2723a27d22a51d860ed921785354fda691f83be4eca3b9d618d5c332438ebf97518a01983eb
 DIST samba-4.7.3.tar.gz 16845436 BLAKE2B d38f58a944d19f4475ab636f09a4f9b97b92897b1d8d041efc07e1d2724d07fafa3686b5d38b847b896c4f024f5cf7330eaca4b6eb4cd34da73a32fe94e8c69e SHA512 3fd9d5f208201e3137c5966e10878ba2fc00fa80b3468e8b402e08f941b5508edd7181720033aaa25fcff0ee0ae5438619423d41a9b9b3d14dc3743fbe3f902f
 DIST samba-4.7.4.tar.gz 16853555 BLAKE2B 3907b9ecb55f3ff02cec8bfac6e7410595ccc77baef27a2ec12ebbb94e66860497a60b4c6166bf39e580a5e4c5233780bb8117dc1498e722ac34185bd0ccde7b SHA512 50af2ed0586116171b2fabb96a05118c447cd5a165a5328b02be832fda9eb1465052a6670415831484639921164ddbf03b6ec47857244cc164ea5a9e4e39cf65
+DIST samba-4.8.0rc1.tar.gz 17624979 BLAKE2B 9f2cf10aadf0c45c0489f59fd9dab6d0e9ce6bbfda8e3ddd4df712db5e805237761e6838f49738fb3abf7f68eec467f92a28e65dde13300ee90bc097b7f34db1 SHA512 6e3680cc2a472fc4acaf1c37bcd3a03b097bfc7f117e8ab79431c90d2f0c4159fcffa95f65dc5f3392366e4b0b6137991d5fe03ef4db839e130e93d1c1f73a61
 DIST samba-disable-python-patches-4.2.12.tar.xz 6052 BLAKE2B 0ae755cbbd8921f4e2f5adf797cd3a77f81bb15ac2d1a65645bc9b53184c397a2bb35f83b88a0de680cc834a63b263e883e91206a7df99735f5ef8f091f54bb0 SHA512 c527d0a052d3211e5b12c17bc94db56cc5e5545189ed65a760c0656c94c22e27a4b159e6439eb0370873e1619873a741f3b3bd10d3876b38eb3914a87eace372
 DIST samba-disable-python-patches-4.5.0_rc1.tar.xz 6204 BLAKE2B b46ea587df583ea71c8ac3d6ce3045d80bcb0cc3d7eab8fa23f812d76dcb6258e4fbec7723128da29fa5369b9372370145904798b21d4e75bb62946ddd98bc0e SHA512 920089ba3c6e8e7d913b1d7ef1017262a19d1af41215adb30cfc98a57556efc4b0116931d4ef774c01124149d8eca2be3a23814ce7e11daf0180d2c111799927
 EBUILD samba-4.2.14.ebuild 7106 BLAKE2B ceb6f147af5299d1a6b5edfe1f3bfc0b8c47853496a998779d1cbf12a2739c5e704ca5b6310d109565d8dd62882525ae5282cb00058040c25f6a1a88624b7335 SHA512 a503be5d561ab80a535888c8b9318b05ee297f0186536994dd6901a7551d7787393fa513f771160d368633bc4671f4fb0760aa5ede020a6829b997347787b61e
-EBUILD samba-4.5.10-r1.ebuild 7796 BLAKE2B 34a6a14ebe7caad1261b30bcf8613c83796b08ef71ce4b7785c577cca6c6fa9bf1ba5d189a3679375b378ada2b07574902b4e7da25c9a40c279a2d3e4bab9cb4 SHA512 6e5abd4cbf145ba5b429ae6f62314cee3334c5f7eaded7563bfbe08853370b5dc7598e1f020ea5b6026a0cc630dd208cf61c15bfe860bc037706c03c24180c4c
-EBUILD samba-4.5.15.ebuild 7801 BLAKE2B f5679d913695bf3e1f916525327ccd48ceb0b472c6f3300ad3b921ba4dfd32382ffcff5779f5b98a2ed3acba5db0ae5e4fcfa606c69f0da5559e0410a135a737 SHA512 9fa0c3a3f40173642fc696ed5212cd16229c6133f904d122584c063bb42b117ee3450be9efcc48baf91a9df92c0c71e4c278c162cc2fc449c8d05155a3a2f7f8
+EBUILD samba-4.5.10-r1.ebuild 7815 BLAKE2B 2384b9e62e8a876cf208cae2f6245c00a92c8e04dfdd25652e8de706c8d08282505d3d3b84aaa2a594bc25b6420333b605387223c25d5356fa8709806f8f92db SHA512 d0c613f8de60ab50b3d48626ec00f57e28265d385e157bb54845f5e77304dde1ba6384446a8415884b263715991c44ba7c6ec059dd5863b6acc70e97ed25b79e
+EBUILD samba-4.5.15.ebuild 7820 BLAKE2B 35c262ef23f55909c57d9b1a2cf0ad8a10c6c5cb80628db44f05663139dd69e33e2d5eb3a97f803d03bea6fe52baa4824559541df33ce5d95a3b4d96a5e43701 SHA512 2e45b6e31c1cbe2769fe9f95e51b319bf1ebca4ca108393f8a1e3687ec7218e2c5c99eb25f73d6cc5e166522f156f697036925f2dde1acdea183302552fce2af
 EBUILD samba-4.6.11.ebuild 8598 BLAKE2B 80e9401ae3e5a9702aef8d21c5482f8e84c8b62da721922c87112601bbf8fdd16f7dd4d5e55a89367d032591fce9f1d424f21cc501f7090ea3cd50e62247e466 SHA512 2d0b831132754ca3aaa8fe3c2fad001a51f8e99d4b8dca97733f93b5966abe83d9d2f6bdc743a8816860ee898dbd8a701c7d5d604e006384d45b8a2eda19501d
 EBUILD samba-4.6.12.ebuild 8598 BLAKE2B 80e9401ae3e5a9702aef8d21c5482f8e84c8b62da721922c87112601bbf8fdd16f7dd4d5e55a89367d032591fce9f1d424f21cc501f7090ea3cd50e62247e466 SHA512 2d0b831132754ca3aaa8fe3c2fad001a51f8e99d4b8dca97733f93b5966abe83d9d2f6bdc743a8816860ee898dbd8a701c7d5d604e006384d45b8a2eda19501d
 EBUILD samba-4.7.3.ebuild 8492 BLAKE2B 4a8d81457333d6057633946ac5c50a309c0ff3f0ffe60b6d6706d614dc9c1a72de07ec2006e2a5363cc01f9a73ab776121eb568c0f8e442344f274dc28007b60 SHA512 2b6c5bdd753f9f941ef38a59540f13881bd209337eca6bc84d9d8e7053f2a6d68229a47f3866cb934eeaa235596f14634a0d10709782126183dc4563c4a0a30f
 EBUILD samba-4.7.4.ebuild 8525 BLAKE2B e98a537cbda904db990f35c9867bc51bfa96419f5a8f9f100d5533ed1eaa0e73d5455e1ad98799101114e97dded90563e812acf5494dfacf4e2f2fa603a31e76 SHA512 1639cfad70328394bbca2334c5ca71ba95e7aa39fe869992680caf15a131b637af7a609dc3e9edbbf78c7526813fbd2b5ad78e86b1e04b1783825f696c7b204a
+EBUILD samba-4.8.0_rc1.ebuild 8257 BLAKE2B 65d7061376de0a4267a2c74dc9564890177b932f375340bb12fd7a2ee52551313bc759b7b834efa55858881138ca799bbbabad58e431aebf6a38ccf28af20e79 SHA512 f0e47fdc3550725627f487cb94aada1270ed337ccace51da293f47be924032ede17b2cc67d65f06f180ec5950fdae80e03c3716b05406c3bc0636d9e4e25455b
 MISC metadata.xml 1641 BLAKE2B d360b1d43e278d71dfcaacd749a730a55998a3f7e7676a113015eb93c1a30480f237705d93b8d22d0733a852bbe320397fcabe2d9c517330c1a24aa0e47ca1c6 SHA512 9e6bf4cb2b711f48a3f730f2e4e9cc8c460b46013fe78ad376855748bdff0d8e44beb05798de551c0c22cd2b40d74c2c30799393d05bd7c7a9161a74eb0e98be
diff --git a/net-fs/samba/samba-4.5.10-r1.ebuild b/net-fs/samba/samba-4.5.10-r1.ebuild
index d21506da9c7f..fe9661d17a0d 100644
--- a/net-fs/samba/samba-4.5.10-r1.ebuild
+++ b/net-fs/samba/samba-4.5.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -160,6 +160,7 @@ multilib_src_configure() {
 		--disable-rpath-install
 		--nopyc
 		--nopyo
+		--disable-cephfs
 	)
 	if multilib_is_native_abi ; then
 		myconf+=(
diff --git a/net-fs/samba/samba-4.5.15.ebuild b/net-fs/samba/samba-4.5.15.ebuild
index f73bbd3a65e0..968e06d54fb8 100644
--- a/net-fs/samba/samba-4.5.15.ebuild
+++ b/net-fs/samba/samba-4.5.15.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -160,6 +160,7 @@ multilib_src_configure() {
 		--disable-rpath-install
 		--nopyc
 		--nopyo
+		--disable-cephfs
 	)
 	if multilib_is_native_abi ; then
 		myconf+=(
diff --git a/net-fs/samba/samba-4.8.0_rc1.ebuild b/net-fs/samba/samba-4.8.0_rc1.ebuild
new file mode 100644
index 000000000000..bf0eef6a4ea5
--- /dev/null
+++ b/net-fs/samba/samba-4.8.0_rc1.ebuild
@@ -0,0 +1,278 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE='threads(+),xml(+)'
+
+inherit python-single-r1 waf-utils multilib-minimal linux-info systemd eutils
+
+MY_PV="${PV/_rc/rc}"
+MY_P="${PN}-${MY_PV}"
+
+SRC_PATH="stable"
+[[ ${PV} = *_rc* ]] && SRC_PATH="rc"
+
+SRC_URI="mirror://samba/${SRC_PATH}/${MY_P}.tar.gz"
+[[ ${PV} = *_rc* ]] || \
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+DESCRIPTION="Samba Suite Version 4"
+HOMEPAGE="http://www.samba.org/"
+LICENSE="GPL-3"
+
+SLOT="0"
+
+IUSE="acl addc addns ads ceph client cluster cups debug dmapi fam gnutls gpg iprint ldap pam python
+quota selinux syslog system-heimdal +system-mitkrb5 systemd test winbind zeroconf"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/samba-4.0/policy.h
+	/usr/include/samba-4.0/dcerpc_server.h
+	/usr/include/samba-4.0/ctdb.h
+	/usr/include/samba-4.0/ctdb_client.h
+	/usr/include/samba-4.0/ctdb_protocol.h
+	/usr/include/samba-4.0/ctdb_private.h
+	/usr/include/samba-4.0/ctdb_typesafe_cb.h
+	/usr/include/samba-4.0/ctdb_version.h
+)
+
+# sys-apps/attr is an automagic dependency (see bug #489748)
+CDEPEND="
+	>=app-arch/libarchive-3.1.2[${MULTILIB_USEDEP}]
+	dev-lang/perl:=
+	dev-libs/libaio[${MULTILIB_USEDEP}]
+	dev-libs/libbsd[${MULTILIB_USEDEP}]
+	dev-libs/iniparser:0
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	dev-python/subunit[${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	sys-apps/attr[${MULTILIB_USEDEP}]
+	>=sys-libs/ldb-1.3.1[ldap(+)?,python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/libcap
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=
+	>=sys-libs/talloc-2.1.11[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.15[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.35[python?,${PYTHON_USEDEP},${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+	virtual/libiconv
+	pam? ( virtual/pam )
+	acl? ( virtual/acl )
+	addns? (
+		net-dns/bind-tools[gssapi]
+		dev-python/dnspython:=[${PYTHON_USEDEP}]
+	)
+	ceph? ( sys-cluster/ceph )
+	cluster? ( !dev-db/ctdb )
+	cups? ( net-print/cups )
+	debug? ( dev-util/lttng-ust )
+	dmapi? ( sys-apps/dmapi )
+	fam? ( virtual/fam )
+	gnutls? (
+		dev-libs/libgcrypt:0
+		>=net-libs/gnutls-1.4.0
+	)
+	gpg? ( app-crypt/gpgme )
+	ldap? ( net-nds/openldap[${MULTILIB_USEDEP}] )
+	system-heimdal? ( >=app-crypt/heimdal-1.5[-ssl,${MULTILIB_USEDEP}] )
+	system-mitkrb5? ( >=app-crypt/mit-krb5-1.15.1[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd:0= )"
+DEPEND="${CDEPEND}
+	${PYTHON_DEPS}
+	app-text/docbook-xsl-stylesheets
+	dev-libs/libxslt
+	virtual/pkgconfig
+	|| (
+		net-libs/rpcsvc-proto
+		<sys-libs/glibc-2.26[rpc(+)]
+	)
+	test? (
+		!system-mitkrb5? (
+			>=sys-libs/nss_wrapper-1.1.3
+			>=net-dns/resolv_wrapper-1.1.4
+			>=net-libs/socket_wrapper-1.1.7
+			>=sys-libs/uid_wrapper-1.2.1
+		)
+	)"
+RDEPEND="${CDEPEND}
+	python? ( ${PYTHON_DEPS} )
+	client? ( net-fs/cifs-utils[ads?] )
+	selinux? ( sec-policy/selinux-samba )
+	!dev-perl/Parse-Yapp
+"
+
+REQUIRED_USE="addc? ( python gnutls )
+	test? ( python )
+	addns? ( python )
+	ads? ( acl gnutls ldap )
+	gpg? ( addc )
+	?? ( system-heimdal system-mitkrb5 )
+	${PYTHON_REQUIRED_USE}"
+
+# the test suite is messed, it uses system-installed samba
+# bits instead of what was built, tests things disabled via use
+# flags, and generally just fails to work in a way ebuilds could
+# rely on in its current state
+RESTRICT="test"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.0-pam.patch"
+	"${FILESDIR}/${PN}-4.5.1-compile_et_fix.patch"
+	"${FILESDIR}/${PN}-glibc-2.26-no_rpc.patch" #637320
+	"${FILESDIR}/${PN}-4.7.4-no_ads.patch"
+)
+
+#CONFDIR="${FILESDIR}/$(get_version_component_range 1-2)"
+CONFDIR="${FILESDIR}/4.4"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+SHAREDMODS=""
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+	if use cluster ; then
+		SHAREDMODS="idmap_rid,idmap_tdb2,idmap_ad"
+	elif use ads ; then
+		SHAREDMODS="idmap_ad"
+	fi
+}
+
+src_prepare() {
+	default
+
+	# un-bundle dnspython
+	sed -i -e '/"dns.resolver":/d' "${S}"/third_party/wscript || die
+
+	# unbundle iso8601 unless tests are enabled
+	use test || sed -i -e '/"iso8601":/d' "${S}"/third_party/wscript || die
+
+	# ugly hackaround for bug #592502
+	cp /usr/include/tevent_internal.h "${S}"/lib/tevent/ || die
+
+	sed -e 's:<gpgme\.h>:<gpgme/gpgme.h>:' \
+		-i source4/dsdb/samdb/ldb_modules/password_hash.c \
+		|| die
+
+	# Friggin' WAF shit
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	# when specifying libs for samba build you must append NONE to the end to 
+	# stop it automatically including things
+	local bundled_libs="NONE"
+	if ! use system-heimdal && ! use system-mitkrb5 ; then
+		bundled_libs="heimbase,heimntlm,hdb,kdc,krb5,wind,gssapi,hcrypto,hx509,roken,asn1,com_err,NONE"
+	fi
+
+	local myconf=(
+		--enable-fhs
+		--sysconfdir="${EPREFIX}/etc"
+		--localstatedir="${EPREFIX}/var"
+		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)/samba"
+		--with-piddir="${EPREFIX}/run/${PN}"
+		--bundled-libraries="${bundled_libs}"
+		--builtin-libraries=NONE
+		--disable-rpath
+		--disable-rpath-install
+		--nopyc
+		--nopyo
+		$(multilib_native_use_with acl acl-support)
+		$(multilib_native_usex addc '' '--without-ad-dc')
+		$(multilib_native_use_with addns dnsupdate)
+		$(multilib_native_use_with ads)
+		$(multilib_native_use_enable ceph cephfs)
+		$(multilib_native_use_with cluster cluster-support)
+		$(multilib_native_use_enable cups)
+		$(multilib_native_use_with dmapi)
+		$(multilib_native_use_with fam)
+		$(multilib_native_use_with gpg gpgme)
+		$(multilib_native_use_enable iprint)
+		$(multilib_native_use_with pam)
+		$(multilib_native_usex pam "--with-pammodulesdir=${EPREFIX}/$(get_libdir)/security" '')
+		$(multilib_native_use_with quota quotas)
+		$(multilib_native_use_with syslog)
+		$(multilib_native_use_with systemd)
+		$(multilib_native_use_with winbind)
+		$(multilib_native_usex python '' '--disable-python')
+		$(multilib_native_use_enable zeroconf avahi)
+		$(multilib_native_usex test '--enable-selftest' '')
+		$(usex system-mitkrb5 '--with-system-mitkrb5' '')
+		$(use_enable gnutls)
+		$(use_with debug lttng)
+		$(use_with ldap)
+	)
+	multilib_is_native_abi && myconf+=( --with-shared-modules=${SHAREDMODS} )
+
+	CPPFLAGS="-I${SYSROOT}${EPREFIX}/usr/include/et ${CPPFLAGS}" \
+		waf-utils_src_configure ${myconf[@]}
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# Make all .so files executable
+	find "${ED}" -type f -name "*.so" -exec chmod +x {} +
+
+	if multilib_is_native_abi ; then
+		# install ldap schema for server (bug #491002)
+		if use ldap ; then
+			insinto /etc/openldap/schema
+			doins examples/LDAP/samba.schema
+		fi
+
+		# create symlink for cups (bug #552310)
+		if use cups ; then
+			dosym ../../../bin/smbspool /usr/libexec/cups/backend/smb
+		fi
+
+		# install example config file
+		insinto /etc/samba
+		doins examples/smb.conf.default
+
+		# Fix paths in example file (#603964)
+		sed \
+			-e '/log file =/s@/usr/local/samba/var/@/var/log/samba/@' \
+			-e '/include =/s@/usr/local/samba/lib/@/etc/samba/@' \
+			-e '/path =/s@/usr/local/samba/lib/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/local/samba/@/var/lib/samba/@' \
+			-e '/path =/s@/usr/spool/samba@/var/spool/samba@' \
+			-i "${ED%/}"/etc/samba/smb.conf.default || die
+
+		# Install init script and conf.d file
+		newinitd "${CONFDIR}/samba4.initd-r1" samba
+		newconfd "${CONFDIR}/samba4.confd" samba
+
+		systemd_dotmpfilesd "${FILESDIR}"/samba.conf
+		systemd_dounit "${FILESDIR}"/nmbd.service
+		systemd_dounit "${FILESDIR}"/smbd.{service,socket}
+		systemd_newunit "${FILESDIR}"/smbd_at.service 'smbd@.service'
+		systemd_dounit "${FILESDIR}"/winbindd.service
+		systemd_dounit "${FILESDIR}"/samba.service
+	fi
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi ; then
+		"${WAF_BINARY}" test || die "test failed"
+	fi
+}
+
+pkg_postinst() {
+	ewarn "Be aware the this release contains the best of all of Samba's"
+	ewarn "technology parts, both a file server (that you can reasonably expect"
+	ewarn "to upgrade existing Samba 3.x releases to) and the AD domain"
+	ewarn "controller work previously known as 'samba4'."
+
+	elog "For further information and migration steps make sure to read "
+	elog "http://samba.org/samba/history/${P}.html "
+	elog "http://wiki.samba.org/index.php/Samba4/HOWTO "
+}
diff --git a/net-ftp/Manifest.gz b/net-ftp/Manifest.gz
index e4d83c711387..36626c2eba57 100644
--- a/net-ftp/Manifest.gz
+++ b/net-ftp/Manifest.gz
diff --git a/net-ftp/ftp/Manifest b/net-ftp/ftp/Manifest
index 0debf4867722..321cda9fc399 100644
--- a/net-ftp/ftp/Manifest
+++ b/net-ftp/ftp/Manifest
@@ -3,5 +3,5 @@ DIST netkit-ftp-0.17-patches-2.tar.bz2 4307 BLAKE2B d7febb30807dab2dd66b6fe19916
 DIST netkit-ftp-0.17.tar.gz 53934 BLAKE2B 451f90f26cd5cc1a6693fea7c31d47127d8b89b4b00a2f863af61d46d87f6e416141db1c6f6bb320021665a99f0d9e00dc4a5c3b0bb209df0ae74aad97a45f20 SHA512 ba8e411d0230c78e9e4555c03dc1036c6e506ef8edb72ecee4d6a7559d85143721bffbe8b8a6e42918b3098072ac8f207584be9e3a241f6bd31e361c92de6554
 DIST netkit-ftp-ssl_0.17.23+0.2-1.debian.tar.gz 48189 BLAKE2B 7894f64308ae14c72e2fcf7e18225fa36680d2d88a3e59c4b7edac3669e051e3196a2acda3f8da083bd3d8405e9f28f67be10d70684854e8bbc7008f8189cb8d SHA512 c2fa882c185987298a73e7cef8c073ab0aee7627b60b412be90eef8619bf02d97721c15197fe4f443eab53bcca87876633924872f3102ef9e92dc7511c065228
 EBUILD ftp-0.17-r7.ebuild 1101 BLAKE2B dd8e5a6b01520d66e9b55aa2896324a81c8070794086105ae3658e7f5b3eef4e65549e52090b575e21d00a819a1f361f553122bfe5024da993a7f9a2cfb8e8a5 SHA512 eefe5c6d58ee734d556edcf4b800b72147664b6bd4371e12a65816238d9eb3134be57aea71fb0c8d5567d76d91ad1154780c83b0053e0f73ebfdf9906a8de1f9
-EBUILD ftp-0.17.23.0.2.1.ebuild 1562 BLAKE2B 4261d2c8bd1318580787cbd81966769815ec94518ba3b7a759f969c9364f9b341db76132e3b96fc958e482100a41ded01922d6d5f2eec3812b92dbac8de274f8 SHA512 57ee13c0c3d2548979e0e8b271a74059b0825f27003f885fc21fb7289817eae793dae6b4746b4c762e64352e11da11ecc2d578dc47ef0be59a39caacae72c9a6
+EBUILD ftp-0.17.23.0.2.1.ebuild 1561 BLAKE2B 271ad372985928d367a9e138df21d3f8132221c7a343a4e8764e5678840e60ab9a29b9e20aa0a4a2ac90be62d5a069412426500bdb9c551884a11a77bce4ea21 SHA512 ed143f05fadc221e36c869fb404b2dc6b80a95e04c1c32e5222aaba8574e32b9e45cae850865f6da6939d369b22310a36f49cc560690764206a67e3c4889b26a
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
index 7644d3a32d4c..4d7b24b1e2f3 100644
--- a/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
+++ b/net-ftp/ftp/ftp-0.17.23.0.2.1.ebuild
@@ -19,7 +19,7 @@ SRC_URI="ftp://sunsite.unc.edu/pub/Linux/system/network/netkit/${MY_P}.tar.gz
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE="ipv6 libressl readline ssl"
 
 RDEPEND="
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 40e1042859cf..7727b496f0f9 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/slack-bin/Manifest b/net-im/slack-bin/Manifest
index acdab8d7fd7d..862db7af59ad 100644
--- a/net-im/slack-bin/Manifest
+++ b/net-im/slack-bin/Manifest
@@ -4,9 +4,11 @@ DIST slack-desktop-2.5.2-amd64.deb 47812458 BLAKE2B 1f066cf0c85ce0b6153a1e62737c
 DIST slack-desktop-2.6.3-amd64.deb 51434914 BLAKE2B 7924e0e220c97946a5e1eb944e9ed3b01a46cc5e082fa40606667d83d68ed1de874bf98b637585c029cc674e324fd32688752c9a14644921dd585058055c5bf4 SHA512 943abc3084e395277c41f7a42feffcdeb184900c9cf0bce58bbbe6891d23b97b937fa8d47a1200e9aaa62ed0f7d4b6e3f24d41cd610cd185df570e58c31640bf
 DIST slack-desktop-2.8.0-amd64.deb 51225854 BLAKE2B 746a11d85941272c53a9c7d2433c2801fb880e6d59bf2ee1599597650a3ce59369e04b15c51af28c1e90e3375f9b9fcc88a1bf9cfc130472faafa2b7b8809be5 SHA512 9a3a8c4eec95583cde76003e99679dda9d6e44692258242bef888043666d589da8a7a5d68898f61e645a6810291ef36fea9551834c3d2fbec8e3baa6a84313d0
 DIST slack-desktop-2.8.2-amd64.deb 51257834 BLAKE2B 85f06aa634b40f3ddd1450fcfaa044bf4cf9b5a7463525ac0ee98b07cd882e0b30e0a894c8ab2e2605e3db903e570c318d6d6cb968223d59abc5013053528547 SHA512 533b360ff22ff74743fb7323c08f01230509428e752aed2ed090bf002475934063e6c3853727ab030f6267ca332d783a045df02da02a3a12d045d6a168bf5b58
+DIST slack-desktop-3.0.2-amd64.deb 55654542 BLAKE2B 70a1da6cc7be1313b02e74225ee87fbb93c0050f40301e0a02c01241efe91db9d09149fd8feeecf33786c657b53e8aec3a4d7563e61ae88e4b46f85bad27ded7 SHA512 29d7d96dbf4b81ac4164043c0cae0e314d94770b74118068684770763a52eed2a3fd430b4a307db2d133ad46cc57379a71415d92790946f5c1b448153c9bc2c1
 EBUILD slack-bin-2.1.2.ebuild 1769 BLAKE2B c667beab3b7754601efcce865265974c3c959189b41465b055ebe8402e9369009d1a1abc486422c6267e49737e5bf51ec8608cdca74b8e20e59ccc88d8b9c7d0 SHA512 195c9b12c1ecda6afcae9cfec0710f30cac1480f5aa5f4ec6f5bd42550b6e012ab30e0be67f5c979db2be41357f47a7bbab44506c67bc23c1caa3ae43125d38b
 EBUILD slack-bin-2.5.2.ebuild 1674 BLAKE2B 483498cb605f3301cb5e7034284624ef301a6502767df5e3bc5ffe0232ef621d57ea7c8bb38ebcdde29beedbedeefb43b3fe0e5c2421f0ffe4974bb0196fc9fa SHA512 5b975220ef97fe554c46df85cf98eb51c89e48026f460d2e4cfaae1ae72c5af7e919519d2fdf28e95f3d22929caf8b5237075f57b1add35394b621bc987eb62c
 EBUILD slack-bin-2.6.3.ebuild 1674 BLAKE2B 483498cb605f3301cb5e7034284624ef301a6502767df5e3bc5ffe0232ef621d57ea7c8bb38ebcdde29beedbedeefb43b3fe0e5c2421f0ffe4974bb0196fc9fa SHA512 5b975220ef97fe554c46df85cf98eb51c89e48026f460d2e4cfaae1ae72c5af7e919519d2fdf28e95f3d22929caf8b5237075f57b1add35394b621bc987eb62c
 EBUILD slack-bin-2.8.0.ebuild 1716 BLAKE2B cf251af7426e0401f4cfaf7e93e6c7bd0c24c78ecaf1e3fec510817e44c6ad5e66365fd480a902fb521773da81fc2285020e63a9684e3247d8241207524fa04d SHA512 2f83f679d34b0e5052379081a69546e336e89ae981db1a991c0178624cc898f2f28fd7849e595c17b1fa3cdf0627796445dab7b79a19fcd61adc6c5d00ad3226
 EBUILD slack-bin-2.8.2.ebuild 1716 BLAKE2B cf251af7426e0401f4cfaf7e93e6c7bd0c24c78ecaf1e3fec510817e44c6ad5e66365fd480a902fb521773da81fc2285020e63a9684e3247d8241207524fa04d SHA512 2f83f679d34b0e5052379081a69546e336e89ae981db1a991c0178624cc898f2f28fd7849e595c17b1fa3cdf0627796445dab7b79a19fcd61adc6c5d00ad3226
-MISC metadata.xml 686 BLAKE2B c0ea120b511e6be9968a728646f1af1ee6e791f5d7c8eb10d9ffd612328118bedf74ff705183995b2124c39570695c4b2a91b69d977b7fc0467cae738b664fca SHA512 f887850e1eacc25eaa94f3a249f86664454a05f7d205c67bbd89ed9afb77e1e2b5f3cf3d8596c0a3e26e70e420b486c29f07449929de2a7261aa516e2c887631
+EBUILD slack-bin-3.0.2.ebuild 2513 BLAKE2B 14cdc06015c9737c4cd46e90a1786d452c39ee2f44f46651f6eb6b99b7eca0dfefe96eabb03f62395706f6b0c811b35c944d917745ec8ddb063f5bab776d10a4 SHA512 69fad06a6e3cef63f495eb2cafcd3ef17b110b5d8a3fcc66a7bf1243d0c7e3ce2b76f2e846e4808ca26189aa9504e2481a49b7849cc79536752fd280f1eeaeb4
+MISC metadata.xml 770 BLAKE2B b84907f7e6edab20de957ec2ecb5e9acb2c3167095b0a89bd41e00187d47defe6e2737324ca4b7ac2b01c16f5e12db118889bccdf3dd8b17a4ebc50b84be97e2 SHA512 6dba8262370ebbfceee5a9b8c26eca95b11271c74490ece09cec90a698d614902cec29104695692508a2d6b30a87efb1b82d44bef2edef828e26634c06aa6828
diff --git a/net-im/slack-bin/metadata.xml b/net-im/slack-bin/metadata.xml
index 15eca405ed06..200d6a674a29 100644
--- a/net-im/slack-bin/metadata.xml
+++ b/net-im/slack-bin/metadata.xml
@@ -15,6 +15,9 @@
 	All content inside Slack is searchable, including files, conversations,
 	and people.
 	</longdescription>
+	<use>
+		<flag name="pax_kernel">Triggers a paxmarking of the binary</flag>
+	</use>
 	<upstream>
 		<doc>https://get.slack.help/hc/en-us</doc>
 	</upstream>
diff --git a/net-im/slack-bin/slack-bin-3.0.2.ebuild b/net-im/slack-bin/slack-bin-3.0.2.ebuild
new file mode 100644
index 000000000000..6f2f809380dd
--- /dev/null
+++ b/net-im/slack-bin/slack-bin-3.0.2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_PN="${PN/-bin/}"
+MULTILIB_COMPAT=( abi_x86_64 )
+
+inherit desktop gnome2-utils multilib-build pax-utils unpacker xdg-utils
+
+DESCRIPTION="Team collaboration tool"
+HOMEPAGE="http://www.slack.com/"
+SRC_URI="https://downloads.slack-edge.com/linux_releases/${MY_PN}-desktop-${PV}-amd64.deb"
+
+LICENSE="all-rights-reserved"
+SLOT="0"
+KEYWORDS="~amd64 -*"
+IUSE="pax_kernel"
+RESTRICT="bindist mirror"
+
+RDEPEND="app-crypt/libsecret:0[${MULTILIB_USEDEP}]
+	dev-libs/atk:0[${MULTILIB_USEDEP}]
+	dev-libs/expat:0[${MULTILIB_USEDEP}]
+	dev-libs/glib:2[${MULTILIB_USEDEP}]
+	dev-libs/nspr:0[${MULTILIB_USEDEP}]
+	dev-libs/nss:0[${MULTILIB_USEDEP}]
+	gnome-base/gconf:2[${MULTILIB_USEDEP}]
+	media-libs/alsa-lib:0[${MULTILIB_USEDEP}]
+	media-libs/fontconfig:1.0[${MULTILIB_USEDEP}]
+	media-libs/freetype:2[${MULTILIB_USEDEP}]
+	net-misc/curl:0[${MULTILIB_USEDEP}]
+	net-print/cups:0[${MULTILIB_USEDEP}]
+	sys-apps/dbus:0[${MULTILIB_USEDEP}]
+	x11-libs/cairo:0[${MULTILIB_USEDEP}]
+	x11-libs/gdk-pixbuf:2[${MULTILIB_USEDEP}]
+	x11-libs/gtk+:2[${MULTILIB_USEDEP}]
+	x11-libs/libX11:0[${MULTILIB_USEDEP}]
+	x11-libs/libxcb:0/1.12[${MULTILIB_USEDEP}]
+	x11-libs/libXcomposite:0[${MULTILIB_USEDEP}]
+	x11-libs/libXcursor:0[${MULTILIB_USEDEP}]
+	x11-libs/libXdamage:0[${MULTILIB_USEDEP}]
+	x11-libs/libXext:0[${MULTILIB_USEDEP}]
+	x11-libs/libXfixes:0[${MULTILIB_USEDEP}]
+	x11-libs/libXi:0[${MULTILIB_USEDEP}]
+	x11-libs/libxkbfile:0[${MULTILIB_USEDEP}]
+	x11-libs/libXrandr:0[${MULTILIB_USEDEP}]
+	x11-libs/libXrender:0[${MULTILIB_USEDEP}]
+	x11-libs/libXScrnSaver:0[${MULTILIB_USEDEP}]
+	x11-libs/libXtst:0[${MULTILIB_USEDEP}]
+	x11-libs/pango:0[${MULTILIB_USEDEP}]"
+
+QA_PREBUILT="opt/slack/slack
+	opt/slack/resources/app.asar.unpacked/node_modules/*
+	opt/slack/libnode.so
+	opt/slack/libffmpeg.so
+	opt/slack/libCallsCore.so"
+
+S="${WORKDIR}"
+
+src_install() {
+	insinto /usr/share/pixmaps
+	doins usr/share/pixmaps/${MY_PN}.png
+
+	newicon -s 512 usr/share/pixmaps/${MY_PN}.png ${MY_PN}.png
+	domenu usr/share/applications/${MY_PN}.desktop
+
+	insinto /opt/${MY_PN}
+	doins -r usr/lib/${MY_PN}/.
+	fperms +x /opt/${MY_PN}/${MY_PN}
+	dosym ../../opt/${MY_PN}/${MY_PN} usr/bin/${MY_PN}
+
+	use pax_kernel && pax-mark -m ${ED%/}/opt/${MY_PN}/${MY_PN}
+}
+
+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/net-irc/Manifest.gz b/net-irc/Manifest.gz
index 661f706fc16d..7ec41e26af51 100644
--- a/net-irc/Manifest.gz
+++ b/net-irc/Manifest.gz
diff --git a/net-irc/hexchat/Manifest b/net-irc/hexchat/Manifest
index 8b71763e2e8b..c80c11dc0d80 100644
--- a/net-irc/hexchat/Manifest
+++ b/net-irc/hexchat/Manifest
@@ -3,6 +3,6 @@ AUX hexchat-2.12.4-configure.ac.patch 9671 BLAKE2B 0e1391f6a07759167cc64829e8218
 AUX hexchat-2.12.4-libressl.patch 1040 BLAKE2B ee063f1ce4ea2d355959df5ec3b0271e66f4db0fd65645a72a6705bd8480f8e7b403b82d9c6eeb810e356e74c5a1d9903abc9f09a95a1de292fd045eb217758f SHA512 a309ce5e0bb25aa6c88c62bb5a5e1758e49d431cd51ef8186f29ac3c09af544ff75fd043ef8d9217c2779fb1c76fa27d392d9f7e9165a5772e401345bddce1ca
 DIST hexchat-2.12.4.tar.xz 1451468 BLAKE2B 91db1486b421f9707f9dddfe8aba812aa283d5e3cc3c12815faa7e515d00b803bde0bbf30e1ca5c0b69fe954dd30a6f69e5094dabe1dc641ae4f0742ad1965b4 SHA512 48d30c23973a19efc7a8e6d00a3e9675e8556a6fa9da046175b3d87bdab0bebbc6caf58970d654e270421d0d49c2cd9f498b425b7e3a49dd81670dc4825fca40
 EBUILD hexchat-2.12.4-r1.ebuild 3609 BLAKE2B f1d3828bb8e4a9c1315fe2ad0e4abd2e3da682ee95882ccbfb5bbe546df994208750a8d628b55198d281678a61da583a938423561145a10a1cf08d622877befb SHA512 84c8fb88e9cfe25ac42f255c5fd1dd73d096ebb6e1f50ccd0bcff394b5c3f90791cf2d8841ae1ae2192422f0658d0825c01cee8a83a8583c590ddafaa6365c87
-EBUILD hexchat-2.12.4-r2.ebuild 3404 BLAKE2B b619f9673dfcb2c0e2d6ba6c0526dded71149e620d58bee14f0f9838f73b40c2818fbfcbdf860dd268a5603f2af36caa03664dc3fd26159d62e0cb45b100b94d SHA512 92c224e7c90640a7eee2400454243c9e611b30f28bb215b73d3f7880f30db5798f1f7ccb4ddf701dfa11cc959abd542d55c22f9149ae5bab8a08d6f9cb84acdf
-EBUILD hexchat-9999.ebuild 3469 BLAKE2B 91cedae7220e6e47932381c7160601bc10bfeecb7d21fcbf653f5959ef82906c7dd0850c841185864f4bc608716e465a182357c7c35c87bc61a7325327b1bc9e SHA512 bb51a41dbcf9a57a5d4d4e2a7c39810861c5771f156560fd63767912237efbd5871b2701c8174c27626696b4260e31f1f6c38e941f4390fc811f6a7e6b93f1ea
+EBUILD hexchat-2.12.4-r2.ebuild 3408 BLAKE2B ecaf76967360e6720de5018b2a8b8d354db06ead38bda2559871a87e15d2afa945580c226fafd32cc39c8ec3743d2eae972dbdecb7e5ea98e5a9a7f1de51e61b SHA512 9c93c3e0d39d911af72af03d9156b1f13dec40e22881ed8913db3b276ed3888472cfca59c0ec51ba779b58fecb49bf7c84f3e936a8dd1cc3e31257aa5ef9281e
+EBUILD hexchat-9999.ebuild 3473 BLAKE2B d582398297c3c26a61af331c33135b48583abd73ceea12e265a92d25d4f930f2b8365253aa74e3f65041adbeddc7da4f8c0df352e8fef60b419d9978eae39a13 SHA512 1d236912762d9543bce6e8faadcbb4e1e55a8568a5c6b3a82ba9ba40e5a9ad27e8c27dab5d5eb608ff7120686a16f7f446d149c495125251160348164ca93bdf
 MISC metadata.xml 1389 BLAKE2B 5a6e0276fb775a6b829411761601102e42b250a4ea4a3a2afff3f89fd87b4adffda374d1534fc632463caf5a5834686a792114e8980dcee7d7839e1c6ef60c58 SHA512 64ce08c2a4a3a786276bbadbb0a59be1e365bc72cacd42a18ee1e64ce546c4c55f4fb4f2c11dd3425a26c9654880f8b0254667456974270bc8c37d85d50f5c36
diff --git a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
index 842eac30186a..1311a5c72562 100644
--- a/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
+++ b/net-irc/hexchat/hexchat-2.12.4-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit autotools fdo-mime flag-o-matic gnome2-utils python-single-r1
 
 DESCRIPTION="Graphical IRC client based on XChat"
diff --git a/net-irc/hexchat/hexchat-9999.ebuild b/net-irc/hexchat/hexchat-9999.ebuild
index de60cb5fd53b..2e5d52c8be2c 100644
--- a/net-irc/hexchat/hexchat-9999.ebuild
+++ b/net-irc/hexchat/hexchat-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
 inherit autotools fdo-mime gnome2-utils mono-env python-single-r1
 
 DESCRIPTION="Graphical IRC client based on XChat"
diff --git a/net-irc/shadowircd/Manifest b/net-irc/shadowircd/Manifest
index 9d138e9b3b66..86201fea3870 100644
--- a/net-irc/shadowircd/Manifest
+++ b/net-irc/shadowircd/Manifest
@@ -1,8 +1,6 @@
 AUX format-security.patch 14907 BLAKE2B ce52db28f71c7fe8cd94b8a3106c5672858bb94ad540b9ffb1d6e16f73c2241a4f2d8531ce1ac69bc743e0bc46cccb2d8c02ffc691ae2e304d8ba62e48733ff3 SHA512 1f258c683f49d053aed52a30e9d77ce1aeda39d4376332a8e2caa8247f3d9b476accf5847ce5c04e7ae322bf88bcb40d0849de40d4f1d270cde7df6b5609c8a0
 AUX shadowircd.confd 196 BLAKE2B 3f11d928ed529a4129f862178b4b24eaa973effb9e52ecf58c3b8a9eec3d86b259181e34073e61e9d45b81a2e99143f083f655ff89af5b4d7fe267ee9d74de1a SHA512 64ffcf4f2d90009e2d085f920f00de20812344c1cf03f1f3c128176f16e1dc7dcba70ea2193e5ac97775fc95a4fc6d2413826d0f29f58d077a50e4eccfc6f267
-AUX shadowircd.initd 857 BLAKE2B a7683d331ab526e86901d3a7255d5e67c9d23500263adb303e9eaec24215bc33e647af61004b87929c5ef7aae1689055c7c3db4647ccf2e44d0b83b632785e20 SHA512 7e9d8b8d7eea5e6ff8474b862e0b07aec426b96268b41fc294bb97f26609eda2518b65e285cbef80876b111ab94dd8d7c80a52ca9425cc7f9385516a3f4bd74b
 AUX shadowircd.initd-r1 595 BLAKE2B b19c47e817a35a8c48c53cfbbd07d4851efd61af67e5f5f6fd3389cf4e4b633ddbb8c8a24d42610ccf8f4a19607374915c5b091f2854904c13f2b3a8b593f5dd SHA512 d8c168c7fbe60ec0d90e780158a66a4b1f1a916a6e24a40ea834b43f7e9f6d153607a565e79de51b0b7b39e0750124cf41ac49f50bcfc3ce5ebecf0d73a59342
 DIST shadowircd-6.3.3.tar.gz 1980432 BLAKE2B d9f443011668bf407624cb5da2a9f8396861e4c4c7e587bae35d7ac3bd9513a109865e56fd92efc1d022d773c10a36ba95cc2f1f763e06b74f46e300cb142b5a SHA512 f3638bee6d49c56738cf05dd7c67d93344ed5787eb8777589390dbc38a1481e9a28895bdd4534124dcc8dbe247f3e28e299fe0bc0bb89e4d974b4aff734701d4
 EBUILD shadowircd-6.3.3-r1.ebuild 2381 BLAKE2B a21bd763aff33ceb8a4a4a46f6b3a40b00b4776c7c6957c669c1f83fb349d5d7046f8f833ca7ab5820073360636ca051071434ec93bcadfdb1c90c1792476194 SHA512 a3ff4f0cfe0d78d0a3f3ac8dabfe8acd1e538590801c9d91a92d6eaabb30a41b81ff5c802cab1724abdcac17441837ded029ea3674253a61c3d49d3c459ff183
-EBUILD shadowircd-6.3.3.ebuild 2340 BLAKE2B b08f8886cfd9bee53be850be500a82212f63c8b1a5b0d96d0ee6a61820866aacd9009d0cf76df6703cf7438e7fb3c1953d89d5e15e331519ce9e4ee82ac50426 SHA512 16f3f9028bf9847d551e73f37b01e5b98ca63d82ad5e16cb3d77a1d4edc81f9ef863e1c10199a046a148bff865e107077b4420787f6c5dbd3795d26b004759a8
 MISC metadata.xml 320 BLAKE2B 50a60d79612a4a7d5c95b2fa371fa3e95cb409c23edb61fb910046bbc0e491ec5eb6470ce274c797a21ad3659a763994755109c7eb64c4999c04bc76d67a613a SHA512 6af904bec4c184c6f358b23ec08426cd5b0c1e670e559e21160b42fb5a9d3ab80f48974769cf38495df33bd7d8926bf1e46f8a3ace3124588b306f299997b5fd
diff --git a/net-irc/shadowircd/files/shadowircd.initd b/net-irc/shadowircd/files/shadowircd.initd
deleted file mode 100644
index 5b01c2366de7..000000000000
--- a/net-irc/shadowircd/files/shadowircd.initd
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-extra_started_commands="reload"
-
-depend() {
-	use dns net
-	provide ircd
-}
-
-start() {
-	if ! [ -d /var/run/shadowircd ]; then
-		ebegin "Creating /var/run/shadowircd for ${SVCNAME}"
-		mkdir /var/run/shadowircd \
-			&& chown :shadowircd /var/run/shadowircd \
-			&& chmod 770 /var/run/shadowircd
-		eend $?
-	fi
-
-	ebegin "Starting ${SVCNAME}"
-	start-stop-daemon --start --exec /usr/bin/shadowircd-ircd \
-		--user shadowircd --pidfile /var/run/shadowircd/ircd.pid \
-		${SHADOWIRCD_OPTS}
-	eend $?
-}
-
-stop() {
-	ebegin "Stopping ${SVCNAME}"
-	start-stop-daemon --stop --pidfile /var/run/shadowircd/ircd.pid
-	eend $?
-}
-
-reload() {
-	ebegin "Reloading ${SVCNAME}"
-	start-stop-daemon --signal HUP --pidfile /var/run/shadowircd/ircd.pid
-	eend $?
-}
diff --git a/net-irc/shadowircd/shadowircd-6.3.3.ebuild b/net-irc/shadowircd/shadowircd-6.3.3.ebuild
deleted file mode 100644
index 422e14379dd0..000000000000
--- a/net-irc/shadowircd/shadowircd-6.3.3.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils multilib user
-
-DESCRIPTION="An IRCd based on charybdis that adds several useful features"
-HOMEPAGE="http://shadowircd.net"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="debug +ipv6 largenet ssl zlib"
-
-RDEPEND="ssl? ( dev-libs/openssl )
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}
-	virtual/yacc
-	sys-devel/flex"
-
-S="${WORKDIR}/${PN}-${P}"
-
-pkg_setup() {
-	enewgroup ${PN}
-	enewuser ${PN} -1 -1 "${EPREFIX}"/usr ${PN}
-}
-
-src_prepare() {
-	# Fill the example configuration file with proper paths.
-	sed -i \
-		-e "s:path =.*modules:path = \"$(get_libdir)/${PN}/modules:g" \
-		-e "s:etc/:../etc/${PN}/:g" \
-		-e "s:logs/:../var/log/shadowircd/:g" \
-		-e "s:test\.\(cert\|key\):ssl.\1:g" \
-		doc/example.conf \
-		doc/reference.conf \
-		|| die
-}
-
-src_configure() {
-	econf \
-		ac_cv_prog_cc_g=no \
-		--disable-gnutls \
-		$(use_enable debug assert soft) \
-		$(use_enable debug iodebug) \
-		$(use_enable ipv6) \
-		$(use_enable !largenet small-net) \
-		$(use_enable ssl openssl) \
-		$(use_enable zlib) \
-		--with-program-prefix=shadowircd- \
-		\
-		--enable-fhs-paths \
-		--sysconfdir="${EPREFIX}"/etc/${PN} \
-		--libdir="${EPREFIX}"/usr/"$(get_libdir)"/${PN} \
-		--with-logdir="${EPREFIX}"/var/log/${PN} \
-		--with-moduledir="${EPREFIX}"/usr/"$(get_libdir)"/${PN}/modules \
-		--with-rundir="${EPREFIX}"/var/run
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/${PN}.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	insinto etc/${PN}
-	newins doc/reference.conf ircd.conf
-
-	keepdir var/{lib,log}/${PN}
-
-	# Ensure that if `make install' created /var/run/${PN}, we still
-	# force the initscript to create that directory.
-	rm -rf "${D}"/var/run || die
-
-	# shadowircd needs writing to its state (bandb) and log directories
-	fowners :shadowircd /var/{lib,log}/${PN}
-	fperms 770 /var/{lib,log}/${PN}
-
-	# ensure that shadowircd can access but not modify its configuration
-	# while protecting it from others
-	fowners :shadowircd /etc/${PN}{,/ircd.conf}
-	fperms 750 /etc/${PN}
-	fperms 640 /etc/${PN}/ircd.conf
-}
-
-pkg_postinst() {
-	elog "All of the shadowircd binaries in PATH have been prefixed with"
-	elog "'shadowircd-' to prevent file collisions."
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index afd491738028..f214b533d646 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/libmicrohttpd/Manifest b/net-libs/libmicrohttpd/Manifest
index 198e63fdb290..b72b78386cb3 100644
--- a/net-libs/libmicrohttpd/Manifest
+++ b/net-libs/libmicrohttpd/Manifest
@@ -1,4 +1,3 @@
-AUX libmicrohttpd-0.9.53-fix-build-without-epoll.patch 702 BLAKE2B e56d5a0ede9c760d0c0ef47e93ffc0ffeb1837ca1ca3f1627b6b5936d12cc639517e2223f0a38d2dede6aad3ab018a1f1e313d61a8126db42c8b09f9b560ecfe SHA512 d14269551ebc8c4f2f21da71cfbbeb82c8808e6daedda906f3e699350e52eaa14c55cc263343e25667f18d3ae703b86d413925b03c73a992d6358053165bbb02
 DIST libmicrohttpd-0.9.52.tar.gz 1244489 BLAKE2B b8736bd50afa9531ea5377f082c8085ff189fad32cca5c07db14e4a1551dd2330630a06cfadb022b212385c2b01e4469c66e727c3e1c2035c131d99760962171 SHA512 2cb7fa6ed59ec5f48748cd2aedea8a68629f02ffcf8e86c6d5b57a6622bb5f0ffd7dabfd6c04cc99047ca81eb76efe2a79b34bd6e3de329261a319369232fcf4
 DIST libmicrohttpd-0.9.55.tar.gz 1308328 BLAKE2B 5189bcaf2f29fdff9fdd3d7dfddd1b5e5abbca016c4f55a7e0a176b505cd6e3aa5868260615c922937856cfb9c6fd77a4edeab829c669b4f7751d5512e8c538b SHA512 b410e7253d7c98c40b5e8b8dcd1f93bcbb05c88717190e8dae73073d36465e8e5cfa53c6c5098de60051a5ec64dc423fd94f4b06537d8146b744aa99f5a0b173
 DIST libmicrohttpd-0.9.57.tar.gz 1332713 BLAKE2B 52e46726b220229ae722b4b94478bcd657e5edf1a836fa412b3365d8a2ca651887e62badd095f42f4fe41ad92f07e4147c812aef1c03dd6fba72a4acc6b1581a SHA512 996a59b1bc950320f21df095d3e24e1e6a6e4204095eb84e7dc5e5ed296b1dbe553459b227ba6cc93f60721f1975f778ece8c7c1c10e9168d030fba46675eed3
diff --git a/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.53-fix-build-without-epoll.patch b/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.53-fix-build-without-epoll.patch
deleted file mode 100644
index ff27c26e3e6d..000000000000
--- a/net-libs/libmicrohttpd/files/libmicrohttpd-0.9.53-fix-build-without-epoll.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 01df8861c19a203cea9ef26570893c2b9c0e48b2
-Author: Evgeny Grin (Karlson2k) <k2k@narod.ru>
-Date:   Wed Apr 12 21:11:28 2017 +0300
-
-    Fixed GNU/Linux builds without epoll
-
-diff --git a/src/microhttpd/daemon.c b/src/microhttpd/daemon.c
-index 49a1b82..02713e3 100644
---- a/src/microhttpd/daemon.c
-+++ b/src/microhttpd/daemon.c
-@@ -2251,8 +2251,10 @@ send_param_adapter (struct MHD_Connection *connection,
-       if (0 < ret)
-         {
-           /* write successful */
-+#ifdef EPOLL_SUPPORT
-           if (left > (uint64_t)ret)
-             connection->epoll_state &= ~MHD_EPOLL_STATE_WRITE_READY;
-+#endif /* EPOLL_SUPPORT */
-           return ret;
-         }
-       err = MHD_socket_get_error_();
diff --git a/net-libs/libpcap/Manifest b/net-libs/libpcap/Manifest
index d2fef2181890..59164074d3b1 100644
--- a/net-libs/libpcap/Manifest
+++ b/net-libs/libpcap/Manifest
@@ -1,12 +1,14 @@
 AUX libpcap-1.6.1-prefix-solaris.patch 806 BLAKE2B b79c23f923724c3a202ac14c3ba00aef0e6ec97431e61ad3e1ff518554fa155194425cdd04f15ca9233c69d70d66cb5583e1f2c26cb17de0141da137da91637b SHA512 a1b49dcf4328518e95807c8f307cbc3eb34680002fd9367c29cf637d80e0c55ffa2e4525822fe42660159be8a71ab925680e058a44ce63ea4482e7ebfdb0a709
 AUX libpcap-1.8.1-cross-compile.patch 555 BLAKE2B f86da7efd3a04b393a3ba77fb762924bd9c592b24f0b223920f91d52a9acaa2311b5481fdcc25e256c4dc2ae2f806bc20993a9a84e6ef1dd4434ff6176af2451 SHA512 a857a9c79ab6160cd82ed9d427c5e49b79c7ddfcbddd9f19998be5a27d8fd16920d7d5bdce14353ac7af80df878782b997007e0c7a7ebb6eb5e094eb6db1275f
 AUX libpcap-1.8.1-darwin.patch 395 BLAKE2B 629e349f4734ed1fd234082abf06eb2b1280c71a42049f84c37118d44f116a1a12dfe3a1df0f4f114f03492d59fef4dd0d8561c7f88904bc628f694ee0d62b15 SHA512 f068ec0a5853451676f6c4f2950880dd22623c5ad4a0c18441b7244914dc9b4db7a4df2ed81687b89adc9e742dbcd5d68bcbfa0fda1d61fd3d322c7fc6180907
+AUX libpcap-1.8.1-disable-remote.patch 776 BLAKE2B 085500b64c4f1da871b0ca13115dd95981f96279581908dd5bd779187970c82423531bcbd916955cc3deb1e15b71488adc9dcb5a92207cded6f162d7e137f3a8 SHA512 929243aa68ecf8ee4605fc993a9c64d1b7dba29990765f60a44c158ac7cc8c64f2c06861eae441cf8ee7379ebf3067ba5a2cd2df859212010180e85d2c3c6cd4
 AUX libpcap-1.8.1-libnl.patch 688 BLAKE2B 8f3c68374815f86c894c5fb9d29969bb5b76f757cf7e35e44b4d0021a2b67b3a39b70dd070070fd8a82ab68550e2c60bfbf4eb8a95e6a5c478316eceb398b4ad SHA512 f56a8f4b87c2f9bfb70e2b31b2e4dcb4fb80654b13cf541f9ff42f193cb9bb4e90a3ad9ef7e91c6ebc8667525bfc75ab78b54381d3f1709f10aaf9f48fd3a1f0
 AUX libpcap-1.8.1-usbmon.patch 522 BLAKE2B 27f464db028d8b2cbc1f4651ebb79b7a7042a2a1bdb97e5c1334e64b27cd969ea6a2f8d9d6301e4a4ec48dec2cec0e53cd68c887bbc445ab056a1f603696a34e SHA512 489c2f20e7935e47d478efb1077e3cf3806614651cdbd6312d0378989c71409e870f9d0fb9d496cf00b7076d8d001714c56d0444144eedbab47c6ed3afd3bf90
 AUX libpcap-9999-libnl.patch 688 BLAKE2B f4f7a29ae843f652e5a3c55e9eb1ab1bbc3ec43933d87232c84ced9077ca0ad88ec18e71a30c3c3b93e2b8b57555e43ddb99c90d8cabdc83509e0d4e70e2c611 SHA512 e7d839e10335d0a04592efae13031c701fd222e88910e0a4dceeafa2c3bcf3aa8ae726710c963dd2b4c53088af4f4d154d73e41d86dbd723511633628b174fd3
 AUX libpcap-9999-prefix-darwin.patch 394 BLAKE2B b54df9fa5f1d796ad4739b2ae4ea55a8b66fc2ba434438a0e17cbd7ca5bfaf5d1611e0d8431be45d3fb80dbd61bc2bda2b6fa50378da4780154b4ce523a688d8 SHA512 bfd560b1bba72a84c5afa1cdf166944e9ede10cb817c7273941b3fc0838ca2676adfd143c0e8873f234de343aabb2177f46f2cd062738d2837d42a1da7370083
 DIST libpcap-1.8.1.tar.gz 753405 BLAKE2B f80fbd6451cf788fc43e5f2240e5ecb267ac98b57bca3fa56dd63576b57d10966bfacde5005d07282352fc2b30d8ef5964cbd126f8f63e565f1bb3dc6f8d9a1c SHA512 7e6a7351bb4213e1c3dd95ef7a460e91f733d933e39ba518ad8ba6d2f86b6e7cfa50ae667c8dc1300ef47bf8693ac8a1f18e068f41175ca5d0147a0b72278882
 EBUILD libpcap-1.8.1-r1.ebuild 1924 BLAKE2B b980119431c525003c7bd210ee0a1d5c017cc221174639d443015d2922c7266896df57eb90ba0d6881e31a947623a4d7d3cea104653094d347682a0905987edd SHA512 fcf5ddcc40205e24d5654b01b34f065df81c64f8e2b6bc33c0e97b693f00a27bc98a7bb764548487156519a78c9690569dadfcca3f3981eab7ecedc216d44911
+EBUILD libpcap-1.8.1-r2.ebuild 1972 BLAKE2B 69ac3ae188c55a9d5abafe86b77976e7ecad1c117dcd6663228f280aad9c16fcbc3f3e570521db335ede5fe2975eb37eee892023b339a77dfcb117a693acd4bc SHA512 a8d536a92fe6e9ad0b4a24a5c43b185a001ba9ea813e93fd9b906a454601e3d52d0eb6bfc66deedbba9917d6db5af9c2b559040467c153a03b8cc7b8ee5e9e1b
 EBUILD libpcap-1.8.1.ebuild 1900 BLAKE2B 1d0e210ddd94eef7e55077b55b6db4564503267b5fd2190ba528a3c1c1e642b4babef11d2f756279f70676576dd750880d6ad3e937a5a82187a6583907cd41fc SHA512 82f191130f7ae698489ff3011a7d943d9567eaf45155ec3b584a6f6ae383649261c6369e665e61de04baa12dcf674287425db42b88f0b31163753fcdaea549b5
 EBUILD libpcap-9999.ebuild 1571 BLAKE2B 0b14fe43dc352586c11b70dfa0ae4c77ee3055dfb52c736e882c12ca420536dd9885ef2ad8271ace1853af4e2e990d53ed3db4e530e4be597a6bd0f0710399f8 SHA512 755d4f7f5c1a9651fe2476a5053d9b5c463e029a9eb70d7069798cae0ee3dd958cc771587a92f75f4f43e9382d4171acff3802773e4e87e5d0b63b27e9c4d55f
 MISC metadata.xml 475 BLAKE2B a914e052c15c557f921c504f0cf128704ed8854bd8107dd2019a5584dd86f80ad06545ef8780e01447c309801207e2f83e286a90ad755ddebd7447d27bba1336 SHA512 ff92cbd5725e74f72d117b57d85858851ddf3b27046bf7d5b9e29cac8e07c98bb21e2a81ff8ffcec08adb062a42deb051019d60911a8b86ecd232a37e1b88170
diff --git a/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch b/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch
new file mode 100644
index 000000000000..df68a5f0aa03
--- /dev/null
+++ b/net-libs/libpcap/files/libpcap-1.8.1-disable-remote.patch
@@ -0,0 +1,31 @@
+This patch was taken directly from debian: https://packages.debian.org/source/stretch/libpcap
+
+Disable bits of remote capture support inherited from the WinPCAP merge
+which cause applications to FTBFS if they define HAVE_REMOTE (#843384).
+
+--- a/pcap/pcap.h
++++ b/pcap/pcap.h
+@@ -506,6 +506,11 @@
+   #define MODE_STAT 1
+   #define MODE_MON 2
+ 
++#ifdef HAVE_REMOTE
++  /* Includes most of the public stuff that is needed for the remote capture */
++  #include <remote-ext.h>
++#endif	 /* HAVE_REMOTE */
++
+ #elif defined(MSDOS)
+ 
+   /*
+@@ -526,11 +531,6 @@
+ 
+ #endif /* _WIN32/MSDOS/UN*X */
+ 
+-#ifdef HAVE_REMOTE
+-  /* Includes most of the public stuff that is needed for the remote capture */
+-  #include <remote-ext.h>
+-#endif	 /* HAVE_REMOTE */
+-
+ #ifdef __cplusplus
+ }
+ #endif
diff --git a/net-libs/libpcap/libpcap-1.8.1-r2.ebuild b/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
new file mode 100644
index 000000000000..a8f06895f6d2
--- /dev/null
+++ b/net-libs/libpcap/libpcap-1.8.1-r2.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools eutils multilib-minimal
+
+DESCRIPTION="A system-independent library for user-level network packet capture"
+HOMEPAGE="
+	http://www.tcpdump.org/
+	https://github.com/the-tcpdump-group/libpcap
+"
+SRC_URI="
+	https://github.com/the-tcpdump-group/${PN}/archive/${P}.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="bluetooth dbus netlink static-libs usb"
+
+RDEPEND="
+	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
+	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
+	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	sys-devel/flex
+	virtual/yacc
+	dbus? ( virtual/pkgconfig[${MULTILIB_USEDEP}] )
+"
+
+S=${WORKDIR}/${PN}-${P}
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.6.1-prefix-solaris.patch
+	"${FILESDIR}"/${PN}-1.8.1-cross-compile.patch
+	"${FILESDIR}"/${PN}-1.8.1-darwin.patch
+	"${FILESDIR}"/${PN}-1.8.1-libnl.patch
+	"${FILESDIR}"/${PN}-1.8.1-usbmon.patch
+	"${FILESDIR}"/${PN}-1.8.1-disable-remote.patch
+)
+
+src_prepare() {
+	default
+
+	eapply_user
+
+	echo ${PV} > VERSION || die
+
+	eautoreconf
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" \
+	econf \
+		$(use_enable bluetooth) \
+		$(use_enable usb) \
+		$(use_enable dbus) \
+		$(use_with netlink libnl) \
+		--enable-ipv6
+}
+
+multilib_src_compile() {
+	emake all shared
+}
+
+multilib_src_install_all() {
+	dodoc CREDITS CHANGES VERSION TODO README{,.dag,.linux,.macosx,.septel}
+
+	# remove static libraries (--disable-static does not work)
+	if ! use static-libs; then
+		find "${ED}" -name '*.a' -exec rm {} + || die
+	fi
+	prune_libtool_files
+
+	# We need this to build pppd on G/FBSD systems
+	if [[ "${USERLAND}" == "BSD" ]]; then
+		insinto /usr/include
+		doins pcap-int.h portability.h
+	fi
+}
diff --git a/net-libs/nghttp2/Manifest b/net-libs/nghttp2/Manifest
index de9144348c0d..63ff00fd2c2d 100644
--- a/net-libs/nghttp2/Manifest
+++ b/net-libs/nghttp2/Manifest
@@ -7,4 +7,4 @@ EBUILD nghttp2-1.19.0.ebuild 1815 BLAKE2B 718ebd7a82095f71f7a327d6bff2070eb80b3c
 EBUILD nghttp2-1.28.0.ebuild 1815 BLAKE2B 0e9dd0e955b6e595ef5177078b3653554014ae22e58e5400c419bd465bfe8804235a5e4ef1a1f37f04c1792d1982fc8856259560cd5f97926d5b769b83a82db7 SHA512 fd44ab40a68379bbef08e3471a38db2509b0f8f6fd29db8928e0310ee758a35c1c6b5c032b442aff437020df1e079af59e849aa83e3a019dc9ea6d7fb1c564c6
 EBUILD nghttp2-1.29.0.ebuild 1812 BLAKE2B 99dfd26c8b47044eea26c533d68084bd7e546364de9e56f6d04e768971185cf3bd6ce8367205bdd4ffabda80f19d940387d582b86e304e37b9f9f587366e2e48 SHA512 9e4498388d8c28cd259d9fdf012175704ea81566100646fe6c81f6534e4a0be3f03d4713ce1ed32f9db9c120ecbbda81b4d1eb6484ab4b87f2830754600588bb
 EBUILD nghttp2-9999.ebuild 1886 BLAKE2B 60947f82b8cd1efec3ef0fdb07769e88ba384cc9d92f12cb20856cd05875bac76eb1026ddf0fdfeaabfeaa1ca5e84d6850e89e904f3607f1de2d8dc74688197a SHA512 d1c5a738b4998c7d2167d3ab4c984a140a9e0b3de9cc4d4bcfed8da9fcc8d3e52a0fe809adf3c2ebea762b44b26f200ddd742b4d766a930dc1d67e3d1f26d34c
-MISC metadata.xml 494 BLAKE2B 528df8af2c336fea2aa480b2eaf12ce8b8011704f088ddf16d4aaabd799c2a5443fef35aae656a11e37f8f5109324272496dd0f0b7fec90fd41f7894a54da65f SHA512 4e28fa2dafd2358abe1fbdbe6a5314c3a67549a0974d94428dd4fc75abe340b52190f29f575bf069fb9b3effdc202c12fd0e6ed6c132961fb4cbb5aef1f36942
+MISC metadata.xml 578 BLAKE2B a210790f12a0149240e59fee7702570c81a026851cfe8fdc2ce015bfb56c73150937a06e26dfabf896118a4d566b33d94ace7a622d751c0455629bf02061fcdb SHA512 a8948265c469d936a699b42978f7e8b2fdd6a7d016094242763730f75f285e6b8ed2a26d66ae8597f1c0ca9d45d47f3e2893005c0cd101e13fd4f62c6e937e28
diff --git a/net-libs/nghttp2/metadata.xml b/net-libs/nghttp2/metadata.xml
index 425825101bf5..15ee3405227a 100644
--- a/net-libs/nghttp2/metadata.xml
+++ b/net-libs/nghttp2/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>polynomial-c@gentoo.org</email>
+		<name>Lars Wendler</name>
+	</maintainer>
 	<use>
 		<flag name="hpack-tools">Install HPACK (header compression) helper tools</flag>
 		<flag name="jemalloc">Use <pkg>dev-libs/jemalloc</pkg> for memory allocation</flag>
diff --git a/net-libs/nodejs/Manifest b/net-libs/nodejs/Manifest
index f55926859e5b..23676b0343f8 100644
--- a/net-libs/nodejs/Manifest
+++ b/net-libs/nodejs/Manifest
@@ -8,6 +8,7 @@ DIST node-v6.12.3.tar.xz 15767900 BLAKE2B 2a986c8099d14b199e33676e1a7d4169194075
 DIST node-v6.9.4.tar.xz 15519264 BLAKE2B 4dfad88b06b209272b8468501cc3c87c40425781fb55011ee93326555c2df88a166ffaff1877563668e06389703053849361739556f1bc87c1e2386d48b9542e SHA512 86d3e2889031c2b50c021bd3fd63194c2c22c44291d51dff1b5e1652b01853c09d2880c2f58fdad062e3e2a3f637a3f0d78dac66b835b676790cf272e64f8dce
 DIST node-v8.9.4.tar.xz 18338980 BLAKE2B 81180fc0c9b10cebc051a72649fb40650c89a05d427b826a6f3937e2b108b97edd27dd1c1521e57168e5a92b37e590429735c07c3198e4b912774c305ae61693 SHA512 9656b57145c2b3048ff9ad70f91dbff33a7349dca564efe3b2ff585e2ffad004ea8de920a7a049ff4c5487683986d78b5a578306c2c99f3b1a3de96d9ad1dece
 DIST node-v9.3.0.tar.xz 18385364 BLAKE2B 825fd8786b68020f7bb2735e519cd5ecb49552766646425613780736e7c20f555007e90048abd3e985d27656a39da6737ced5c905f113b0e531549312751e2d8 SHA512 bafc3bbd01ce0cc00f13e6f34b8ed361cff337c71b90836132c8188b1103ba2d6aab145258b6afafafc2455fa8a5de54be265435a553793946fd6d308095ae3e
+DIST node-v9.4.0.tar.xz 18444244 BLAKE2B 498f7db473a31d127dd6bf86ab0f8a5cfbf6924f65ab15ab18a6137594c044ec3c68847498d0923329f6c9aef84bd3ea228788bd45061db8d8e846c9e76f29f6 SHA512 2c5423f150b69caa0afc9e171cc91a3e7dc2860d1d7aec163bf085f1a087001e1766af34159b505fd9f0f0dad25bc247358939c5b3bca562eb5c8de3edf29a41
 EBUILD nodejs-0.12.17.ebuild 3425 BLAKE2B b1c8ea2a39ee873c2d46a68af2e6050ae6e879ae9a80d20543e4486fda5885385b702394b4af1284883cc0685541ae7184e3b0c9b97866190d28e66a3d508534 SHA512 5507119d2bf420f8096c15258dded17cd5bc5470aa36d8ca1ef4324c183536580965b5c0b8022f22ebce509621d84ab2423d768e2c5d8e2268a40f622ead8075
 EBUILD nodejs-0.12.18.ebuild 3437 BLAKE2B 7e4f091b468b62780e479360c9a1afda0eb792d475aed7bef93fee9631f9beb7f883cdea83dc0c21cb4b638c0cb60d7dd07051c36aac4f52d13bc7ffff3d89f5 SHA512 3fe9bbcb88764aa3f143d28eb8749f2d8daa8750979196b6b307cb8d820e43e9d91eda620c914c9c843cab542c5d3051fc081f4f5ba9dba35e75708be72331ba
 EBUILD nodejs-4.8.5.ebuild 4435 BLAKE2B 0a226e511e27eef347c542d1830e86208636159384983d1be76f08b220008e5e999e303a78feeff58beb52d6f3f18382804b9114cd1d73a4b1aaab329f676406 SHA512 66f3bfae15bef4755f9ec630c4bc50a44ae0b63102c3568bf6ca41caea66bca09cd67eb8dc314a27b0a571f2672e93f3937b9f14e3b19a0eaf36221c36c07d66
@@ -17,5 +18,6 @@ EBUILD nodejs-6.12.3.ebuild 6179 BLAKE2B f7343d5fcf848e46790ef98f63e9fa96b3f9635
 EBUILD nodejs-6.9.4.ebuild 6073 BLAKE2B cf41081773527f8efb120d6d7ba8d21dc834fc47fbf1964fc235853d842321899c605f42e2799136a54f65e6140c89a05726ba49d86a5fcd78fa4c78114f1e96 SHA512 aefc407c057e7c660ed0be4adc5056c9130b95adb63b22bd55d06c4981d70d53d82a65350df4778684c597de5b5bf6b2f8cd28b0ce61de4914c4db02ac3461f7
 EBUILD nodejs-8.9.4.ebuild 6349 BLAKE2B 7a090373ca9551e2853f5637206a69e7f2e55efedb65694defc39f7cd5530b7858bc2285f1a1ee622d72b7b4e940de7445f272ea37194db10527892f9a2272af SHA512 8fa17c50b027ef4439b465612dbb81bb848da88e18d531bcd18a520fe91962567d03638e9b8449d30725197625653b435e3d95771294bc61ec397dbf57a4755a
 EBUILD nodejs-9.3.0.ebuild 6350 BLAKE2B 1b8b2ed276c850a2065804e19e79b5a32eb2d768a52f169794732075663cf6ab8d5133cc3b5b5f41f58547745455a0b189af440473db5157539fed6f698afa7d SHA512 dc75843801d5075d8e6b627b85a5272d21e5f7e0a622044578aba30d326b657291b1d9630b0ed293a6b8dda09722edc0b97c037abcd5ea7ad1701d7a0f66a763
+EBUILD nodejs-9.4.0.ebuild 6350 BLAKE2B af48c8403a97ebd33a2af3f853c2b6a333d54d4225c1ebd6cd8f94474e0dda00f778dcf093ad7b6f712b733dce0486e0906b4ddb0d31c386982d8f6b90bfdd28 SHA512 f429b0a8157bbc9ae1cae9c701eb06dc6e42be046bde8a616f96c246ff30e59876f30fd06ebfba9dc83d628194fb71fc6d1cc4f2decbc03bb8abd9959c6a4f35
 EBUILD nodejs-99999999.ebuild 6281 BLAKE2B a994bcf6c89d23f551c9b16bdcc85633b91f27f3317c929470350413ecbd16bfc3c22a3d506cd77b6960be3810919092eb7d48025b1614e93099071abfb8ea8b SHA512 d1871476fb4ce74d921bfc35b36fa1e7e59d7a8c8a9fb660e61e3a4b0d5b8536c5ef0667e6079a68d0feef798ea62a74cfa85caf86b00e2483265ad8e94ca269
 MISC metadata.xml 573 BLAKE2B 89ced6a86cc67a80119e520991d1de3229be3a777ff4f7b49daa8854c470e3f7e3335681028ce3f18d3acfc8c01057dcf5d0597becd76ef95fcc50b3b214c277 SHA512 231bb23c3dd421ea5c618bfea3a70225e089e6c2eed74fc80ca3becf3f84072dfbfc02a100083ac533a0d95496ce2ba802e1ec65e64659afcf2e70e638b7a2bc
diff --git a/net-libs/nodejs/nodejs-9.4.0.ebuild b/net-libs/nodejs/nodejs-9.4.0.ebuild
new file mode 100644
index 000000000000..b50e40671d39
--- /dev/null
+++ b/net-libs/nodejs/nodejs-9.4.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+RESTRICT="test"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit bash-completion-r1 eutils flag-o-matic pax-utils python-single-r1 toolchain-funcs
+
+DESCRIPTION="A JavaScript runtime built on Chrome's V8 JavaScript engine"
+HOMEPAGE="https://nodejs.org/"
+SRC_URI="https://nodejs.org/dist/v${PV}/node-v${PV}.tar.xz"
+
+LICENSE="Apache-1.1 Apache-2.0 BSD BSD-2 MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x64-macos"
+IUSE="cpu_flags_x86_sse2 debug doc icu inspector +npm +snapshot +ssl systemtap test"
+REQUIRED_USE="
+	${PYTHON_REQUIRED_USE}
+	inspector? ( icu ssl )
+"
+
+RDEPEND="
+	>=dev-libs/libuv-1.18.0:=
+	>=net-libs/http-parser-2.7.0:=
+	>=net-libs/nghttp2-1.29.0
+	sys-libs/zlib
+	icu? ( >=dev-libs/icu-60.1:= )
+	ssl? ( >=dev-libs/openssl-1.0.2n:0=[-bindist] )
+"
+DEPEND="
+	${RDEPEND}
+	${PYTHON_DEPS}
+	systemtap? ( dev-util/systemtap )
+	test? ( net-misc/curl )
+"
+S="${WORKDIR}/node-v${PV}"
+PATCHES=(
+	"${FILESDIR}"/gentoo-global-npm-config.patch
+)
+
+pkg_pretend() {
+	(use x86 && ! use cpu_flags_x86_sse2) && \
+		die "Your CPU doesn't support the required SSE2 instruction."
+
+	( [[ ${MERGE_TYPE} != "binary" ]] && ! test-flag-CXX -std=c++11 ) && \
+		die "Your compiler doesn't support C++11. Use GCC 4.8, Clang 3.3 or newer."
+}
+
+src_prepare() {
+	tc-export CC CXX PKG_CONFIG
+	export V=1
+	export BUILDTYPE=Release
+
+	# fix compilation on Darwin
+	# https://code.google.com/p/gyp/issues/detail?id=260
+	sed -i -e "/append('-arch/d" tools/gyp/pylib/gyp/xcode_emulation.py || die
+
+	# make sure we use python2.* while using gyp
+	sed -i -e "s/python/${EPYTHON}/" deps/npm/node_modules/node-gyp/gyp/gyp || die
+	sed -i -e "s/|| 'python2'/|| '${EPYTHON}'/" deps/npm/node_modules/node-gyp/lib/configure.js || die
+
+	# less verbose install output (stating the same as portage, basically)
+	sed -i -e "/print/d" tools/install.py || die
+
+	# proper libdir, hat tip @ryanpcmcquen https://github.com/iojs/io.js/issues/504
+	local LIBDIR=$(get_libdir)
+	sed -i -e "s|lib/|${LIBDIR}/|g" tools/install.py || die
+	sed -i -e "s/'lib'/'${LIBDIR}'/" lib/module.js deps/npm/lib/npm.js || die
+
+	# Avoid writing a depfile, not useful
+	sed -i -e "/DEPFLAGS =/d" tools/gyp/pylib/gyp/generator/make.py || die
+
+	sed -i -e "/'-O3'/d" common.gypi deps/v8/gypfiles/toolchain.gypi || die
+
+	# Avoid a test that I've only been able to reproduce from emerge. It doesnt
+	# seem sandbox related either (invoking it from a sandbox works fine).
+	# The issue is that no stdin handle is openened when asked for one.
+	# It doesn't really belong upstream , so it'll just be removed until someone
+	# with more gentoo-knowledge than me (jbergstroem) figures it out.
+	rm test/parallel/test-stdout-close-unref.js || die
+
+	# debug builds. change install path, remove optimisations and override buildtype
+	if use debug; then
+		sed -i -e "s|out/Release/|out/Debug/|g" tools/install.py || die
+		BUILDTYPE=Debug
+	fi
+
+	default
+}
+
+src_configure() {
+	local myconf=( --shared-http-parser --shared-libuv --shared-nghttp2 --shared-zlib )
+	use debug && myconf+=( --debug )
+	use icu && myconf+=( --with-intl=system-icu ) || myconf+=( --with-intl=none )
+	use inspector || myconf+=( --without-inspector )
+	use npm || myconf+=( --without-npm )
+	use snapshot && myconf+=( --with-snapshot )
+	use ssl && myconf+=( --shared-openssl ) || myconf+=( --without-ssl )
+
+	local myarch=""
+	case ${ABI} in
+		amd64) myarch="x64";;
+		arm) myarch="arm";;
+		arm64) myarch="arm64";;
+		ppc64) myarch="ppc64";;
+		x32) myarch="x32";;
+		x86) myarch="ia32";;
+		*) myarch="${ABI}";;
+	esac
+
+	GYP_DEFINES="linux_use_gold_flags=0
+		linux_use_bundled_binutils=0
+		linux_use_bundled_gold=0" \
+	"${PYTHON}" configure \
+		--prefix="${EPREFIX}"/usr \
+		--dest-cpu=${myarch} \
+		$(use_with systemtap dtrace) \
+		"${myconf[@]}" || die
+}
+
+src_compile() {
+	emake -C out mksnapshot
+	pax-mark m "out/${BUILDTYPE}/mksnapshot"
+	emake -C out
+}
+
+src_install() {
+	local LIBDIR="${ED}/usr/$(get_libdir)"
+	emake install DESTDIR="${D}"
+	pax-mark -m "${ED}"usr/bin/node
+
+	# set up a symlink structure that node-gyp expects..
+	dodir /usr/include/node/deps/{v8,uv}
+	dosym . /usr/include/node/src
+	for var in deps/{uv,v8}/include; do
+		dosym ../.. /usr/include/node/${var}
+	done
+
+	if use doc; then
+		# Patch docs to make them offline readable
+		for i in `grep -rl 'fonts.googleapis.com' "${S}"/out/doc/api/*`; do
+			sed -i '/fonts.googleapis.com/ d' $i;
+		done
+		# Install docs!
+		dohtml -r "${S}"/doc/*
+	fi
+
+	if use npm; then
+		dodir /etc/npm
+
+		# Install bash completion for `npm`
+		# We need to temporarily replace default config path since
+		# npm otherwise tries to write outside of the sandbox
+		local npm_config="usr/$(get_libdir)/node_modules/npm/lib/config/core.js"
+		sed -i -e "s|'/etc'|'${ED}/etc'|g" "${ED}/${npm_config}" || die
+		local tmp_npm_completion_file="$(emktemp)"
+		"${ED}/usr/bin/npm" completion > "${tmp_npm_completion_file}"
+		newbashcomp "${tmp_npm_completion_file}" npm
+		sed -i -e "s|'${ED}/etc'|'/etc'|g" "${ED}/${npm_config}" || die
+
+		# Move man pages
+		doman "${LIBDIR}"/node_modules/npm/man/man{1,5,7}/*
+
+		# Clean up
+		rm "${LIBDIR}"/node_modules/npm/{.mailmap,.npmignore,Makefile} || die
+		rm -rf "${LIBDIR}"/node_modules/npm/{doc,html,man} || die
+
+		local find_exp="-or -name"
+		local find_name=()
+		for match in "AUTHORS*" "CHANGELOG*" "CONTRIBUT*" "README*" \
+			".travis.yml" ".eslint*" ".wercker.yml" ".npmignore" \
+			"*.md" "*.markdown" "*.bat" "*.cmd"; do
+			find_name+=( ${find_exp} "${match}" )
+		done
+
+		# Remove various development and/or inappropriate files and
+		# useless docs of dependend packages.
+		find "${LIBDIR}"/node_modules \
+			\( -type d -name examples \) -or \( -type f \( \
+				-iname "LICEN?E*" \
+				"${find_name[@]}" \
+			\) \) -exec rm -rf "{}" \;
+	fi
+}
+
+src_test() {
+	out/${BUILDTYPE}/cctest || die
+	"${PYTHON}" tools/test.py --mode=${BUILDTYPE,,} -J message parallel sequential || die
+}
+
+pkg_postinst() {
+	einfo "The global npm config lives in /etc/npm. This deviates slightly"
+	einfo "from upstream which otherwise would have it live in /usr/etc/."
+	einfo ""
+	einfo "Protip: When using node-gyp to install native modules, you can"
+	einfo "avoid having to download extras by doing the following:"
+	einfo "$ node-gyp --nodedir /usr/include/node <command>"
+}
diff --git a/net-libs/polarssl/Manifest b/net-libs/polarssl/Manifest
deleted file mode 100644
index b1dc3149448f..000000000000
--- a/net-libs/polarssl/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX polarssl-1.3.9-respect-cflags.patch 619 BLAKE2B 646512c034f2473ed8feb0ad399d3eafc2b5904e5331eb173c83b94d1e3440ead33b783d1410c4f6dcf8a342d7c76d94b807873d37b32ee764a3b9d920c241e4 SHA512 1dc7d7ea34b95c379b8d035497b8975c0de8befadb8f918021bafa726e11ecab83f9aed1d9e295c03c4b50e1cd12efb0956322b82ac6413222a30a5079fc6cea
-DIST polarssl-1.3.9-gpl.tgz 1741396 BLAKE2B 0eb717174bc314660b8abcdd9509603edd905ef835a96c2f0a7e3f52f90f3ca491833d489752e72d43217ae54bd9dd319d67925c3193988183a934085b2a553d SHA512 e8958f834fd80ac996ac58152a0a5d4e31449e8b7b79ee6daac6f45bed60c5c5ad31f84b211d5e36ad0d6c82a742841e986a738735af048c286bce0e8fe4d62d
-EBUILD polarssl-1.3.9-r1.ebuild 2533 BLAKE2B b2e7140626941841d63541273ee05ed35f40ceb21cefdb0668bd7ddf58571bc0178a4680d2384080bbf23911d36d378056fd693b3c813cf94cb2266b340ea44b SHA512 99ba3357af30f58f312d009e90f0c5593326483fc1ecb8ef0ef7e744526a6c4831ab6f38ab44baf89d991e99d57f600e20cd9bf53684c5766cb73cccde8cb2eb
-EBUILD polarssl-1.3.9.ebuild 2464 BLAKE2B 5eb1aec78d09f04a716d191df9de54d6c69ac21df191bb9992aea274e4c2c43c2e112e0b90063584b3ce6739c211113186e31f688e55c7500eb7c5468f186624 SHA512 35f4f764b2786babea5e76beab7d9d592d2d3516cefc0bacf1bd3fd839492a34facb7b00ec4ac2534d2af032859343f5448fb55ddedbfddd7a398422e74f35d8
-MISC metadata.xml 633 BLAKE2B 06ee738f02e4d6c87af4998cf80530bd308c097d085703929af1a55b2041a7525b36f9b9f2eec98efad699fc1fee2f038c57895e2c46c6c09eacfd5446292bf6 SHA512 57018df16efca7e15c3836d744d4276bea309816dd9c345467c280d737284a45c3c4828b8dc93013d284d5f2b153ec01d4a0deed5df130c782d71d0e0553d4ab
diff --git a/net-libs/polarssl/files/polarssl-1.3.9-respect-cflags.patch b/net-libs/polarssl/files/polarssl-1.3.9-respect-cflags.patch
deleted file mode 100644
index 45dffd53041c..000000000000
--- a/net-libs/polarssl/files/polarssl-1.3.9-respect-cflags.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-From: Julian Ospald <hasufell@gentoo.org>
-Date: Sat Oct 25 17:12:43 UTC 2014
-Subject: respect system cflags
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -4,7 +4,7 @@
- string(REGEX MATCH "Clang" CMAKE_COMPILER_IS_CLANG "${CMAKE_C_COMPILER_ID}")
- 
- if(CMAKE_COMPILER_IS_GNUCC)
--  set(CMAKE_C_FLAGS "-Wall -Wextra -W -Wdeclaration-after-statement -Wlogical-op -Wwrite-strings")
-+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -W -Wdeclaration-after-statement -Wlogical-op -Wwrite-strings")
-   set(CMAKE_C_FLAGS_RELEASE "-O2")
-   set(CMAKE_C_FLAGS_DEBUG "-g3 -O0")
-   set(CMAKE_C_FLAGS_COVERAGE "-g3 -O0 --coverage")
diff --git a/net-libs/polarssl/metadata.xml b/net-libs/polarssl/metadata.xml
deleted file mode 100644
index eafc157bbafb..000000000000
--- a/net-libs/polarssl/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="person">
-		<email>tommy@gentoo.org</email>
-	</maintainer>
-	<longdescription lang="en">
-		The aim of the PolarSSL project is to provide a quality, open-source
-		cryptographic library written in C and targeted at embedded systems.
-	</longdescription>
-	<use>
-		<flag name="havege">Enable the HAVEGE random generator.
-			Warning: the HAVEGE random generator is not suitable for
-			virtualized environments
-		</flag>
-		<flag name="programs">Build PolarSSL programs</flag>
-	</use>
-</pkgmetadata>
diff --git a/net-libs/polarssl/polarssl-1.3.9-r1.ebuild b/net-libs/polarssl/polarssl-1.3.9-r1.ebuild
deleted file mode 100644
index 01f8abbeec11..000000000000
--- a/net-libs/polarssl/polarssl-1.3.9-r1.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="http://polarssl.org/"
-SRC_URI="http://polarssl.org/download/${P}-gpl.tgz"
-
-LICENSE="GPL-2"
-SLOT="0/7"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc havege libressl programs cpu_flags_x86_sse2 static-libs test threads zlib"
-
-RDEPEND="
-	programs? (
-		!libressl? ( dev-libs/openssl:0 )
-		libressl? ( dev-libs/libressl )
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.9-respect-cflags.patch )
-
-enable_polarssl_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/polarssl/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_polarssl_option POLARSSL_HAVE_SSE2
-	use zlib && enable_polarssl_option POLARSSL_ZLIB_SUPPORT
-	use havege && enable_polarssl_option POLARSSL_HAVEGE_C
-	use threads && enable_polarssl_option POLARSSL_THREADING_C
-	use threads && enable_polarssl_option POLARSSL_THREADING_PTHREAD
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		$(multilib_is_native_abi && cmake-utils_use_enable programs PROGRAMS \
-			|| echo -DENABLE_PROGRAMS=OFF)
-		$(cmake-utils_use_enable zlib ZLIB_SUPPORT)
-		$(cmake-utils_use_use static-libs STATIC_POLARSSL_LIBRARY)
-		$(cmake-utils_use_enable test TESTING)
-		-DUSE_SHARED_POLARSSL_LIBRARY=ON
-		-DINSTALL_POLARSSL_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	use doc && dohtml -r apidoc
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED%/}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED%/}"/usr/bin/polarssl_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/polarssl/polarssl-1.3.9.ebuild b/net-libs/polarssl/polarssl-1.3.9.ebuild
deleted file mode 100644
index 6dce83e4878f..000000000000
--- a/net-libs/polarssl/polarssl-1.3.9.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib cmake-utils multilib-minimal
-
-DESCRIPTION="Cryptographic library for embedded systems"
-HOMEPAGE="http://polarssl.org/"
-SRC_URI="http://polarssl.org/download/${P}-gpl.tgz"
-
-LICENSE="GPL-2"
-SLOT="0/7"
-KEYWORDS="alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="doc havege programs cpu_flags_x86_sse2 static-libs test threads zlib"
-
-RDEPEND="
-	programs? ( dev-libs/openssl:0 )
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen media-gfx/graphviz )
-	test? ( dev-lang/perl )"
-
-PATCHES=( "${FILESDIR}"/${PN}-1.3.9-respect-cflags.patch )
-
-enable_polarssl_option() {
-	local myopt="$@"
-	# check that config.h syntax is the same at version bump
-	sed -i \
-		-e "s://#define ${myopt}:#define ${myopt}:" \
-		include/polarssl/config.h || die
-}
-
-src_prepare() {
-	use cpu_flags_x86_sse2 && enable_polarssl_option POLARSSL_HAVE_SSE2
-	use zlib && enable_polarssl_option POLARSSL_ZLIB_SUPPORT
-	use havege && enable_polarssl_option POLARSSL_HAVEGE_C
-	use threads && enable_polarssl_option POLARSSL_THREADING_C
-	use threads && enable_polarssl_option POLARSSL_THREADING_PTHREAD
-
-	cmake-utils_src_prepare
-}
-
-multilib_src_configure() {
-	local mycmakeargs=(
-		$(multilib_is_native_abi && cmake-utils_use_enable programs PROGRAMS \
-			|| echo -DENABLE_PROGRAMS=OFF)
-		$(cmake-utils_use_enable zlib ZLIB_SUPPORT)
-		$(cmake-utils_use_use static-libs STATIC_POLARSSL_LIBRARY)
-		$(cmake-utils_use_enable test TESTING)
-		-DUSE_SHARED_POLARSSL_LIBRARY=ON
-		-DINSTALL_POLARSSL_HEADERS=ON
-		-DLIB_INSTALL_DIR="/usr/$(get_libdir)"
-	)
-
-	cmake-utils_src_configure
-}
-
-multilib_src_compile() {
-	cmake-utils_src_compile
-	use doc && multilib_is_native_abi && emake apidoc
-}
-
-multilib_src_test() {
-	LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:${BUILD_DIR}/library" \
-		cmake-utils_src_test
-}
-
-multilib_src_install() {
-	cmake-utils_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	use doc && dohtml -r apidoc
-
-	if use programs ; then
-		# avoid file collisions with sys-apps/coreutils
-		local p e
-		for p in "${ED%/}"/usr/bin/* ; do
-			if [[ -x "${p}" && ! -d "${p}" ]] ; then
-				mv "${p}" "${ED%/}"/usr/bin/polarssl_${p##*/} || die
-			fi
-		done
-		for e in aes hash pkey ssl test ; do
-			docinto "${e}"
-			dodoc programs/"${e}"/*.c
-			dodoc programs/"${e}"/*.txt
-		done
-	fi
-}
diff --git a/net-libs/rpcsvc-proto/Manifest b/net-libs/rpcsvc-proto/Manifest
index 2b7c0bad1a4f..75f91881f262 100644
--- a/net-libs/rpcsvc-proto/Manifest
+++ b/net-libs/rpcsvc-proto/Manifest
@@ -1,6 +1,8 @@
 DIST rpcsvc-proto-1.2.tar.gz 59883 BLAKE2B 178f9f9fced73dc2e4b587f1bd7924c2811f0b96b5efc048e9a6d3cb4abd32a2c34ff0f5b01576f3dc51f07ca6a06266cd7a055f278f7b205cbb9e30563015e4 SHA512 59e6ac2c3e551daef584878e8ae8fc2da7cb80a04c20f96de561abc972fcfac1fbb57a5ee0dbe7bf5288a1527c9b87fc3f73a259b30393982a9a642cf4b4deb4
+DIST rpcsvc-proto-1.3.1.tar.gz 59174 BLAKE2B d50d958cfad79142d686ae6312cdaa6044f1322bc794dbc95c1b78d088396c5adda292c83d150f3502df859c23d4e370894283ae210e5fe9aa1d0e8ed05553d0 SHA512 d687665ed51fd6fd66ab638813c5020f0c8b8491625b91937ac4b5ee4dd2357eae8e2909394e7651494e7aea77a6279ae907ba6354682ba446de7088b55f54ea
 DIST rpcsvc-proto-1.3.tar.gz 59202 BLAKE2B 88c74806419e097b20fc41bb63ff66401a6c21a2b7100474e55f1b6452a32d669e879248f00349604237e996167b21b9173158e69876f0db3a1394fb922df7af SHA512 5880ea39a750ee1f69dcedfe32afd617e695ee5328d6386977bbd11babb7bd18d8cb50c2d5f8daf35650aa8a94a4f6dda1171c1159917bb596108b1057c5a158
 EBUILD rpcsvc-proto-0.ebuild 495 BLAKE2B c5df8759ec767be4305c031aed71246536b2ea8b9256c7667358e27921d1f421e5b462ace83fa383b7e0e54c634b79e3706f05fb77ecc74336fc78eb2e7f5b25 SHA512 3103a561491eb5afe0b35ea513765297edf42b24c24e24130eccef2af36fb85d066ba648a9938fbf744e0c0be3958040892cc66476a80959ab69dbfdac88850b
 EBUILD rpcsvc-proto-1.2-r1.ebuild 649 BLAKE2B d95ca842ad48c1fb83a4003cea99ae44312d7e6cb59f777a67dbca0585809a218230f86f2b1237c704bc9805ab36677374b3bbb6f202f4db5178c628faaee668 SHA512 9901e68bd3672ce6689f055d4d79cc73cbf4352c7bb4e1d901450a6ba47f63c0dfe16681a003069a631d31f56b91ed7cc156d3f54a0b1e39b6bb592d180da96d
+EBUILD rpcsvc-proto-1.3.1.ebuild 643 BLAKE2B 7172abfbf67547620ae634f806b19e6dc01a154747096a562bda7ff6a0f50122dcc9c7c1c0978a287421c6d662025342202e227b0552e49d55f15513c49b98fd SHA512 5008ae592acc11837cbaa3100b4f837e4673bf8e152863d41bc4ffb3777425b972851e3195236fcf190e90d4e5b2905ce3d10af4b7a2db909d388733f3269d93
 EBUILD rpcsvc-proto-1.3.ebuild 641 BLAKE2B 384f51cfdca049ba988fbed43765e64232a54d7c3341419a24a0e5df8723cdcb24f5adb4a2c744ef5666c1bba493b6b061bd1986fecd88390e2c83d5120c11ec SHA512 ca768b98578bf6c7b7c6127ac6ac9c33ba8c6c7a28672a9231a085ab78a02fc4745e3c54c54e5584c8903f1a922fcc7ab28b0a9ff8ba304d2fffbacd9ff9024a
 MISC metadata.xml 379 BLAKE2B 9fb870d3a0ed3c94fdc445b5fabd01e52bd29428a9b464729a23a6e23918d2425a1e2ee850b36c0d5205bd76143e49a23f1d1c8366eef186736f1376c2bb5ce3 SHA512 00a77262e76176fbc54ff2d1d8ba070868f185f5f940abd25ad1af80fd52f1560c9e0290c42283a98519a653a334ed6dfd4e0f8540d10946253b3afc205bb753
diff --git a/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1.ebuild b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1.ebuild
new file mode 100644
index 000000000000..af9ee8387e54
--- /dev/null
+++ b/net-libs/rpcsvc-proto/rpcsvc-proto-1.3.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit autotools
+
+DESCRIPTION="rpcsvc protocol definitions from glibc"
+HOMEPAGE="https://github.com/thkukuk/rpcsvc-proto"
+SRC_URI="https://github.com/thkukuk/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+SLOT="0"
+LICENSE="LGPL-2.1+ BSD"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="!<sys-libs/glibc-2.26"
+
+src_prepare(){
+	default
+	eautoreconf
+}
+
+src_install(){
+	default
+
+	# provided by sys-fs/quota[rpc]
+	rm "${ED%/}"/usr/include/rpcsvc/rquota.{x,h} || die
+}
diff --git a/net-libs/webkit-gtk/Manifest b/net-libs/webkit-gtk/Manifest
index e836271ff4d4..b1094bbfe789 100644
--- a/net-libs/webkit-gtk/Manifest
+++ b/net-libs/webkit-gtk/Manifest
@@ -9,11 +9,9 @@ AUX webkit-gtk-2.4.4-jpeg-9a.patch 1262 BLAKE2B 0ba241e782fb5ac415149e621f04f0db
 AUX webkit-gtk-2.4.7-disable-webgl.patch 442 BLAKE2B 5f9586b33fa496ae49f52143dc3d966d989ba24094fa98558ab23cb9a73df26666101ae78e41c408429eba5540f6803c564d4736a882bedba3cc7ab920c3c061 SHA512 742854749e674b3fec33652709921630a5fd3d7afd10446b3121a8cf94fb4fef70cc4de6ffe1a08143f518fd76aa05d0f4b54a041192cbc8eb9fbd5766faa5b8
 AUX webkit-gtk-2.4.9-gcc-6.patch 1890 BLAKE2B dd539bc80529b737d1fa613dcdbd2445e062234533df8f12c6b7ce2f4852e22f912e5199701863b8c1f947fd3dc0ce52c8c0c357af006eb6160f8ce8e3f8b52d SHA512 cfcfe95b08d503456b1ea6e1770dd4ca4cd61f613ef76962cd01bc4826fbb25aed04834f820da987fd1c80941b90da73086ec5e7e19285e54082f5e90598fd9c
 AUX webkit-gtk-2.8.5-fix-ia64-build.patch 663 BLAKE2B 4eb51aefe08ba9c2bef60a9b5f5f68dad98dac259fc2c014b0fd567a45424a30aee9412cd914b0a05745c16df0dd81e553fdf80e15beef5f006408ce78825321 SHA512 ce8dbe7f2bacfc6d1ad70d39d80447ab90e6daf63bc1dc4a49c406255f76eff090f79e6076ebc349d69193b72a821fa6591692cf74a28e529f8db95cf86358fc
-DIST webkitgtk-2.18.4.tar.xz 14828528 BLAKE2B 447092ebe258b58e0e70bf8f7b347adaf77ad8391b65163528591d403d363894ed50676212390239cc2adfbc8458745b9f873481cb0bacf40b5ea598abb19999 SHA512 c7440668cc097232b7eb9ea15e1047f7110cd06249cb61501b0414175693e0b11b22335abf17c62582dcf16c41ae49d0a713cd069f7df32955e440b9d23194d1
 DIST webkitgtk-2.18.5.tar.xz 14828616 BLAKE2B 850d5b74327975060615d9bb481c8ec264eb862e63c5fc9bfa59bdab0edfbc3ad81c989df0fce13beb61bcbaed9c63571ad9aa3b9c5ad6137c662cf2f89ebc90 SHA512 f11a45150af4ba36192380ad0757da53d50b660f0a4f127a71123a6d80e9757d16a1deb1d69b235852c62bb1225352823932c60df7d6aa9372442ed7a165068c
 DIST webkitgtk-2.4.11.tar.xz 9869100 BLAKE2B 9b1351976dc753025e6aba86a40f97fdf58821a6a7af109140a18adc7a0e1d8c140711b48bceeb3c4c189e7d52f258520623c7d971c46b6f2572c0e1de0d0100 SHA512 2e2cf01a52b8593765a0a3c2d7f0ad306121660019eb402226bd2826c7d4666dab4e91ca6ccbd29abe0ad3993549f256ed1ab88de22e9c8516d5f40a4edd6bfb
-EBUILD webkit-gtk-2.18.4.ebuild 8282 BLAKE2B 2074b46db74e014544724ee1e2cd5f56f232c77d1f8e254378485acec7cf423fc5de60a737b669428b38451b7cfc7f44b745acbf9f68444e9ab72af43af245b2 SHA512 442d5e8b7ed6aed95366620cf61ea335d504db7cf06d5faf791bd77a1ad0cbb8e0bad556d85bedb2c6aca50523def4fdb7a413d15621e87552e5b321c8614386
-EBUILD webkit-gtk-2.18.5.ebuild 8283 BLAKE2B f6c4dfa1fe775a0862f56b300ede8b95cbb6c52f87f3861fa11da8e167929d1658490baef349eaf2313782f191ac8e4111bd03ec090048d230ed9d292cfa1b4c SHA512 d5f1a6c4e45972fc0bee76fd9380924c219b0a7a10048098ca3902638cbebf0a404545ba9822d63e3e19dd601b0fee0a19e0cfc4ae5bde5e530bf34c1dc0bd66
+EBUILD webkit-gtk-2.18.5.ebuild 8282 BLAKE2B 6a26be83bc96b53fb1534a7722f645e26cb64b143ea444df632b3c6a33fa989e8ab1d770b5eba4eacd595e14391ae089379f96938d5f57faa3332ea05c3c3b1b SHA512 8337581e0e02c0008c7dde6b4e6e38f3de30e04cbc78a2650327786c623658dbf1810be8705471bceb74b4f543162d9388a78ac31a617730d95d15af9b7a3e19
 EBUILD webkit-gtk-2.4.11-r1.ebuild 8966 BLAKE2B f54135230b3e5d12303f131bec732e2163c32a58c8571d566810f6563b285c11b253d5e46b80752a1e15a3f6c8462aaa3e856ea1c52b1bb9032d80f1e1b3f021 SHA512 559a7228b2c7f2dd00c26c7d4b0b935850eb93cc1e192c2e6695e5a418766050c80181d3b96254dcbfc3b9a8419c0605835a13b7640ceb6b750ec40edff35cd9
 EBUILD webkit-gtk-2.4.11-r200.ebuild 8373 BLAKE2B 9ee92280f93c2aa1107aab98faabf9c3298b0b70b9e5c30fdfd6c8d9cb3f7c9ab5362248c19a9d0d6ed49ec81ca4e6f0b5510413e16dbdace7941f051d0872ca SHA512 7b96440750ed9f5e6402aed773cfe1e40e419364d7d526922247e58c9cb7ead97960f9866d90cc990abce8e183d06bd66191d09991d137b7b9ba86faee4f4dca
 MISC metadata.xml 771 BLAKE2B 219d1c257311262d452b02b19b387cca0fc17cdc675cb4c790277c2c4f2ae9863a6039738a9151a3d6912ca024bc1d2348f5ca786f50412295fa8455c90fc8b4 SHA512 a4f15ea6644bf827f15628917d7af57f6569a2273cdf1246d468af95ab776ffe89fa305f842c869ad75c2b9a9480c4d5bc0e00732952ded75607de7ed9695236
diff --git a/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild
deleted file mode 100644
index b05d77618c66..000000000000
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.4.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-CMAKE_MAKEFILE_GENERATOR="ninja"
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby22 ruby23 ruby24"
-
-inherit check-reqs cmake-utils eutils flag-o-matic gnome2 pax-utils python-any-r1 ruby-single toolchain-funcs versionator virtualx
-
-MY_P="webkitgtk-${PV}"
-DESCRIPTION="Open source web browser engine"
-HOMEPAGE="http://www.webkitgtk.org/"
-SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
-
-LICENSE="LGPL-2+ BSD"
-SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
-
-IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
-
-# webgl needs gstreamer, bug #560612
-REQUIRED_USE="
-	geolocation? ( introspection )
-	gles2? ( egl )
-	introspection? ( gstreamer )
-	nsplugin? ( X )
-	webgl? ( ^^ ( gles2 opengl ) )
-	!webgl? ( ?? ( gles2 opengl ) )
-	webgl? ( gstreamer )
-	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)
-RDEPEND="
-	>=x11-libs/cairo-1.10.2:=
-	>=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
-	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.2.3:1.0
-		>=media-libs/gst-plugins-base-1.2.3:1.0
-		>=media-libs/gst-plugins-bad-1.10:1.0[opengl?,egl?] )
-
-	X? (
-		x11-libs/cairo[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
-		x11-libs/cairo[opengl] )
-	webgl? (
-		x11-libs/cairo[opengl]
-		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/gtk-doc-am-1.10
-	>=dev-util/gperf-3.0.1
-	>=sys-devel/bison-2.4.3
-	|| ( >=sys-devel/gcc-4.9 >=sys-devel/clang-3.3 )
-	sys-devel/gettext
-	virtual/pkgconfig
-
-	dev-lang/perl
-	virtual/perl-Data-Dumper
-	virtual/perl-Carp
-
-	doc? ( >=dev-util/gtk-doc-1.10 )
-	geolocation? ( dev-util/gdbus-codegen )
-	introspection? ( jit? ( sys-apps/paxctl ) )
-	test? (
-		dev-lang/python:2.7
-		dev-python/pygobject:3[python_targets_python2_7]
-		x11-themes/hicolor-icon-theme
-		jit? ( sys-apps/paxctl ) )
-"
-
-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
-}
-
-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() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=555504
-	eapply "${FILESDIR}"/${PN}-2.8.5-fix-ia64-build.patch
-	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)
-
-	local ruby_interpreter=""
-
-	if has_version "virtual/rubygems[ruby_targets_ruby24]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby24)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby23]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby23)"
-	elif has_version "virtual/rubygems[ruby_targets_ruby22]"; then
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby22)"
-	else
-		ruby_interpreter="-DRUBY_EXECUTABLE=$(type -P ruby21)"
-	fi
-
-	# 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
-
-	# support for webgl (aka 2d-canvas accelerating)
-	local canvas_enabled
-	if use webgl && ! use gles2 ; then
-		canvas_enabled=ON
-	else
-		canvas_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)
-		-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}
-		-DENABLE_ACCELERATED_2D_CANVAS=${canvas_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/webkit-gtk/webkit-gtk-2.18.5.ebuild b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
index 8bf4a9f17cb2..c49d26d006ae 100644
--- a/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
+++ b/net-libs/webkit-gtk/webkit-gtk-2.18.5.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://www.webkitgtk.org/releases/${MY_P}.tar.xz"
 
 LICENSE="LGPL-2+ BSD"
 SLOT="4/37" # soname version of libwebkit2gtk-4.0
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos"
 
 IUSE="aqua coverage doc +egl +geolocation gles2 gnome-keyring +gstreamer +introspection +jit libnotify nsplugin +opengl spell wayland +webgl X"
 
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 03884f603ead..4fdc904d382c 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/rss2email/Manifest b/net-mail/rss2email/Manifest
index 840eff70a7a9..3b2f3165a99c 100644
--- a/net-mail/rss2email/Manifest
+++ b/net-mail/rss2email/Manifest
@@ -1,5 +1,7 @@
 AUX rss2email-2.69-config-location.patch 433 BLAKE2B 068d30efe9658b51d3327a18adec116e3b2f7601cf8fb6ddda9a5c8e6d2ed8acca390f217f96486ca88ff96e85f24cc441d270260cd14fbb6ccbe63ada3d7dea SHA512 a486c34b58798ec8581164ef593c7320f27233b5e4abfa648389ea54b8c6b7c51f7737baf18150e65537ed198f05293befbf4c1a3abb6c0954a9870ab4985805
 DIST rss2email-2.71.tar.gz 63268 BLAKE2B 56c4e2b59611ffcb0e7a9ff3558e6ed4da3f5ba186d5c2f84b715b8b63bf4729a57c1986f910a46d81813f3e756e07a35959e3000f1bf65839a5da830c50377f SHA512 242a4f2e4fe64f42e3348f8c159d91f79121224beec4faf542393c8323bdcba85510a28fc967ec59702f08205de1d40c2a26235f9d5590751f392880a7211c60
+DIST rss2email-3.10_pre20171001.tar.gz 162385 BLAKE2B 91ae17c43cca616750139b6d559fcfff50be682f70a932ae3e1e281c2a1ae0c31419d37ce7d8887b72873359f0ce29dfb03a1a7c19cfdc2fc945902110b6a3a1 SHA512 d0174489b1d5be9f18e720351f994a87ac0d6131fd23914deb1305223a022e3a741cf279c68c533e8dfe99112af334223354dcd145b38c09e32e16e1a80898ff
 DIST rss2email_2.65-1.diff.gz 8626 BLAKE2B 25b497e099d6093d94a29bf79d89b53d51cff0ed71c926e709b17d8a5a066d13a64c75e162ab02fa34756c49891595f43d1031f4549bf5603238d76bf8e1ac3d SHA512 cb0ca7f6c02f342305c6c19f03973f91343ca530a6a858427bfd6a57948e6123e02d64b1285efed10cda9541f3237f666d8e1a7954a3c2b57866a68dd43b8d8d
 EBUILD rss2email-2.71-r1.ebuild 1621 BLAKE2B 90f214d11231318e13fe6acffce72837a36c6a39b378e0eb60fc0cc0ab6626b5e589c35975a11f1ef596adca540995c22e3235f227a93568d0005af2e1d363c8 SHA512 c758468374d63600c7800453186f1ce42279090cd3e39c9dff35f6fdb26a7720758ea0610bfbf99d95d38b9bd204a36217a6a91805eb662f7fd62b1f7baada53
+EBUILD rss2email-3.10_pre20171001.ebuild 777 BLAKE2B 1d8ffd67fbdec8355f9a17fba45849f5298f8171b7ee9463cac6618374143ce9d02b913a1ac769fea9abae477df4f6717e986f4528117ab657b6fd45f68d9068 SHA512 3cb013bf016650b8a3c146f4c43ef48b67b5b1c59554dde54e72f82419e791d7ef35c247d8c5e8b58ad2b5c09711a5c4540c7c2eaf00949ef1bce2fd50981492
 MISC metadata.xml 540 BLAKE2B 32e0d7708d623f2845f5fea8d95daa69c70c374d087bd20b7837fc04a305c90119f8c9731ec2fcc98154f4d76e8882677f252b4ee83d33cc5446df94ebb7a964 SHA512 4291fe42e4663a06a6481e2b5eae59f932372eb6e0c4154fb2fd46a9b871bbdf1d3140e70a66e386669a4ab313c0e10e5066a02cfab22be31168d0719080b75a
diff --git a/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild b/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild
new file mode 100644
index 000000000000..a37eba22f8a2
--- /dev/null
+++ b/net-mail/rss2email/rss2email-3.10_pre20171001.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_{4,5,6} )
+
+inherit distutils-r1
+
+DEBIAN_PV=${PV/_*/}-4
+
+MY_COMMIT=e21e803a158a90ed784ee61ce7226e5c3a593a28
+DESCRIPTION="A python script that converts RSS/Atom newsfeeds to email"
+HOMEPAGE="https://github.com/rss2email/rss2email"
+SRC_URI="https://github.com/rss2email/rss2email/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 GPL-3 )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="dev-util/patchutils"
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/feedparser-5.0.1
+	>=dev-python/html2text-3.01"
+
+S="${WORKDIR}"/${PN}-${MY_COMMIT}
+
+src_install() {
+	distutils-r1_src_install
+	doman r2e.1
+}
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8460872eaf9c..1ef6b7f606f1 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/bird/Manifest b/net-misc/bird/Manifest
index 5eb9fb8a565a..6e465615c6d8 100644
--- a/net-misc/bird/Manifest
+++ b/net-misc/bird/Manifest
@@ -1,15 +1,6 @@
 AUX initd-v4-bird-1.3.8 801 BLAKE2B 09d9045299972580280fbb6d8745378a75b3a9e647b965d9033e6493df67ea268afba8ab95c46208894f330ff3607d90502653072eb73c130d1841cab9e604c2 SHA512 e878792e589317b743c53fa9fd1f5a4e04c6c97a64946a3e47a910c35d32ad265dcd860935e91950cddb97e1f6ab43c02157a5349e4bd4529cdd1539ca7cf879
 AUX initd-v6-bird-1.3.8 802 BLAKE2B a9dc698f9dfde93314fe1b0f4c8005d9b5f14e4133ebad124f4283a50d990c946bda88b1d55227ed6bf9f33caf0d716b0a8540adf592fbf156297c20ab8a3b1c SHA512 6adb2b7c22696e53644bb5331bcb1b6e84026e41086f6f538c40073a7daa3b0ce3a14e041c2615a72cbe151d6fa8f81b543f85d421f019440ef5b6fd0a556ad9
-DIST bird-1.4.5.tar.gz 1284666 BLAKE2B 46e233f41170cd888f0f1bee50e30d5d99b767a3a6cd9681c4d0091b325513efa7cc329be6549ec7d5c707cd97c90065d80a85212747cd0e34b908905d8b7c89 SHA512 fba60e7daacfdf86e3fa9cb4dc627d33928b4b84dca98d3bfbd378265e422b7ecfe10c2d17369d295afe8a5f1f2e771209bbd54710485a19d64e6551f16d6b94
-DIST bird-1.5.0.tar.gz 1300141 BLAKE2B fcce23b580552fead97ff0eb577cd1980a84381ba52138808e22f1fda9b0318c3e260e5ce996b52384ab090e25d67cbbcfdd12e1581ade035af187b4fc18ba26 SHA512 6814a1393d192083bc9807fd9c56e4bfe169aa34b70811f10da61c79d2fd4b18827bd4f3ea70d9ceba32125e54afb3f8df388416bff619c6f7e838a171f70ae8
-DIST bird-1.6.0.tar.gz 1273899 BLAKE2B 25c8c89f0609392fc47d8ef943f193b575f0fcf5209c6211ae34188ffb4381e830e00b582261e3970061d9f73866a309bc007e34fa1190f15f7a50f6c208d6fa SHA512 3b73c5aa26ac725547d8ff67c35008b6793ef4dc9f22940bacc3871f60abb77e41d93bef0e493d5808eea455e17a04bbba837f16665d726a0a80e73270fed67a
-DIST bird-1.6.1.tar.gz 1286450 BLAKE2B cad7febc28adaf0ea6fafca571611e38193904445bd0b9c2915073a7b2ac249ad5dd2c152a4ea5c95f0493cd95450fe350e34123730c76f6c1dd4aa8d60fbd8a SHA512 ac95aafdc0c94af32a9a78c7d9746bc085d6c4ba74e1acbf5ddf9c1f80a035ce6ece2adf66b1de54c9405e0887c79c6bbde3657c6c7cb727869b661fb7105196
-DIST bird-1.6.2.tar.gz 1300037 BLAKE2B 0a9949ed60dc40825c0fcc2045bee2f3b80617d80aed101aa7edd37cfca3ef398e1940d7c455330733a62c1feb0ca2f077b21cfd991b9e52d7ac797c514b0cbb SHA512 a45ef7fba6caec3ae3908a4cad83d5b5d75533f625bd9fd75d4c42aa1642e76ffd01b2d4f2fbaeffc298b525f426c726432a092d15c9d23e7ccf9ddfa6beeaa1
 DIST bird-1.6.3.tar.gz 1337198 BLAKE2B e1a4a5ec4f46980f77f7c69860343da50eadea54129f20b52302aca5cdf63b19370f8cc2642b480af621772ed7b49ed7ed61a38c486f22c055abbe6be210aab9 SHA512 d0f044cbbb3e5fe0624ad8ae58f5fa352ff41a9cd73f37d803431d9d148927bce52d8f2b82e31dd65c753c55b1034aaf8e15739a511e42cd2dd122b5cd1e15df
-EBUILD bird-1.4.5.ebuild 1115 BLAKE2B 95c0839af0f6d33913a5defe9751b652b182af474b2442d7878300cb8178a3147e9af4fe51fa70cf7eceed2a3d964a074eada3f57589b4592b54abb3a7dd6639 SHA512 8cadb81688945095b460e473dec075b6727752320e312603e9540c7d12f845c1ca5fb7c396050aa88de21b487190d0d72b1175722f06e00409d33844eff4f210
-EBUILD bird-1.5.0.ebuild 1115 BLAKE2B bede0314d13b3d37505d3a7549172904f3c839eb12caf41d7aed52e1371e595d3448ddbf612c0da0d8a6ce446653d4bfa70a4fd1580271c5b62afca1ae1fc1c9 SHA512 aa25e90d6aaa996b98767170412fe10d10ac9f75723651eb19a97db1d746cc634e061b193e8499bb0ac6adea9fbf261c9ee4098126b8ae1283e6c33d8ebbf8a1
-EBUILD bird-1.6.0.ebuild 1128 BLAKE2B c79e46d46ab73fb116b93810e2025a84a7460642d750707848dae6aa3750ec4aacd931e06833e49e10da6a0e9de5ec046d47f33cd450259a4c2120dee69eda54 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf
-EBUILD bird-1.6.1.ebuild 1128 BLAKE2B c79e46d46ab73fb116b93810e2025a84a7460642d750707848dae6aa3750ec4aacd931e06833e49e10da6a0e9de5ec046d47f33cd450259a4c2120dee69eda54 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf
-EBUILD bird-1.6.2.ebuild 1128 BLAKE2B c79e46d46ab73fb116b93810e2025a84a7460642d750707848dae6aa3750ec4aacd931e06833e49e10da6a0e9de5ec046d47f33cd450259a4c2120dee69eda54 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf
+EBUILD bird-1.6.3-r1.ebuild 1267 BLAKE2B 5ccf27da7c9039b6596eb0404e798ad5593c5844f690df66300721a136b9c9c4813804ef0d7f90dc2d027ca21e0926c35f899e7b5be512442a5fd0ed09513336 SHA512 e2c23c2431aa391dddb17d3ff52500bb2503d378fd522cfd3053165b15439ba27a09974c3d3055ed043a98aa807576c7a02472c2d6a86ee86cf8bc82cc9fa120
 EBUILD bird-1.6.3.ebuild 1128 BLAKE2B c79e46d46ab73fb116b93810e2025a84a7460642d750707848dae6aa3750ec4aacd931e06833e49e10da6a0e9de5ec046d47f33cd450259a4c2120dee69eda54 SHA512 ff07b85bd0bcf0b9483099eccaaf2f1ccee42918d99416235330a5c43d6be7798a8981599020767569bf26c3ef52b82034ea5f0a2043c00d2c81b2849539babf
-MISC metadata.xml 245 BLAKE2B 94154a8bdd62b19999d65d599876471c8e44c02209c12a20d75667a21eb873ad59b42d27536d54ff1274d57bad9d73d81eaacea36b8b02e01b40b9eb5e6c82d4 SHA512 c3c7907e50537dd94fdcec1da306eee2f050e5a456d369cd3df8c9bf36c810d811fe547418a8025e533916eb52a742d9feafae647b2957820d99ed962dad302e
+MISC metadata.xml 334 BLAKE2B c53abae724868a2a1e8ac40f84d7c35371a26c74d790975c0a73bb1df914e9d8bd9f6c541657b065f863e8837fae9168144a0d552d30debe9f7e63fcdf703078 SHA512 8bcd99ebbcb563836b5c63f61079594bb27dfb1ed0e35955e4a0a6faba02b82751ba6e58b1324b56bd8fd30799c8c75ba5f442c1e602efa905835ec2d8569330
diff --git a/net-misc/bird/bird-1.4.5.ebuild b/net-misc/bird/bird-1.4.5.ebuild
deleted file mode 100644
index 4804c17b02d8..000000000000
--- a/net-misc/bird/bird-1.4.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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 ~x86"
-IUSE="debug ipv6"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_prepare() {
-	mkdir ipv6
-	tar c --exclude ipv6 . | tar x -C ipv6
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--disable-ipv6 \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable debug)
-
-	if use ipv6; then
-		cd ipv6
-		econf \
-			--enable-client \
-			--enable-ipv6 \
-			--localstatedir="${EPREFIX}/var" \
-			$(use_enable debug)
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd ipv6
-		emake
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		newbin ipv6/birdc birdc6
-		newsbin ipv6/bird bird6
-		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
-	fi
-	dobin birdc
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-1.5.0.ebuild b/net-misc/bird/bird-1.5.0.ebuild
deleted file mode 100644
index 2cad4e37a202..000000000000
--- a/net-misc/bird/bird-1.5.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-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 ~x86"
-IUSE="debug ipv6"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_prepare() {
-	mkdir ipv6
-	tar c --exclude ipv6 . | tar x -C ipv6
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--disable-ipv6 \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable debug)
-
-	if use ipv6; then
-		cd ipv6
-		econf \
-			--enable-client \
-			--enable-ipv6 \
-			--localstatedir="${EPREFIX}/var" \
-			$(use_enable debug)
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd ipv6
-		emake
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		newbin ipv6/birdc birdc6
-		newsbin ipv6/bird bird6
-		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
-	fi
-	dobin birdc
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-1.6.0.ebuild b/net-misc/bird/bird-1.6.0.ebuild
deleted file mode 100644
index 580dd5694106..000000000000
--- a/net-misc/bird/bird-1.6.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~x86"
-IUSE="debug ipv6"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_prepare() {
-	mkdir ipv6
-	tar c --exclude ipv6 . | tar x -C ipv6
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--disable-ipv6 \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable debug)
-
-	if use ipv6; then
-		cd ipv6
-		econf \
-			--enable-client \
-			--enable-ipv6 \
-			--localstatedir="${EPREFIX}/var" \
-			$(use_enable debug)
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd ipv6
-		emake
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		newbin ipv6/birdc birdc6
-		newsbin ipv6/bird bird6
-		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
-	fi
-	dobin birdc
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-1.6.1.ebuild b/net-misc/bird/bird-1.6.1.ebuild
deleted file mode 100644
index 580dd5694106..000000000000
--- a/net-misc/bird/bird-1.6.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~x86"
-IUSE="debug ipv6"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_prepare() {
-	mkdir ipv6
-	tar c --exclude ipv6 . | tar x -C ipv6
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--disable-ipv6 \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable debug)
-
-	if use ipv6; then
-		cd ipv6
-		econf \
-			--enable-client \
-			--enable-ipv6 \
-			--localstatedir="${EPREFIX}/var" \
-			$(use_enable debug)
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd ipv6
-		emake
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		newbin ipv6/birdc birdc6
-		newsbin ipv6/bird bird6
-		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
-	fi
-	dobin birdc
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-1.6.2.ebuild b/net-misc/bird/bird-1.6.2.ebuild
deleted file mode 100644
index 580dd5694106..000000000000
--- a/net-misc/bird/bird-1.6.2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~x86"
-IUSE="debug ipv6"
-
-RDEPEND="sys-libs/ncurses
-	sys-libs/readline"
-DEPEND="sys-devel/flex
-	sys-devel/bison
-	sys-devel/m4"
-
-src_prepare() {
-	mkdir ipv6
-	tar c --exclude ipv6 . | tar x -C ipv6
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		--enable-client \
-		--disable-ipv6 \
-		--localstatedir="${EPREFIX}/var" \
-		$(use_enable debug)
-
-	if use ipv6; then
-		cd ipv6
-		econf \
-			--enable-client \
-			--enable-ipv6 \
-			--localstatedir="${EPREFIX}/var" \
-			$(use_enable debug)
-	fi
-}
-
-src_compile() {
-	emake
-	if use ipv6; then
-		cd ipv6
-		emake
-	fi
-}
-
-src_install() {
-	if use ipv6; then
-		newbin ipv6/birdc birdc6
-		newsbin ipv6/bird bird6
-		newinitd "${FILESDIR}/initd-v6-${PN}-1.3.8" bird6
-	fi
-	dobin birdc
-	dosbin bird
-	newinitd "${FILESDIR}/initd-v4-${PN}-1.3.8" bird
-	dodoc doc/bird.conf.example
-}
diff --git a/net-misc/bird/bird-1.6.3-r1.ebuild b/net-misc/bird/bird-1.6.3-r1.ebuild
new file mode 100644
index 000000000000..07a2f35e3070
--- /dev/null
+++ b/net-misc/bird/bird-1.6.3-r1.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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 ~x86"
+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() {
+	mkdir ipv6
+	tar c --exclude ipv6 . | tar x -C ipv6
+	eapply_user
+}
+
+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/metadata.xml b/net-misc/bird/metadata.xml
index 1a06e96ebdc7..3be54ec47f3c 100644
--- a/net-misc/bird/metadata.xml
+++ b/net-misc/bird/metadata.xml
@@ -5,4 +5,7 @@
 		<email>chainsaw@gentoo.org</email>
 		<name>Tony Vroon</name>
 	</maintainer>
+	<use>
+		<flag name="client">Build the ncurses/readline full featured CLI</flag>
+	</use>
 </pkgmetadata>
diff --git a/net-misc/curl/Manifest b/net-misc/curl/Manifest
index 55d5a7bb05c3..1516cfc67b0d 100644
--- a/net-misc/curl/Manifest
+++ b/net-misc/curl/Manifest
@@ -1,5 +1,4 @@
 AUX curl-7.30.0-prefix.patch 880 BLAKE2B 5b7552a8339014221864a585d174b02a96ec7dd7fe8762d331d1981834044f8ec4db64d527a4ded3f5f4cccc86f281576668de092439eb19f5477d5fcf8369cf SHA512 c7cd13b9ccbd12ed01ea121ffece9c23b898a5b34698bae59ae1dd23b1cf2445180b84d80c4a640981f16dba5018df944f405dd5c660addab54ca21e0e673b7f
-AUX curl-7.55.1-fix-build.patch 604 BLAKE2B bf8967460ddab3f0626c93a48d345aa1451dcf1bfa1b69179dd66e0df7869e00cd110daf01c45fa98949e114a1f8799fc5e1a7c9b045fd4abd76559affb5c73a SHA512 9c0aa85219052d7f85be45510f66e49d2dc344b6652d4e8d9c3e2ef583fa90b0e857b285a336a318ca8402b998556bdbc9cdec08973cc4f57c4b9fed1789fdcf
 AUX curl-fix-gnutls-nettle.patch 1186 BLAKE2B 5a7ea1ab68e8e314cda5b957335caf84e5b0e9b2b65c1eacfe94349139ff27903d55ae608a71a0389bf9f8bfbda92184c4cc30ca0b96b13b11f0d77cbf4c7b53 SHA512 b88d4d71a1d55626aedea620e94a5b6064141c6ff0d8a64c784705d44d4a00dc789dd0a55a56320ca4c9f2b9914e72285447c9310bb4563b45d7f3430b18a0fa
 AUX curl-respect-cflags-3.patch 406 BLAKE2B 1b533144858aff5566150c4a2648ad2e48e8ff29849ae285592edfee4b3332d06e750395dea7190ee6a01d2b5ee2c2c42c10400c2e5defa09963a90a1a10417d SHA512 3219e4e67d534e35012909243fc8d69d58989462db44dd507c502e7aaa299f1d9a01392e2c83797cc2bdb53d503470c5d6e7bf94572a6ccc6e5eafcc0466bc54
 DIST curl-7.57.0.tar.bz2 2849283 BLAKE2B 05bf62df8908a7c2b00abbc31067b8e12e8f8527594597e0c92e950a83e359e3ad430930face01057e0d2e6af8e8d759a9e078bd179cdbd69bc7fe2d10c5c5e3 SHA512 f366d2e931d7aff63bac0e1f760ced32c849252947d522427ba92124566906a7e6bd081b6d1630df36895dda2a00ac4cf1bed1470740693ef47ab90c6a270377
diff --git a/net-misc/curl/files/curl-7.55.1-fix-build.patch b/net-misc/curl/files/curl-7.55.1-fix-build.patch
deleted file mode 100644
index b9749d59c7f3..000000000000
--- a/net-misc/curl/files/curl-7.55.1-fix-build.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-index d77a884..6dcd0f1 100644
---- a/m4/curl-confopts.m4
-+++ b/m4/curl-confopts.m4
-@@ -37,14 +37,14 @@ AC_HELP_STRING([--enable-threaded-resolver],[Enable threaded resolver])
- AC_HELP_STRING([--disable-threaded-resolver],[Disable threaded resolver]),
-   OPT_THRES=$enableval)
-   case "$OPT_THRES" in
--    *)
--      dnl configure option not specified
--      want_thres="yes"
--      ;;
-     no)
-       dnl --disable-threaded-resolver option used
-       want_thres="no"
-       ;;
-+    *)
-+      dnl configure option not specified
-+      want_thres="yes"
-+      ;;
-   esac
-   AC_MSG_RESULT([$want_thres])
- ])
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index 1c99c0e15994..1c69c2d3d184 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,4 +1,3 @@
-AUX 2.7.15-no-user-root.patch 704 BLAKE2B d7353f8338be379cd31f42cc29c4346930c191b3157084df658eebc0d1e4202d9711d8694b6b6ba65285f0de1e83ab55188d9d79a2e6a45c919c1dcb64003b91 SHA512 3bce2f6b0605e708107097b8bb033681c901afc535c1921712d3b2db172cc296b50cc4a833b0d21c9718fc094d37d9d9b3c2e9abb65d6f96449ae91635d3101c
 AUX 2.8.0-no-user-root.patch 708 BLAKE2B fe16be6af4322f52a5014acf034ad4f8e2711c46386de9ccbeedee819224d8523ecd79c862338de1910f84a5c39cddbffce9955c2c0185576d837f2d2ac08da6 SHA512 d5e75f6b4dad401b547d4533126b93690c17237c51987547639c407fe684f5fe83759ea77637b8b2e7b2b9c63ac85ff015ec2b35c459bbef74572ea08f89c8dd
 DIST Electrum-3.0.5.tar.gz 2639766 BLAKE2B 28587ca056247a5671d84c0b79824e8eea8df8ca2e3204333e6edd7db98ecbeebdf81f4ac819de8b87c7593e83f948d091d48d55cdff08af76322d94bacec0fd SHA512 27cfa44ce8eeb5eef8038f1f68b4a42d173daaf7a940ffc9e9b1dad16a8f7f49bd53d5eefdbaf242e5e09aa2f887bce536f17941c2250225cd92c78f62c52e39
 EBUILD electrum-3.0.5.ebuild 4256 BLAKE2B 6f8b98f75accac0d16401175ec13acbe355ae328b69b06a04d0e55e0ccfa95c34d4804a8239bed611188af59c54a346077701defd827aed4b525ee42ad2628d4 SHA512 09d6270945126e63ea0c8385ec4fb4726d7b029e12543fcf6466c1384bebb38ab87d5462e926f1928971423099cb49fa0cb9433c52b4230fff474eb29750a877
diff --git a/net-misc/electrum/files/2.7.15-no-user-root.patch b/net-misc/electrum/files/2.7.15-no-user-root.patch
deleted file mode 100644
index e98cf30da42c..000000000000
--- a/net-misc/electrum/files/2.7.15-no-user-root.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- setup.py.orig	2017-01-06 19:17:44.294137848 +0000
-+++ setup.py	2017-01-06 19:17:50.093161327 +0000
-@@ -21,12 +21,6 @@
-     parser.add_argument('--root=', dest='root_path', metavar='dir', default='/')
-     opts, _ = parser.parse_known_args(sys.argv[1:])
-     usr_share = os.path.join(sys.prefix, "share")
--    if not os.access(opts.root_path + usr_share, os.W_OK) and \
--       not os.access(opts.root_path, os.W_OK):
--        if 'XDG_DATA_HOME' in os.environ.keys():
--            usr_share = os.environ['XDG_DATA_HOME']
--        else:
--            usr_share = os.path.expanduser('~/.local/share')
-     data_files += [
-         (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
-     ]
diff --git a/net-misc/igmpproxy/Manifest b/net-misc/igmpproxy/Manifest
index 9e559358c02d..372dbee57187 100644
--- a/net-misc/igmpproxy/Manifest
+++ b/net-misc/igmpproxy/Manifest
@@ -2,5 +2,7 @@ AUX igmpproxy-conf.d 165 BLAKE2B df8526557acd0d88b017298dfd06b636c60537e79bca0fd
 AUX igmpproxy-init.d 514 BLAKE2B 5022b5f458c1a2c4082f591a1f003129453d6d8846ca6976820bb03b980aae7fed81abc29499effa3f96daf84e977c00ec842cc6a3d63b12be86c1e254adf15f SHA512 7bb2812c27556d1355e415eaa8ebe5d3ed5a896e88c6813c4bce686b3268c6f0000507cea59afa37a3f474fa6e2ca20c91bf87a63cf4c8209cef2f5bbb01c1cf
 AUX igmpproxy.service 150 BLAKE2B 2b02ddf142d49dd264d4025a91a8a9335132b40eb0128d614bbd95f2cfbb886a3e69b8f6de09b8d6bdfb0901eee19c8f8e721284244ee380417ed3d1823f25d4 SHA512 675bfd38f542dfeb92372625058b443700726683a6f6ffc2e24a2f13e645b372cec5806957ec7aa6c764fd85b4d3b4a50d2640805eb8235fe30e9e269c974b09
 DIST igmpproxy-0.1.tar.gz 140159 BLAKE2B d4a0fb0f69f1e8c7221ecd2842e95cfa390f54885d5eaaa5c69a32563b318a05540e123d4b19cd63a930d17934c1344fdf6467fad5c1de333d03e0a802e7912b SHA512 1a569814d8984610402313d8c4adb78ff362f82ae28c968a8ba0fb411e12a704d1b51b387111b51517ab8fb2e86952bbd196f27eccd311c11ce288fc6fa25ad4
+DIST igmpproxy-0.2.tar.gz 170705 BLAKE2B a2a13399995f283fb77b500140c1750ed306511eb5f51a71491edc245c8d8f873809fac9a82dc7ba0be7a7390643d85d7f4a2a8521b3c2c20fb8f09ad33b507d SHA512 a06f95c912456191d0953c08058ccb987120f6b11426d15e329c2de95878b9fc6ee5742b253e2c06b8002771478c382a58a14a0af76fb835ebb1d132b9f34e4f
 EBUILD igmpproxy-0.1-r2.ebuild 587 BLAKE2B d96e2871845a21ddbab6a481915a82f5de977ff0e36d2c9c72cfc1d55a5bbf706349079151ada0f7b44a348a3a137c902dce9b4d88ffdfd96f3a1a8936ccf79c SHA512 75036b6de777dd630a89c6d08f729cb6c51c591c9ec9b206f492e081914f6c49ecb93bc9dd6e7026703a72b8adb1a4596d7c9aa326ab72b7e5cf72aa29ab3b86
+EBUILD igmpproxy-0.2.ebuild 623 BLAKE2B 1712e810c9dd4e4420744c8d43a8887f6b505d68888d2febc0ed279c3761acec388725ab6e71ffd8c8ad63dbf03501b72754e7d68d358b88f1065541ac6fbc0e SHA512 dbe1f4d9674952c00cd625bdb0c598d0241d2c6075aeb16c56ce5798fbd5dc731c124223fa557439a6c11d829cac67161aba89cbbba0d73aeb4ae10014ee341c
 MISC metadata.xml 447 BLAKE2B 08ca9aadcb600bf783269eef2be66631a19afa27baf2b390a7bd6e7390660c66285789ec41d26826cfc71dac7882b27d1a6460d53c1c5b7e2c3da2c54dd7d998 SHA512 4c6c8c0023027fa3ca7acc3d164fb14f381df30850964bad7f1ccd0ccd4d2fcb301b0b4aba9493f4bce1cf96ee59197970489648db5be7e085a140c282ff30a5
diff --git a/net-misc/igmpproxy/igmpproxy-0.2.ebuild b/net-misc/igmpproxy/igmpproxy-0.2.ebuild
new file mode 100644
index 000000000000..92b9f1240bdc
--- /dev/null
+++ b/net-misc/igmpproxy/igmpproxy-0.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit linux-info systemd
+
+DESCRIPTION="Multicast Routing Daemon using only IGMP signalling"
+HOMEPAGE="https://github.com/pali/igmpproxy"
+SRC_URI="https://github.com/pali/igmpproxy/releases/download/${PV}/${P}.tar.gz"
+
+LICENSE="GPL-2 Stanford"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+CONFIG_CHECK="~IP_MULTICAST ~IP_MROUTE"
+
+src_install() {
+	emake DESTDIR="${D}" install
+	newinitd "${FILESDIR}/${PN}-init.d" ${PN}
+	newconfd "${FILESDIR}/${PN}-conf.d" ${PN}
+	systemd_dounit "${FILESDIR}/${PN}.service"
+}
diff --git a/net-misc/rsync/Manifest b/net-misc/rsync/Manifest
index a75b89f6be56..ae4fafdb78b3 100644
--- a/net-misc/rsync/Manifest
+++ b/net-misc/rsync/Manifest
@@ -10,7 +10,7 @@ AUX rsyncd.logrotate 105 BLAKE2B 82430036a5ca123ba20bc80040e98869734b3b397440968
 AUX rsyncd.service 206 BLAKE2B 3b8bf9165d2410f731c5c2a63fdb5553708aa6aca0fed99acefb38c16b8ae9430a5257440c070b88b71a1295cc6360d89458e1b6696ec9897e722699f162769e SHA512 b848a13856027e4fe1fd206a2aeb32854abd73beb31ebad7ac62c36b433e65507bbb5eef3901a42f46e70a4e887c7f9013617f19712e160ce155f3cb83bfc625
 AUX rsyncd.xinetd-3.0.9-r1 194 BLAKE2B 8e3edf4831e020451ba1886e2e8ae86e576016aabcaaf8e84c48adb15ba6a2e8d8c58098af2757011ea4f84fbfd758029d905fb8f5ed21bcc5ac34c3baae2a9c SHA512 fc053fc4748950343e866cc95284d037156a953454e4294d775f01f059e96e805582688bf1de5c965836889192ce4a663ec740e6ec2265406e509c5c6d6c3215
 DIST rsync-3.1.2.tar.gz 892724 BLAKE2B e366514ae9835ba7c201a9e09fb9342c5e52fa36d45d46300d080403de25a64ba3ed7a703e56b4f47a743a597694a2d0a50bb4bab6cfa0aa7b59a4f7b93b9f21 SHA512 4c55fd69f436ead0cb5a0b7c6fdfef9bb28ddb9c63534eb619e756b118d5b08cfc5e696498650932c86e865b37e06633da947e6720ca0c27ed5c034313ae208b
-EBUILD rsync-3.1.2-r1.ebuild 2868 BLAKE2B 43895a478b5e451a202c61a9103f0bc0b66c067e8dc52fdb868b7149c651cc85cccd8b2b5564e87097becad079ee806361b4cca53456ab46c09d219b900be589 SHA512 4c0311a250f2ad01016918b0b0c5bd4eaa09953d913e9ee66da53b081d7941312903d3b068ec48710f5ead6f659b0315fe422c729277650c34238106c8afac4a
-EBUILD rsync-3.1.2-r2.ebuild 3080 BLAKE2B a78563994b1bcefa55bb71b3ecd66224be4f6d46177f80fcb3597bcfa0944313b7aa4a37c05ee1801a5fca293978cd8fc51c15a8d4b0da2aa9c2d6c32498a605 SHA512 1627518be854536ba26be38dd98cfb2f563ff855625742cbcd6d401252d42f17e2830188dd2de6de3e07404979de922a63b69bb71874773b7cb36c92014a327f
-EBUILD rsync-3.1.2.ebuild 2840 BLAKE2B 2ee399fcfa6ed8b11b2446178653d3ae55a4bd2f920f4ca5430f397741f9161ce6ccfd472030e7f008225fa28f9886d92751767be5b2213a5f0706207f9c448a SHA512 2f0998787e96cfbb29398923998905fc029520a1352ae4420561471f8342e3876e0ed9dec935d4d5677bed2693aa6aa810b7f713914633ba97676a2dfa1edcb1
+DIST rsync-3.1.3pre1.tar.gz 905910 BLAKE2B 1823494a325181773cd14f2b8a9aae4ad6a891d70713e111f43c516a69cb9852103c7bb8ced864aec24b8d2a7a4e791c53f6e868276c6c6cc25f0aaba36ddbf2 SHA512 8e2e4623650985169d4ec2e84549f8b5f060b5544380c5b332998161eb1adcfece48216c343730eb726904079836c2d47dc85fa9707fccc02f09841eb547b597
+EBUILD rsync-3.1.2-r2.ebuild 3079 BLAKE2B da170ff573c25a1c84c615bdc28b69070e66df5a53d7d3045451cf9535f98439a25dbf5a0032b08c9c810f67f2631b44b996015427c334c0d23d2afca9fe9967 SHA512 facf9e9db4212fa57602334def44fe56f869da794e2a0c4e3ed896755d86b9704c4a3b3f76141e8c1eb4750744c77c7e4642266dae9ddff7eb4b2ca427b31b7f
+EBUILD rsync-3.1.3_pre1.ebuild 2853 BLAKE2B 78f5bf6f8dfb345ddb2c12237eaec6acfcee6137fb8e8105d364e59343d384ecccb51f1a062b9f0bc0f1ea9dbe3e7a1679cd3650320bc7ff0a20e617f8198190 SHA512 2b6653219a8c6e1c9e9bd312e819c7071d509465bda02b87ae475f4ffb9a510be16e8de180d5a32696dca7802153721bfaba65e9b2b43ea048027284677a1e65
 MISC metadata.xml 449 BLAKE2B 961dae7e8c69c0d452c9eedf67223d14ff8ff481821206d6fe2daed3a23a0da704155d61339b0d32182e5ba9195ff25b3383bd90945ea474b21da7f66f09c77f SHA512 1c0f031c078a7c22b8375b093dcd241e139ca86a61e2d463d9d01946b57b24dff29ab489ac063b70d210d1306106896fe77bd9678331d5954ef3182222d4f920
diff --git a/net-misc/rsync/rsync-3.1.2-r1.ebuild b/net-misc/rsync/rsync-3.1.2-r1.ebuild
deleted file mode 100644
index 84bd042e0aae..000000000000
--- a/net-misc/rsync/rsync-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit eutils flag-o-matic prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
-[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-if [[ ${PV} != *_pre ]] ; then
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="acl examples iconv ipv6 static stunnel xattr"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
-	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
-	>=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-PATCHES=( "${FILESDIR}"/${PN}-3.1.2-CVE-2017-16548.patch )
-
-S=${WORKDIR}/${P/_/}
-
-src_configure() {
-	use static && append-ldflags -static
-	econf \
-		--without-included-popt \
-		$(use_enable acl acl-support) \
-		$(use_enable xattr xattr-support) \
-		$(use_enable ipv6) \
-		$(use_enable iconv) \
-		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
-	touch proto.h-tstamp #421625
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-	dodoc NEWS OLDNEWS README TODO tech_report.tex
-	insinto /etc
-	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
-	# Install stunnel helpers
-	if use stunnel ; then
-		emake DESTDIR="${D}" install-ssl-client
-		emake DESTDIR="${D}" install-ssl-daemon
-	fi
-
-	# Install the useful contrib scripts
-	if use examples ; then
-		exeinto /usr/share/rsync
-		doexe support/*
-		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
-	fi
-
-	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
-	systemd_dounit "${FILESDIR}/rsyncd.service"
-}
-
-pkg_postinst() {
-	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
-		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
-		ewarn "is a security risk which you should fix.  Please check your"
-		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-	fi
-	if use stunnel ; then
-		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
-		einfo
-		einfo "You maybe have to update the certificates configured in"
-		einfo "${EROOT}/etc/stunnel/rsync.conf"
-	fi
-}
diff --git a/net-misc/rsync/rsync-3.1.2-r2.ebuild b/net-misc/rsync/rsync-3.1.2-r2.ebuild
index ba5738ec8f8d..224e0afbccf6 100644
--- a/net-misc/rsync/rsync-3.1.2-r2.ebuild
+++ b/net-misc/rsync/rsync-3.1.2-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 if [[ ${PV} != *_pre ]] ; then
-KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="acl examples iconv ipv6 static stunnel xattr"
 
diff --git a/net-misc/rsync/rsync-3.1.2.ebuild b/net-misc/rsync/rsync-3.1.2.ebuild
deleted file mode 100644
index 06451278bc6a..000000000000
--- a/net-misc/rsync/rsync-3.1.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils flag-o-matic prefix systemd
-
-DESCRIPTION="File transfer program to keep remote files into sync"
-HOMEPAGE="https://rsync.samba.org/"
-SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
-[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-if [[ ${PV} != *_pre ]] ; then
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="acl examples iconv ipv6 static stunnel xattr"
-
-LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
-	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
-	>=dev-libs/popt-1.5[static-libs(+)]"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	iconv? ( virtual/libiconv )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-S=${WORKDIR}/${P/_/}
-
-src_prepare() {
-	epatch_user
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	econf \
-		--without-included-popt \
-		$(use_enable acl acl-support) \
-		$(use_enable xattr xattr-support) \
-		$(use_enable ipv6) \
-		$(use_enable iconv) \
-		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
-	touch proto.h-tstamp #421625
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
-	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
-	dodoc NEWS OLDNEWS README TODO tech_report.tex
-	insinto /etc
-	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
-
-	insinto /etc/xinetd.d
-	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
-
-	# Install stunnel helpers
-	if use stunnel ; then
-		emake DESTDIR="${D}" install-ssl-client
-		emake DESTDIR="${D}" install-ssl-daemon
-	fi
-
-	# Install the useful contrib scripts
-	if use examples ; then
-		exeinto /usr/share/rsync
-		doexe support/*
-		rm -f "${ED}"/usr/share/rsync/{Makefile*,*.c}
-	fi
-
-	eprefixify "${ED}"/etc/{,xinetd.d}/rsyncd*
-
-	systemd_dounit "${FILESDIR}/rsyncd.service"
-}
-
-pkg_postinst() {
-	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
-		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
-		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
-		ewarn "is a security risk which you should fix.  Please check your"
-		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
-	fi
-	if use stunnel ; then
-		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
-		einfo
-		einfo "You maybe have to update the certificates configured in"
-		einfo "${EROOT}/etc/stunnel/rsync.conf"
-	fi
-}
diff --git a/net-misc/rsync/rsync-3.1.3_pre1.ebuild b/net-misc/rsync/rsync-3.1.3_pre1.ebuild
new file mode 100644
index 000000000000..a01698246090
--- /dev/null
+++ b/net-misc/rsync/rsync-3.1.3_pre1.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit flag-o-matic prefix systemd
+
+DESCRIPTION="File transfer program to keep remote files into sync"
+HOMEPAGE="https://rsync.samba.org/"
+SRC_URI="https://rsync.samba.org/ftp/rsync/src/${P}.tar.gz"
+[[ "${PV}" = *_pre* ]] && SRC_URI="https://rsync.samba.org/ftp/rsync/src-previews/${P/_/}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ ${PV} != *_pre ]] ; then
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="acl examples iconv ipv6 static stunnel xattr"
+
+LIB_DEPEND="acl? ( virtual/acl[static-libs(+)] )
+	xattr? ( kernel_linux? ( sys-apps/attr[static-libs(+)] ) )
+	>=dev-libs/popt-1.5[static-libs(+)]"
+RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	iconv? ( virtual/libiconv )"
+DEPEND="${RDEPEND}
+	static? ( ${LIB_DEPEND} )"
+
+S="${WORKDIR}/${P/_/}"
+
+src_configure() {
+	use static && append-ldflags -static
+	local myeconfargs=(
+		--with-rsyncd-conf="${EPREFIX}"/etc/rsyncd.conf
+		--without-included-popt
+		$(use_enable acl acl-support)
+		$(use_enable iconv)
+		$(use_enable ipv6)
+		$(use_enable xattr xattr-support)
+	)
+	econf "${myeconfargs[@]}"
+	touch proto.h-tstamp #421625
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	newconfd "${FILESDIR}"/rsyncd.conf.d rsyncd
+	newinitd "${FILESDIR}"/rsyncd.init.d-r1 rsyncd
+
+	dodoc NEWS OLDNEWS README TODO tech_report.tex
+
+	insinto /etc
+	newins "${FILESDIR}"/rsyncd.conf-3.0.9-r1 rsyncd.conf
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/rsyncd.logrotate rsyncd
+
+	insinto /etc/xinetd.d
+	newins "${FILESDIR}"/rsyncd.xinetd-3.0.9-r1 rsyncd
+
+	# Install stunnel helpers
+	if use stunnel ; then
+		emake DESTDIR="${D}" install-ssl-client
+		emake DESTDIR="${D}" install-ssl-daemon
+	fi
+
+	# Install the useful contrib scripts
+	if use examples ; then
+		exeinto /usr/share/rsync
+		doexe support/*
+		rm -f "${ED%/}"/usr/share/rsync/{Makefile*,*.c}
+	fi
+
+	eprefixify "${ED%/}"/etc/{,xinetd.d}/rsyncd*
+
+	systemd_dounit "${FILESDIR}/rsyncd.service"
+}
+
+pkg_postinst() {
+	if egrep -qis '^[[:space:]]use chroot[[:space:]]*=[[:space:]]*(no|0|false)' \
+		"${EROOT}"/etc/rsyncd.conf "${EROOT}"/etc/rsync/rsyncd.conf ; then
+		ewarn "You have disabled chroot support in your rsyncd.conf.  This"
+		ewarn "is a security risk which you should fix.  Please check your"
+		ewarn "/etc/rsyncd.conf file and fix the setting 'use chroot'."
+	fi
+	if use stunnel ; then
+		einfo "Please install \">=net-misc/stunnel-4\" in order to use stunnel feature."
+		einfo
+		einfo "You maybe have to update the certificates configured in"
+		einfo "${EROOT}/etc/stunnel/rsync.conf"
+	fi
+}
diff --git a/net-misc/uftp/Manifest b/net-misc/uftp/Manifest
index 6ac616928b4c..eefb7874ff04 100644
--- a/net-misc/uftp/Manifest
+++ b/net-misc/uftp/Manifest
@@ -1,11 +1,12 @@
 AUX logrotate 166 BLAKE2B a3da56439bae88709b8cea7d1631d6848ea9e63870a9e9ad2853889d3b9b16d11d09bbfa99a41e24b2ecb5e1134875190b99aa7056192fd16d7696560bbfb83f SHA512 77c7b0e17123432f39d43048d7c51b88b20cb5ef297d36e2be50f8816f956dda6ca300fa3053756ac9f9480699cec9c28fb5ad77e81eeac667ace55dbc61e88f
 AUX uftp-3.7_makefile.patch 2037 BLAKE2B a1bd4751b74c6d1b3edfa914575235a8ad135dd18e70ee31bd83bc8aa475d7f447ba0254ae7a094c7326f09e580fb4693d33ce16afeb839a3a5e27d26bd30fa8 SHA512 1fc5109626a8a46bd9bd05348cbfc957a524827c5f165f1f991f7887319f735ae90dab6bad91a96d7c6bae7e2c07e26ebcbd91b9a595b97d8b1b6d79e496e899
+AUX uftp-4.9.4_makefile.patch 1502 BLAKE2B fc5b2b07f250b16bed1386c31850dcab1fd854c8db2232190559855fb45c0608b35e4e5accd3c93cce198c792b36f31f5705b068371a94780cb841772c61846f SHA512 41a2c9f6f572eacb2c503f578ab3c4baf6c9e1ffb92b7831da2e122e1b99c2fed2e82811ec0fb2f98cee684b395981cd83ae2f50dacfc7234210c91c6d3ce87e
 AUX uftpd.conf 169 BLAKE2B 13e8d47f9a2b79f7e6c81d3a4aed80bbffa2c3195981b67eafce3801faf50b5ea2570de36634dd3e36b526f721e14259ba7b79a95f35c8e98d85fe6b95b9525f SHA512 732a3e7f5eb1eec609f05d6c075ea11b16bdd9abcdc9528dacf7fbc148e2249306226fd5975b39956758d0b237b0d59b97e7c602451639fe7db19c43ae4f39f9
 AUX uftpd.init 518 BLAKE2B b4a98852340d03a5bb8673faff02f7f18a5a27b87d22aebaf19753d836250c7d4519598049d41b9cf81832c18cc7a1726664bf647cceb92b2457a811df54ea8a SHA512 4008611d6a8f7e4c960269526761b9c5b2b7446bf1795983a62fb5fc12b4525ecd2e0e42ff2fb7d937e427d9d77834a2b6836db1242269fad7b09f92952c53b8
 AUX uftpproxyd.conf 121 BLAKE2B 82664d638b8a4041a5c18676e46509c3ed20525b7178ada1fa902f41f57a78c5e465b22701bd369e26ea65ebf4fe5834f7b23f4fcebd6d87850ed8fd93e58f40 SHA512 c61441d048ce99a50b5224cea7c4f9f1a2532fff8083a9a71e6099a98cba1fe79b43825188034efd402b47ac28bbe341827cb21872c17550419db36a8da7bb35
 AUX uftpproxyd.init 522 BLAKE2B a7a4df565d5dfa2761068adfa3dc440030269cc0d809c892807a2582df36882b2cc489de608ed0baa85f6714d15e7a3ec3f00895324fe1f6a521c3ca8ffd9ccb SHA512 2d69f0b84750cb62fb96b7fc7a042fe54b6f658074f9c4c49a2bf4957507fce333862ae95fd0498e60240490ce44cd299b8fba851d4d7c9a67dcdf1e7f29d7f5
 DIST uftp-3.7.1.tar 849920 BLAKE2B 32a2ccca01f4b8ee205301a2bb4ac30da4f17bf0d8a24f885ec40a430b2cc478efcd504ba118ef7f55c43ef53a6fb3e6caa2e2cebda93c254ab289a8683488a6 SHA512 93fefe1d4c5310bfa6470a78011e63aea8cc9cf59a73ea24920d3ad8c835476bbc410b3669ee79c847eba7d21d61f600e09529d5e6f2ed24076f663a34d99c15
-DIST uftp-3.7.tar 849920 BLAKE2B fac05a89ed0a8e2904e810595c0f43e8b7e9402446499dabaa9567cb5f058e5d6c71e6f4521664a8c38a4d556f6dcedaad9643d5147ecd646c01f874cbf40b02 SHA512 8e154ea196b34995bc3831c375237a4d98f0627ca79fb6714b66763f64748810e5151efdc40773044a127a0e875ffcc8b985e6f7babd359ae38280a219c4d610
-EBUILD uftp-3.7.1.ebuild 1079 BLAKE2B 56b5290daa949a982974eca806e31ce1a6918c0e6b8bf91bb9274cf9ddd8be8cfb41fcef26a8ff4c3c53c64f296768bbe52a36ca79601e3781b8a14b7cc75f74 SHA512 29499af4e9c9747f56686fd9f39cd79f4af9dccb19560b1470a431a3a6ba1943e60eebc9a6eef760e0e82448474fc0e9e6da757503b4090e8ef3e623a0634ee9
-EBUILD uftp-3.7.ebuild 1074 BLAKE2B ae6e5199a83cb71dc3ae4904f8c47ef47aa7bb8258b36255509bf5aafa8d427888331dd0d7675f76f9e5066fe0ebd211c775e590decdb727809e25f29a513c1d SHA512 abe662c5b454aa24d3b001b5fe1b5ac905573a03bd00a75607bbdacd31f98c83da7beb4b5b3b4965982b756c9cffdc4e9369f67463f20ce59b856d4d03250d57
+DIST uftp-4.9.4.tar.gz 243819 BLAKE2B b7aa75f8db82480912dd4cf8199dce7e8170db837853f16a2d8e5a4b7cf190416b7a2a23e170a4837f59a7bba030b0434383bceae9b253eb1d2fc13f6fcd26e7 SHA512 f3c799265a55e0cb536f17be3a0ebfad5f81284255083ebe9a12fda4b5ce8407f05a710cb32a41f3dccbc0ac90367c44d4b67058bdbeaa4f2f8efe732463ebf0
+EBUILD uftp-3.7.1.ebuild 1062 BLAKE2B eab032956e3170de02ad65e543011be42260335cbe51e30acde9509a6b15a10f98ade2bd284293a27906484c4281bd7549569543df68ae1af6b4c2fcd5160b13 SHA512 59352a391e6b7aceff3939ea588a6be4859b1b62333451b26978ad0b08eb3d1cd7b90c0e3e4a5d84c1fac86741ce43ffc9ec5bfb64c697ccb02079cd1b5f6006
+EBUILD uftp-4.9.4.ebuild 1268 BLAKE2B f0f5346bc945ded6924a601256d95e997c9a626a3b770f849e35b73a380ab319ca30e3ef8b211f7aed256fb0e1d214291943b730b6b9b52b23bdd8b0cf48fb82 SHA512 1ae279fcaa4e627fd212465e73de1d1b1bb18491de290fd0cce5c945c07c43eca7f35421ff589fe1fc33b35bf057d938519cb32d327fd5bf88de1e7a27fe5612
 MISC metadata.xml 433 BLAKE2B 0c732cc29ed317b29aa5c7313ebf825e62835325c1c44f1e39bbf2893d40335b3458ddf9263132fc858d28ac8c66876f39bdccbfdc376c87c955e8f09eba7171 SHA512 7e63ff9bed7a90bc94ac2f0441b6f089e5f38d08afb47c5513b09bb6ee2b5fca756a20401d622548c129b540a0b93dba882c38e5ac69dcca9ec72e4c4c9e7686
diff --git a/net-misc/uftp/files/uftp-4.9.4_makefile.patch b/net-misc/uftp/files/uftp-4.9.4_makefile.patch
new file mode 100644
index 000000000000..5a131c350a56
--- /dev/null
+++ b/net-misc/uftp/files/uftp-4.9.4_makefile.patch
@@ -0,0 +1,41 @@
+diff -Nuar uftp-4.9.4-orig/makefile uftp-4.9.4/makefile
+--- uftp-4.9.4-orig/makefile	2017-12-13 13:15:53.873252064 +0500
++++ uftp-4.9.4/makefile	2017-12-13 13:25:44.092223428 +0500
+@@ -42,24 +42,24 @@
+ endif
+ 
+ # defaults
+-OPTIONS=-g -Wall $(ENC_OPTS)
++OPTIONS=-Wall $(ENC_OPTS)
+ LDLIBS=-lc -lm $(CRYPT_LIB)
+ MTFLAGS=
+ 
+ # FreeBSD
+ ifeq ("FreeBSD", "$(UNAME_S)")
+-OPTIONS=-g -Wall -DHAS_GETIFADDRS -DNO_DUAL -DSOCKADDR_LEN $(ENC_OPTS)
++OPTIONS=-DHAS_GETIFADDRS -DNO_DUAL -DSOCKADDR_LEN $(ENC_OPTS)
+ endif
+ 
+ # OSX, aka Darwin
+ ifeq ("Darwin", "$(UNAME_S)")
+-OPTIONS=-g -Wall -DHAS_GETIFADDRS $(ENC_OPTS)
++OPTIONS=-Wall -DHAS_GETIFADDRS $(ENC_OPTS)
+ endif
+ 
+ # Sun
+ ifeq ("SunOS", "$(UNAME_S)")
+ CC = cc
+-OPTIONS=-g -DBSD_COMP -DNO_DUAL -DNO_RECVMSG $(ENC_OPTS)
++OPTIONS=-DBSD_COMP -DNO_DUAL -DNO_RECVMSG $(ENC_OPTS)
+ LDLIBS=-lnsl -lsocket -lm $(CRYPT_LIB)
+ CFLAGS+=`getconf LFS_CFLAGS`
+ OPENSSL=/usr/sfw
+@@ -68,7 +68,7 @@
+ 
+ # Linux
+ ifeq ("Linux", "$(UNAME_S)")
+-OPTIONS=-g -Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -Wformat=2 -Wwrite-strings -Wpointer-arith -Wcast-qual -Wshadow -Wno-missing-field-initializers -Wstrict-prototypes -Winline -Wbad-function-cast -DHAS_GETIFADDRS $(ENC_OPTS)
++OPTIONS=-Wall -Wextra -Wno-unused-parameter -Wno-sign-compare -Wformat=2 -Wwrite-strings -Wpointer-arith -Wcast-qual -Wshadow -Wno-missing-field-initializers -Wstrict-prototypes -Winline -Wbad-function-cast -DHAS_GETIFADDRS $(ENC_OPTS)
+ LDLIBS=-lm $(CRYPT_LIB)
+ CFLAGS+=`getconf LFS_CFLAGS`
+ endif
diff --git a/net-misc/uftp/uftp-3.7.1.ebuild b/net-misc/uftp/uftp-3.7.1.ebuild
index 21d1dd7ac57d..41aed30ba67b 100644
--- a/net-misc/uftp/uftp-3.7.1.ebuild
+++ b/net-misc/uftp/uftp-3.7.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Encrypted UDP based FTP with multicast"
 HOMEPAGE="http://www.tcnj.edu/~bush/uftp.html"
@@ -14,12 +14,12 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="+server ssl"
 
-DEPEND="ssl? ( dev-libs/openssl )"
+DEPEND="ssl? ( dev-libs/openssl:0= )"
 RDEPEND="${DEPEND}"
 
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.7_makefile.patch"
-}
+PATCHES=(
+	"${FILESDIR}/${PN}-3.7_makefile.patch"
+)
 
 src_compile() {
 	use ssl || local opt="NO_ENCRYPTION=1"
diff --git a/net-misc/uftp/uftp-3.7.ebuild b/net-misc/uftp/uftp-3.7.ebuild
deleted file mode 100644
index 4ce34926ad04..000000000000
--- a/net-misc/uftp/uftp-3.7.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Encrypted UDP based FTP with multicast"
-HOMEPAGE="http://www.tcnj.edu/~bush/uftp.html"
-SRC_URI="http://www.tcnj.edu/~bush/downloads/${P}.tar"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+server ssl"
-
-DEPEND="ssl? ( dev-libs/openssl )"
-RDEPEND="${DEPEND}"
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}_makefile.patch"
-}
-
-src_compile() {
-	use ssl || local opt="NO_ENCRYPTION=1"
-	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
-	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
-}
-
-src_install() {
-	dobin uftp uftp_keymgt
-	dodoc ReadMe.txt
-	doman uftp.1 uftp_keymgt.1
-
-	if use server ; then
-		dosbin uftpd uftpproxyd
-		newinitd "${FILESDIR}/uftpd.init" uftpd
-		newconfd "${FILESDIR}/uftpd.conf" uftpd
-		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
-		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
-		doman uftpd.1 uftpproxyd.1
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/logrotate" uftpd
-	fi
-}
diff --git a/net-misc/uftp/uftp-4.9.4.ebuild b/net-misc/uftp/uftp-4.9.4.ebuild
new file mode 100644
index 000000000000..74358db417d4
--- /dev/null
+++ b/net-misc/uftp/uftp-4.9.4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs
+
+DESCRIPTION="Encrypted UDP based FTP with multicast"
+HOMEPAGE="http://uftp-multicast.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}-multicast/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+server ssl"
+
+DEPEND="ssl? ( dev-libs/openssl:0= )"
+RDEPEND="${DEPEND}"
+
+PATCHES=(
+	"${FILESDIR}/${P}_makefile.patch"
+)
+
+src_compile() {
+	use ssl || local opt="NO_ENCRYPTION=1"
+	emake CC=$(tc-getCC) $opt uftp uftp_keymgt
+	use server && emake CC=$(tc-getCC) $opt uftpd uftpproxyd
+}
+
+src_install() {
+	dobin uftp uftp_keymgt
+	dodoc {Changes,protocol,ReadMe}.txt
+	doman uftp.1 uftp_keymgt.1
+
+	if use server ; then
+		dosbin uftpd uftpproxyd
+		newinitd "${FILESDIR}/uftpd.init" uftpd
+		newconfd "${FILESDIR}/uftpd.conf" uftpd
+		newinitd "${FILESDIR}/uftpproxyd.init" uftpproxyd
+		newconfd "${FILESDIR}/uftpproxyd.conf" uftpproxyd
+		doman uftpd.1 uftpproxyd.1
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}/logrotate" uftpd
+	fi
+}
+
+pkg_postinst() {
+	if use server ; then
+		ewarn "Please note, uftpd 4.x server is not backward compatible with"
+		ewarn "uftp 3.x clients! Please upgrade clients before servers."
+	fi
+}
diff --git a/net-misc/youtube-dl/Manifest b/net-misc/youtube-dl/Manifest
index 4e6d99e7f485..662d0c9d0e75 100644
--- a/net-misc/youtube-dl/Manifest
+++ b/net-misc/youtube-dl/Manifest
@@ -1,10 +1,10 @@
 DIST youtube-dl-2017.03.16.tar.gz 2631620 BLAKE2B 2aff8710a296140a4329b0f8e7f57526684ca114ba39a7397eef81b1b79b4b5dfae685c1f0011cddf8569d8df1e50111bbce7f12647c067972c79ea3b116b2ff SHA512 f3b8942f6b2be3b1cfd4bddfb74c17bad48c8ef4bea34114970ecb9d65b5a3dcbe71beba6d7c2dbda168371bbb2e8bbaddce58039bd9d158bf23950a2a88123c
 DIST youtube-dl-2017.11.15.tar.gz 2834012 BLAKE2B fd93e3923f99874be58681a886c09e31ac10063975ab636badf27e59b44743c72cddf05e3a431c49ffd0f7b40f9b005f4d90feff85d4ca889dee80833300b076 SHA512 e10c0d53db7fdfb02610b53f54046c0a9354b305ba05c5d00a43649a283a6449263f66ff56171d52cf18f906c6aeccc25dc48ea708b4b1bb2b8323b937abca96
-DIST youtube-dl-2017.12.31.tar.gz 2872519 BLAKE2B cbf06f545f580d4bb3c5f58ea9a38291cdb358114787a93a1889e3c07c17fb2a832b7a25fecb6f92cdba8731fc32b9eed5ae4f5a52d0d6a103c3d3d4ef6b9ba5 SHA512 c6cd663627d2291c0eb6e1d711772f6640555d19f34533e1784cba4e6c983522db6dc3e44140dfcdad900db12024548bd5b16f89e60a5531538d7dcb36a8cd93
 DIST youtube-dl-2018.01.07.tar.gz 2877870 BLAKE2B 8def952710c4500e251641b4ca458ba4810c84435c504ca44569211d3d762efe4a5086f12bf9edee0944b5894697e5be359abead41282f637bab83addbbf67cc SHA512 ac5f603eb61b367fb26c07213f8350b1a305bad41a4d6beaa65f1568e6365e666818c67be35ce118de495bbdc980c9eb599b9273e7bb79f2e40dd23732d9a6fd
+DIST youtube-dl-2018.01.14.tar.gz 2885608 BLAKE2B 57e4eac94ab3ff615470115d2d25de20633828f95d041e17659ae890564f8de5bc67ad1f6209551e3fd7a654892d9ce9eb3e87f016036b10211498b6c526e43b SHA512 687a38a96e8b09452c9460cd4d3796d7334bbe9ff2563adc700865ed8f30f5dd7254aaf3b57a7bdaacda4147210f9390e5c0f739449992abc680a037013189e2
 EBUILD youtube-dl-2017.03.16.ebuild 2381 BLAKE2B bbf217461544a08786e3ba044e9b704354133dde4197d05ad92a8cdfd2e402dd0c013964da8b7971475a31ced7db734c89ef3ea33991b0227980d4025490c0fa SHA512 b47b7f8c00e04879aaac6bc70621d28f9e6e153b618bd246f95a2b11f8f09bf77cfefc5f0869b379759edf68a8f5d4afded6425032a9efdb8a1cbf44a23e9862
 EBUILD youtube-dl-2017.11.15.ebuild 2379 BLAKE2B 34ee4dfda07511e1f1e27576b967341bba6329312751cf5bc49fd54fe1bd6c2a5444ca0b82a25c15a40901b7a2edf743cfbb08e3bfcfca72e9dc5afe420605ed SHA512 f3996f3fe5ff5d92025a1adf594db099114e1a9a2e831d26fa8472c1cea1e3792a81996407b0349f244aeba1489f6ea1b757aaab827d5af55a6cad5a18a8eddf
-EBUILD youtube-dl-2017.12.31.ebuild 3286 BLAKE2B e846a48522924ae983a0b5b078b42523a2dccf22d23340e52348507f8718d01965a1a97c7a0c5ab10caaee1133536f8932d327d08eddf8f8982958aa84c29456 SHA512 67e4d6e79fd04259bf95d30ecb051527d0c864002b80f28734f37cd38ad9728743334b2fc786c652582c9ff9d79bde6f46507e68de41e84decefb87db8e8e0d0
 EBUILD youtube-dl-2018.01.07.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
+EBUILD youtube-dl-2018.01.14.ebuild 3284 BLAKE2B a36074bf28f7e0a3f835ca1b0231b3eb02fbe4de5b3df7420f8f0ec036e088658b2f8b9dc34e255d84559c12b34adf3b259231c8137f4d74679f9e1a51be2ce9 SHA512 9b12579cb1afd266c835016733cced4b2f1108ba0d30bfc855ae5b36eb31bb63e739fc78e30e2d37145e404d0c5e3d0f37797f0efa863b553324d69b26bc6a50
 EBUILD youtube-dl-99999999.ebuild 2089 BLAKE2B df876c715ffaa403d175515951e751611df0cb89e815515b045bebb29add327aa0df50f25303864e1ff0abe8f19a53718e9d20c64dd9d3ead549ad57125376d0 SHA512 a390ee79a77aa98603ca01a702df6621ac4630e62e7afd089e065bd4468fc38bfd13bba365e28916024f0eb9e92627133281985f57692432522aeb4671a0cf11
 MISC metadata.xml 218 BLAKE2B 717fcfd86a1f75e0ad21845c9b496cf01d7bc7c80b6be8c08143ea304a08fbb75352e82e8fc883398e96da9c037f8912c4a9612b5cf85ffb25b3a5f041b02fe2 SHA512 d36d668a636222ce6394eca2598850e68139819543fd3cf0e76301e2a61c9b9303026b49536d1ed1b52f44d5703dc5e4247df786e0b4a704b28872e0a4a71b27
diff --git a/net-misc/youtube-dl/youtube-dl-2017.12.31.ebuild b/net-misc/youtube-dl/youtube-dl-2017.12.31.ebuild
deleted file mode 100644
index 80eb0bafbd83..000000000000
--- a/net-misc/youtube-dl/youtube-dl-2017.12.31.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 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="http://youtube-dl.org/downloads/${PV}/${P}.tar.gz"
-
-LICENSE="public-domain"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-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 motherless myvidster
-			porn91 porncom pornflip pornhd pornotube pornovoisines pornoxo
-			ruleporn sexu slutload spankbang spankwire sunporno thisav tube8
-			vporn watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz
-			youporn
-		)
-		# these have multi-line import statements
-		local mxxx=(
-			drtuber fourtube pornhub redtube tnaflix 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 youtube-dl.zsh _youtube-dl
-
-	insinto /usr/share/fish/completions
-	doins youtube-dl.fish
-
-	distutils-r1_python_install_all
-
-	rm -r "${ED}"/usr/etc || die
-	rm -r "${ED}"/usr/share/doc/youtube_dl || die
-}
-
-pkg_postinst() {
-	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
-	elog "https://github.com/rg3/youtube-dl/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."
-}
diff --git a/net-misc/youtube-dl/youtube-dl-2018.01.14.ebuild b/net-misc/youtube-dl/youtube-dl-2018.01.14.ebuild
new file mode 100644
index 000000000000..db51a779b025
--- /dev/null
+++ b/net-misc/youtube-dl/youtube-dl-2018.01.14.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=(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 ~hppa ~ppc ~ppc64 ~x86 ~amd64-linux ~arm-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 tube8 vporn
+			watchindianporn xbef xnxx xtube xvideos xxxymovies youjizz youporn
+		)
+		# these have multi-line import statements
+		local mxxx=(
+			drtuber fourtube motherless pornhub redtube tnaflix 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 youtube-dl.zsh _youtube-dl
+
+	insinto /usr/share/fish/completions
+	doins youtube-dl.fish
+
+	distutils-r1_python_install_all
+
+	rm -r "${ED}"/usr/etc || die
+	rm -r "${ED}"/usr/share/doc/youtube_dl || die
+}
+
+pkg_postinst() {
+	elog "youtube-dl(1) / https://bugs.gentoo.org/355661 /"
+	elog "https://github.com/rg3/youtube-dl/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."
+}
diff --git a/net-news/Manifest.gz b/net-news/Manifest.gz
index fddd57e6feb2..141ae4a7976f 100644
--- a/net-news/Manifest.gz
+++ b/net-news/Manifest.gz
diff --git a/net-news/snownews/Manifest b/net-news/snownews/Manifest
index b0152691c7e3..1bfb656d0422 100644
--- a/net-news/snownews/Manifest
+++ b/net-news/snownews/Manifest
@@ -1,3 +1,3 @@
 DIST snownews-1.5.12.tar.gz 167944 BLAKE2B c629bfa53860a031a6afd3a82d44747e61780b03e5a74bb9db4b8c22b441870a8345317d901ddaf42de62aee54685d6329c49343821005ea211c1e17932bf755 SHA512 7a7ccd5ea57f8bbb73f1429ab931a38203e858c74a383c5347e66088b84f6a7240feeee99e179687ce0a7a89c6c1406ce20d6c5d6771d25a0a0301fa5526e220
-EBUILD snownews-1.5.12-r1.ebuild 1290 BLAKE2B 151ab853319ad0a35ebcdf1551cb7c4a30b10e9f4082d2e91cf6b3741485b8cb9872acb2f2db544b3f8c4f1491fe99eca8bc94f0ca8fc274472d990cbc10e50e SHA512 6d9fa67ea049d4d85b02abb2f82fc39cc234b2f4fd70612a005e11fb67b4d73a63a7af7d24cbad61ee6447780447ca90b27ee21a54184de108267816072f81c8
+EBUILD snownews-1.5.12-r1.ebuild 1285 BLAKE2B a93a596a32945f8cf3de47febccd8dea2ec7eeceea998d4afc4f0e82bd05badc68de3b8ebb945af981ac74789b880f4e36cec48ae5d506db5146f1ecbbf57058 SHA512 9c6a3c03b0e09760fb3f555a3a0accd83953513adac17acfe83c3563fb0a1ec66d0ce7b9d5d151f5131ecbde6e6b7369e886d3510d0449caccc11e915a5e9df1
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-news/snownews/snownews-1.5.12-r1.ebuild b/net-news/snownews/snownews-1.5.12-r1.ebuild
index 0b1026c5adce..7d3276a9ef76 100644
--- a/net-news/snownews/snownews-1.5.12-r1.ebuild
+++ b/net-news/snownews/snownews-1.5.12-r1.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 inherit eutils toolchain-funcs
 
 DESCRIPTION="Snownews, a text-mode RSS/RDF newsreader"
-HOMEPAGE="http://snownews.kcore.de/"
-SRC_URI="http://home.kcore.de/~kiza/software/snownews/download/${P}.tar.gz"
+HOMEPAGE="https://kiza.eu/software/snownews/"
+SRC_URI="https://kiza.eu/media/software/snownews/${P}.tar.gz"
 LICENSE="GPL-2"
 
 SLOT="0"
diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz
index 27cc5a9aedf9..ee2c60d63f1b 100644
--- a/net-p2p/Manifest.gz
+++ b/net-p2p/Manifest.gz
diff --git a/net-p2p/transmission/Manifest b/net-p2p/transmission/Manifest
index eaa69309bd05..c6d7c6626547 100644
--- a/net-p2p/transmission/Manifest
+++ b/net-p2p/transmission/Manifest
@@ -1,9 +1,11 @@
 AUX libsystemd.patch 630 BLAKE2B 1e7d9ac41ebc8971a86f051aaa5e7c4899004e4ae29b62d8b2963a16047cdd9ce7830156510d8e2f00967dcfb538991138f3b5c31bb2c841e5ddabfdb397ab47 SHA512 5babefd3ab0216dd1cf0b08b1ad10c79d034782ce744c9a4df402036ed1529655b9e05c641e876e9629a8366363ad0bf2d5e7581a621f2b0749ff02c6ed742eb
 AUX transmission-2.92-handshake.patch 1257 BLAKE2B dbbf66458702c1aafcedbc296b12c6aa77973463f83db3aa6e2b8c388fd60e2e33f487021fe3c53c18415f6d8e098eb949cfba963f1b07b15d35140cf8d29a7e SHA512 d4272018ffc7ea9607dae475275d694e678119160225f00135ced711771ddf79af7271c42399bccf701d67ac07052a47f33439ba32bb74838786d3e915c364f6
+AUX transmission-2.92-pr468.patch 11213 BLAKE2B 87aaeefa0bbace9522c18374e5aeb159dc6d40c61c5d7d6cae0eada3c46c66dc29db37493523c12ce443da8470384be39ad64f0763b2d649b5d60c1b6a896482 SHA512 aa0c7e09d302da4811b1bd4c80c61e97c5592e91561872d733cf9de6d386cf039c29a6c57843bc804bca2b5a1a6ef640dacb496bf590e70591aef8c2ef11d9f2
 AUX transmission-daemon.confd.4 735 BLAKE2B bc4c06dcf4a12282d36d446537ae8d3a461a9bb84f93b54f7d13be1c430209647bae89054b60f5d8dd434049140f74c1cb4ad04064d03b37ad88a851c28c07fa SHA512 47e78c85857eefb9be6c25d1e789cfb2a276d5816ba911ba1511e764469b2d9998edafe44247aff784113ca28926748bc5fb2b879280b780fd69ffb1e4e40736
 AUX transmission-daemon.initd.10 1707 BLAKE2B 57857fa0b628f0c49ebaf13544b366bf9db39c70f31556a21262556ad89657a7f13c84e19f882839e4bc10f2b8afef96aa51f833478e38f215499244ca8b388b SHA512 30d9fe7d06ca3c92ff436e9bbe84729a5b343b52965f8d1d3d43f14f5fa25881dbc9676c5d3d916cff552aad5872ed41c2930e9ce3a5f7c958dbeec0d1ab1ac4
 AUX transmission-daemon.service.conf 69 BLAKE2B 6e38a28f54366850ae794896f2954c3af77afead303197c49970873fa604d6b375e71122de8d3645f9fcc8abed4f696ac257bd59ba87ebdc5cdd5839d32c0a7b SHA512 3dc02be596296fc1efbf1bc690be3953709af00c230f55db4d067ff592d87e1a465faa4067bc15d65a8a27fed2cf07d108abb2ed45fc76b47b0642ce2e182946
 DIST transmission-2.92.tar.xz 3378116 BLAKE2B 8929a2eab8a1617db44ca8a081fd7de786daef92e891ac86d4690451c0f4fa0d4e1ea03692c59babea6e9aee5dcfef57bd81e5c72a0bb4fe9efbd436ff006104 SHA512 4d99476bee88cedcc4238a0eee64a4089016933cbfc1cfb1cca023ad4ebcfe46375c9e7651a17af4aeaaf1feb19cbd8166aa56ef7992d9e745a7bbcbe8efca11
 EBUILD transmission-2.92-r2.ebuild 4347 BLAKE2B ccdce02673646bcc583f0fbd173c10cb2445669e04dd48ac2012298e1d7f663e78fe50ed6e300194e29a08dba3fbea3dc8c1028722f6a9e6a894dd85a696cac8 SHA512 1dc44445ec7bda9aff29c70a0a368cfca377795e14d887e66c9c552f0629142398f13b49c8b1da8b46fa8f5d15f7a9c7c7430e772dfc135e45619c69e35bf332
+EBUILD transmission-2.92-r3.ebuild 4409 BLAKE2B d6a4fa648bffd2a900aa5cf6dd962188aab4e9fe25d83ccce8f24b19389d3e2b5c9c1a552e37304b564be3d1ed69e657048afe850f4a592c73676b270c7fa911 SHA512 5fb59bff0ada74dc9ee9d12e81ebafba842ce2c56d7259640ca78f5b55983792b8763dc1076732f2c539703778e70f918a40055940c9445c3d65721c11dd6bb6
 EBUILD transmission-9999.ebuild 3738 BLAKE2B e00cd0e47d5a7a21f1fdfdb46b3f656bb4d1cfc5cee6499cac3728229dfb8fac490076c51e0fb76dba64ecd45492475abb0ad464ebdd81ea5adcba37a6ffe8c1 SHA512 8ea1ae5d27f1db02eef27ddb4e9803c4146fd6d8fbeaff2cdfa749faad0e5df6b2095c42797775be021b50f25325fc31901ef883967c9178c635572781fb2aac
 MISC metadata.xml 602 BLAKE2B 05300c81bd2c4df76aaaf8381a788016777e259075aa6a3bf9da239b4832dac1281f718f0fd79ece7d5c238440e07d1aabe15b7da40f34674ac30bbd356d0c6b SHA512 0047a936eda032a4521707ea50dcde06dce3837993e70d43a5b033183ba58633ae46e2d2e56de98a56f3480b30e596c7fbae82fd1e2ee9cbebc7983d9551617d
diff --git a/net-p2p/transmission/files/transmission-2.92-pr468.patch b/net-p2p/transmission/files/transmission-2.92-pr468.patch
new file mode 100644
index 000000000000..a3a0cf160823
--- /dev/null
+++ b/net-p2p/transmission/files/transmission-2.92-pr468.patch
@@ -0,0 +1,302 @@
+Fix a weakness that allows remote code execution via the Transmission
+RPC server using DNS rebinding:
+
+https://bugs.chromium.org/p/project-zero/issues/detail?id=1447
+
+Patch adapted from Tavis Ormandy's patch on the Transmission master
+branch to the Transmission 2.92 release by Leo Famulari
+<leo@famulari.name>:
+
+https://github.com/transmission/transmission/pull/468/commits
+
+From fe2d3c6e75088f3d9b6040ce06da3d530358bc2f Mon Sep 17 00:00:00 2001
+From: Tavis Ormandy <taviso@google.com>
+Date: Thu, 11 Jan 2018 10:00:41 -0800
+Subject: [PATCH] mitigate dns rebinding attacks against daemon
+
+---
+ libtransmission/quark.c        |   2 + 
+ libtransmission/quark.h        |   2 + 
+ libtransmission/rpc-server.c   | 116 +++++++++++++++++++++++++++++++++++++----
+ libtransmission/rpc-server.h   |   4 ++
+ libtransmission/session.c      |   2 + 
+ libtransmission/transmission.h |   1 + 
+ libtransmission/web.c          |   3 ++
+ 7 files changed, 121 insertions(+), 9 deletions(-)
+
+diff --git a/libtransmission/quark.c b/libtransmission/quark.c
+index 30cc2bca4..b4fd7aabd 100644
+--- a/libtransmission/quark.c
++++ b/libtransmission/quark.c
+@@ -289,6 +289,8 @@ static const struct tr_key_struct my_static[] =
+   { "rpc-authentication-required", 27 },
+   { "rpc-bind-address", 16 },
+   { "rpc-enabled", 11 },
++  { "rpc-host-whitelist", 18 },
++  { "rpc-host-whitelist-enabled", 26 },
+   { "rpc-password", 12 },
+   { "rpc-port", 8 },
+   { "rpc-url", 7 },
+diff --git a/libtransmission/quark.h b/libtransmission/quark.h
+index 7f5212733..17464be8f 100644
+--- a/libtransmission/quark.h
++++ b/libtransmission/quark.h
+@@ -291,6 +291,8 @@ enum
+   TR_KEY_rpc_authentication_required,
+   TR_KEY_rpc_bind_address,
+   TR_KEY_rpc_enabled,
++  TR_KEY_rpc_host_whitelist,
++  TR_KEY_rpc_host_whitelist_enabled,
+   TR_KEY_rpc_password,
+   TR_KEY_rpc_port,
+   TR_KEY_rpc_url,
+diff --git a/libtransmission/rpc-server.c b/libtransmission/rpc-server.c
+index a3485f3fa..292cd5fce 100644
+--- a/libtransmission/rpc-server.c
++++ b/libtransmission/rpc-server.c
+@@ -52,6 +52,7 @@ struct tr_rpc_server
+     bool               isEnabled;
+     bool               isPasswordEnabled;
+     bool               isWhitelistEnabled;
++    bool               isHostWhitelistEnabled;
+     tr_port            port;
+     char             * url;
+     struct in_addr     bindAddress;
+@@ -63,6 +64,7 @@ struct tr_rpc_server
+     char             * password;
+     char             * whitelistStr;
+     tr_list          * whitelist;
++    tr_list          * hostWhitelist;
+ 
+     char             * sessionId;
+     time_t             sessionIdExpiresAt;
+@@ -588,6 +590,49 @@ isAddressAllowed (const tr_rpc_server * server, const char * address)
+   return false;
+ }
+ 
++static bool isHostnameAllowed(tr_rpc_server const* server, struct evhttp_request* req)
++{
++    /* If password auth is enabled, any hostname is permitted. */
++    if (server->isPasswordEnabled)
++    {
++        return true;
++    }
++
++    char const* const host = evhttp_find_header(req->input_headers, "Host");
++
++    // If whitelist is disabled, no restrictions.
++    if (!server->isHostWhitelistEnabled)
++        return true;
++
++    /* No host header, invalid request. */
++    if (host == NULL)
++    {
++        return false;
++    }
++
++    /* Host header might include the port. */
++    char* const hostname = tr_strndup(host, strcspn(host, ":"));
++
++    /* localhost or ipaddress is always acceptable. */
++    if (strcmp(hostname, "localhost") == 0 || strcmp(hostname, "localhost.") == 0 || tr_addressIsIP(hostname))
++    {
++        tr_free(hostname);
++        return true;
++    }
++
++    /* Otherwise, hostname must be whitelisted. */
++    for (tr_list* l = server->hostWhitelist; l != NULL; l = l->next) {
++        if (tr_wildmat(hostname, l->data))
++        {
++            tr_free(hostname);
++            return true;
++        }
++    }
++
++    tr_free(hostname);
++    return false;
++}
++
+ static bool
+ test_session_id (struct tr_rpc_server * server, struct evhttp_request * req)
+ {
+@@ -663,6 +708,23 @@ handle_request (struct evhttp_request * req, void * arg)
+           handle_upload (req, server);
+         }
+ #ifdef REQUIRE_SESSION_ID
++        else if (!isHostnameAllowed(server, req))
++        {
++            char* tmp = tr_strdup_printf(
++                "<p>Transmission received your request, but the hostname was unrecognized.</p>"
++                "<p>To fix this, choose one of the following options:"
++                "<ul>"
++                "<li>Enable password authentication, then any hostname is allowed.</li>"
++                "<li>Add the hostname you want to use to the whitelist in settings.</li>"
++                "</ul></p>"
++                "<p>If you're editing settings.json, see the 'rpc-host-whitelist' and 'rpc-host-whitelist-enabled' entries.</p>"
++                "<p>This requirement has been added to help prevent "
++                "<a href=\"https://en.wikipedia.org/wiki/DNS_rebinding\">DNS Rebinding</a> "
++                "attacks.</p>");
++            send_simple_response(req, 421, tmp);
++            tr_free(tmp);
++        }
++
+       else if (!test_session_id (server, req))
+         {
+           const char * sessionId = get_current_session_id (server);
+@@ -674,7 +736,7 @@ handle_request (struct evhttp_request * req, void * arg)
+             "<li> When you get this 409 error message, resend your request with the updated header"
+             "</ol></p>"
+             "<p>This requirement has been added to help prevent "
+-            "<a href=\"http://en.wikipedia.org/wiki/Cross-site_request_forgery\">CSRF</a> "
++            "<a href=\"https://en.wikipedia.org/wiki/Cross-site_request_forgery\">CSRF</a> "
+             "attacks.</p>"
+             "<p><code>%s: %s</code></p>",
+             TR_RPC_SESSION_ID_HEADER, sessionId);
+@@ -875,19 +937,14 @@ tr_rpcGetUrl (const tr_rpc_server * server)
+   return server->url ? server->url : "";
+ }
+ 
+-void
+-tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
++static void
++tr_rpcSetList (char const* whitelistStr, tr_list** list)
+ {
+   void * tmp;
+   const char * walk;
+ 
+-  /* keep the string */
+-  tmp = server->whitelistStr;
+-  server->whitelistStr = tr_strdup (whitelistStr);
+-  tr_free (tmp);
+-
+   /* clear out the old whitelist entries */
+-  while ((tmp = tr_list_pop_front (&server->whitelist)))
++  while ((tmp = tr_list_pop_front (list)) != NULL)
+     tr_free (tmp);
+ 
+   /* build the new whitelist entries */
+@@ -896,7 +953,7 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
+       const char * delimiters = " ,;";
+       const size_t len = strcspn (walk, delimiters);
+       char * token = tr_strndup (walk, len);
+-      tr_list_append (&server->whitelist, token);
++      tr_list_append (list, token);
+       if (strcspn (token, "+-") < len)
+         tr_logAddNamedInfo (MY_NAME, "Adding address to whitelist: %s (And it has a '+' or '-'!  Are you using an old ACL by mistake?)", token);
+       else
+@@ -909,6 +966,21 @@ tr_rpcSetWhitelist (tr_rpc_server * server, const char * whitelistStr)
+     }
+ }
+ 
++void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelistStr)
++{
++    tr_rpcSetList(whitelistStr, &server->hostWhitelist);
++}
++
++void tr_rpcSetWhitelist(tr_rpc_server* server, char const* whitelistStr)
++{
++    /* keep the string */
++    char* const tmp = server->whitelistStr;
++    server->whitelistStr = tr_strdup(whitelistStr);
++    tr_free(tmp);
++
++    tr_rpcSetList(whitelistStr, &server->whitelist);
++}
++
+ const char*
+ tr_rpcGetWhitelist (const tr_rpc_server * server)
+ {
+@@ -930,6 +1002,11 @@ tr_rpcGetWhitelistEnabled (const tr_rpc_server * server)
+   return server->isWhitelistEnabled;
+ }
+ 
++void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled)
++{
++    server->isHostWhitelistEnabled = isEnabled;
++}
++
+ /****
+ *****  PASSWORD
+ ****/
+@@ -1063,6 +1140,28 @@ tr_rpcInit (tr_session  * session, tr_variant * settings)
+   else
+     tr_rpcSetWhitelistEnabled (s, boolVal);
+ 
++  key = TR_KEY_rpc_host_whitelist_enabled;
++
++  if (!tr_variantDictFindBool(settings, key, &boolVal))
++  {
++      missing_settings_key(key);
++  }
++  else
++  {
++      tr_rpcSetHostWhitelistEnabled(s, boolVal);
++  }
++
++  key = TR_KEY_rpc_host_whitelist;
++
++  if (!tr_variantDictFindStr(settings, key, &str, NULL) && str != NULL)
++  {
++      missing_settings_key(key);
++  }
++  else
++  {
++      tr_rpcSetHostWhitelist(s, str);
++  }
++
+   key = TR_KEY_rpc_authentication_required;
+   if (!tr_variantDictFindBool (settings, key, &boolVal))
+     missing_settings_key (key);
+diff --git a/libtransmission/rpc-server.h b/libtransmission/rpc-server.h
+index e0302c5ea..8c9e6b24e 100644
+--- a/libtransmission/rpc-server.h
++++ b/libtransmission/rpc-server.h
+@@ -49,6 +49,10 @@ void            tr_rpcSetWhitelist (tr_rpc_server * server,
+ 
+ const char*     tr_rpcGetWhitelist (const tr_rpc_server * server);
+ 
++void tr_rpcSetHostWhitelistEnabled(tr_rpc_server* server, bool isEnabled);
++
++void tr_rpcSetHostWhitelist(tr_rpc_server* server, char const* whitelist);
++
+ void            tr_rpcSetPassword (tr_rpc_server * server,
+                                    const char *    password);
+ 
+diff --git a/libtransmission/session.c b/libtransmission/session.c
+index 844cadba8..58b717913 100644
+--- a/libtransmission/session.c
++++ b/libtransmission/session.c
+@@ -359,6 +359,8 @@ tr_sessionGetDefaultSettings (tr_variant * d)
+   tr_variantDictAddStr  (d, TR_KEY_rpc_username,                    "");
+   tr_variantDictAddStr  (d, TR_KEY_rpc_whitelist,                   TR_DEFAULT_RPC_WHITELIST);
+   tr_variantDictAddBool (d, TR_KEY_rpc_whitelist_enabled,           true);
++  tr_variantDictAddStr(d, TR_KEY_rpc_host_whitelist, TR_DEFAULT_RPC_HOST_WHITELIST);
++  tr_variantDictAddBool(d, TR_KEY_rpc_host_whitelist_enabled, true);
+   tr_variantDictAddInt  (d, TR_KEY_rpc_port,                        atoi (TR_DEFAULT_RPC_PORT_STR));
+   tr_variantDictAddStr  (d, TR_KEY_rpc_url,                         TR_DEFAULT_RPC_URL_STR);
+   tr_variantDictAddBool (d, TR_KEY_scrape_paused_torrents_enabled,  true);
+diff --git a/libtransmission/transmission.h b/libtransmission/transmission.h
+index 4f76adfd6..e213a8f4e 100644
+--- a/libtransmission/transmission.h
++++ b/libtransmission/transmission.h
+@@ -123,6 +123,7 @@ const char* tr_getDefaultDownloadDir (void);
+ #define TR_DEFAULT_BIND_ADDRESS_IPV4        "0.0.0.0"
+ #define TR_DEFAULT_BIND_ADDRESS_IPV6             "::"
+ #define TR_DEFAULT_RPC_WHITELIST          "127.0.0.1"
++#define TR_DEFAULT_RPC_HOST_WHITELIST              ""
+ #define TR_DEFAULT_RPC_PORT_STR                "9091"
+ #define TR_DEFAULT_RPC_URL_STR       "/transmission/"
+ #define TR_DEFAULT_PEER_PORT_STR              "51413"
+diff --git a/libtransmission/web.c b/libtransmission/web.c
+index ee495e9fc..c7f062730 100644
+--- a/libtransmission/web.c
++++ b/libtransmission/web.c
+@@ -594,6 +594,7 @@ tr_webGetResponseStr (long code)
+       case 415: return "Unsupported Media Type";
+       case 416: return "Requested Range Not Satisfiable";
+       case 417: return "Expectation Failed";
++      case 421: return "Misdirected Request";
+       case 500: return "Internal Server Error";
+       case 501: return "Not Implemented";
+       case 502: return "Bad Gateway";
diff --git a/net-p2p/transmission/transmission-2.92-r3.ebuild b/net-p2p/transmission/transmission-2.92-r3.ebuild
new file mode 100644
index 000000000000..839052138da0
--- /dev/null
+++ b/net-p2p/transmission/transmission-2.92-r3.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools fdo-mime flag-o-matic gnome2-utils qmake-utils systemd user
+
+DESCRIPTION="A Fast, Easy and Free BitTorrent client"
+HOMEPAGE="http://www.transmissionbt.com/"
+SRC_URI="http://download.transmissionbt.com/${PN}/files/${P}.tar.xz"
+
+# web/LICENSE is always GPL-2 whereas COPYING allows either GPL-2 or GPL-3 for the rest
+# transmission in licenses/ is for mentioning OpenSSL linking exception
+# MIT is in several libtransmission/ headers
+LICENSE="|| ( GPL-2 GPL-3 Transmission-OpenSSL-exception ) GPL-2 MIT"
+SLOT=0
+IUSE="ayatana gtk libressl lightweight systemd qt5 xfs"
+KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux"
+
+RDEPEND=">=dev-libs/libevent-2.0.10:=
+	!libressl? ( dev-libs/openssl:0= )
+	libressl? ( dev-libs/libressl:0= )
+	net-libs/libnatpmp
+	>=net-libs/miniupnpc-1.7:=
+	>=net-misc/curl-7.16.3[ssl]
+	sys-libs/zlib:=
+	gtk? (
+		>=dev-libs/dbus-glib-0.100
+		>=dev-libs/glib-2.32:2
+		>=x11-libs/gtk+-3.4:3
+		ayatana? ( >=dev-libs/libappindicator-0.4.90:3 )
+		)
+	qt5? (
+		dev-qt/qtcore:5
+		dev-qt/qtdbus:5
+		dev-qt/qtgui:5
+		dev-qt/qtnetwork:5
+		dev-qt/qtwidgets:5
+		)
+	systemd? ( >=sys-apps/systemd-209:= )"
+DEPEND="${RDEPEND}
+	>=dev-libs/glib-2.32
+	dev-util/intltool
+	sys-devel/gettext
+	virtual/os-headers
+	virtual/pkgconfig
+	qt5? ( dev-qt/linguist-tools:5 )
+	xfs? ( sys-fs/xfsprogs )"
+
+REQUIRED_USE="ayatana? ( gtk )"
+
+DOCS=( AUTHORS NEWS qt/README.txt )
+
+PATCHES=(
+	"${FILESDIR}"/libsystemd.patch
+	"${FILESDIR}"/transmission-2.92-handshake.patch
+	"${FILESDIR}"/transmission-2.92-pr468.patch
+)
+
+src_prepare() {
+	sed -i -e '/CFLAGS/s:-ggdb3::' configure.ac || die
+
+	# Trick to avoid automagic dependency
+	if ! use ayatana ; then
+		sed -i -e '/^LIBAPPINDICATOR_MINIMUM/s:=.*:=9999:' configure.ac || die
+	fi
+
+	# http://trac.transmissionbt.com/ticket/4324
+	sed -i -e 's|noinst\(_PROGRAMS = $(TESTS)\)|check\1|' libtransmission/Makefile.am || die
+
+	# Prevent m4_copy error when running aclocal
+	# m4_copy: won't overwrite defined macro: glib_DEFUN
+	rm m4/glib-gettext.m4 || die
+
+	default
+	eautoreconf
+}
+
+src_configure() {
+	export ac_cv_header_xfs_xfs_h=$(usex xfs)
+
+	# https://bugs.gentoo.org/577528
+	append-lfs-flags
+
+	econf \
+		--enable-external-natpmp \
+		$(use_enable lightweight) \
+		$(use_with systemd systemd-daemon) \
+		$(use_with gtk)
+
+	if use qt5; then
+		pushd qt >/dev/null || die
+		eqmake5 qtr.pro
+		popd >/dev/null || die
+	fi
+}
+
+src_compile() {
+	emake
+
+	if use qt5; then
+		emake -C qt
+		$(qt5_get_bindir)/lrelease qt/translations/*.ts || die
+	fi
+}
+
+src_install() {
+	default
+
+	rm "${ED%/}"/usr/share/transmission/web/LICENSE || die
+
+	newinitd "${FILESDIR}"/transmission-daemon.initd.10 transmission-daemon
+	newconfd "${FILESDIR}"/transmission-daemon.confd.4 transmission-daemon
+	systemd_dounit daemon/transmission-daemon.service
+	systemd_install_serviced "${FILESDIR}"/transmission-daemon.service.conf
+
+	if use qt5; then
+		pushd qt >/dev/null || die
+		emake INSTALL_ROOT="${ED%/}"/usr install
+
+		domenu transmission-qt.desktop
+
+		local res
+		for res in 16 22 24 32 48 64 72 96 128 192 256; do
+			doicon -s ${res} icons/hicolor/${res}x${res}/transmission-qt.png
+		done
+		doicon -s scalable icons/hicolor/scalable/transmission-qt.svg
+
+		insinto /usr/share/qt5/translations
+		doins translations/*.qm
+		popd >/dev/null || die
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+
+	enewgroup transmission
+	enewuser transmission -1 -1 /var/lib/transmission transmission
+
+	if [[ ! -e "${EROOT%/}"/var/lib/transmission ]]; then
+		mkdir -p "${EROOT%/}"/var/lib/transmission || die
+		chown transmission:transmission "${EROOT%/}"/var/lib/transmission || die
+	fi
+
+	elog "If you use transmission-daemon, please, set 'rpc-username' and"
+	elog "'rpc-password' (in plain text, transmission-daemon will hash it on"
+	elog "start) in settings.json file located at /var/lib/transmission/config or"
+	elog "any other appropriate config directory."
+	elog
+	elog "Since µTP is enabled by default, transmission needs large kernel buffers for"
+	elog "the UDP socket. You can append following lines into /etc/sysctl.conf:"
+	elog " net.core.rmem_max = 4194304"
+	elog " net.core.wmem_max = 1048576"
+	elog "and run sysctl -p"
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+	gnome2_icon_cache_update
+}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 3ebf2a53499b..b09fc8d89e3c 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index dd00e915ee13..57e5654ef8c6 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -2,8 +2,10 @@ AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711
 DIST cups-filters-1.16.4.tar.xz 1440964 BLAKE2B d25525fe9db6e42b244f15550ddb3e9f58bd7048209f9d62b4896245945e11d5fa1658e5882faf0eb0aaa6a465153d222cd1d90cc94d25895522f5313b9089da SHA512 367c2c1d6755800b88f79808ef0c595aa80b080634299d015828bfb8f0e27085aa052c77e3f3f1645833340caca709bec8e00b46070ff4d13b9994fb1400da60
 DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e3088874e55fd98264018f033f0948449b70623adc2c6e136a7441cf4cbef4470811694379bc798aeff81fe3ed80e66ca SHA512 811d2671c660a2129c207d5d8daaa576b027ba14ac4cf4753d0e8c1190866a684e284f1e7439b864aaab332e429befbc13c567bf6c9fc1a502fe2cd7d11e5ed4
 DIST cups-filters-1.18.0.tar.xz 1457748 BLAKE2B 6db45707d3c0bdd369407023423a02f8909936daeccdecf1be6007d782888352c15c5590f845e074ca8da271ce1d7262c8b98a0ec8df6e383622654c06730d29 SHA512 260f4d4c635b4ca0222a9a90a6675d7ecb1cf8b4f4428431c263f50f9152537331d2c7d77c4fa0f899a12beecd6500f6ca146f4e2d087cc6525919aa0b922647
+DIST cups-filters-1.19.0.tar.xz 1465524 BLAKE2B 044ab5906f73a9405de55df953c76f7efd09ac4f7800df538c8c3cfd1651de6ed4ea6e3de9378221fef69d983f070b6dcab68dfd2b822fe59aa7f804a8c27907 SHA512 4b580734f7bac78c9d48aad7d8bb9e47227134e594fba76b1c82632fd8dd3e885f3897f7efd1a4b56647b74741f452f4e36d0157591c7fd5d626001028903d30
 EBUILD cups-filters-1.16.4.ebuild 3432 BLAKE2B 9733302bc404c6454ba652bd523f2a41ba0070eb605c8b4150056ed5ddbd6093bdd72871889fa030093c7426721e45580ef75671080655eb6ec2c89dcff2bf25 SHA512 4a69c596427cbca25b3549aeb2fa91733065f1fd7a30d236234633a9955998147614d53b2e7e8044c034f297b292a67d83ebdba603079223f4f8352b4d4c3049
 EBUILD cups-filters-1.17.9.ebuild 3504 BLAKE2B 5d8c026d3040863a9bbfe54dd4bcbd36ba20ff341dcc9348f21af574aa64162ee46536f9c868df3b0bf51caf55ee4ddf20e178741ab00bc1a24b5278fa26bfe0 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02
 EBUILD cups-filters-1.18.0.ebuild 3504 BLAKE2B 5d8c026d3040863a9bbfe54dd4bcbd36ba20ff341dcc9348f21af574aa64162ee46536f9c868df3b0bf51caf55ee4ddf20e178741ab00bc1a24b5278fa26bfe0 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02
+EBUILD cups-filters-1.19.0.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
 EBUILD cups-filters-9999.ebuild 3504 BLAKE2B 5d8c026d3040863a9bbfe54dd4bcbd36ba20ff341dcc9348f21af574aa64162ee46536f9c868df3b0bf51caf55ee4ddf20e178741ab00bc1a24b5278fa26bfe0 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02
 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.19.0.ebuild b/net-print/cups-filters/cups-filters-1.19.0.ebuild
new file mode 100644
index 000000000000..be4ec7dfe0fa
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.19.0.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit bzr autotools
+	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~m68k-mint"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
+
+RDEPEND="
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-3.0.2:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	pclm? ( >=app-text/qpdf-7.0_beta1 )
+	pdf? ( app-text/mupdf )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}
+	dev-util/gdbus-codegen
+	test? ( media-fonts/dejavu )
+"
+
+src_prepare() {
+	default
+	[[ "${PV}" == "9999" ]] && eautoreconf
+
+	# Bug #626800
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	local myeconfargs=(
+		--docdir="${EPREFIX}/usr/share/doc/${PF}"
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ipp_autosetup auto-setup-driverless)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable postscript ijs)
+		$(use_enable static-libs static)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/kyocera-1x2x-mfp-driver/Manifest b/net-print/kyocera-1x2x-mfp-driver/Manifest
index 359d20cf6357..0d5ce0a4bdfb 100644
--- a/net-print/kyocera-1x2x-mfp-driver/Manifest
+++ b/net-print/kyocera-1x2x-mfp-driver/Manifest
@@ -1,4 +1,4 @@
 AUX rastertokpsl-fix.sh 399 BLAKE2B 14376b73ad961b4dba3064403c079be18492a2e0091f113ed127c3f18668a6abcd0cfdc587dc2991269ce3549049d5b367ed96da623ec851353c9a5b7a4dbdb5 SHA512 7d757297b737a4fcebfd91bde4457674b738bf227480d5bcbf5049eb332c215395bca7798cd1931592ada217b5d85806fe567bd1741d8fadc23b572642901d09
 DIST LinuxDrv_1.1203_FS-1x2xMFP.zip 5392941 BLAKE2B d39140d6bbf5d08d248739f2689ccd45d066b5568c3ba27bdcea34f2ed348e91d0b95d64c7e789dd08094ebda43a5fb6911efb9cdfcc43cf1fefd4af32fb18bb SHA512 afbe237d25d784a6202be01669ccb5e1f0f9a6349b6b74227723905529f23da6d7880b25420b289277020450286d02f579722add5c0d48c839ac44152a60d1ab
-EBUILD kyocera-1x2x-mfp-driver-1.1203-r1.ebuild 3430 BLAKE2B b7074fbc2332d37fca33748c09508837f1b881e11449b75b3430d1cadfa49d6d6d0c89cb970676f00f4e71f939db09ce88b6798260ff182a76d8ef1451f89b0d SHA512 6995f4bd77b97cfc0b33b73c3b574868ad4b2f8355213d42ae373c457668b2406b07efb338eef43789f152d5d7f51e82d9154bbccc02116b8c35ad3cff2322dd
+EBUILD kyocera-1x2x-mfp-driver-1.1203-r1.ebuild 3431 BLAKE2B f764815ab3b6f3a5e873016d183ae4b081e7de93fc9972f556caaf8342e4194d5bc740eb63701e690b86a0650b937dafe28c3ee9116a5f7fd4e83137acc19955 SHA512 4d1103d77579f41bded3ee5bd2c38c6aec04ed88e59cf3be31d80e30bb9510c3940a52ed8cb6dbf2e9b2fc183b9f4af6c5a550be6bf9ac8244567a5d96c836ea
 MISC metadata.xml 529 BLAKE2B ba4ec378b877456893586f9ebed9bf81643f650da1b1f13410514cc15ee4734ba07ee04ae1de56c9891b7a3d0278d7e34312de9dcc7f671909d66711e93fdfe9 SHA512 b0b99720ff90cee4eeaffe3639191500deacaef20283e5ef2bacbb4d1d10227d945beb12767bd46a39b98b9634debccebdede469d371315a1656c18fe4eb5400
diff --git a/net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild b/net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild
index a235beae8bdc..a575ee6097e4 100644
--- a/net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild
+++ b/net-print/kyocera-1x2x-mfp-driver/kyocera-1x2x-mfp-driver-1.1203-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SLOT="0"
 KEYWORDS="-* ~amd64"
 
 IUSE_L10N=(en ar cs de el es fr he hu it ko pl pt ro ru th tr vi zh-CN zh-TW)
-IUSE="+rastertokpsl-fix ${IUSE_L10N[@]/#/l10n_}"
+IUSE="+rastertokpsl-fix +${IUSE_L10N[@]/#/l10n_}"
 REQUIRED_USE="|| ( ${IUSE_L10N[@]/#/l10n_} )"
 
 RDEPEND="net-print/cups"
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index d50ec18862be..3e94664edc54 100644
--- a/net-vpn/Manifest.gz
+++ b/net-vpn/Manifest.gz
diff --git a/net-vpn/freelan/Manifest b/net-vpn/freelan/Manifest
index 34e4e7d384ba..e009e7a07ab7 100644
--- a/net-vpn/freelan/Manifest
+++ b/net-vpn/freelan/Manifest
@@ -1,10 +1,4 @@
-AUX boost158.patch 1433 BLAKE2B 1fcb0d99a10e1660d1e2c985cb38b02ce55d2fbf8bb87e33dda2a037120f157b1e786aacbe3c58026949c78de94034d752bf58304f541462788b055b2f05dc94 SHA512 862765ea32542275777a50ca0c6cc135525dc4cab8c6db184f85aaa24daf7e34ca809e6c9b7b52c49c68d5d3aade5d5e5c0eb60816f4f84d8fccf754e5841640
-AUX boost163.patch 1448 BLAKE2B ce29c06d9ab05b7048ce6b4e1521ca787c25323085a4a698084180af4fddb364391d1214180de657f3c553fd58685e05fe667f871e3e83026960f4ff9788cba4 SHA512 ce67970a5d24314318c6c418178b154a7577e4568571129995961b318b087595bb7133d734c05e6d741836f99b2c978293fd786fc538b9a057fe9c85b164b318
-AUX gcc7.patch 1821 BLAKE2B 4dd7e687481098b2e69bf381f1715e200bf084c47645da8b043603a1874a6d6dbbfecdd50399ced7d14ed02ed8bd1d990a65d81a1666edc6141300829edfd42a SHA512 8448139692db3fe01ae45fa36f378e036ff947f8e500bb97c74326bf27a28479bc1981ff16c1a15288905e0f3fd76b05d16588437038fc47abee23a77388f9ea
-AUX glibc225.patch 710 BLAKE2B 27fd063dccca4d251702f0b2618df93e2f6a5f9d60e42ca6055be15efc3339a0781d44d73f6e644652b74c3a1e4300bdbcee0ecb78826d14a32b1382269fcf38 SHA512 150d3d259aa54575bf77b7ba97fb9e8bfad0d9eec14a82098a8ab6e1151696b93f90f9ba60b1570f22468806f3da26514cdfb12351071a7fbced4ba15dbac549
-AUX mf.patch 1004 BLAKE2B bb2f9a2148b72184b8a58d94036514339046175b29ab9a0db62ab2ccec1b1bf9d64c1809b3334f1a017f2ac68c095848052ff10eb26fa48413247733453051c9 SHA512 1753cd420ec43d3aab05b28326ebb41c43ce8d3437bfa3703bc90b3b86d0a65cfbba17aff3b99057900dc84bb54c815c0178441171ba51029aefec0a131f6313
 AUX openrc/freelan.initd 263 BLAKE2B d0a111fc41f2b5774e5073fca1e68df333c180f95b0335d4f18cf681b9cf238a55203b13bf3aee757497234c4e2feb1732bebe03095ec729e79526ef5f55147a SHA512 bf8ac87cbfdf83ab38e0a90f85d598abf25028682cd94b6b44de69d02daecf35d35403e2a3e63c10cb6a99f783f7a72bb58fd0e0cb00013c32fe2aba4b179f23
-AUX prefix.patch 3282 BLAKE2B 8e681dd73b5bba8668c540f0da8ffe9dad90875c199b968ac867c6a3e60470a9a1b3098722fe6f4ddcc0dacefbf3c6b437cbec2ae153ac305258e9554480737d SHA512 8a4751cd2cc9933e7fd3ae47c03292f2752416002b8ce6fe1ff651aa7c341d6195a640d51f0c88e25113084aeb4e2e88eef91f9b97936b46da6ec600d0efe799
-DIST freelan-2.0.tar.gz 4330112 BLAKE2B 2b900f8b04b4eb19334d4a7bac29b024ff59e37d66df533cbc84d346049994e022ffb71eae8b5c418a727bb01fc4bcdc190ffed7c49023df98aa60a2437cf0af SHA512 72e5381fdad4d413f4f85c4789ad78c38360a300da6f49a3e8119fe2cacb7a7b05ce16ddcbfcdc008e1c2848c535648967e92f082338fdfb2c1b8e43f53291cc
-EBUILD freelan-2.0.ebuild 1370 BLAKE2B 3ccc68f4b3f2cb3da87642499da33de5ea1581688e895050d7fde46eca9183cbd58b75c50fbb5fdaae3d98174b328c29a83b03df56aa2f1734f4b72ca16a9133 SHA512 5dbdb99545cadc5d840d6b0ae0f34e9e8082fbf8cd312f8f3dcad1ba89b480d396b826d8a7071b6f2caa4e713954592327ca830921913522e5536030d113205d
+DIST freelan-2.1.tar.gz 4340411 BLAKE2B 78365f8f4d6334313abd824a68a06470a34e6e62b17fae1f32e3d655c1210892ccbb17ba81b02930e1554d73adbaea171562365dcda091677513d15506f631fe SHA512 f01f0021ab54450be8cf81b3ee58a74ff02e421ccc0e6b7a3733bbd721dedb14a0bf8c6a9e01d20f000e4b232c89fc358834e696211e239c899e4926e6682e1a
+EBUILD freelan-2.1.ebuild 1235 BLAKE2B 81839cfb9c05991476b9796269ae2916c5778dba3c7303f73d804d7bd2a20b991c22f1cf2b95601611b8c5b693702bff560ecc6f1f0d2dffee38621d6cd9c6fb SHA512 225276c0d0f8984049f5d45e9c05271e9921c147fcc86b918a7a30584e739ec77fa5d2072d10bfc20488e840ccd855b1ccc6c7de6845e19f702e38a96ee8842b
 MISC metadata.xml 340 BLAKE2B 0357b1c5d1b93bc0eda1ef8fab979eff07eff843168adcf3c81ca210d129b8ff84167704c49c2d1940e4e9aea0ac50f11ec80da36a88e988cb66c8b7b109684b SHA512 864027adfa1b5b2947c04b737a862aabb9dee4f411d837489cad78bd0e46cd92d31a71ee1167dc938ec0dd23d8005dc1255df6d1b21820f05c3b420f1e280608
diff --git a/net-vpn/freelan/files/boost158.patch b/net-vpn/freelan/files/boost158.patch
deleted file mode 100644
index 7d5bb740f7bd..000000000000
--- a/net-vpn/freelan/files/boost158.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-commit 68d18a5a7dd7fad8638409d46d144d33a30b54ce
-Author: Mihai Bişog <mihai.bisog@gmail.com>
-Date:   Sat Aug 1 15:18:35 2015 +0300
-
-    Fixed compilation errors when compiling against boost 1.58
-
-diff --git a/libs/asiotap/include/asiotap/types/endpoint.hpp b/libs/asiotap/include/asiotap/types/endpoint.hpp
-index 125e1b4..318b7e6 100644
---- a/libs/asiotap/include/asiotap/types/endpoint.hpp
-+++ b/libs/asiotap/include/asiotap/types/endpoint.hpp
-@@ -350,6 +350,9 @@ namespace asiotap
- 	 */
- 	std::istream& operator>>(std::istream& is, endpoint& value);
- 
-+// Note: this operator is defined in boost variant as of version 1.58. Keeping it around will
-+// introduce overload resolution ambiguity.
-+#if BOOST_VERSION < 105800
- 	/**
- 	 * \brief Compare two endpoints.
- 	 * \param lhs The left argument.
-@@ -360,6 +363,7 @@ namespace asiotap
- 	{
- 		return !(lhs == rhs);
- 	}
-+#endif
- 
- 	/**
- 	 * \brief Get an endpoint with a default port.
-diff --git a/libs/freelan/src/curl.cpp b/libs/freelan/src/curl.cpp
-index 342bb79..392d734 100644
---- a/libs/freelan/src/curl.cpp
-+++ b/libs/freelan/src/curl.cpp
-@@ -146,7 +146,7 @@ namespace freelan
- 
- 	void curl::set_proxy(const asiotap::endpoint& proxy)
- 	{
--		if (proxy != asiotap::hostname_endpoint::null())
-+		if (proxy != asiotap::endpoint(asiotap::hostname_endpoint::null()))
- 		{
- 			set_option(CURLOPT_PROXY, static_cast<const void*>(boost::lexical_cast<std::string>(proxy).c_str()));
- 		}
diff --git a/net-vpn/freelan/files/boost163.patch b/net-vpn/freelan/files/boost163.patch
deleted file mode 100644
index 33636ef0d0b1..000000000000
--- a/net-vpn/freelan/files/boost163.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: freelan-2.0/libs/freelan/src/core.cpp
-===================================================================
---- freelan-2.0.orig/libs/freelan/src/core.cpp
-+++ freelan-2.0/libs/freelan/src/core.cpp
-@@ -1766,7 +1766,8 @@ namespace freelan
- 			{
- 				m_logger(fscp::log_level::information) << "IPv4 address: " << m_configuration.tap_adapter.ipv4_address_prefix_length;
- 
--				tap_config.ipv4.network_address = { m_configuration.tap_adapter.ipv4_address_prefix_length.address(), m_configuration.tap_adapter.ipv4_address_prefix_length.prefix_length() };
-+				asiotap::base_ip_network_address<boost::asio::ip::address_v4> a(m_configuration.tap_adapter.ipv4_address_prefix_length.address(), m_configuration.tap_adapter.ipv4_address_prefix_length.prefix_length());
-+				tap_config.ipv4.network_address = a;
- 			}
- 			else
- 			{
-@@ -1778,7 +1779,8 @@ namespace freelan
- 			{
- 				m_logger(fscp::log_level::information) << "IPv6 address: " << m_configuration.tap_adapter.ipv6_address_prefix_length;
- 
--				tap_config.ipv6.network_address = { m_configuration.tap_adapter.ipv6_address_prefix_length.address(), m_configuration.tap_adapter.ipv6_address_prefix_length.prefix_length() };
-+				asiotap::base_ip_network_address<boost::asio::ip::address_v6> a(m_configuration.tap_adapter.ipv6_address_prefix_length.address(), m_configuration.tap_adapter.ipv6_address_prefix_length.prefix_length());
-+				tap_config.ipv6.network_address = a;
- 			}
- 			else
- 			{
diff --git a/net-vpn/freelan/files/gcc7.patch b/net-vpn/freelan/files/gcc7.patch
deleted file mode 100644
index 71bcf3d9a841..000000000000
--- a/net-vpn/freelan/files/gcc7.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-commit 5014a8023b42762052d6417ebbc0cd2adb1fda90
-Author: Sebastien Vincent <sebastien.vincent@cppextrem.com>
-Date:   Sat Aug 5 20:10:55 2017 +0200
-
-    Fixes compilation with g++-7.
-
-diff --git a/libs/asiotap/src/posix/posix_tap_adapter.cpp b/libs/asiotap/src/posix/posix_tap_adapter.cpp
-index 71377cee..cdd7abf3 100644
---- a/libs/asiotap/src/posix/posix_tap_adapter.cpp
-+++ b/libs/asiotap/src/posix/posix_tap_adapter.cpp
-@@ -206,6 +206,7 @@ namespace asiotap
- 						{
- 							result[name] = name;
- 						}
-+						break;
- 					}
- 					case tap_adapter_layer::ip:
- 					{
-@@ -213,6 +214,7 @@ namespace asiotap
- 						{
- 							result[name] = name;
- 						}
-+						break;
- 					}
- 				}
- 			}
-diff --git a/libs/netlinkplus/include/netlinkplus/endpoint.hpp b/libs/netlinkplus/include/netlinkplus/endpoint.hpp
-index 3503cae3..74fb7e1b 100644
---- a/libs/netlinkplus/include/netlinkplus/endpoint.hpp
-+++ b/libs/netlinkplus/include/netlinkplus/endpoint.hpp
-@@ -44,6 +44,8 @@
- 
- #pragma once
- 
-+#include <cstring>
-+
- #include <boost/asio.hpp>
- 
- #include <linux/netlink.h>
-@@ -125,17 +127,17 @@ namespace netlinkplus
- 
- 			friend bool operator==(const netlink_endpoint& lhs, const netlink_endpoint& rhs)
- 			{
--				return (lhs.m_sockaddr == rhs.m_sockaddr);
-+				return (std::memcmp(&lhs.m_sockaddr, &rhs.m_sockaddr, sizeof(sockaddr_nl)) == 0);
- 			}
- 
- 			friend bool operator!=(const netlink_endpoint& lhs, const netlink_endpoint& rhs)
- 			{
--				return (lhs.m_sockaddr != rhs.m_sockaddr);
-+				return (std::memcmp(&lhs.m_sockaddr, &rhs.m_sockaddr, sizeof(sockaddr_nl)) != 0);
- 			}
- 
- 			friend bool operator<(const netlink_endpoint& lhs, const netlink_endpoint& rhs)
- 			{
--				return (lhs.m_sockaddr < rhs.m_sockaddr);
-+				return (std::memcmp(&lhs.m_sockaddr, &rhs.m_sockaddr, sizeof(sockaddr_nl)) < 0);
- 			}
- 
- 		private:
diff --git a/net-vpn/freelan/files/glibc225.patch b/net-vpn/freelan/files/glibc225.patch
deleted file mode 100644
index e21df29d1aec..000000000000
--- a/net-vpn/freelan/files/glibc225.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 597b6eb65b4ea68f0fe8015db38ce68b71c280d7
-Author: Florian Lamprecht <florian_lamprecht@gmx.de>
-Date:   Sun Mar 19 13:37:27 2017 +0100
-
-    Fix a compiler warning on linux
-    
-    include a systemmacro explictly to avoid warning, which is handled as error.
-
-diff --git a/libs/asiotap/src/posix/posix_tap_adapter.cpp b/libs/asiotap/src/posix/posix_tap_adapter.cpp
-index 74e9eb2a..71377cee 100644
---- a/libs/asiotap/src/posix/posix_tap_adapter.cpp
-+++ b/libs/asiotap/src/posix/posix_tap_adapter.cpp
-@@ -56,7 +56,7 @@
- #ifdef LINUX
- 
- #include <linux/if_tun.h>
--
-+#include <sys/sysmacros.h>
- /**
-  * \struct in6_ifreq
-  * \brief Replacement structure since the include of linux/ipv6.h introduces conflicts.
diff --git a/net-vpn/freelan/files/mf.patch b/net-vpn/freelan/files/mf.patch
deleted file mode 100644
index c7e169f4e8a7..000000000000
--- a/net-vpn/freelan/files/mf.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-commit 4109bb053906f45b545a6cca4399734b91bca425
-Author: Julien Kauffmann <julien.kauffmann@freelan.org>
-Date:   Sat May 9 16:55:51 2015 -0400
-
-    Fixed Makefile
-
-diff --git a/Makefile b/Makefile
-index d6bcd59..20b5ea1 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,14 +1,15 @@
- PRODUCT_NAME:=freelan
--PRODUCT_VERSION:=$(shell git describe)
-+PRODUCT_VERSION:=$(shell cat VERSION | tr -d '\r\n')
-+PRODUCT_PREFIX=/usr
- 
--default: install
--
--install:
--	# Install the files to ${DESTDIR} (defaults to /)
--	scons install prefix=/
-+default: build
- 
- build:
--	scons all samples
-+	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} scons --mode=release apps prefix=${PRODUCT_PREFIX}
-+
-+install:
-+	# Install the files to $(DESTDIR) (defaults to /)
-+	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} DESTDIR=$(DESTDIR) scons --mode=release install prefix=${PRODUCT_PREFIX}
- 
- package:
- 	git archive HEAD --prefix=${PRODUCT_NAME}-${PRODUCT_VERSION}/ | gzip > ${PRODUCT_NAME}-${PRODUCT_VERSION}.tar.gz
diff --git a/net-vpn/freelan/files/prefix.patch b/net-vpn/freelan/files/prefix.patch
deleted file mode 100644
index ac75e87fb1d1..000000000000
--- a/net-vpn/freelan/files/prefix.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-commit d782a42eaeecdce9b4377a7b41dc60b9fecca31c
-Author: Julien Kauffmann <julien.kauffmann@freelan.org>
-Date:   Sat May 9 19:30:11 2015 -0400
-
-    Added support for a different binary prefix
-
-diff --git a/Makefile b/Makefile
-index 20b5ea1..b009d2c 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,15 +1,16 @@
- PRODUCT_NAME:=freelan
- PRODUCT_VERSION:=$(shell cat VERSION | tr -d '\r\n')
--PRODUCT_PREFIX=/usr
-+PRODUCT_BIN_PREFIX=/usr
-+PRODUCT_PREFIX=/
- 
- default: build
- 
- build:
--	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} scons --mode=release apps prefix=${PRODUCT_PREFIX}
-+	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} scons --mode=release apps prefix=${PRODUCT_PREFIX} bin_prefix=${PRODUCT_BIN_PREFIX}
- 
- install:
- 	# Install the files to $(DESTDIR) (defaults to /)
--	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} DESTDIR=$(DESTDIR) scons --mode=release install prefix=${PRODUCT_PREFIX}
-+	FREELAN_NO_GIT=1 FREELAN_NO_GIT_VERSION=${PRODUCT_VERSION} DESTDIR=$(DESTDIR) scons --mode=release install prefix=${PRODUCT_PREFIX} bin_prefix=${PRODUCT_BIN_PREFIX}
- 
- package:
- 	git archive HEAD --prefix=${PRODUCT_NAME}-${PRODUCT_VERSION}/ | gzip > ${PRODUCT_NAME}-${PRODUCT_VERSION}.tar.gz
-diff --git a/SConstruct b/SConstruct
-index 32a9915..bc68b71 100644
---- a/SConstruct
-+++ b/SConstruct
-@@ -28,7 +28,7 @@ class FreelanEnvironment(Environment):
-     A freelan specific environment class.
-     """
- 
--    def __init__(self, mode, prefix, **kwargs):
-+    def __init__(self, mode, prefix, bin_prefix=None, **kwargs):
-         """
-         Initialize the environment.
- 
-@@ -66,14 +66,19 @@ class FreelanEnvironment(Environment):
- 
-         self.mode = mode
-         self.prefix = prefix
-+        self.bin_prefix = bin_prefix if bin_prefix else prefix
-         self.destdir = self['ENV'].get('DESTDIR', '')
- 
-         if self.destdir:
-             self.install_prefix = os.path.normpath(
-                 os.path.abspath(self.destdir),
-             ) + self.prefix
-+            self.bin_install_prefix = os.path.normpath(
-+                os.path.abspath(self.destdir),
-+            ) + self.bin_prefix
-         else:
-             self.install_prefix = self.prefix
-+            self.bin_install_prefix = self.bin_prefix
- 
-         if os.path.basename(self['CXX']) == 'clang++':
-             self.Append(CXXFLAGS=['-Qunused-arguments'])
-@@ -147,10 +152,15 @@ class FreelanEnvironment(Environment):
- mode = GetOption('mode')
- prefix = os.path.normpath(os.path.abspath(ARGUMENTS.get('prefix', './install')))
- 
-+if 'bin_prefix' in ARGUMENTS:
-+    bin_prefix = os.path.normpath(os.path.abspath(ARGUMENTS['bin_prefix']))
-+else:
-+    bin_prefix = None
-+
- if mode in ('all', 'release'):
--    env = FreelanEnvironment(mode='release', prefix=prefix)
-+    env = FreelanEnvironment(mode='release', prefix=prefix, bin_prefix=bin_prefix)
-     libraries, includes, apps, samples, configurations = SConscript('SConscript', exports='env', variant_dir=os.path.join('build', env.mode))
--    install = env.Install(os.path.join(env.install_prefix, 'bin'), apps)
-+    install = env.Install(os.path.join(env.bin_install_prefix, 'bin'), apps)
-     install.extend(env.Install(os.path.join(env.install_prefix, 'etc', 'freelan'), configurations))
- 
-     Alias('install', install)
diff --git a/net-vpn/freelan/freelan-2.0.ebuild b/net-vpn/freelan/freelan-2.0.ebuild
deleted file mode 100644
index eb641501a7e4..000000000000
--- a/net-vpn/freelan/freelan-2.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit scons-utils toolchain-funcs eutils
-
-DESCRIPTION="Peer-to-peer VPN software that abstracts a LAN over the Internet"
-HOMEPAGE="http://www.freelan.org/"
-SRC_URI="https://github.com/freelan-developers/freelan/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="debug"
-
-DEPEND="
-	dev-libs/boost:=[threads]
-	dev-libs/openssl:0=
-	net-misc/curl:=
-	virtual/libiconv
-"
-RDEPEND="${DEPEND}"
-
-FREELAN_NO_GIT=1
-FREELAN_NO_GIT_VERSION=${PV}
-
-src_prepare() {
-	epatch \
-		"${FILESDIR}/boost158.patch" \
-		"${FILESDIR}/mf.patch" \
-		"${FILESDIR}/prefix.patch" \
-		"${FILESDIR}/boost163.patch" \
-		"${FILESDIR}/glibc225.patch" \
-		"${FILESDIR}/gcc7.patch"
-
-	sed -e "s/CXXFLAGS='-O3'/CXXFLAGS=''/" \
-		-e "s/CXXFLAGS=\['-Werror'\]/CXXFLAGS=[]/" \
-		-e "s/CXXFLAGS=\['-pedantic'\]/CXXFLAGS=[]/" \
-		-i SConstruct || die
-	epatch_user
-}
-
-src_compile() {
-	tc-export CXX CC AR
-	export LINK="$(tc-getCXX)"
-
-	local MYSCONS=(
-		"--mode=$(usex debug debug release)"
-		prefix="${EPREFIX:-/}"
-		bin_prefix="/usr"
-		apps
-	)
-	escons "${MYSCONS[@]}"
-}
-
-src_install() {
-	DESTDIR="${D}" escons --mode=release prefix="${EPREFIX:-/}" bin_prefix="/usr" install
-	dodoc CONTRIBUTING.md README.md
-
-	newinitd "${FILESDIR}/openrc/freelan.initd" freelan
-}
diff --git a/net-vpn/freelan/freelan-2.1.ebuild b/net-vpn/freelan/freelan-2.1.ebuild
new file mode 100644
index 000000000000..aa9b0303c450
--- /dev/null
+++ b/net-vpn/freelan/freelan-2.1.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit scons-utils toolchain-funcs
+
+DESCRIPTION="Peer-to-peer VPN software that abstracts a LAN over the Internet"
+HOMEPAGE="http://www.freelan.org/"
+SRC_URI="https://github.com/freelan-developers/freelan/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="debug"
+
+DEPEND="
+	dev-libs/boost:=[threads]
+	dev-libs/openssl:0=
+	net-misc/curl:=
+	virtual/libiconv
+	net-libs/miniupnpc:=
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+	export FREELAN_NO_GIT=1
+	export FREELAN_NO_GIT_VERSION=${PV}
+
+	sed -e "s/CXXFLAGS='-O3'/CXXFLAGS=''/" \
+		-e "s/CXXFLAGS=\['-Werror'\]/CXXFLAGS=[]/" \
+		-e "s/CXXFLAGS=\['-pedantic'\]/CXXFLAGS=[]/" \
+		-i SConstruct || die
+	default
+}
+
+src_compile() {
+	tc-export CXX CC AR
+	export LINK="$(tc-getCXX)"
+
+	local MYSCONS=(
+		"--mode=$(usex debug debug release)"
+		prefix="${EPREFIX:-/}"
+		bin_prefix="/usr"
+		apps
+	)
+	escons "${MYSCONS[@]}"
+}
+
+src_install() {
+	DESTDIR="${D}" escons --mode=release install prefix="${EPREFIX:-/}" bin_prefix="/usr"
+	dobin build/release/bin/freelan
+	dodoc CONTRIBUTING.md README.md
+
+	newinitd "${FILESDIR}/openrc/freelan.initd" freelan
+}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 8ebb670c978a..6fa4d508e11c 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/gr-specest/Manifest b/net-wireless/gr-specest/Manifest
new file mode 100644
index 000000000000..cf26c2265166
--- /dev/null
+++ b/net-wireless/gr-specest/Manifest
@@ -0,0 +1,2 @@
+EBUILD gr-specest-9999.ebuild 701 BLAKE2B 06b6a33946f22af69af7ae59a642c9749782b31e39a9b99897b288937a8e41d160ee8c09ce3171d5d80924dd2e90b90a405864109d0b3b018dee71f26a44838f SHA512 7735c9acf40e0ba70e06b6f2f51f84985aaefe6341b40b9d60547c7a8d886b02f45118d8f9b8cca6439d55be653bc07431ebc3bca68228921b6ad7306dad3800
+MISC metadata.xml 338 BLAKE2B d8dd443fa026ba6b7343fe067de88b467663e1e5a77904a32df6ee64bc3128341fcd48c52a99103229180005cc9a007dd7c7ec33e3c136835185ec68a03bc0ce SHA512 de41f6b74153a345fca1448cb9dcbd391acfcfbdc784d3359a96c6c099897aa65ecc58f84e09e872772274afd74a0ba15ef06be8a4492e7e89f43f70f6ba090f
diff --git a/net-wireless/gr-specest/gr-specest-9999.ebuild b/net-wireless/gr-specest/gr-specest-9999.ebuild
new file mode 100644
index 000000000000..12a9c520a90b
--- /dev/null
+++ b/net-wireless/gr-specest/gr-specest-9999.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils git-r3 python-single-r1
+
+DESCRIPTION="A module adding spectral estimation routines to GNU Radio"
+HOMEPAGE="https://github.com/kit-cel/gr-specest"
+EGIT_REPO_URI="https://github.com/kit-cel/gr-specest.git"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS=""
+IUSE="doc"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	>=net-wireless/gnuradio-3.7.0:=[${PYTHON_USEDEP}]
+	${PYTHON_DEPS}"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig"
+
+src_configure() {
+	mycmakeargs=(
+		-DPYTHON_EXECUTABLE="${PYTHON}"
+	)
+	cmake-utils_src_configure
+}
diff --git a/net-wireless/gr-specest/metadata.xml b/net-wireless/gr-specest/metadata.xml
new file mode 100644
index 000000000000..8a3f94073560
--- /dev/null
+++ b/net-wireless/gr-specest/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>zerochaos@gentoo.org</email>
+	<name>Rick Farina</name>
+</maintainer>
+<maintainer type="project">
+	<email>radio@gentoo.org</email>
+	<name>Radio</name>
+</maintainer>
+</pkgmetadata>
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index e35729907e94..ec1867e1a21a 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/use.mask b/profiles/arch/amd64/use.mask
index caf8d15af3f0..c875bee78cda 100644
--- a/profiles/arch/amd64/use.mask
+++ b/profiles/arch/amd64/use.mask
@@ -6,6 +6,12 @@
 
 # SECTION: Unmask
 
+# Michael Orlitzky <mjo@gentoo.org> (07 Jan 2018)
+# Oracle database stuff should work on amd64.
+-oci8
+-oci8-instant-client
+-oracle
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Unmask elogind since it is keyworded here.
 -elogind
@@ -96,11 +102,6 @@
 # Lilo works on amd64, so ...
 -lilo
 
-# 2007/08/19 - Christoph Mende <angelos@gentoo.org>
-# Unmask support for dev-db/oracle-instantclient-basic
--oci8-instant-client
--oracle
-
 # 2007/03/10 - Mike Frysinger <vapier@gentoo.org>
 # NVRAM works on x86/amd64 hosts
 -nvram
@@ -125,10 +126,6 @@
 -video_cards_vmware
 -video_cards_qxl
 
-# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
-# Unmask the flags for PHP that are available only on x86/amd64
--oci8
-
 # Feb 16th 2007; Simon Stelling <blubb@gentoo.org>
 # Since this profile forces >=portage-2.1.2, we can unmask all
 # SIMD assembler flags
diff --git a/profiles/arch/arm/package.use.stable.mask b/profiles/arch/arm/package.use.stable.mask
index bf23c16f576b..19cc5e875db6 100644
--- a/profiles/arch/arm/package.use.stable.mask
+++ b/profiles/arch/arm/package.use.stable.mask
@@ -18,7 +18,7 @@ media-sound/mpd fluidsynth
 # Alexis Ballier <aballier@gentoo.org> (29 May 2017)
 # frei0r-plugins is not stable yet, mask it on stable versions
 <media-video/libav-12 frei0r
-<=media-video/ffmpeg-3.3.5 frei0r sofalizer
+<=media-video/ffmpeg-3.3.6 frei0r sofalizer
 
 # Alexis Ballier <aballier@gentoo.org> (26 May 2017)
 # toolame not stable yet
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 752b4918b135..a97dce3a8c01 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -8,13 +8,6 @@
 # dev-libs/libressl not marked stable yet
 libressl
 
-# Mike Gilbert <floppym@gentoo.org> (28 Oct 2017)
-# Mask python targets until dev-lang/python is stable.
-python_single_target_python3_6
-python_targets_python3_6
-python_single_target_python3_5
-python_targets_python3_5
-
 # Hans de Graaff <graaff@gentoo.org> (17 Apr 2017)
 # Temporary mask to support stable bug 615818
 ruby_targets_ruby22
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index 6c23a4598d8b..730688845f01 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
+# Brian Evans <grknight@gentoo.org> (15 Jan 2018)
+# app-arch/snappy is not tested
+dev-db/mariadb innodb-snappy
+
 # Michał Górny <mgorny@gentoo.org> (12 Jan 2018)
 # Requires dependency flags that are masked in this profile.
 media-libs/sdl-mixer midi
diff --git a/profiles/arch/mips/use.mask b/profiles/arch/mips/use.mask
index 60ea7770845a..384fdee257c2 100644
--- a/profiles/arch/mips/use.mask
+++ b/profiles/arch/mips/use.mask
@@ -4,6 +4,10 @@
 # Unmask the flag which corresponds to ARCH.
 -mips
 
+# Brian Evans <grknight@gentoo.org> (15 Jan 2018)
+# Mask tcmalloc as dev-util/google-perftools is unavailable
+tcmalloc
+
 # James Le Cuirot <chewi@gentoo.org> (29 Jun 2017)
 # Unmask as this profile is big endian.
 -big-endian
diff --git a/profiles/arch/x86/use.mask b/profiles/arch/x86/use.mask
index 58f2fc383b66..61982cc07f41 100644
--- a/profiles/arch/x86/use.mask
+++ b/profiles/arch/x86/use.mask
@@ -4,6 +4,12 @@
 # Unmask the flag which corresponds to ARCH.
 -x86
 
+# Michael Orlitzky <mjo@gentoo.org> (13 Jan 2018)
+# Oracle database stuff should work on x86.
+-oci8
+-oci8-instant-client
+-oracle
+
 # Michael Palimaka <kensington@gentoo.org> (03 Jun 2017)
 # Unmask elogind since it is keyworded here.
 -elogind
@@ -120,10 +126,6 @@
 # Unmask nvidia XvMC support
 -nvidia
 
-# Unmask dev-db/oracle-instantclient-basic support
--oci8-instant-client
--oracle
-
 # Modular X: unmask for architectures on which they are available
 -input_devices_synaptics
 -input_devices_vmmouse
@@ -140,12 +142,6 @@
 -video_cards_virtualbox
 -video_cards_qxl
 
-# Diego Pettenò <flameeyes@gentoo.org> (4 Jan 2007)
-# Unmask the flags for PHP that are available only on x86
-#
-# Shared with amd64
--oci8
-
 # Robert Buchholz <rbu@gentoo.org> (03 Jun 2007)
 # Unmask as it works on x86
 -lcd_devices_svga
diff --git a/profiles/base/package.use.stable.mask b/profiles/base/package.use.stable.mask
index 972361178c67..f0f583ba3e77 100644
--- a/profiles/base/package.use.stable.mask
+++ b/profiles/base/package.use.stable.mask
@@ -1,9 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # 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 package.use.mask
 
+# Andreas Sturmlechner <asturm@gentoo.org> (16 Jan 2018)
+# USE=wxwidgets Requires x11-libs/wxGTK:3.0-gtk3 stabilisation
+# USE=tcl does not build reliably, bug #624576
+>=sci-libs/plplot-5.12 tcl wxwidgets
+
 # Bernard Cafarelli <voyageur@gentoo.org> (27 Nov 2017)
 # Dependencies have no stable keyword
 app-backup/backup-manager s3
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+/eapi b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+/parent b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+/parent
new file mode 100644
index 000000000000..665aafbea8db
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+/eapi b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+/parent b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+/parent
new file mode 100644
index 000000000000..7eed652658f8
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone/kernel-2.6.32+
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+/eapi b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+/parent b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+/parent
new file mode 100644
index 000000000000..b3da232ba558
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/prefix/standalone
diff --git a/profiles/default/linux/amd64/17.0/no-multilib/prefix/parent b/profiles/default/linux/amd64/17.0/no-multilib/prefix/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/amd64/17.0/no-multilib/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/default/linux/musl/package.use.mask b/profiles/default/linux/musl/package.use.mask
index a1ebac8bd77c..2bb6d0614b8a 100644
--- a/profiles/default/linux/musl/package.use.mask
+++ b/profiles/default/linux/musl/package.use.mask
@@ -1,6 +1,9 @@
 # Copyright 1999-2015 Gentoo Foundation.
 # Distributed under the terms of the GNU General Public License v2
 
+# See bug #604542
+net-misc/iputils idn
+
 # See bug #504200
 sys-devel/gcc sanitize
 
diff --git a/profiles/default/linux/package.use.mask b/profiles/default/linux/package.use.mask
index 0a6667cd9dce..8060b8e26b79 100644
--- a/profiles/default/linux/package.use.mask
+++ b/profiles/default/linux/package.use.mask
@@ -20,10 +20,6 @@ net-dns/bind seccomp
 # media-libs/libomxil-bellagio keyworded on amd64/x86
 media-libs/mesa openmax
 
-# Thomas Sachau <tommy@gentoo.org> (25 Dez 2013)
-# mask frost USE flag, broken with >=net-libs/polarssl-1.3.0, bug 489256
-net-p2p/fms frost
-
 # Diego Elio Pettenò (27 Aug 2012)
 # The libpci access is only used for linux.
 net-analyzer/net-snmp -pci
diff --git a/profiles/default/linux/x86/17.0/prefix/kernel-2.6.16+/eapi b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.16+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.16+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/prefix/kernel-2.6.16+/parent b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.16+/parent
new file mode 100644
index 000000000000..c4bb168d81b2
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.16+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/prefix/standalone/kernel-2.6.16+
diff --git a/profiles/default/linux/x86/17.0/prefix/kernel-2.6.32+/eapi b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.32+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.32+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/prefix/kernel-2.6.32+/parent b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.32+/parent
new file mode 100644
index 000000000000..b4882488fc0c
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/kernel-2.6.32+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/prefix/standalone/kernel-2.6.32+
diff --git a/profiles/default/linux/x86/17.0/prefix/kernel-3.2+/eapi b/profiles/default/linux/x86/17.0/prefix/kernel-3.2+/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/kernel-3.2+/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/x86/17.0/prefix/kernel-3.2+/parent b/profiles/default/linux/x86/17.0/prefix/kernel-3.2+/parent
new file mode 100644
index 000000000000..b8a505e58f6c
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/kernel-3.2+/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../features/prefix/standalone
diff --git a/profiles/default/linux/x86/17.0/prefix/parent b/profiles/default/linux/x86/17.0/prefix/parent
new file mode 100644
index 000000000000..f3229c5b9876
--- /dev/null
+++ b/profiles/default/linux/x86/17.0/prefix/parent
@@ -0,0 +1 @@
+..
diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults b/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
index 510e5e21b3ce..c64a419f389d 100644
--- a/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
+++ b/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults
@@ -14,5 +14,5 @@ ac_cv_func_utimensat=no
 ac_cv_func_pipe2=no
 
 # >=python-3 is masked.
-PYTHON_TARGETS="-python3_*"
+PYTHON_TARGETS=python2_7
 PYTHON_SINGLE_TARGET=python2_7
diff --git a/profiles/package.mask b/profiles/package.mask
index 0774af71193e..83b0aece3a52 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -29,6 +29,16 @@
 
 #--- END OF EXAMPLES ---
 
+# Aaron W. Swenson <titanofold@gentoo.org> (14 Jan 2018)
+# Upstream is now Upwork. Use app-office/upwork instead.
+# Masked for removal in 30 days.
+app-office/odeskteam
+
+# Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
+# Dead upstream, depends on dead Qt4.
+# Masked for removal in 30 days.
+sys-kernel/kccmp
+
 # Andreas Sturmlechner <asturm@gentoo.org> (13 Jan 2018)
 # Dead upstream, depends on dead Qt4.
 # Masked for removal in 30 days.
@@ -375,10 +385,6 @@ media-libs/libdvb
 dev-lang/blassic
 
 # Pacho Ramos <pacho@gentoo.org> (28 Dec 2017)
-# Fails at runtime (#614314). Removal in a month.
-app-text/nfoview
-
-# Pacho Ramos <pacho@gentoo.org> (28 Dec 2017)
 # Needs to be migrated to pycryptodome, this was merged into paramiko
 # (#611616). Removal in a month.
 dev-python/ssh
@@ -703,13 +709,6 @@ virtual/jre:9
 # experimental features and accept a more unstable release.
 >=www-client/chromium-65
 
-# Aaron W. Swenson <titanofold.org> (15 Dec 2017)
-# Masked for removal in 30 days (2017-01-14). Upstream doesn't appear
-# to be active and is really far behind in supporting the latest
-# enhancements from PostgreSQL. Consider using dev-db/pgadmin4
-# instead. (Bug 641140)
-dev-db/phppgadmin
-
 # Andrey Grozin <grozin@gentoo.org> (15 Dec 2017)
 # Dead upstream. Removal in 30 days. Use bpython or ptpython instead.
 dev-python/dreampie
@@ -722,23 +721,11 @@ dev-python/pydb
 # Dead upstream, unclear license. Removal in 30 days.
 dev-python/pygui
 
-# Thomas Deutschmann <whissi@gentoo.org> (14 Dec 2017)
-# Unpatched security vulnerability per bug #537108
-# Removal in 30 days. Please migrate to net-libs/mbedtls if you have
-# not done yet.
-net-libs/polarssl
-
 # Patrice Clement <monsieurp@gentoo.org> (12 Dec 2017)
 # Masked due to a hard dependency on an ancient versions of dev-libs/msgpack
 # (<0.6) that have been punted from the tree.
 net-misc/cocaine-core
 
-# Jonas Stein <jstein@gentoo.org> (10 Dec 2017)
-# Site blocks certain IP blocks from downloading files, while the package
-# may not be mirrored. (bug #640508)
-# Masked for removal on 2018-01-12
-app-arch/defluff
-
 # Andreas Sturmlechner <asturm@gentoo.org> (03 Dec 2017)
 # Depends on dead Qt4, upstream porting inquiry pending. Bug #631788
 games-kids/crayon-physics
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 4e3223a76b14..b1d5fdcdff74 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -48,19 +48,19 @@ amd64           default/linux/amd64/17.0/x32                            dev
 
 # Experimental SYMLINK_LIB=no profiles
 # Run app-portage/unsymlink-lib *before* switching the profile.
-#amd64           default/linux/amd64/17.1                           exp
-#amd64           default/linux/amd64/17.1/selinux                   exp
-#amd64           default/linux/amd64/17.1/hardened                  exp
-#amd64           default/linux/amd64/17.1/desktop                   exp
-#amd64           default/linux/amd64/17.1/desktop/gnome             exp
-#amd64           default/linux/amd64/17.1/desktop/gnome/systemd     exp
-#amd64           default/linux/amd64/17.1/desktop/plasma            exp
-#amd64           default/linux/amd64/17.1/desktop/plasma/systemd    exp
-#amd64           default/linux/amd64/17.1/developer                 exp
-#amd64           default/linux/amd64/17.1/no-multilib                    exp
-#amd64           default/linux/amd64/17.1/no-multilib/hardened           exp
-#amd64           default/linux/amd64/17.1/no-multilib/hardened/selinux   exp
-#amd64           default/linux/amd64/17.1/systemd                   exp
+amd64           default/linux/amd64/17.1                           exp
+amd64           default/linux/amd64/17.1/selinux                   exp
+amd64           default/linux/amd64/17.1/hardened                  exp
+amd64           default/linux/amd64/17.1/desktop                   exp
+amd64           default/linux/amd64/17.1/desktop/gnome             exp
+amd64           default/linux/amd64/17.1/desktop/gnome/systemd     exp
+amd64           default/linux/amd64/17.1/desktop/plasma            exp
+amd64           default/linux/amd64/17.1/desktop/plasma/systemd    exp
+amd64           default/linux/amd64/17.1/developer                 exp
+amd64           default/linux/amd64/17.1/no-multilib                    exp
+amd64           default/linux/amd64/17.1/no-multilib/hardened           exp
+amd64           default/linux/amd64/17.1/no-multilib/hardened/selinux   exp
+amd64           default/linux/amd64/17.1/systemd                   exp
 
 # ARM Profiles
 arm             default/linux/arm/13.0                          stable
@@ -90,9 +90,9 @@ arm             default/linux/arm/13.0/armv7a/desktop/gnome     dev
 arm             default/linux/arm/13.0/armv7a/developer         dev
 
 # ARM64 Profiles
-arm64           default/linux/arm64/13.0                        dev
+arm64           default/linux/arm64/13.0                        exp
 arm64           default/linux/arm64/13.0/desktop                exp
-arm64           default/linux/arm64/13.0/desktop/systemd        dev
+arm64           default/linux/arm64/13.0/desktop/systemd        exp
 arm64           default/linux/arm64/13.0/developer              exp
 arm64           default/linux/arm64/13.0/systemd                exp
 arm64           default/linux/arm64/17.0                        dev
@@ -290,18 +290,18 @@ x86		default/linux/musl/x86					exp
 x86		hardened/linux/musl/x86					exp
 
 # Non-embedded uclibc profiles
-amd64		default/linux/uclibc/amd64				dev
-amd64		hardened/linux/uclibc/amd64				dev
-arm		default/linux/uclibc/arm/armv7a				dev
-arm		hardened/linux/uclibc/arm/armv7a			dev
-mips		default/linux/uclibc/mips				dev
-mips		hardened/linux/uclibc/mips				dev
-mips		default/linux/uclibc/mips/mipsel			dev
-mips		hardened/linux/uclibc/mips/mipsel			dev
-ppc		default/linux/uclibc/ppc				dev
-ppc		hardened/linux/uclibc/ppc				dev
-x86		default/linux/uclibc/x86				dev
-x86		hardened/linux/uclibc/x86				dev
+amd64		default/linux/uclibc/amd64				exp
+amd64		hardened/linux/uclibc/amd64				exp
+arm		default/linux/uclibc/arm/armv7a				exp
+arm		hardened/linux/uclibc/arm/armv7a			exp
+mips		default/linux/uclibc/mips				exp
+mips		hardened/linux/uclibc/mips				exp
+mips		default/linux/uclibc/mips/mipsel			exp
+mips		hardened/linux/uclibc/mips/mipsel			exp
+ppc		default/linux/uclibc/ppc				exp
+ppc		hardened/linux/uclibc/ppc				exp
+x86		default/linux/uclibc/x86				exp
+x86		hardened/linux/uclibc/x86				exp
 
 # uclibc/embedded multiarch profiles
 #amd64		uclibc/amd64					dev
@@ -334,8 +334,14 @@ x86-linux		prefix/linux/x86				exp
 # Linux Standalone Profiles
 amd64-linux		prefix/linux-standalone/amd64			exp
 amd64-linux		prefix/linux-standalone/amd64/legacy		exp
+amd64-linux		default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+		exp
+amd64-linux		default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+	exp
+amd64-linux		default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+	exp
 x86-linux		prefix/linux-standalone/x86			exp
 x86-linux		prefix/linux-standalone/x86/legacy		exp
+x86-linux		default/linux/x86/17.0/prefix/kernel-3.2+	exp
+x86-linux		default/linux/x86/17.0/prefix/kernel-2.6.32+	exp
+x86-linux		default/linux/x86/17.0/prefix/kernel-2.6.16+	exp
 arm-linux		prefix/linux-standalone/arm/armv7a		exp
 arm64-linux		prefix/linux-standalone/arm64			exp
 ppc64-linux		prefix/linux-standalone/ppc64			exp
diff --git a/profiles/releases/freebsd-11.1/package.use.mask b/profiles/releases/freebsd-11.1/package.use.mask
new file mode 100644
index 000000000000..a31b625b320f
--- /dev/null
+++ b/profiles/releases/freebsd-11.1/package.use.mask
@@ -0,0 +1,9 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Brian Evans <grknight@gentoo.org> (15 Jan 2018)
+# Mask innodb-snappy as app-arch/snappy is untested
+# Mask innodb-lz4 as app-arch/lz4 is untested
+# Mask oqgraph as dev-libs/judy is untested
+# Mask numa as sys-process-numactl is untested
+dev-db/mariadb innodb-snappy innodb-lz4 oqgraph numa
diff --git a/profiles/releases/freebsd-11.1/use.mask b/profiles/releases/freebsd-11.1/use.mask
new file mode 100644
index 000000000000..6014f7dee6cc
--- /dev/null
+++ b/profiles/releases/freebsd-11.1/use.mask
@@ -0,0 +1,14 @@
+# Copyright 1999-2018 Gentoo Foundation.
+# Distributed under the terms of the GNU General Public License, v2
+
+# Brian Evans <grknight@gentoo.org> (15 Jan 2018)
+# Mask dev-util/systemtap is untested
+systemtap
+
+# Brian Evans <grknight@gentoo.org> (15 Jan 2018)
+# Mask dev-libs/jemalloc is untested
+jemalloc
+
+# Brian Evans <grknight@gentoo.org> (15 Jan 2018)
+# Mask dev-libs/libressl is untested
+libressl
diff --git a/profiles/thirdpartymirrors b/profiles/thirdpartymirrors
index 0a9e3e0b3c4b..55c8cd93e968 100644
--- a/profiles/thirdpartymirrors
+++ b/profiles/thirdpartymirrors
@@ -14,7 +14,7 @@ gnome		https://download.gnome.org/
 gnu		http://ftpmirror.gnu.org/ http://ftp.gnu.org/gnu/
 gnu-alpha	ftp://alpha.gnu.org/gnu/ http://alpha.gnu.org/gnu/ ftp://ftp.funet.fi/pub/gnu/alpha/gnu/ http://www.nic.funet.fi/pub/gnu/alpha/gnu/ ftp://gnualpha.uib.no/pub/gnualpha/ http://gnualpha.uib.no/ ftp://mirrors.fe.up.pt/pub/gnu-alpha/ http://mirrors.fe.up.pt/pub/gnu-alpha/ http://mirror.lihnidos.org/GNU/alpha/gnu/ http://mirrors.ibiblio.org/gnu/alpha/gnu/
 gnupg		ftp://ftp.gnupg.org/gcrypt/ http://mirrors.dotsrc.org/gcrypt/ http://artfiles.org/gnupg.org/ http://ftp.heanet.ie/mirrors/ftp.gnupg.org/gcrypt/ ftp://sunsite.icm.edu.pl/pub/security/gnupg/ http://gd.tuwien.ac.at/privacy/gnupg/ http://www.ring.gr.jp/pub/net/gnupg/ ftp://ftp.ring.gr.jp/pub/net/gnupg/
-hackage		http://hackage.haskell.org/ https://dev.gentoo.org/~qnikst/hdiff.luite.com/
+hackage		https://hackage.haskell.org/
 idsoftware	ftp://ftp.idsoftware.com/idstuff ftp://ftp.fu-berlin.de/pc/games/idgames/idstuff ftp://ftp.gamers.org/pub/idgames/idstuff
 imagemagick	http://mirror.checkdomain.de/imagemagick/ ftp://mirror.checkdomain.de/imagemagick/ ftp://ftp.kddlabs.co.jp/graphics/ImageMagick/ ftp://ftp.u-aizu.ac.jp/pub/graphics/image/ImageMagick/imagemagick.org ftp://ftp.nluug.nl/pub/ImageMagick http://ftp.nluug.nl/ImageMagick/ ftp://sunsite.icm.edu.pl/packages/ImageMagick/ http://ftp.acc.umu.se/mirror/imagemagick.org/ftp/ https://www.imagemagick.org/download http://transloadit.imagemagick.org/download ftp://transloadit.imagemagick.org/ImageMagick ftp://ftp.fifi.org/pub/ImageMagick
 kde		https://download.kde.org http://mirror.csclub.uwaterloo.ca/kde ftp://mirrors.dotsrc.org/kde ftp://kde.mirror.anlx.net
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 5daa8a2d2f70..8336e87e2c93 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -222,6 +222,10 @@ app-arch/pigz:symlink - Install symlinks which override app-arch/gzip implementa
 app-arch/rar:all_sfx - Install all SFX (Self-Extracting) files rather than just the native format (allows creation of Windows EXEs on Linux ELF systems)
 app-arch/tar:minimal - just install `tar`
 app-arch/unzip:natspec - Use dev-libs/libnatspec to correctly decode non-ascii file names archived in Windows.
+app-arch/wimlib:fuse - Use fuse libraries
+app-arch/wimlib:ntfs - Use libntfs-3g library from sys-fs/ntfs3g
+app-arch/wimlib:openssl - Use the SHA-1 message digest from libcrypto instead of compilling another implementation
+app-arch/wimlib:yasm - Use yasm assembler instead of nasm
 app-arch/xz-utils:extra-filters - Build additional filters that are not used in any of the default xz presets. This includes delta and BCJ coders, additional match finders and SHA256 checks.
 app-arch/zip:natspec - Use dev-libs/libnatspec to correctly decode non-ascii file names archived in Windows.
 app-backup/amanda:ndmp - Support for the NDMP protocol
@@ -996,9 +1000,11 @@ app-office/calligra:phonon - Build stage/eventplugins and videoshape plugin usin
 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/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.
 app-office/gnucash:hbci - Enable HBCI support, for connecting to some internet banks
 app-office/gnucash:quotes - Enable Online Stock Quote retrieval
+app-office/gnucash:register2 - Use the new register (Experimental)
 app-office/gnumeric:libgda - Enable database support through gnome-extra/libgda.
 app-office/gnumeric:perl - Enable perl plugin loader.
 app-office/gnumeric:python - Enable python plugin loader.
@@ -2082,6 +2088,7 @@ dev-libs/libdynd:mkl - Enable a plugin for Intel Math Kernel Library sci-libs/mk
 dev-libs/libevent:debug - Support runtime debug mode and malloc hooks (for programmers)
 dev-libs/libffi:pax_kernel - Use PaX emulated trampolines, for we can't use PROT_EXEC
 dev-libs/libflatarray:cuda - Enables plugins for NVIDIA GPUs (e.g. CUDAAllocator)
+dev-libs/libgcrypt:o-flag-munging - Enable O-flag mangling during build
 dev-libs/libgdata:gnome-online-accounts - Enable net-libs/gnome-online-accounts support
 dev-libs/libgit2:gssapi - Enable GSSAPI support for SPNEGO auth
 dev-libs/libgit2:ssh - Enable SSH transport support
@@ -3274,6 +3281,11 @@ games-sports/xmoto:editor - Depend on inkscape, scripts to convert svg to level
 games-strategy/0ad:editor - Include Atlas scenario editor projects
 games-strategy/0ad:lobby - Enable the use of net-libs/gloox and the multiplayer lobby
 games-strategy/0ad:nvtt - Support for some uncompressed data formats via media-gfx/nvidia-texture-tools (might be needed for some mods)
+games-strategy/colobot:devbuild - TODO
+games-strategy/colobot:tools - Build tools
+games-strategy/colobot-data:music - Enable music support
+games-strategy/colobot-data:music_flac_convert - Fetch flac music and convert it to ogg
+games-strategy/colobot-data:music_ogg - Fetch ogg music
 games-strategy/defcon-demo:system-libs - Use system libraries instead of the ones included in the upstream distribution.
 games-strategy/freeciv:aimodules - Support for dynamically loadable AI modules (server-side)
 games-strategy/freeciv:auth - Add authentication capability via mysql, postgres or sqlite3
@@ -5750,6 +5762,7 @@ net-im/pyicq-t:webinterface - Install dependencies needed for the web interface
 net-im/qtox:X - Adds support for X11
 net-im/qtox:gtk - Adds support for GTK and Status Notifier tray backends
 net-im/skypeforlinux:pax_kernel - Triggers a paxmarking of the main skype binary
+net-im/slack-bin:pax_kernel - Triggers a paxmarking of the binary
 net-im/telepathy-connection-managers:gadu - Enable Gadu Gadu protocol support.
 net-im/telepathy-connection-managers:irc - Enable Internet Relay Chat (IRC) support.
 net-im/telepathy-connection-managers:meanwhile - Enable meanwhile support for Sametime protocol.
@@ -6051,8 +6064,6 @@ net-libs/pjproject:resample - Include resampling implementations in the build
 net-libs/pjproject:silk - Include SILK support in the build
 net-libs/pjproject:v4l2 - Include Video4Linux v2 support in the build
 net-libs/pjproject:webrtc - Enable WebRTC support
-net-libs/polarssl:havege - Enable the HAVEGE random generator. Warning: the HAVEGE random generator is not suitable for virtualized environments
-net-libs/polarssl:programs - Build PolarSSL programs
 net-libs/ptlib:asn - Enable ASN decoding/encoding support
 net-libs/ptlib:dtmf - Enable DTMF encoding/decoding support
 net-libs/ptlib:http - Enable HTTP support
@@ -6260,6 +6271,7 @@ net-misc/bfgminer:udev-broad-rules - Enable broader udev rules that may match no
 net-misc/bfgminer:x6500 - Enable support for mining with X6500 FPGAs
 net-misc/bfgminer:zeusminer - Enable support for mining with ZeusMiner units
 net-misc/bfgminer:ztex - Enable support for mining with Ztex FPGAs
+net-misc/bird:client - Build the ncurses/readline full featured CLI
 net-misc/cfengine:html - Install HTML documentation
 net-misc/cfengine:libvirt - Enable support for virtual machine management through app-emulation/libvirt
 net-misc/cfengine:masterfiles - Install the Masterfiles Policy Framework
@@ -7348,7 +7360,6 @@ sci-libs/ceres-solver:sparse - Enable support for sparse matrix algebra with var
 sci-libs/cfitsio:tools - Build execs fpack, funpack, imcopy, fitscopy, listhead
 sci-libs/cgnslib:legacy - Enable or disable building legacy code (3.0 compatible)
 sci-libs/cgnslib:tools - A number of utility programs: cgnscheck, cgnscompress, cgnsdiff, cgnslist, cgnsnames, cgnsupdate, cgnsconvert, adf2hdf, hdf2adf.
-sci-libs/chemkit:applications - Build also applications not only the libraries
 sci-libs/cholmod:cuda - Use nvidia cuda toolkit for speeding up computations
 sci-libs/cholmod:metis - Enable the Partition module to cholmod using sci-libs/metis
 sci-libs/clblas:client - Build a command line clBLAS client program.
@@ -7668,7 +7679,6 @@ sci-visualization/qtiplot:linguas_zh_CN - Chinese locale for China
 sci-visualization/veusz:emf - Add FITS format via dev-python/pyemf
 sci-visualization/veusz:fits - Add FITS format via dev-python/astropy
 sci-visualization/veusz:minuit - Use Minuit during fitting viadev-python/pyminuit
-sci-visualization/veusz:vo - Add Virtual Observatory tools via dev-python/astropy
 sci-visualization/visit:cgns - Builds the reader for the CFD General Notation System file format.
 sci-visualization/visit:silo - Adds support for reading .silo files.
 sci-visualization/visit:xdmf2 - Support for xdmf2 formated data.
diff --git a/ros-meta/Manifest.gz b/ros-meta/Manifest.gz
index 12b4f7bb3593..b7ae89e3bbf4 100644
--- a/ros-meta/Manifest.gz
+++ b/ros-meta/Manifest.gz
diff --git a/ros-meta/gazebo_ros_pkgs/Manifest b/ros-meta/gazebo_ros_pkgs/Manifest
index 47bb7396afd5..9f920b268ae6 100644
--- a/ros-meta/gazebo_ros_pkgs/Manifest
+++ b/ros-meta/gazebo_ros_pkgs/Manifest
@@ -1,6 +1,8 @@
 DIST gazebo_ros_pkgs-2.6.1.tar.gz 1825040 BLAKE2B ebf12fe16ce2d8ee74bb171bfa1ff15fe93860e09df5e2680047d08f430a4647a8b23aae4cf789d86623f94ec75d8a29daffbfde8170aa174303122d05607122 SHA512 4cc0b2ec5c60e69b9a69d323c2c7cfe53bc1b5108d6cba5d77b571c69d76a7eb6d72a3783dc60fe183057c63279df8d5cded26cd46333e9f21277e9ae1e31c34
 DIST gazebo_ros_pkgs-2.6.2.tar.gz 1830633 BLAKE2B 8365084619d57d8427753e33d4a3128162c44b10552166c7070eaabde3f806cee9981c60b30b18b6cbe80b83e2871b0100b51329a1a6bd9747320245f21ec1a4 SHA512 f932eebbc88f4922c0275625d50ad5723446744cbf4a59138437d9bdd75a9b5232fdf8df2012460313eb2224d4287daebc3a28181ab3f1b81e67d70a8b8ed5d3
+DIST gazebo_ros_pkgs-2.7.3.tar.gz 1836260 BLAKE2B 7867bec1461769923ba36ea2e56b21d85cf1db254cd50a028af5953fe1b5373015b68785a90d242e245d12a2da2c7a8ff26db66c0c466e6a6e029fbb74340a06 SHA512 66590a248f0813ab0f2a80df234f9dd8d448c500726b62d3fc74397d3a618d6fae994c3e463bb0c4a8892cef35ba1729229c471f3d21d4b3a2091d5ad74cc33b
 EBUILD gazebo_ros_pkgs-2.6.1.ebuild 457 BLAKE2B f62b4dc6e86a8c1f6d0459da68d398663e954fc6508cdf4f876ef450bbe9da9dea5189a7f287c0a011ed6f29bb02311ffc243016c780352a710db0ee73e81e5e SHA512 b24783ce061b9089ad545dbf9b2f3b7c02be105afa65f6c252b8714020f6788847f3ab45bb57a1ba6a5ba79a3782b3f0033e5424ede03bf61f872b3c287cd711
 EBUILD gazebo_ros_pkgs-2.6.2.ebuild 457 BLAKE2B 0574045871c0d8611d2a8267b358cac6f8c16c4c6fd6b941747f052d56e089c52f6a202cb7106eb38525f8f6269389d367409fddd0f7cf1a273166c1e130352b SHA512 147db9137c88a3576f1c8177ee21aa0e2f85e882a8bd98dfaaefa82a382dd87eb817303263f1654f6dcd7bb033c83e20ddc47c4ed7d7e54ee0eeb7ca1f6a1980
-EBUILD gazebo_ros_pkgs-9999.ebuild 457 BLAKE2B b428c977a0c3ffa8be0e74d345bffb6086240d7751574bfa1fcce5546754c79923d0b566729665c82e37525b6bda7388985b50d74cb539c567acd596fb3efedd SHA512 f7805eef0b2765f9ac5aa596e1d1b3d834b084e311d1ade8be6feb5923c8711ce44ab3982edd9e62d990df720d153b1616a8e3dd9986994dc292717c3f6c7f64
+EBUILD gazebo_ros_pkgs-2.7.3.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
+EBUILD gazebo_ros_pkgs-9999.ebuild 477 BLAKE2B d9f4c6b5fed3b475447e26efe8be74e5e84cecec13c86ddc37f7dc455089a27a1dec9e8bf1823294788e30292d17d22404e105ab517534c246babe2478cdfa08 SHA512 ec1eac99a927595eab44a04cca08f6c6dded0b5cbbef402953ac55b7c911cee9c4bf6fecde6e6e5cba39673b9d07bfb4e5087937cb51ed56ae60239bb8df1ffd
 MISC metadata.xml 344 BLAKE2B 673236d235252b8d24e90577c187252fe83ac05f87c29b123c3e064be9649efca3e8e23f0f60e2fd7a1d1b4f1c8c59dd6ae18bed904057f68c8a99c8c2e49fda SHA512 9b7223f95a007995d9a626aa653d2f0f8dc84364c325109fbd9b2f84f0359db12f2d2e3d16391f33364627082f52f8bac6b81c1992d64630bd70e476ce2c5d4d
diff --git a/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.7.3.ebuild b/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.7.3.ebuild
new file mode 100644
index 000000000000..ef31ca273e02
--- /dev/null
+++ b/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-2.7.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+ROS_REPO_URI="https://github.com/ros-simulation/gazebo_ros_pkgs"
+KEYWORDS="~amd64"
+ROS_SUBDIR=${PN}
+
+inherit ros-catkin
+
+DESCRIPTION="Interface for using ROS with the gazebo simulator"
+LICENSE="BSD"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+	dev-ros/gazebo_dev
+	dev-ros/gazebo_msgs
+	dev-ros/gazebo_plugins
+	dev-ros/gazebo_ros
+	dev-ros/gazebo_ros_control
+"
+DEPEND="${RDEPEND}"
diff --git a/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-9999.ebuild b/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-9999.ebuild
index 85bc022d1fe2..ef31ca273e02 100644
--- a/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-9999.ebuild
+++ b/ros-meta/gazebo_ros_pkgs/gazebo_ros_pkgs-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -14,6 +14,7 @@ SLOT="0"
 IUSE=""
 
 RDEPEND="
+	dev-ros/gazebo_dev
 	dev-ros/gazebo_msgs
 	dev-ros/gazebo_plugins
 	dev-ros/gazebo_ros
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 63826002c21f..e15ec4201e57 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/amos/Manifest b/sci-biology/amos/Manifest
index 5d9e4c7935f9..cf9af10bddd2 100644
--- a/sci-biology/amos/Manifest
+++ b/sci-biology/amos/Manifest
@@ -4,5 +4,5 @@ AUX amos-3.1.0-goBambus2.py-indent-and-cleanup.patch 1057 BLAKE2B fde1011da76275
 AUX amos-3.1.0-qa-Wformat.patch 4511 BLAKE2B 64064175db625a098a528f0c8036196968c58dae445edd3c98fc5627e3a84d593abc438958573ef7a28193d0d2fc76db30fe16a180a383dec9bae5084305505d SHA512 de0382f9128b46fef8e87d14de75bbc9f0af3e8bcbb915edab26a883186109ab29ddbb31c5cf70fc8d37700abe36fb73a7bdca46c29672052d01ebebffd52abe
 DIST amos-3.1.0-fix-c++14.patch.bz2 8033 BLAKE2B 942248f64906253205392df71010bf41105d2985fc8112e7443975d776cc484a4e2b6cf34284d4c384145bf32601892c06f156a0b0ccf0f2ce721de242e02e9b SHA512 76e26ca48a009cbf637d9462878223633e9b21cbd12d58a19e9a561f2cf4805791becc0b5f7aaf81975ca1e02b263cdd9d5ff310c4594670922ea65885ad9634
 DIST amos-3.1.0.tar.gz 2094268 BLAKE2B b9fb80d4e7b7e9e7769081c2680a3cba26591f00a4d9fdb17ad602e581dea5e8e2add4b0d9d3821a7f8a4ec1a45dfd867037baf35ecd401584f030c86b2b0f83 SHA512 7a416b9a0438b47425355383b709491a58f38c8d834df29e43c942170e710c6ea7e3bc8c509a58421b1340ad6eece9ea2da357ce5cd1d41ce08375676ee30491
-EBUILD amos-3.1.0-r3.ebuild 1089 BLAKE2B 7ee83b8e948e16f3fdc486ed8896c6fb57496e982859ca18cedb1e0e8a2bebd9125fccd2d13602edc137a6fd6d62d003ab4f9dbe0ac517937b76690d87769253 SHA512 5eaebe166daa11142d77e0d1623a46a0736a1d1180c6bc80ad246f67c684ad38ceba0cf179ea2a7af83c8c2785f24ed12f54c2a71d6a10fe7174f852e649ded8
+EBUILD amos-3.1.0-r3.ebuild 1189 BLAKE2B d0e36265d14eb3b3c0da7e21edc63bc75e3176d52ec0a117fefa394d234f29954809626bd0517a9210b7fa104dae9c72f962b3cde12386da04890f039a5af8a2 SHA512 b2e0386fc5bd65884f4f9ccbdb74ec0f42c37c157cf52c17195fbf390156f242f9c77780323b40fa33e6f5be52863fb0beddd23048695c3e40a65f2272dce7c7
 MISC metadata.xml 345 BLAKE2B 750928cf3e96c24e2af8e84d5889100c1954eb140596368dc00d479f63898c82e3bb0e07a9e970c6c12eb36ed3ae84c6bcc7913cf3ed56e2d71120185d24a4f0 SHA512 a31ba5660e524b70517f2644bb929d4bc0428d1ea682752ca2ddefd3b5a8a5c8aabf7a9877fa61e8fe12599da65e9f0a6c1e7db90d61729e26c33b76303ff497
diff --git a/sci-biology/amos/amos-3.1.0-r3.ebuild b/sci-biology/amos/amos-3.1.0-r3.ebuild
index ab383a3b95a0..33c30995b11b 100644
--- a/sci-biology/amos/amos-3.1.0-r3.ebuild
+++ b/sci-biology/amos/amos-3.1.0-r3.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit autotools flag-o-matic python-single-r1
+inherit autotools flag-o-matic python-single-r1 qmake-utils
 
 DESCRIPTION="A Modular, Open-Source whole genome assembler"
 HOMEPAGE="http://amos.sourceforge.net/"
@@ -42,6 +42,11 @@ src_prepare() {
 	append-cxxflags -Wno-cpp
 }
 
+src_configure() {
+	econf \
+		--with-qmake-qt4=$(usex qt4 $(qt4_get_bindir)/qmake no)
+}
+
 src_install() {
 	default
 	python_fix_shebang "${ED%/}"/usr/bin/goBambus2
diff --git a/sci-biology/consed/Manifest b/sci-biology/consed/Manifest
index 7738d880d777..ee33e813846f 100644
--- a/sci-biology/consed/Manifest
+++ b/sci-biology/consed/Manifest
@@ -2,7 +2,7 @@ AUX consed-29-fix-build-system.patch 5614 BLAKE2B 8b145d01e5fa6935715e7775d8e415
 AUX consed-29-fix-c++14.patch 9261 BLAKE2B ff70814b39780dbbabc70eb7555359e8aee2ef72b40b7e149e2f63ccaeedfe7e0dc8822cb2b5c79d57c33e621a59e0e1cd273e49a0976daef0bdeb52f4f46569 SHA512 be5cd76d36cf437c1113d09e540d98d0eb92b7e2e732f4a5a308066b8046b5628048203e791a0fa316e44a4cc127d027418a7f038406df22c3f60552f5b87789
 AUX consed-29-fix-perl-shebang.patch 17375 BLAKE2B e34a358569d594f4ab60fc3745a6a84cab781cbad860421f5ac322154df9635e13b2e2349c92f4271b0ca161eda87285ba89bf0801992954fecaa11575c8baf9 SHA512 4caed1ab7229e2b3e367f03a8d650cafed2974232fcd6daa08e62c90512d49e09caceb34c5bb65c67a588bab314165d72d8c1687393549d4107425df78e3218d
 AUX consed-29-fix-qa.patch 11168 BLAKE2B 139b52d402f27c8121a43f933a181aabf150c0c8836f2facc7b42909db3808fab1ceede30956d6b3c2462ad31b43e054c0bbf8552e57e6e41479d25eb111738b SHA512 088d774159b421666bf75f6f9f17ee83d488625d482d8d404bde12671025b1f03322bee5c50e792fbbd822c223fa5ee697cf99c7efc9fcbebc119314d02df604
-DIST consed-29-linux.tar.gz 36172715 SHA256 98354e2507ef9026b82c89db199ff1de7e4ec3686fccd691d215acdcde34ce39 SHA512 63a95d84cb58009045a9d898c8b1a94f98516bed9189f624a5930338cc8f51562504257f309d945fafcc07e0811ffeea122b640789f75fbd6c94535178dab4dd WHIRLPOOL 26ebc1ee7114b0c609fd36c2c46b71c399bacb61f7db285ab36f296902964c14518c058e814a166b20a36c2d320280aeed0ca18b7104c6b503324bf27d4b57af
-DIST consed-29-sources.tar.gz 3258845 SHA256 e7d3c2bf60e0bb22025e0416d16cf9864fec8091811ec285a39db4cb46bc3fc6 SHA512 fd711a65a02ef1238cca12b90fe7fa9b67da6c37d43cd105f38c7b6475fbc073c1f4d7f99703dec9d3a0a7a2a9317cb14999a114bb6f52589cb9b6e34700eb93 WHIRLPOOL 5ac363f049b6b40554112f830e812e7ab7d334a0f6707ea4da981ed1e468109f3bd7669382aa77e93cf12c78cc95fb1085711dcc972c7ff22ffe6b73056bb2c2
+DIST consed-29-linux.tar.gz 36172715 BLAKE2B 6706576b404c0bccb7ed28ab6fe2dec86fdac6f7651406d3f30e35caac3e49a66b4762edace2133d2dfb776bbeb730b74797c7323deb950f2648a46c4594fe98 SHA512 63a95d84cb58009045a9d898c8b1a94f98516bed9189f624a5930338cc8f51562504257f309d945fafcc07e0811ffeea122b640789f75fbd6c94535178dab4dd
+DIST consed-29-sources.tar.gz 3258845 BLAKE2B 508763ff2a240047cff0a43ba4b9b9a7f9302c0a023478c6b08f86bb77fb2c12a62a9b16165fe6257fe6c86af853dabe279bd9e05632c3e112e3fb7fad2c6bd3 SHA512 fd711a65a02ef1238cca12b90fe7fa9b67da6c37d43cd105f38c7b6475fbc073c1f4d7f99703dec9d3a0a7a2a9317cb14999a114bb6f52589cb9b6e34700eb93
 EBUILD consed-29.ebuild 2701 BLAKE2B 0eaed4ffca6daa9921ab782b00e34f207ff235e94ed2cff0147921c037667d30af200141b61ca91c9e386f5f9672566ba92e3dbeb8c2bef965f9ab72cbf2c27d SHA512 56d73a2d4ed207924c2a7676bfca84b8c0cc4f80d1a2a1b94fa2b3d644a6583f15e32ee81b9892122e051f17a1eda56d63ffb8d650283a9bee5c61bca6faf1d3
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/phrap/Manifest b/sci-biology/phrap/Manifest
index 8c05c3f368bb..0905e1e9256c 100644
--- a/sci-biology/phrap/Manifest
+++ b/sci-biology/phrap/Manifest
@@ -1,4 +1,4 @@
 AUX phrap-1.080812-fix-build-system.patch 3600 BLAKE2B 29a7846cd6394d17b35e525220b8ead461a22ab0f1301ae5668da36605649c07f23040c4c134424802d4da6e0c3b48fbbb05ec5708de50b33f024e4ba702ac49 SHA512 536ad862b9b8ce0fbc7ab67bc48db597e7d4b8c66018a5abefe5a59f4fbc30a4a76c94f4c13f5af7d42a422a22f5181d8f015b797d37f175238c3d4170adf21c
-DIST phrap-1.080812-distrib.tar.gz 317350 SHA256 7025f3cb30e5a3305a13d150f39a85580ade0bbf8169b25db65cbe396e201052 SHA512 6b125b9a99b6180eb5de16bccfe068abefdb59237fd3295924c418749f2f2d6e39cdbcecc6786e42738846975334c4d8a645eae8fd0fcbda6b0e99241deb15ca WHIRLPOOL e516561804620ba8c96ed0e5c5d791f3fe1e7984e08f646e6fd7c30042f2550f5d1c9b2f800e8a853e42b049b92418ed9d0121e77bf4e9aa895974bce5e73717
+DIST phrap-1.080812-distrib.tar.gz 317350 BLAKE2B 9cc53d05184b4a55a9a80e6112498f91a622b98a853b255daedd57c892b7c2bb8ef3091ed3d141e297864c158b7e03d02313a272448d2e0fb80e1c51a906e00a SHA512 6b125b9a99b6180eb5de16bccfe068abefdb59237fd3295924c418749f2f2d6e39cdbcecc6786e42738846975334c4d8a645eae8fd0fcbda6b0e99241deb15ca
 EBUILD phrap-1.080812-r2.ebuild 950 BLAKE2B bf8ecd534bd6f9dc99eb815e17196a23fbfd5a3caae7fc3ff024f188e73d061787f140350fd4bff042d5aa5663f52ea91e62b3e95eb56387eb225335181e6bb5 SHA512 4857f1fe337f24ee33618e3dac40a5edb7210d1353c058b57a1263a4ccdd8213270827c2c2f902d454226fc65368a1588d497dcdcf2eb9c15af406d1d5cac3fe
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/phred/Manifest b/sci-biology/phred/Manifest
index dfd40b35f024..5c9b996c45e9 100644
--- a/sci-biology/phred/Manifest
+++ b/sci-biology/phred/Manifest
@@ -1,5 +1,5 @@
 AUX phred-071220-fix-build-system.patch 1981 BLAKE2B 0c9ae75ecf54eadd1d6cd3cfeed5d2f949f234b77d4f329133e2c176207410e93a35341c43636c5b2f742a2ee2d20825cf79bb65d5dac43ba28fc07f7c6bb69b SHA512 7647f6f6e9a1ae51cbf1aa3e39b337288e22fc26a95fdd88f92ce43fc6c0ef6ff59ec26919d14dfefff70be48e4a5604ddefef98bddf5d1d14d1e656665c878d
 AUX phred-071220-fix-qa.patch 787 BLAKE2B 79f687dc1e51dd51e9f97886e0ada9b515d7e4255dff0ec3e81dccb2103ba8b4bee691c8a5b9a321cbdde5576fe8d80dbadafdb740c2cdee81fe9748255084ab SHA512 27811a834358d0e1bf8281882e0420e0eb6bd9586871c8c72a4de79badc9539ea8e9258b9c3a3bf8ca1d3f6924d61abce2dcc0c0ed3b64e5fa53d4548109f5bc
-DIST phred-dist-071220.b-acd.tar.gz 357767 SHA256 364b0b54c29717ba4c8acc48a128eaf25ba1d7f06acab7565975f6879764a975 SHA512 0a6b0a733e6dcc0495eaab720b75f8e5815df494d0a773b8b8336d5208321c2ba475921084835a769367ec51aed156585ab97346a510100d4337e3215ec75276 WHIRLPOOL 9b14cfb1ca970a14ef613ca17efb82955c0ecec414dfad8835c883650f306b3a79846b7a410a9359cbd9ca953d890673366b6f865a2a357e81213d34b3327d3e
+DIST phred-dist-071220.b-acd.tar.gz 357767 BLAKE2B ae1180f54eaa3631a4e32c2ffe388b35745302e3d014c8fa893119e7e488d4bb4316f7ee0588cd12db5cbbc23033f689f4a0a487cdc7fe42e8c7a67ceb3c43ae SHA512 0a6b0a733e6dcc0495eaab720b75f8e5815df494d0a773b8b8336d5208321c2ba475921084835a769367ec51aed156585ab97346a510100d4337e3215ec75276
 EBUILD phred-071220-r1.ebuild 966 BLAKE2B 1d01310018b354843d7650a15f70b6ae5005f4ffa70fcbd270f88e02e9dea837e972c28d771a8926eb7c68faca87d475c2e79fc0332007214b37ce88d9817479 SHA512 203ced3280f1c1bced57a1cb514533b71df1c2c9eefc94e594f61d45300da32617ff6023196d47cab7a1ca21bef61392760f5a12f25815ac5d78b9a8c58e7e91
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-biology/repeatmasker-libraries/Manifest b/sci-biology/repeatmasker-libraries/Manifest
index 55328cbe57b4..75681cc74b2a 100644
--- a/sci-biology/repeatmasker-libraries/Manifest
+++ b/sci-biology/repeatmasker-libraries/Manifest
@@ -1,3 +1,3 @@
-DIST repeatmaskerlibraries-20120418.tar.gz 28059668 SHA256 7bd44a70ee33ef60ab829b4cb84a2a82a6fa923e2992071f374b7a473e4dac62 SHA512 254d47faeee72ee62e6854ebc389578691d66e99d9d5e2a0c2462bf752ac5b4d2171c9e6b45d4f87f548a96b62753bb9c37c2d2c00e06544e91dd09fe2bbfe32 WHIRLPOOL 1da932f84c591221c61177116d734d00c36c52d588bcdab73ed63e8128b9c90a63f855bf4e8e603167e059f98465460b5b2e7e00e4a724bec230d27b1b32a31a
+DIST repeatmaskerlibraries-20120418.tar.gz 28059668 BLAKE2B 0683305f0d3045ff1bcb9f1c952d3c12e92a3003f79ba18a16334805049a64e0b307fac2cf7fad236c9b0cab80e3317ebb1d93bf6487bafd9d45de2455565879 SHA512 254d47faeee72ee62e6854ebc389578691d66e99d9d5e2a0c2462bf752ac5b4d2171c9e6b45d4f87f548a96b62753bb9c37c2d2c00e06544e91dd09fe2bbfe32
 EBUILD repeatmasker-libraries-20120418.ebuild 760 BLAKE2B 3e4019a480811b8cfd18a5bb822e3f7061b8c49a3361f1db2bc2b8f9c7e610442a3924a0ddea1b7cefe55353dca39edd433cfda0feaa32da5416805ddc7d8b65 SHA512 ceb9b66624d509e9c6f3750d7a51d707e7b626dc3c15fe09d84be632f68ca8d0bcbde25b9b5dde4919af2449ea25877931f751f5934e2fbe7f1db0b394ef5cc0
 MISC metadata.xml 267 BLAKE2B 7cf386952842945148119de3263231db4d1046d5f54811f7e303ed8ec4d27cbc1960b99c92daf6f32e5b981c2fb9f50ec666be6193865d6e18541b7427a152a9 SHA512 91ab266d9ab24401bc0fec759c5b6cfcf44a3c5669fc31c7301d79770839bb5dfa0e155d949392ef06176b4a0b2c32b91b1b54b0027f972db61f0a5e54644403
diff --git a/sci-calculators/Manifest.gz b/sci-calculators/Manifest.gz
index 0b3602af7698..1d7d253c60ec 100644
--- a/sci-calculators/Manifest.gz
+++ b/sci-calculators/Manifest.gz
diff --git a/sci-calculators/speedcrunch/Manifest b/sci-calculators/speedcrunch/Manifest
index aad6344d30c3..019fdc0f11a5 100644
--- a/sci-calculators/speedcrunch/Manifest
+++ b/sci-calculators/speedcrunch/Manifest
@@ -1,5 +1,5 @@
 DIST speedcrunch-0.11.tar.gz 1516510 BLAKE2B 31c1b0f4f34357a66ad16efe67cc444f1b6eb49b2438b78729bd00148e4b0298a6f5f731b7e2fd9b1825bddba3b37b75a57f42edb0cec2499428f1d0141c17dc SHA512 19d7d5b80709063768abf7076a95e25b7c16956dd20ab181d3876b87bc26e7d8c18820a7ca23af22ea3b52d67de12238b7a106e575415ee755c8c204f732eaf1
 DIST speedcrunch-0.12.0.tar.gz 3667420 BLAKE2B d983c22cbed9f3496bf7cadf670db3e7af4461a37e5fe151094ecaf6077cabffea84e4530c9b18145a220f09336d70567c96509b99c3b6a18f967aa97051d66e SHA512 9f93936311e227ed0aff374adae408f212e6d63174154931ecb19a31f1a6f360b9548989bbdc5988d03a7600f2d3e466ef18bf5f071002b99f22b22e773143eb
 EBUILD speedcrunch-0.11-r2.ebuild 1237 BLAKE2B ed7636c3f580dc62f668de18ef6a5698c818fc6b1b25d83661f535671554bf9b5b150dd662bef2fa635e4b452c86831b0c1e3bc8da44cdd7bcdc4458868be0c7 SHA512 9264fd5c139e298bebb3687660d89924d8a736428acf3034ab7d2f0931d6af9d1a71032837c6426abb522f536ef0129008352d226cc321b5fd36340eda227b65
-EBUILD speedcrunch-0.12.0.ebuild 1488 BLAKE2B 354d956a74b721022d84af566ebeb2b9a2cdc4e64f466665ffe90e748d2533553a29a28032a757eb49bc7c82e97323a220ab0a38b7b2b266276059f91e957566 SHA512 3c2883ccf9569baa6637a1c6242ae2f98de6ebc7d3caeb6d0dc86644f4c71a85d3caffe93e907005b20aedd48d86a9de36012d6d8ac5cfda13e3e3dd245b57f5
+EBUILD speedcrunch-0.12.0.ebuild 1487 BLAKE2B fa1ac3560da2fcdd30f88e26cb54206642d6c74f9537b1bf0d2e36df166bb278b3ffb6f5375d105914f6f4052059f05e57aec23a6c0b2bad4cc6cbc109b34e06 SHA512 7679b504c3f1ddd189c6fabbc4f8a891d4c7a06edcc8fd72993fd01575a262b84d84a8014d5f9456b005001a02954631f8a9751803669859600a8b9e895e2410
 MISC metadata.xml 502 BLAKE2B 8e0471f47af5fe59b74db725b30c6a3b1625b73faf7cfdf2db68b44ce63623d579935275bf28c3e01b48c17a0ed3792cbf25743845e16c4e4efd769196bf41a3 SHA512 9113af02758f4a55914c9492ba455cd66dbb61d0f0d53bf16acd7f7d26bbe3a98b0d9b4372845ea71c5a3ccf02f2b8b8ef9896616cfa3ee63d9534d4293b3f4e
diff --git a/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild b/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
index ce832a1c11e3..0174aa0d6936 100644
--- a/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
+++ b/sci-calculators/speedcrunch/speedcrunch-0.12.0.ebuild
@@ -18,7 +18,7 @@ SRC_URI="https://bitbucket.org/heldercorreia/${PN}/get/release-${PV}.tar.gz -> $
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc ${PLOCALES[@]/#/l10n_}"
 
 DEPEND="
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 956a59b48530..5c77a1d62ab3 100644
--- a/sci-chemistry/Manifest.gz
+++ b/sci-chemistry/Manifest.gz
diff --git a/sci-chemistry/avogadro/Manifest b/sci-chemistry/avogadro/Manifest
index 7c09d780df85..e1221628478b 100644
--- a/sci-chemistry/avogadro/Manifest
+++ b/sci-chemistry/avogadro/Manifest
@@ -1,16 +1,14 @@
-AUX 1.0.1-gl2ps.patch 1511 BLAKE2B 4c4e4f52c2275530a286201a5db492fcd63aeb2174225de3f78fab1ad65033496557695340edd29a4b2abb6f9b45169f295b35b90a0fe5aa969636213484c0a0 SHA512 b4a8d0138bffa7c018e2125e16a47cefefba01f19ce3d460488f36e44f55b212cea9c9875429e7c0c596388366adea045b50ace579b6352d2b7e0b073420c67f
-AUX avogadro-1.1.0-textrel.patch 1535 BLAKE2B 0843b52977e53679f6e3490a6e6a389e9fd32bebd167cc3b68ffaf831f88249cfa1a2006ab8d4d611e40ac28ccc051a42f79ffd40be54d1569e35402fb7cc31d SHA512 5872a773668cb38b27ab0dbaf14d947eff4cb3d4ae99410c8968cafe576a9df5d3b0937d028b9ffd076c212c5f9b8e213cda74a63afff6caa713346ee338be77
 AUX avogadro-1.1.0-xlibs.patch 680 BLAKE2B 381597d8b1444f412ecefdf1de2860f557172b195b400e869ee1404b1614b494015c1815a0cafbdf1b19483aa23d0793f09c68df6e6a3a53e9de19524b431528 SHA512 df2727e4aea1549daada56778d7710656f3f6ff9fa31c441c06e82241c8e5b0733c39d575c98f2d1b57b9be0a52d445412ecd6cca7a1f319c6982035e789f21d
 AUX avogadro-1.1.1-boost-join-moc.patch 2051 BLAKE2B 8711c60f2ad0d63d6b4cb39c8461a70f5ced9d9045e5b9b18cea5577721f15e7c9314c8d86d844f47fca5b769837167268903d91328219c5eda16c72f3007967 SHA512 d4e4ef54d94cccb0f34c4960d302772f9da47e27cb79e1ee0a4e928ef248ac629fd59f1564bedf7c82a2a7ca8b25456878c22569dbcda26478a6c06e5815a084
 AUX avogadro-1.1.1-eigen3.patch 2230 BLAKE2B c22f039d1c91a8fbe06d8e7f272900111bde03635b1120accc73ca47a241c36fffe68ed9766bba088eb3137de1ccd6acb1c70a26f0970cac5a9ab6096b87eeda SHA512 df6a53cacebee613739d230fc0c7dc21cb67d553950af82cf83d04750f1d9fa98a3bb052c15fffebacf41d2e53dcd3503bffff2aa8dfbfcb47e2d1ebccd77614
+AUX avogadro-1.1.1-gcc-version.patch 997 BLAKE2B d04059442cf31f4224c6be12b695b379f580717131b590b43e919e7b4789ccb643f93ec3f89d7a4572ca94a08442ea17b01e430162f7187078fe5688af78fd25 SHA512 1a1d204a7f8a050446d5691fce0b7c46e0a6e619a042e769771f8a3a3596f9ae176c33b070d212c07dc977b20db82e19a9ee1e64963e5cae68c43a9d379818b4
 AUX avogadro-1.1.1-mkspecs-dir.patch 580 BLAKE2B ca9da1dcbf5560fbedd84f12023d921f9cb11f8475aea5094454195eeb37eb21a1a92cbef268b166e26f7477a086a74337b0c262eab729c8012d1067987bee6d SHA512 6c5b67d9f9e1e9fa3c11ae235f467525129fa9d81f34211ed8b97c199690e12cd1457df3aac861615d94efb452af306df6b53218309ff87f6ca1f68edffbf6b2
 AUX avogadro-1.1.1-no-strip.patch 745 BLAKE2B d06400dc0737b7991fe5da6888159b41e7765c851c7ade14619a12571d40c40332363b34da1b0b4af521ee37d2575c28d8cb075bbcf7916b78596af21f395e89 SHA512 921b1333bf37135d5890222193ebdb5b351739d16bf1434c59509e8aab0135ea5cde6812b63d4159fafac29d4eb6297320d03513e474466a7fb857ed16301d6e
 AUX avogadro-1.1.1-openbabel.patch 655 BLAKE2B a0bee7e87a75db2c0881036f977e5a8513ba1f6a66360f8e8cad26eaf269df16140721c4b33d3cf4abde35c0be7f13614e6466b6bc34edcc158cf340b42da20e SHA512 23f477c9deb4befb87a92eb1edaabdd8e52a25f24a36ec9dbf345b0686442cec229a16fbb118e3336cf28592d8af4fc51d0a3e5e9d7a7d7c11a65080c08a074d
 AUX avogadro-1.1.1-pkgconfig_eigen.patch 387 BLAKE2B f842b6f0eacdf351688f2a8c83b248cee0602cf1e96bf180bc0be8181e3cb6c3bbbf8e67572088d763d69d0eadfb7936199d29b5e68076cd6ec89138d5051845 SHA512 4e1e838f7cd88ef3ef49c26565aecf16a3cfb5c735d67c2525e877aa64671ac787733b0eee7f02ef79c6ada05d7dd7fc3c4a470e6d4549fcd0fea7d49e780e99
-DIST avogadro-1.0.3.tar.bz2 4971989 BLAKE2B 1cebca8c36c265475e68adbcd3dd451088654095545d9546c1d786920d13d312c035b9d6f7f34ea655e7778d392feaf5dedf36fe93775b18f0d644f97229c47d SHA512 49e7b8ca43f0f52a65efc7bf9dc45670ae5a5de5d1aa6bf7b58b8368e816be30fe6529c45fa658d7337d4a69327bb0aa8799d8d4b4805860aace28011cc74210
-DIST avogadro-1.1.0.tar.bz2 10741835 BLAKE2B 1427eb5c060f4566b431ecbd3847526d6ea4cc22067fa78e2e55ae113550c818959d96f1441432872eb5e96bae13f23e17d0a6640c7b034c90140da3e92df073 SHA512 d621dd3ea9e9223d3a29c6b0c0eec89a935837d0c587fcaaa549f91274a76f78a8c60c2a68a67d2f3aa2e107826befb6658be601c46c5bc0760c95bf7284540a
+AUX avogadro-1.2.0-numpy.patch 448 BLAKE2B 2bbde3ba9e4b8fd5ead2afa3a9cecb458600cf454b50011034ce445ff569212052d04cce9142aab4207da8d84a6b9290d567c4d9262547dcd41c71f7071fa0e3 SHA512 20155043af3ef2f5a01d63dd80cfb3dc7402a2ea43bb3d47dd57e7850671fba62981310280d9361d37ac3359e9dda2daa80f6627836ac53a8dec0f0c2a009905
 DIST avogadro-1.1.1.tar.bz2 11118046 BLAKE2B 358eda508c56247fb34e9cf4b4d790859cc156e000fa10f9e2f2700e9e295557dd5e615ca626227a918fa4f699c089bee23596d186f613f8934a73b8cfeeb358 SHA512 37e2fc9400f8727b7e69d84c13989aaba6fc88287e106a6ed137e4d0fd8ea181dc4ab49b08148d2077754f014748c8ed6f46881f31a1455029f876b599754827
-EBUILD avogadro-1.0.3-r2.ebuild 1298 BLAKE2B 6c6f753b79322c3185523184048a03520b2910555731b2f51e8ca890815abf742332ae721a7d98bf5d5a563c5715f6df3ae58fc27db348ae143a56f7fce83add SHA512 54b364267975e585b7fdc510688d92f3aa7e5cf477a0288f6ccfe7d468c496d785b1c9f3d37e7b0ce7df8729565614b63fa3544507c50359d5e67189a4ab6e45
-EBUILD avogadro-1.1.0.ebuild 1482 BLAKE2B 36daec6e20a5dd3f85e63f6dfc6146d685ee96f11ac9a63e09667a7d886d54bc70096eed95926cd3373bb71041e62cb4adbb173f4d94730261d2e16c6a0d9d2c SHA512 d3f0095e7b1644cb963ad4223a43fcc0201f5c14247b0e0b04c570f47ce2c33f52bb46373d347dedeee662cdfd4924dce27d809bdc9826e785e34e5f73f935d9
-EBUILD avogadro-1.1.1.ebuild 1976 BLAKE2B 7d9e7710407c0a88b1af84280325e09e738dcfcfa5d9eeacee35d2a68fdcee6a6756517687c0a947491be8dcbb26843e333d492621d9df6005aa3678db734c3f SHA512 c6a83d047ab126e32ce74adc07f6702da476c19c96483b30753a634a66521f712ca302c71f1ff7bc72e92da0874e419f5a7edaf1a926631baa0e05634bccd909
+DIST avogadro-1.2.0_p20170207.tar.gz 16805634 BLAKE2B 012ac0fa6e86bdff1ec117e81faf88ddda2e3264b36c3997ce60814f5a5900dc8722266a52bda70715279e640a3deb04a38bc2bfdfc4ae856182d94e25b7c705 SHA512 c5088ba1e1b48f3202766e38b1c3f2016c3facbf4ea544e24eedb0706328815e7500bcebdedfea2a330e665b97f76c7f86b669339c6f5a765533bfd3a88d7b51
+EBUILD avogadro-1.1.1.ebuild 2014 BLAKE2B fc1c386acd5ee23c6609fdfdf2bfa77571818c4b7f1aad7db978dc4274963e3c28b1840d6e66d05f67931fd8b17006772f4d97e3c30566f18ad9b9aee818a6a3 SHA512 08bb5a96d92ae5f81f266dd141f31ec2a3e7dd3b61b841c275ebc68750ec6b778ae26b4d7c7f76179c889f908ccde9ef89a78561912cce8a5a14309e7dc6a4f0
+EBUILD avogadro-1.2.0_p20170207.ebuild 2107 BLAKE2B 80c56bab7a8c08d9023c8cd187996f05df7f2316353884a139980d2b2794a34ac050922c9e9c58de67d481a01d3c694a9b104bc2d18cde37454bb8fba2d445e3 SHA512 4ef7346cab4937ba189de8439ee78a710d3e398519bbe077b38b2099d412e913baee830d134e770e060f947ce23ab8ffd9d2ddd7930400c1b281f90f36715327
 MISC metadata.xml 703 BLAKE2B 64270fc03ee237b6778aa8b07bef13c3d283cf4b43c341c7e529a8a99cf465a548c8f6b64bba21d68c3f5f298104fd3a6e4e719a6a8f6c9749d71376b1248b0d SHA512 3602707feca1ecb4317f30fd06404b087fb7264929204dd488138c60e82a3d6a11537ba3e29d9f2c491f2be6e06ba874167509905f587ec147b83b773f341c67
diff --git a/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild b/sci-chemistry/avogadro/avogadro-1.0.3-r2.ebuild
deleted file mode 100644
index ce624e4ae71f..000000000000
--- a/sci-chemistry/avogadro/avogadro-1.0.3-r2.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
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-single-r1
-
-DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
-HOMEPAGE="http://avogadro.openmolecules.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+glsl python cpu_flags_x86_sse2"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=sci-chemistry/openbabel-2.2.3
-	>=dev-qt/qtgui-4.5.3:4
-	>=dev-qt/qtopengl-4.5.3:4
-	x11-libs/gl2ps
-	glsl? ( >=media-libs/glew-1.5.0:0= )
-	python? (
-		>=dev-libs/boost-1.35.0-r5[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:2"
-
-PATCHES=(
-	"${FILESDIR}"/1.0.1-gl2ps.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_THREADGL=OFF
-		-DENABLE_RPATH=OFF
-		-DENABLE_UPDATE_CHECKER=OFF
-		-DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs"
-		-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
-		$(cmake-utils_use_enable glsl)
-		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
-		$(cmake-utils_use_enable python)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild b/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
deleted file mode 100644
index ff3a9036301b..000000000000
--- a/sci-chemistry/avogadro/avogadro-1.1.0.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit cmake-utils eutils python-single-r1
-
-DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
-HOMEPAGE="http://avogadro.openmolecules.net/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+glsl python cpu_flags_x86_sse2 test"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-RDEPEND="
-	>=sci-chemistry/openbabel-2.3.0
-	>=dev-qt/qtgui-4.5.3:4
-	>=dev-qt/qtopengl-4.5.3:4
-	x11-libs/gl2ps
-	glsl? ( >=media-libs/glew-1.5.0:0= )
-	python? (
-		>=dev-libs/boost-1.35.0-r5[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/sip[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	dev-cpp/eigen:2"
-
-# https://sourceforge.net/p/avogadro/bugs/653/
-RESTRICT="test"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-textrel.patch
-	"${FILESDIR}"/${P}-xlibs.patch
-	"${FILESDIR}"/${PN}-1.1.1-openbabel.patch
-)
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DENABLE_THREADGL=OFF
-		-DENABLE_RPATH=OFF
-		-DENABLE_UPDATE_CHECKER=OFF
-		-DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs"
-		-DQT_MKSPECS_RELATIVE=share/qt4/mkspecs
-		$(cmake-utils_use_enable glsl)
-		$(cmake-utils_use_enable test TESTS)
-		$(cmake-utils_use_with cpu_flags_x86_sse2 SSE2)
-		$(cmake-utils_use_enable python)
-	)
-
-	cmake-utils_src_configure
-}
diff --git a/sci-chemistry/avogadro/avogadro-1.1.1.ebuild b/sci-chemistry/avogadro/avogadro-1.1.1.ebuild
index 5e9225721e1d..63150ada5fa9 100644
--- a/sci-chemistry/avogadro/avogadro-1.1.1.ebuild
+++ b/sci-chemistry/avogadro/avogadro-1.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -45,6 +45,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-pkgconfig_eigen.patch
 	"${FILESDIR}"/${P}-openbabel.patch
 	"${FILESDIR}"/${P}-boost-join-moc.patch
+	"${FILESDIR}"/${P}-gcc-version.patch
 )
 
 pkg_setup() {
diff --git a/sci-chemistry/avogadro/avogadro-1.2.0_p20170207.ebuild b/sci-chemistry/avogadro/avogadro-1.2.0_p20170207.ebuild
new file mode 100644
index 000000000000..28d5724b0e50
--- /dev/null
+++ b/sci-chemistry/avogadro/avogadro-1.2.0_p20170207.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+COMMIT=258105b4d8957e0245a341cdf1dc12c72234c833
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils flag-o-matic python-single-r1 vcs-snapshot xdg-utils
+
+DESCRIPTION="Advanced molecular editor that uses Qt4 and OpenGL"
+HOMEPAGE="http://avogadro.openmolecules.net/"
+SRC_URI="https://github.com/cryos/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="cpu_flags_x86_sse2 +glsl python test"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+	dev-qt/qtcore:4
+	dev-qt/qtgui:4
+	dev-qt/qtopengl:4
+	media-libs/glew:=
+	sci-chemistry/openbabel:=
+	virtual/glu
+	x11-libs/gl2ps
+	glsl? ( >=media-libs/glew-1.5.0:0= )
+	python? (
+		${PYTHON_DEPS}
+		dev-libs/boost:=[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/sip[${PYTHON_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}
+	dev-cpp/eigen:3
+	virtual/pkgconfig
+"
+
+# https://sourceforge.net/p/avogadro/bugs/653/
+RESTRICT="test"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.1-mkspecs-dir.patch
+	"${FILESDIR}"/${PN}-1.1.1-no-strip.patch
+	"${FILESDIR}"/${PN}-1.1.1-pkgconfig_eigen.patch
+	"${FILESDIR}"/${PN}-1.1.1-openbabel.patch
+	"${FILESDIR}"/${PN}-1.1.1-boost-join-moc.patch
+	"${FILESDIR}"/${PN}-1.2.0-numpy.patch
+)
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	sed -e "s:_BSD_SOURCE:_DEFAULT_SOURCE:g" \
+		-i CMakeLists.txt || die
+
+	sed -e "/Version/s/1\.2/1\.0/" \
+		-i avogadro/src/avogadro.desktop || die
+
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_THREADEDGL=OFF
+		-DENABLE_RPATH=OFF
+		-DENABLE_UPDATE_CHECKER=OFF
+		-DQT_MKSPECS_DIR="${EPREFIX}/usr/share/qt4/mkspecs"
+		-DWITH_SSE2=$(usex cpu_flags_x86_sse2)
+		-DENABLE_GLSL=$(usex glsl)
+		-DENABLE_PYTHON=$(usex python)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	QT_MKSPECS_RELATIVE=share/qt4/mkspecs cmake-utils_src_configure
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	xdg_desktop_database_update
+}
diff --git a/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch b/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch
deleted file mode 100644
index d8a0c0f758e1..000000000000
--- a/sci-chemistry/avogadro/files/1.0.1-gl2ps.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/avogadro/src/CMakeLists.txt b/avogadro/src/CMakeLists.txt
-index 75b6dfb..d87ac2c 100644
---- a/avogadro/src/CMakeLists.txt
-+++ b/avogadro/src/CMakeLists.txt
-@@ -45,7 +45,7 @@ endif(ENABLE_UPDATE_CHECKER)
- FILE(GLOB projectDelegates_SRCS "projectdelegates/*.cpp")
- set(avogadro_SRCS ${avogadro_SRCS} ${projectDelegates_SRCS})
- # Add GL2PS to the executable
--set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c")
-+#set(avogadro_SRCS ${avogadro_SRCS} "../gl2ps/gl2ps.c")
- 
- if( WIN32 )
-   set(avogadro_SRCS ${avogadro_SRCS} windows/avogadro.rc)
-diff --git a/avogadro/src/mainwindow.cpp b/avogadro/src/mainwindow.cpp
-index 66785fd..2933953 100644
---- a/avogadro/src/mainwindow.cpp
-+++ b/avogadro/src/mainwindow.cpp
-@@ -51,7 +51,7 @@
- //#endif
- 
- // Include the GL2PS header
--#include "../gl2ps/gl2ps.h"
-+#include <gl2ps.h>
- 
- #include <avogadro/pluginmanager.h>
- 
-diff --git a/libavogadro/src/CMakeLists.txt b/libavogadro/src/CMakeLists.txt
-index cce8ece..cc084fb 100644
---- a/libavogadro/src/CMakeLists.txt
-+++ b/libavogadro/src/CMakeLists.txt
-@@ -152,7 +152,7 @@ endforeach(headerFile ${libavogadro_HDRS})
- add_library(avogadro SHARED ${libavogadro_SRCS} ${libavogadro_QM} ${pythontool_RC_SRCS})
- set_target_properties(avogadro
-   PROPERTIES VERSION ${Avogadro_VERSION_FULL} SOVERSION 1 )
--target_link_libraries(avogadro ${AVO_LINK_LIBRARIES})
-+target_link_libraries(avogadro ${AVO_LINK_LIBRARIES} gl2ps)
- 
- install(TARGETS avogadro DESTINATION ${LIB_INSTALL_DIR})
- install(FILES ${libavogadro_HDRS}
diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch b/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch
deleted file mode 100644
index 6d4536ef7c9b..000000000000
--- a/sci-chemistry/avogadro/files/avogadro-1.1.0-textrel.patch
+++ /dev/null
@@ -1,29 +0,0 @@
- libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt | 2 +-
- libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt   | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt b/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
-index fb88316..2ddcfdf 100644
---- a/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
-+++ b/libavogadro/src/extensions/crystallography/spglib/CMakeLists.txt
-@@ -20,6 +20,6 @@ add_library(spglib STATIC ${spglib_SRCS})
- set_target_properties(spglib PROPERTIES COMPILE_FLAGS "-w")
- 
- # Set -fPIC on x86_64
--if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
-+if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^(i.86|x86|x86_64|ppc|ppc64)$")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC"  )
- endif()
-diff --git a/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt b/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
-index 0cd0c3e..9e89daf 100644
---- a/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
-+++ b/libavogadro/src/extensions/swcntbuilder/tubegen/CMakeLists.txt
-@@ -19,7 +19,7 @@ add_library(tubegen STATIC ${tubegen_SRCS})
- set_target_properties(tubegen PROPERTIES COMPILE_FLAGS "-w")
- 
- # Set -fPIC on x86_64
--if("${CMAKE_SYSTEM_PROCESSOR}" STREQUAL "x86_64")
-+if("${CMAKE_SYSTEM_PROCESSOR}" MATCHES "^(i.86|x86|x86_64|ppc|ppc64)$")
-   set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC"  )
-   set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC"  )
- endif()
diff --git a/sci-chemistry/avogadro/files/avogadro-1.1.1-gcc-version.patch b/sci-chemistry/avogadro/files/avogadro-1.1.1-gcc-version.patch
new file mode 100644
index 000000000000..48840204a8a0
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.1.1-gcc-version.patch
@@ -0,0 +1,23 @@
+From a8bf7bcd7881147c3bcec97d247a2fa4160019d9 Mon Sep 17 00:00:00 2001
+From: Heiko Becker <heirecka@exherbo.org>
+Date: Tue, 5 Jul 2016 00:10:26 +0200
+Subject: [PATCH] Fix detection of gcc6's version number
+
+...and be safe for further new versions.
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1cbeb8f10..8d2958739 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,7 +69,7 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+   # Now check if we can use visibility to selectively export symbols
+   # Get the GCC version - from KDE4 cmake files
+   exec_program(${CMAKE_C_COMPILER} ARGS --version OUTPUT_VARIABLE	_gcc_version_info)
+-  string (REGEX MATCH "[345]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
++  string (REGEX MATCH "[3-9]\\.[0-9]\\.[0-9]" _gcc_version "${_gcc_version_info}")
+   # gcc on mac just reports: "gcc (GCC) 3.3 20030304 ..." without the
+   # patch level, handle this here:
+   if (NOT _gcc_version)
diff --git a/sci-chemistry/avogadro/files/avogadro-1.2.0-numpy.patch b/sci-chemistry/avogadro/files/avogadro-1.2.0-numpy.patch
new file mode 100644
index 000000000000..4869fa4ea79d
--- /dev/null
+++ b/sci-chemistry/avogadro/files/avogadro-1.2.0-numpy.patch
@@ -0,0 +1,13 @@
+diff --git a/cmake/modules/FindNumpy.cmake b/cmake/modules/FindNumpy.cmake
+index b348418..49ba206 100644
+--- a/cmake/modules/FindNumpy.cmake
++++ b/cmake/modules/FindNumpy.cmake
+@@ -10,7 +10,7 @@
+ #endif (NUMPY_INCLUDE_DIR)
+ 
+ EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c 
+-    "import numpy; print numpy.get_include()"
++	"import numpy; print (numpy.get_include())"
+     OUTPUT_VARIABLE NUMPY_INCLUDE_DIR
+     OUTPUT_STRIP_TRAILING_WHITESPACE)
+ 
diff --git a/sci-chemistry/molequeue/Manifest b/sci-chemistry/molequeue/Manifest
index 93372b06da13..65a52494b05b 100644
--- a/sci-chemistry/molequeue/Manifest
+++ b/sci-chemistry/molequeue/Manifest
@@ -1,3 +1,4 @@
+AUX molequeue-0.8.0-cmake.patch 4285 BLAKE2B 916f0c248f487b6d7c11dd34e20364b5dfb494d2e27e657bc5a13f9d6c3f71ae2ab6818bace7df04c0a1388f6f85c42e3e0ab96fc5d3d892c0a95612532baf28 SHA512 9031fd3e5efe0a9332db4b1f46d82486fc804cef55c9fab35030bc562d1a40f5f16a02a5eb8c31bf4c50c7a0abcf22c11da5bdd4e2a45a37a8b6f4ff994d3ad6
 DIST molequeue-0.8.0.tar.gz 643072 BLAKE2B c9ba0a93e4dac3027de1aeb5ae6c62fc3e4229786973d6c3b56af4b70476b0ed54a563837d489912a40c76b9ce0013e13633a327eb314c34305ba17d7f0b4cf7 SHA512 b9539d2ad2c67188ad254f186c1d67c122a15a32047801c632a1613a4f9c887f38baf2da1bb80cb123391948c2a44604fb1082e475ca6de1e683fbe51266ac84
-EBUILD molequeue-0.8.0.ebuild 1555 BLAKE2B 9ecafc79e0a82bf653b8b6b7d8f28103a2d14c795624b641e4046f29a777c577cd2f850d9c8397ab6bace5e6d1c9c01cec2287760df08c64dc38ea77efba91ab SHA512 ba103e6c00b1957389c5b092fce810bb4ed3b2e32b432f93643fd093118f9106829f2091bee9f80cded61b88cf81a92baf5d9902894072df12e319f78e316e55
+EBUILD molequeue-0.8.0.ebuild 1613 BLAKE2B 21ddbe84fb9ad674cc796330ee2a26f5fdcfc7f6187869d2775e5679bbb2bf2dc147d80c79617867f9b1424bf07eb797315fb5cab3cb59359c39171315cf353c SHA512 6971db16063f3c1dfad7a780adae7aaf438c2957f46698a1739a65ac3d658ccac501f687db18eddc1305a4e6a220cac206d781f5783cdcb0d38b4e952c550ed7
 MISC metadata.xml 1257 BLAKE2B 181f9234f11d0cb14fd6b93b42ef153c089d4df8dcb7cf72bc710dbee11bf4bb573f37ea703d02dbe17fa1f39c0aaf591c6d28ad1429abced5108b9ce39f2030 SHA512 10e3dd48ec1e54bc0d47d4c2f0aca427875cc0ceb59a93ab41ab2734607aa6474e80f3ae622e45fa319753591f16439118dd0b301068cb3e16fd79ff11a4f058
diff --git a/sci-chemistry/molequeue/files/molequeue-0.8.0-cmake.patch b/sci-chemistry/molequeue/files/molequeue-0.8.0-cmake.patch
new file mode 100644
index 000000000000..3fd8a9db76be
--- /dev/null
+++ b/sci-chemistry/molequeue/files/molequeue-0.8.0-cmake.patch
@@ -0,0 +1,106 @@
+From 45cbc9f167d1158bc73e87618cc08ede2e3f2911 Mon Sep 17 00:00:00 2001
+From: "Marcus D. Hanwell" <marcus.hanwell@kitware.com>
+Date: Thu, 1 Jun 2017 13:17:20 -0400
+Subject: [PATCH] Removed GenerateExportHeader, bumped CMake min
+
+Removed the GenerateExportHeader copy we had, use CMake's, and bump the
+minimum to ensure it has the features we expect.
+---
+ CMakeLists.txt                   |   2 +-
+ cmake/GenerateExportHeader.cmake | 375 ---------------------------------------
+ cmake/exportheader.cmake.in      |  35 ----
+ 3 files changed, 1 insertion(+), 411 deletions(-)
+ delete mode 100644 cmake/GenerateExportHeader.cmake
+ delete mode 100644 cmake/exportheader.cmake.in
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index df93bc8..a107c8f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -1,4 +1,4 @@
+-cmake_minimum_required(VERSION 2.8.8 FATAL_ERROR)
++cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
+ 
+ project(MoleQueue)
+ 
+From aae92632d10fe98728c3e73bfd891e502e8712fd Mon Sep 17 00:00:00 2001
+From: "Marcus D. Hanwell" <marcus.hanwell@kitware.com>
+Date: Thu, 16 Nov 2017 15:10:25 -0500
+Subject: [PATCH] Remove deprecated calls for export flags
+
+Move them to the project default variables in the top level.
+---
+ CMakeLists.txt                      | 8 ++++++++
+ molequeue/client/CMakeLists.txt     | 1 -
+ molequeue/servercore/CMakeLists.txt | 1 -
+ molequeue/zeromq/CMakeLists.txt     | 1 -
+ thirdparty/qt5json/CMakeLists.txt   | 1 -
+ 5 files changed, 8 insertions(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index a107c8f..e68d81f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -4,6 +4,14 @@ project(MoleQueue)
+ 
+ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
+ 
++# Request C++11 standard, using new CMake variables.
++set(CMAKE_CXX_STANDARD 11)
++set(CMAKE_CXX_STANDARD_REQUIRED True)
++set(CMAKE_CXX_EXTENSIONS False)
++# Set symbol visibility defaults for all targets.
++set(CMAKE_CXX_VISIBILITY_PRESET "hidden")
++set(CMAKE_VISIBILITY_INLINES_HIDDEN True)
++
+ include(BuildType)
+ include(BuildLocation)
+ include(CompilerFlags)
+diff --git a/molequeue/client/CMakeLists.txt b/molequeue/client/CMakeLists.txt
+index 674f91a..8cb131a 100644
+--- a/molequeue/client/CMakeLists.txt
++++ b/molequeue/client/CMakeLists.txt
+@@ -20,7 +20,6 @@ set_target_properties(MoleQueueClient PROPERTIES AUTOMOC TRUE)
+ include(GenerateExportHeader)
+ generate_export_header(MoleQueueClient EXPORT_FILE_NAME molequeueclientexport.h)
+ list(APPEND headers "${CMAKE_CURRENT_BINARY_DIR}/molequeueclientexport.h")
+-add_compiler_export_flags(molequeue_export_flags)
+ set_property(TARGET MoleQueueClient APPEND
+     PROPERTY COMPILE_FLAGS ${molequeue_export_flags})
+ 
+diff --git a/molequeue/servercore/CMakeLists.txt b/molequeue/servercore/CMakeLists.txt
+index 8d4f7ee..aab0bec 100644
+--- a/molequeue/servercore/CMakeLists.txt
++++ b/molequeue/servercore/CMakeLists.txt
+@@ -30,7 +30,6 @@ set(hdrs
+ generate_export_header(MoleQueueServerCore
+   EXPORT_FILE_NAME molequeueservercoreexport.h)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+-add_compiler_export_flags(molequeue_export_flags)
+ set_property(TARGET MoleQueueServerCore APPEND
+   PROPERTY COMPILE_FLAGS ${molequeue_export_flags})
+ 
+diff --git a/molequeue/zeromq/CMakeLists.txt b/molequeue/zeromq/CMakeLists.txt
+index bc1e893..188f437 100644
+--- a/molequeue/zeromq/CMakeLists.txt
++++ b/molequeue/zeromq/CMakeLists.txt
+@@ -20,7 +20,6 @@ target_link_libraries(MoleQueueZeroMq MoleQueueServerCore ${ZeroMQ_LIBRARIES})
+ generate_export_header(MoleQueueZeroMq
+   EXPORT_FILE_NAME molequeuezeromqexport.h)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR})
+-add_compiler_export_flags(molequeue_export_flags)
+ set_property(TARGET MoleQueueZeroMq APPEND
+   PROPERTY COMPILE_FLAGS ${molequeue_export_flags})
+ 
+diff --git a/thirdparty/qt5json/CMakeLists.txt b/thirdparty/qt5json/CMakeLists.txt
+index 6d00685..52f5df2 100644
+--- a/thirdparty/qt5json/CMakeLists.txt
++++ b/thirdparty/qt5json/CMakeLists.txt
+@@ -54,7 +54,6 @@ include(GenerateExportHeader)
+ generate_export_header(${QT5_JSON_LIBRARY_NAME}
+   EXPORT_FILE_NAME qt5jsonexport.h
+   EXPORT_MACRO_NAME QT5JSON_EXPORT)
+-add_compiler_export_flags(qt5json_export_flags)
+ 
+ set_property(TARGET ${QT5_JSON_LIBRARY_NAME} APPEND
+   PROPERTY COMPILE_FLAGS ${qt5json_export_flags})
diff --git a/sci-chemistry/molequeue/molequeue-0.8.0.ebuild b/sci-chemistry/molequeue/molequeue-0.8.0.ebuild
index 3b5733ea45d2..2c20c0bfeeac 100644
--- a/sci-chemistry/molequeue/molequeue-0.8.0.ebuild
+++ b/sci-chemistry/molequeue/molequeue-0.8.0.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils multilib python-single-r1 versionator virtualx
+inherit cmake-utils python-single-r1 versionator virtualx
 
 DESCRIPTION="Abstract, manage and coordinate execution of tasks"
-HOMEPAGE="http://www.openchemistry.org/OpenChemistry/project/molequeue.html"
+HOMEPAGE="https://www.openchemistry.org/projects/molequeue/"
 SRC_URI="https://github.com/OpenChemistry/molequeue/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 SLOT="0"
@@ -22,27 +22,33 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 RDEPEND="${PYTHON_DEPS}
 	dev-qt/qtcore:5
+	dev-qt/qtgui:5
 	dev-qt/qtnetwork:5
 	dev-qt/qtwidgets:5
 	zeromq? ( net-libs/cppzmq:0= )"
 DEPEND="${RDEPEND}
 	doc? ( app-doc/doxygen )"
 
+PATCHES=( "${FILESDIR}"/${P}-cmake.patch )
+
 src_prepare() {
 	cmake-utils_src_prepare
+
+	rm cmake/{GenerateExportHeader.cmake,exportheader.cmake.in} || die
+
 	# delete bundled Qt5Json library
 	rm -r thirdparty || die
 }
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_enable test TESTING)
-		$(cmake-utils_use_use zeromq ZERO_MQ)
-		$(cmake-utils_use_build doc DOCUMENTATION)
-		$(cmake-utils_use client MoleQueue_BUILD_CLIENT)
-		$(cmake-utils_use server MoleQueue_BUILD_APPLICATION)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		-DMoleQueue_BUILD_CLIENT=$(usex client)
+		-DoleQueue_BUILD_APPLICATION=$(usex server)
+		-DENABLE_TESTING=$(usex test)
+		-DUSE_ZERO_MQ=$(usex zeromq)
 		-DINSTALL_LIBRARY_DIR=$(get_libdir)
-		)
+	)
 	use zeromq && \
 		mycmakeargs+=( -DZeroMQ_ROOT_DIR=\"${EPREFIX}/usr\" )
 
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index 2014c75d18aa..5a097cf7e01d 100644
--- a/sci-geosciences/Manifest.gz
+++ b/sci-geosciences/Manifest.gz
diff --git a/sci-geosciences/gpsd/Manifest b/sci-geosciences/gpsd/Manifest
index f5e03b94940b..036a24f374b4 100644
--- a/sci-geosciences/gpsd/Manifest
+++ b/sci-geosciences/gpsd/Manifest
@@ -18,7 +18,7 @@ DIST gpsd-3.16.tar.gz 8587490 BLAKE2B db6619308ddb2f473727bc91d2f696a401a0b4f97a
 DIST gpsd-3.17.tar.gz 8755304 BLAKE2B d1f82b5734fd90fe903a6f2fe8835fe8292fe3e729306e7abe4054821971fece4c23f382c08a233503f07ad66b7b3a02a52a000e55c08491bf254ab6e99378b5 SHA512 71085053f600730e0f2de269c59ce0a17ae106ef01403f02d78418b267c6adb9818d541fba59eb23bf71cdb67c5442c82b4948d262ef7e74bb993dcae677a1b1
 EBUILD gpsd-3.10.ebuild 4785 BLAKE2B 602594de9a4834b3f765a3be4e69148230987c9855f8294d9bf424704f7dadc74f1df2b92ce166752217cee8d0547ef331330819add3cafd046caa66a946bb1a SHA512 6c253b1459de0a8233537543a8c5031b6b30b2f78b4a080f31745f0fe75bb90254843a66e4f59ada264f0bfaacc3c1756351c2b0bb357a6056d96a3164bbe026
 EBUILD gpsd-3.16.ebuild 4930 BLAKE2B 14ebc98190eddf603ff9c747d871ebaf576538ff9e20b212262bf680abbb3976d3ba9d0a4397afbf9ea2419496aec587639be301f64ff7010fff6101b4d23d53 SHA512 0b977e0cf70f20ac136046ba83d3be128e0a78c3f4a62e593a7e17daeacf0b300803e34c90b15b3e3ee51c58c1c304925f9b25e78f1679edfddd7b1ffb8f26d4
-EBUILD gpsd-3.17-r2.ebuild 4608 BLAKE2B b09106b679d282ec09f43725020027b63a7c62134780acbd5e9e3659dc17139703eeeecae6625af7ab9b81fe1f1c0a9cee239e3b28a4dcfcd2ebdf9374b21e51 SHA512 930a740182dcdd642a94bdbfcc480c1fef271500b1f476bfb5c5f6ddfdb50cfcf3cf88eeb50e842e87bcff2f9b4aead7d76f35a9423a2d49cf981e90229c4b89
+EBUILD gpsd-3.17-r2.ebuild 4607 BLAKE2B c726495b2418e66fef300d2640053571da4e965f99f465678a1567ab6c9ddc79d114ea96fbc22ba47ac2db48aea4d29aff2bcc1ec7dea306aa6d80fe677b6ce1 SHA512 38ec3897b58fa08fb611efdfabd247ce6375141397bd782d7c8a9589987fb4327a8fcdf082916a5926b9558d6ae0160ebbdaf2a7795df899a803453e38c5f139
 EBUILD gpsd-3.17.ebuild 4627 BLAKE2B b257c138e370fa05be7931c76bad948ba3e747727b18a1b12856eafe7de01869ef99b3c1ee3ac7c1bd68697aa193fb199bbb26b5ec3e67318f497e14a0ee62f3 SHA512 7b4518ba869362b11fa793d66914c60d75411d017de7c75d77aef12502b1c21ca0823b36c38711b3162856cf0ed9c2187ddc49b3ffa8c4c663f4db402a9273c0
 EBUILD gpsd-9999.ebuild 4723 BLAKE2B 6dd464eed24c3eaa6d1c9d0aa7c5841d28e492934bb4e4397f49ffb73ea8cac08d404c762d61abd368511c4fe23caa6f32c223b9a7410c75ec347adb2a2710b4 SHA512 a8d26da64fcbe69f1dd8bff80928424202d76d94d524428b68606918f521c2236b76b37fe2a30976e3d58e0674cfa0c4212512fff6f842b525636e16ff60e04e
 MISC metadata.xml 950 BLAKE2B a2250377cdd4f1e827e7fe7dd5f8707316e8cbe9552f4ca2e56828e138d2d2b31d5c6cc930247c8666c9546fbe8dad618b2c38a34b6caac7f9e82ca620806ef3 SHA512 a5e8e60afc8c02e769cf496caa30003173455d82554378457ee7350bcc64b57a88b697cf2284a7a56f008461a33d260d167ce866bde0710e235f684e201a5bf8
diff --git a/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild b/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
index 39652c21d116..13be867bc3d2 100644
--- a/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
+++ b/sci-geosciences/gpsd/gpsd-3.17-r2.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+	KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86"
 fi
 
 DESCRIPTION="GPS daemon and library for USB/serial GPS devices and GPS/mapping clients"
diff --git a/sci-geosciences/liblas/Manifest b/sci-geosciences/liblas/Manifest
index 951ee4364f7a..4cde0131f3a0 100644
--- a/sci-geosciences/liblas/Manifest
+++ b/sci-geosciences/liblas/Manifest
@@ -2,5 +2,5 @@ AUX liblas-1.8.0_remove-std-c++98.patch 1141 BLAKE2B 880a1d478c16e680b45e1a064ce
 DIST libLAS-1.8.0.tar.bz2 3907684 BLAKE2B e7516aedb9f0f1df49cb9d4e669749ded5a04999990bb6856fee1181ce65b7d2e36ba779c3fce2f34080bb2293d68f7d2e447ff2fca29f9d3b8ee9b8210b31f6 SHA512 1804149c7bcf04896a683a1098d372a65c000b7562795911fae697f81f370315aa373f34c12fa740d4607c07cd73e48354e34c9e26b032ffe679ecbfd4496a50
 DIST libLAS-1.8.1.tar.bz2 3920203 BLAKE2B 2ef8e822c5d1c07d929e788c59e6e5b942aba637fb764d37e1505d136c75cd4a28efc4702b022bcfee8063b684956b4466c9ec00e737d7024ca2719d7b11f341 SHA512 1cb39c557af0006c54f1100d0d409977fcc1886abd155c1b144d806c47f8675a9f2125d3a9aca16bae65d2aabba84d5e5e322b42085e7db312f3d53f92342acf
 EBUILD liblas-1.8.0.ebuild 860 BLAKE2B 21c698a0b8150fce20677df26ce7e4fefb97314977edb4bd0e26000f926b7f46ebd1c0a650d01c3b8cf7383ab7e3ec1bca928ee1f396102ef8b07fb45341b23c SHA512 b11a84d4efd57208a542c02530c2342f2e1218606bebe1b47c8c345b59d838019fe6190c8419ffc74877260f139f53e935a3a7f46244f4ff019fe6a9d0bd2639
-EBUILD liblas-1.8.1.ebuild 990 BLAKE2B e8a0c5374c835ec8007c76b270a8062ad7a72e1a0e872db7ea173bca71ca03363dffe99255dd421c0ff4e25b2544c645c071bca8cc84d652194252d81cc888c9 SHA512 fe2ff804b78221c54b27e63c72f3d363fe63ef6f56b8409304b7e7e163a388a6eb519a53a332eac7c7544a3f541fd311f0f5e99e8214b8a02c56db5fccc76ea5
+EBUILD liblas-1.8.1.ebuild 989 BLAKE2B 31004d079d90e6b8c8a71bd9cfb8212edcda8cf87babc7878ee1cd1befbcfc78c380221cf67960a90b0cecbb210a032025668e2c717ae692cce95ddbb902912d SHA512 57a629f6fb16941518e8b8cfb7a63304f10f8ff227e006aee434c31248fdfa12c92c7d97e1075ebe59cc8cdbba0904b754a26dd01ad8436c4be45494029ff071
 MISC metadata.xml 700 BLAKE2B 04a72f3e453495412b2cd34d6c6743351842ddb6fe5dfaf856f6a63ea0a7546df8611cb50ae23e39b6669502ab9c7befe43f4d1fc198d410ef7822fdc23fabf4 SHA512 56edecc4e8eee02fe781ce5a61368e5253ba249a78413f4e200a56164878ec768256b36abde5c97022849ba2ca7ed5209ff5d19700b56e43652e3f0a642371d9
diff --git a/sci-geosciences/liblas/liblas-1.8.1.ebuild b/sci-geosciences/liblas/liblas-1.8.1.ebuild
index c216cac1941d..320e41108e08 100644
--- a/sci-geosciences/liblas/liblas-1.8.1.ebuild
+++ b/sci-geosciences/liblas/liblas-1.8.1.ebuild
@@ -14,7 +14,7 @@ RESTRICT="test"
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~x86"
 IUSE="gdal"
 
 RDEPEND="
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 698b3cb0b84c..681273a9c020 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -7,5 +7,5 @@ DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e26
 DIST qgis_sample_data.tar.gz 13601736 BLAKE2B 92acadbd009b181e74516120b3a700c96c7c1a732240434439bbe51afa441dee6521dac7bf6629fb5d7489b63fd0e0a45b1871df099820e8cd594920fa1499b7 SHA512 5847d7b32e5f75e771adf6b959847024f55b2360c307bd80e5628595fc53f5aaca18adf6cb00fa027a7e7b326c7f72bab58df16674daf20b77c676e163d93f78
 EBUILD qgis-2.18.12.ebuild 5279 BLAKE2B b4400f19270a6d724890e4c1e1c0c8273429ffc491cf46f5c7d6c0c27a621a9d198568f3d6f60665a7b13fcd9484ae551f73c148877fafca51c7852bb444e92b SHA512 8118478f8aa8bc7ca5221f48125b6fab899bb8bd4db12da89472fc853f1b0eb8094a51c715e1962970b67462b7ed7939f9a92142b52442fd9d735ab3ce9162a4
 EBUILD qgis-2.18.14.ebuild 5331 BLAKE2B c3600735a749a82521dcb6adaf3cf8fa72d91ccda47d64cadb6da3f69789b4fb188303e7073792fb1906fcb5d49763cb4d13c0634fa08f2d67c6b99301fb097e SHA512 b62acaea5e1f8a1467593f194cde90ef2558f64cd915f517a042299865822656db8a743c47cd2f8bfd3710fdbb7ec4ed66ba8f5cab681392db6852927d91b341
-EBUILD qgis-9999.ebuild 5939 BLAKE2B ad1c489318d004fc357d99d13334f9b6ecc29ca9671e9803482e99f9a0dd8c3810628facc0725aec8c380775c187843506d438143121b6df581ca27114662ee1 SHA512 2f25d1a4d80ba1bf2abbb7b01a396244dc4351f1584edefdc6661160aa6ec08f62307db460c6a440a674d2404c35f2e253af657d80ba58d69abd7ad70b499520
+EBUILD qgis-9999.ebuild 5971 BLAKE2B 3cfc09b23d178b499078df34f1533dcf026ae35d2c4438787178170abf1291de33b987d468e107d488ebbc05ca93f53c13478fef20b2b11c36fe9eb07d94f92a SHA512 e8b0925c559773f0dba5faa4acce416bd15b4e8d4eb7c9006027459bd305afc35d4be0aa4f036e80a22d26ea9556866ab6b0c967c67e77e2907cef9320d1e1a1
 MISC metadata.xml 1121 BLAKE2B c81c6538e2b0a0094f7566fc72e2c4249d5ff21d999355502b0eaf89cb77b0be305d0df0aa366144bf4ced98e5b07969b33a4f6ee2efb3438cdf098788850571 SHA512 bdd356ee78300f01de7169ab2c8915c369e8e2d5a7cce85df21ba4c4835b65164cc28d7258e7ac0efba4b826cce2d90d179c9247b3f53c06ba73d6b2ac175d06
diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-9999.ebuild
index 3bb8a29f2390..a167a5305cf5 100644
--- a/sci-geosciences/qgis/qgis-9999.ebuild
+++ b/sci-geosciences/qgis/qgis-9999.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-PYTHON_COMPAT=( python3_{4,5,6} )
+PYTHON_COMPAT=( python3_5 )
 PYTHON_REQ_USE="sqlite"
 QT_MIN_VER="5.9.1"
 
@@ -67,6 +67,7 @@ COMMON_DEPEND="
 		dev-python/httplib2[${PYTHON_USEDEP}]
 		dev-python/jinja[${PYTHON_USEDEP}]
 		dev-python/markupsafe[${PYTHON_USEDEP}]
+		dev-python/owslib[${PYTHON_USEDEP}]
 		dev-python/pygments[${PYTHON_USEDEP}]
 		dev-python/PyQt5[sql,svg,webkit?,${PYTHON_USEDEP}]
 		dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index 6d08dad05446..523f161cd31f 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/ViSP/Manifest b/sci-libs/ViSP/Manifest
index 56358d0a3bca..106cb7ee7cf4 100644
--- a/sci-libs/ViSP/Manifest
+++ b/sci-libs/ViSP/Manifest
@@ -1,5 +1,7 @@
 AUX ViSP-3.0.0-ffmpeg3.patch 4291 BLAKE2B 2948a7e4cad247da78187a15198fbc5e804caab7ead381219113cd48ccc71c9b59832f315ca784d8bfd3b6d2d2b27ce918341dbbab88c2f66d0749e20cbaa63c SHA512 fed1699ccaba5baa67e0fde19abc5ae828c51c88bf761a9d6784b8ad858230cca7e11bfbc1fb7661bca0a666c49ff9915e0a771909bf42493229165d1131b3a9
 AUX ViSP-3.0.1-opencv.patch 403 BLAKE2B 0bc3da5cd6e73cdd47dac7b525f4f3fbe6e683aa79f9185a3e92cecaf36fdc30c018fe93d1e9f7ac69890b7807e16663e21e65025184b950a8f384c1ec2748d8 SHA512 3a6a84ac6ad2bce4fdf7228b4a296589239c2b4b019b3ad8e4654af71b00eca6102444f38c32604013ec62d60d067deb2902ea8cffffff6d97e0762602a013f4
 DIST visp-3.0.1.tar.gz 26029005 BLAKE2B d8881b0dd56b38f5db88e33f13e7dfa29b0a64fa1aebc5160384db2c7124d3a0ab2f0a5b3ba0255cbe209b578a3cdeb4420dc138a063248f945e9a73e041f21d SHA512 558e9acbd7ac5ef2193dca026062b75e0a30a7efbcae7d1e7d392b0855e643ee96ab9f60c19465f6bfa861374e30d9e91faf2f860e0442fa48ea5ea384b4e3fa
+DIST visp-3.1.0.tar.gz 38743434 BLAKE2B 294eaaf95c7ff7a8ade8bdf2146018856b081a9c461aca68eedb6fb096d253e537f41ad9a81687cba7a9e42a34b5a3fe2d1a705917a1c96f47e1e3e708f20cc3 SHA512 b7d56d3286e3610ff0db4f4c3a51f953825578532a9c518f7654142a644f466343660901632487fb513b0f6a6503d3716d56e733830b4d52daf5839bc1cfbdb5
 EBUILD ViSP-3.0.1.ebuild 3154 BLAKE2B 35ff3e8fea605350c55383a1754d85d8781286f9114c70b0fafdb7ae1d7a74bf0d1d78582625148ee345f20ae5ee02b964bc0636abc36868573e7510d039214e SHA512 a47e3d09ebcf9d27349fd9f568168efe56b503479e887a4e4f4b308293e4d65db2a10a2a1727245c3d7bd84124473f1dc5cd248dc5bf9fc091dbf1e8675dedb6
+EBUILD ViSP-3.1.0.ebuild 3022 BLAKE2B 051f344a7e980d42d34142161fd1303f2490ef46b63429e4ba07b3134f814a421ed43d8ff2dd9e6d1891374228548a2f54e323194cfbb82e0b4d4df244d54597 SHA512 d2a044de8da68ca3c808fe52c3fa32f95f852957540bbe2691760e4eb35628dc75cc463f1836f70c3b5b6f7191e1c42b4ac410740cfac137e23937d33986b07e
 MISC metadata.xml 1393 BLAKE2B f891f74d6a7a334f7ee024f188c70ee031b391bbbebe4f67ff45efa6fe5def3eff0515a769a312e691e8acfda5e3633daa11ed1c590f43110a0ab1a190f39473 SHA512 c66184a7997d1682047605e6773a341f3f8503b765c36aa6931ac13eda2a78b866cf2db3c8ca68eabca206235b4c4bea534e176bd07cd9f5dcad3d9e67583d5e
diff --git a/sci-libs/ViSP/ViSP-3.1.0.ebuild b/sci-libs/ViSP/ViSP-3.1.0.ebuild
new file mode 100644
index 000000000000..07dfbbd91058
--- /dev/null
+++ b/sci-libs/ViSP/ViSP-3.1.0.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils
+
+DESCRIPTION="Visual Servoing Platform: visual tracking and visual servoing library"
+HOMEPAGE="http://www.irisa.fr/lagadic/visp/visp.html"
+SRC_URI="http://gforge.inria.fr/frs/download.php/latestfile/475/visp-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/3.1"
+KEYWORDS="~amd64 ~arm"
+IUSE="
+	+coin demos +dmtx doc examples gsl ieee1394 jpeg lapack motif ogre
+	ois opencv png qt4 test tutorials usb v4l X xml +zbar zlib
+	cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3
+"
+
+RDEPEND="
+	coin? ( media-libs/coin virtual/opengl )
+	dmtx? ( media-libs/libdmtx )
+	gsl? ( sci-libs/gsl )
+	ieee1394? ( media-libs/libdc1394 )
+	jpeg? ( virtual/jpeg:0 )
+	lapack? ( virtual/lapack )
+	!qt4? ( motif? ( media-libs/SoXt ) )
+	ogre? ( dev-games/ogre[ois?] dev-libs/boost:=[threads] )
+	opencv? ( media-libs/opencv:= qt4? ( media-libs/opencv[-qt5(-)] ) )
+	png? ( media-libs/libpng:0= )
+	qt4? ( media-libs/SoQt dev-qt/qtgui:4 )
+	usb? ( virtual/libusb:1 )
+	v4l? ( media-libs/libv4l )
+	X? ( x11-libs/libX11 )
+	xml? ( dev-libs/libxml2 )
+	zbar? ( media-gfx/zbar )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	doc? ( app-doc/doxygen virtual/latex-base media-gfx/graphviz )
+	virtual/pkgconfig
+	test? ( sci-misc/ViSP-images )
+	v4l? ( virtual/os-headers )"
+RDEPEND="${RDEPEND}
+	demos? ( sci-misc/ViSP-images )"
+REQUIRED_USE="
+	ois? ( ogre )
+	qt4? ( coin )
+	motif? ( coin )
+"
+
+S="${WORKDIR}/visp-${PV}"
+PATCHES=( "${FILESDIR}/${PN}-3.0.1-opencv.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
+		"-DBUILD_TESTS=$(usex test ON OFF)"
+		"-DBUILD_DEMOS=$(usex demos ON OFF)"
+		"-DBUILD_TUTORIALS=$(usex tutorials ON OFF)"
+		"-DUSE_COIN3D=$(usex coin ON OFF)"
+		"-DUSE_DC1394=$(usex ieee1394 ON OFF)"
+		"-DUSE_DMTX=$(usex dmtx ON OFF)"
+		"-DUSE_GSL=$(usex gsl ON OFF)"
+		"-DUSE_LAPACK=$(usex lapack ON OFF)"
+		"-DUSE_JPEG=$(usex jpeg ON OFF)"
+		"-DUSE_PNG=$(usex png ON OFF)"
+		"-DUSE_LIBUSB_1=$(usex usb ON OFF)"
+		"-DUSE_OGRE=$(usex ogre ON OFF)"
+		"-DUSE_OIS=$(usex ois ON OFF)"
+		"-DUSE_OPENCV=$(usex opencv ON OFF)"
+		"-DUSE_SOQT=$(usex qt4 ON OFF)"
+		"-DUSE_SOXT=$(usex motif "$(usex qt4 OFF ON)" OFF)"
+		"-DUSE_V4L2=$(usex v4l ON OFF)"
+		"-DUSE_X11=$(usex X ON OFF)"
+		"-DUSE_XML2=$(usex xml ON OFF)"
+		"-DUSE_ZBAR=$(usex zbar ON OFF)"
+		"-DUSE_ZLIB=$(usex zlib ON OFF)"
+		"-DCOIN3D_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin"
+		"-DSOQT_INCLUDE_DIR=${EPREFIX:-${SYSROOT}}/usr/include/coin"
+		"-DENABLE_SSE2=$(usex cpu_flags_x86_sse2 ON OFF)"
+		"-DENABLE_SSE3=$(usex cpu_flags_x86_sse3 ON OFF)"
+		"-DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3 ON OFF)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	cd "${BUILD_DIR}"
+	use doc && emake visp_doc
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use tutorials ; then
+		dodoc -r tutorial
+		docompress -x /usr/share/doc/${PF}/tutorial
+	fi
+	cd "${BUILD_DIR}"
+	use doc && dohtml -r doc/html/*
+}
diff --git a/sci-libs/avogadrolibs/Manifest b/sci-libs/avogadrolibs/Manifest
index e01fea83f108..fd0ff3c18502 100644
--- a/sci-libs/avogadrolibs/Manifest
+++ b/sci-libs/avogadrolibs/Manifest
@@ -1,9 +1,5 @@
 AUX avogadrolibs-0.7.2-6464.patch 902 BLAKE2B 29a06e0d5e814aee4c1aff30af3642e374d32813e4e9837706ef652f89ffde173ff043fc3589fc08b22592e3ded2c0d8ef9c544e54a561ac658ae43651403633 SHA512 3851a3c5f7c599e439b4faa491ea080264e60bf2a7c4d35e01a10726f901a5797026bf32535107b46ca44335c5723d9ec7f0b6a46e9eebf7ffd9f90c7f2103d3
 AUX avogadrolibs-0.8.0-underlinking.patch 1170 BLAKE2B 4edc41c544ca71fea851ac0248903234129fabe8fed1c1dff09f788702cebee28619736941f8c88363c987a6b0cf1fa7376e3ccdef1e0ae413dec31d93b6d4c9 SHA512 2520af361e250dc2459beec78d073686f44b41166cf81fd7c2a98e2ed30c5f20b5c910fb3808a56202420068043044900e7a504657506a12d16bd0acac87a466
-DIST avogadrolibs-0.7.2.tar.gz 637001 BLAKE2B 4bcb57b81ed11e6132f3748ac19119cbeff5c5ce80764659813650369bebeb439348f50e7b1c6ffe0a177035d441f43d18eedb0bcbb78a86a85d5fa845f384bb SHA512 a796af1ab3eb77eb2e5484e9e9cb9d7cf68759c9afbd48ddeb237513583e2c207c7c70b2e87b37843886fc737410456ee451e8fe5a21707bdc01fdf600d4cbb8
-DIST avogadrolibs-0.8.0.tar.bz2 619784 BLAKE2B d94b726bc7a6a91b2cd69d3ac4f8002bf33310c8d72e154b4022ec026cac4af8cde18f1d2d3046db811c171e35b4c6529757761bb5f7b97c6b645f3d5045744b SHA512 edcd220e7c05962543b3cdd61faacb838060a69acb61677150256e2e8f36cad513f58a5071b6ef20510aa4aa6699e517c57d70017d8f1b57936c7f87c9da21c7
 DIST avogadrolibs-0.9.0.tar.gz 742370 BLAKE2B cd104cea48b82a1ac86fdb9e93717e2647f57a0d713673d8b340d259f73d6d9985decf0c4e4d83f13d54d12ae2aefee8e75b5d04861f8ab67b9b42690c3c74f7 SHA512 7cb000cd6399f33483c38b4f8a9c4a4688f5054cba35e101bed0f2371cea614ace6b3fc65c3ed1418976afef4462a09be868500435a5ae9c98a7ac496c10c36f
-EBUILD avogadrolibs-0.7.2-r1.ebuild 1134 BLAKE2B c3f9899537cb6cb33c55e6c9a29bb9a44ff9a46bc2362480d426159fd42f9316e381130d183bb11600f68877491da31b023061effe6d7c1379f97c25ade781a8 SHA512 647996bc7599e95c89f65e0527d682bab720a0b3c34f96ba979a41d8c4b5efde12de572d98146310a67cff8a8709cf0cc67f4ea49f93aab4cabbf80eb45f6572
-EBUILD avogadrolibs-0.8.0.ebuild 1287 BLAKE2B 49789553f843f93dd338e45b8b8271077f0f9a0210547ae73f6264d866f5fc709849dfe6e758bffc795f7e8f16bc68fb369a2f758daccf79ea0a8970f5ffcacc SHA512 d233f1bec425686d2a8984fd63b135c6391e10db0b21ec95dcb9bd2014fea7bbb9ce16c4c03b9dcb928fc79e53160d26ef5fe2918623b9246a07482c309acff6
 EBUILD avogadrolibs-0.9.0.ebuild 1399 BLAKE2B 912eda5882b0e2caa12d1684684c9d3d74579e51f645673ae99482438d6a57b8fdb847ceceed5709e56a742cdf4061fbff55627131d8a4666865129ed173a9b2 SHA512 321dff768e0ec9984630900adb06eea78f2d30f78da5f6ca53f1405d1aae6f24c4c7a2d0c4dc6d2abe9615e19221abd119baeb8bb8dbfa093ce684082a1b2cba
 MISC metadata.xml 561 BLAKE2B 92ca6dca915abd65a8b8a3b9a00bdc2314590839d4bf61e3991477f5e53abfb9c6075d4dbfb31b8c8bb3ae4bd822ab7fc4d68cd0cf612582e77a56efd4278a9b SHA512 20bee27014f13bcb3d1ca6addad61f4553fb77197c6113d65e71f97cbd6bda4a69e5db7f3ca12db41dc5d4afb09882bb89312a8e4babf5110957d6e86c1cbc81
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.7.2-r1.ebuild b/sci-libs/avogadrolibs/avogadrolibs-0.7.2-r1.ebuild
deleted file mode 100644
index ea3c49c5231f..000000000000
--- a/sci-libs/avogadrolibs/avogadrolibs-0.7.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
-HOMEPAGE="http://www.openchemistry.org/"
-SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc opengl qt4 static-plugins test vtk"
-
-REQUIRED_USE="qt4? ( opengl )"
-
-RDEPEND="
-	>=sci-chemistry/molequeue-0.7
-	sci-libs/chemkit
-	sci-libs/hdf5:=
-	opengl? (
-		dev-qt/qtopengl:4
-		media-libs/glew
-		)
-	qt4? (
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
-		)
-	vtk? ( sci-libs/vtk )
-"
-DEPEND="${DEPEND}
-	test? ( dev-cpp/gtest )"
-
-PATCHES=( "${FILESDIR}"/${P}-6464.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_PROTOCALL=OFF
-		-DBUILD_GPL_PLUGINS=ON
-		$(cmake-utils_use_build doc DOCUMENTATION)
-		$(cmake-utils_use_use opengl OPENGL)
-		$(cmake-utils_use_use qt4 QT)
-		$(cmake-utils_use_build static-plugins STATIC_PLUGINS)
-		$(cmake-utils_use_enable test TESTING)
-		$(cmake-utils_use_use vtk VTK)
-		)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild b/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
deleted file mode 100644
index 489784bb1736..000000000000
--- a/sci-libs/avogadrolibs/avogadrolibs-0.8.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit cmake-utils
-
-DESCRIPTION="Advanced molecule editor and visualizer 2 - libraries"
-HOMEPAGE="http://www.openchemistry.org/"
-SRC_URI="mirror://sourceforge/project/avogadro/avogadro2/${PV}/${P}.tar.bz2"
-
-SLOT="0"
-LICENSE="BSD GPL-2+"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc opengl qt5 static-plugins test vtk"
-
-REQUIRED_USE="qt5? ( opengl )"
-
-RDEPEND="
-	>=sci-chemistry/molequeue-0.7
-	sci-libs/chemkit
-	sci-libs/hdf5:=
-	opengl? (
-		dev-qt/qtopengl:5
-		media-libs/glew
-		)
-	qt5? (
-		dev-qt/qtconcurrent:5
-		dev-qt/qtcore:5
-		dev-qt/qtnetwork:5
-		dev-qt/qtwebkit:5
-		dev-qt/qtwidgets:5
-		)
-	vtk? ( sci-libs/vtk )
-"
-DEPEND="${DEPEND}
-	dev-cpp/eigen:3
-	test? ( dev-cpp/gtest )"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.7.2-6464.patch "${FILESDIR}/"${P}-underlinking.patch )
-
-src_configure() {
-	local mycmakeargs=(
-		-DUSE_PROTOCALL=OFF
-		-DBUILD_GPL_PLUGINS=ON
-		-DUSE_MOLEQUEUE=ON
-		$(cmake-utils_use_build doc DOCUMENTATION)
-		$(cmake-utils_use_use opengl OPENGL)
-		$(cmake-utils_use_use qt5 QT)
-		$(cmake-utils_use_build static-plugins STATIC_PLUGINS)
-		$(cmake-utils_use_enable test TESTING)
-		$(cmake-utils_use_use vtk VTK)
-		)
-	cmake-utils_src_configure
-}
diff --git a/sci-libs/chemkit/Manifest b/sci-libs/chemkit/Manifest
index ed6649477d5d..30329518411d 100644
--- a/sci-libs/chemkit/Manifest
+++ b/sci-libs/chemkit/Manifest
@@ -1,5 +1,5 @@
 AUX chemkit-0.1-multilib.patch 4694 BLAKE2B f52836ec887b9673c8eabac6ca4fb008aa23def355419f02704605438de44457f2a017a56a7fdd3ce387df08e5b57a0352052d2b88ff0e051a6cf47a192ffd1e SHA512 dedde9e5db14f088e5a70ebfcd9f46b6fbb2d60b1800a61ece1f7afef24caac502f129573823807caec050ba1515ad402a3615953b903a239c5287a5b96aa8b8
 AUX chemkit-0.1-unbundle.patch 6103 BLAKE2B 9ee0f121fec938a528abb837ab386fec62a8576b5c7d123538ce95604953f4f30d0b285b27a153ef98629f053954324f7c384329fe3ca6873f2d18700e914ff8 SHA512 9edd39008763b56eb7697562536c4c4d476880a414ae1a305d1af64cee04e4ccb82585cfd15d2f7608b5200e39863a9a97c2a152110b28e501fbd055737ce015
 DIST chemkit-0.1.tar.gz 5842235 BLAKE2B 9cf28dc6d2c067403172c4f54a057bf38ea9aeaebc96b9be819f4861d1559c1db440dd33baf15f739b2b0e6dc6ba3e73010e0b5aa1b46309435e7bbffb889259 SHA512 0273f8735333000b04007ccd7adc58f0c4809a570fa5a72e4161652d72e8953bf89cad0893c20ecbb3484d6c13a8828c92f12366dddeedaf591815c35f6ef011
-EBUILD chemkit-0.1-r1.ebuild 1838 BLAKE2B 31d611c5f385ab013ba8e0886cf7acc28e9c0a28fb305530f064d4665def5623403ae5891726f158b2ca217e63348f1905a850746d9ae0002e09ff2a6563ad0c SHA512 d1726b0239454b00623c807337341ff4bf5ad5da889e492da0613e09e34422c566322d2ceb68ebffcea52fd499d42c7678c7640b044d7b7a7312c84b4e322cb0
-MISC metadata.xml 453 BLAKE2B 4f54716d22e75ff9aae66893f194f7e52b12c632594e017d90682ffecfe6c51e85ea58cab892c63028f712c412f70401a87ca02d245568d108d16d3963f27f62 SHA512 4a492fc1856ccc3eda100f356ef4699bbbc9e51719015ffab0d14d6bf1077cd07f7be3a7113e93f9a1fb2acdc347dffe2fb68e6076c00e80f265cd35ec80019a
+EBUILD chemkit-0.1-r2.ebuild 2000 BLAKE2B d6290e3de5dc1118bf89065d820cbfc1d44514e7aaf679d48d61beac4ef82c4a81cac93d34e6532601ed9f82572653d0524f136a6083cbdf152b64e87df75772 SHA512 14236546b1e91a844c32c0085d262962503c4ab5388ea0de6a3124920ee2975d1e5930509969d1ac1678acdeda6a35849666dc6b7e26babfeac2ce86a38de87a
+MISC metadata.xml 352 BLAKE2B fbab9c9aa637ace5d90660942c8a34550c45bdf692b98ef583a77e5ed8d666877c09076314f6ec4081f91d12803fd1d8f50b7a715991e8e0ed0541e8473563b3 SHA512 b197aa62c04a5f668822db2e277407e7e871505f7adf5cfceaab36b5bc808f0b7582f17f9a00c7d4013eb4728b7a6ef61a52325deb182d6cd4a344e5d1e98cb1
diff --git a/sci-libs/chemkit/chemkit-0.1-r1.ebuild b/sci-libs/chemkit/chemkit-0.1-r1.ebuild
deleted file mode 100644
index b620a1e9f7fd..000000000000
--- a/sci-libs/chemkit/chemkit-0.1-r1.ebuild
+++ /dev/null
@@ -1,84 +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 cmake-utils multilib python-single-r1 virtualx
-
-DESCRIPTION="Library for chemistry applications"
-HOMEPAGE="http://www.chemkit.org/"
-SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD PSF-2.2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="applications examples python test"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-	test? ( applications python )"
-
-RDEPEND="
-	dev-libs/boost
-	dev-libs/rapidxml
-	dev-cpp/eigen:3
-	dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qtopengl:4
-	media-libs/glu
-	sci-libs/inchi
-	sci-libs/lemon
-	virtual/opengl
-	examples? (
-		x11-libs/libX11
-		x11-libs/libXext
-	)
-	python? ( ${PYTHON_DEPS} )
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-multilib.patch
-	"${FILESDIR}"/${P}-unbundle.patch
-	)
-
-src_prepare() {
-	# jsoncpp API change
-	# xdrf != xdrfile
-	rm -rvf src/3rdparty/{inchi,khronos,lemon,rapidxml} || die
-	cmake-utils_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCHEMKIT_BUILD_PLUGIN_BABEL=on
-		-DUSE_SYSTEM_INCHI=ON
-		-DUSE_SYSTEM_JSONCPP=OFF
-		-DUSE_SYSTEM_RAPIDXML=ON
-		-DUSE_SYSTEM_XDRF=OFF
-		$(cmake-utils_use applications CHEMKIT_BUILD_APPS)
-		$(cmake-utils_use applications CHEMKIT_BUILD_QT_DESIGNER_PLUGINS)
-		$(cmake-utils_use examples CHEMKIT_BUILD_EXAMPLES)
-		$(cmake-utils_use examples CHEMKIT_BUILD_DEMOS)
-		$(cmake-utils_use python CHEMKIT_BUILD_BINDINGS_PYTHON)
-		$(cmake-utils_use test CHEMKIT_BUILD_TESTS)
-	)
-	cmake-utils_src_configure
-}
-
-src_test() {
-	VIRTUALX_COMMAND="cmake-utils_src_test"
-	virtualmake
-}
-
-src_install() {
-	use examples && \
-		dobin \
-			"${BUILD_DIR}"/demos/*-viewer/*-viewer \
-			"${BUILD_DIR}"/examples/uff-energy/uff-energy
-
-	cmake-utils_src_install
-}
diff --git a/sci-libs/chemkit/chemkit-0.1-r2.ebuild b/sci-libs/chemkit/chemkit-0.1-r2.ebuild
new file mode 100644
index 000000000000..c1cb99bc9455
--- /dev/null
+++ b/sci-libs/chemkit/chemkit-0.1-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit cmake-utils multilib python-single-r1 virtualx
+
+DESCRIPTION="Library for chemistry applications"
+HOMEPAGE="http://www.chemkit.org/"
+SRC_URI="mirror://sourceforge/project/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="BSD PSF-2.2"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples python qt4 test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+	test? ( python qt4 )"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-libs/boost:=
+	dev-libs/rapidxml
+	media-libs/glu
+	sci-libs/inchi
+	sci-libs/lemon
+	virtual/opengl
+	examples? (
+		x11-libs/libX11
+		x11-libs/libXext
+	)
+	python? ( ${PYTHON_DEPS} )
+	qt4? (
+		dev-qt/qtcore:4
+		dev-qt/qtgui:4
+		dev-qt/qtopengl:4
+	)
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}"/${PN}
+
+PATCHES=(
+	"${FILESDIR}"/${P}-multilib.patch
+	"${FILESDIR}"/${P}-unbundle.patch
+)
+
+src_prepare() {
+	# jsoncpp API change
+	# xdrf != xdrfile
+	rm -rvf src/3rdparty/{inchi,khronos,lemon,rapidxml} || die
+	cmake-utils_src_prepare
+
+	# bug 640206
+	sed -e "/add_subdirectory(xtc/s/^/#DONT /" \
+		-i src/plugins/CMakeLists.txt || die "Failed to disable xtc"
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCHEMKIT_BUILD_EXAMPLES=$(usex examples)
+		-DCHEMKIT_BUILD_DEMOS=$(usex examples)
+		-DCHEMKIT_BUILD_BINDINGS_PYTHON=$(usex python)
+		-DCHEMKIT_BUILD_APPS=$(usex qt4)
+		-DCHEMKIT_BUILD_PLUGIN_BABEL=$(usex qt4)
+		-DCHEMKIT_BUILD_QT_DESIGNER_PLUGINS=$(usex qt4)
+		-DCHEMKIT_WITH_GRAPHICS=$(usex qt4)
+		-DCHEMKIT_WITH_GUI=$(usex qt4)
+		-DCHEMKIT_WITH_WEB=$(usex qt4)
+		-DCHEMKIT_BUILD_TESTS=$(usex test)
+		-DUSE_SYSTEM_INCHI=ON
+		-DUSE_SYSTEM_JSONCPP=OFF
+		-DUSE_SYSTEM_RAPIDXML=ON
+		-DUSE_SYSTEM_XDRF=OFF
+	)
+	cmake-utils_src_configure
+}
+
+src_test() {
+	VIRTUALX_COMMAND="cmake-utils_src_test"
+	virtualmake
+}
+
+src_install() {
+	use examples && \
+		dobin \
+			"${BUILD_DIR}"/demos/*-viewer/*-viewer \
+			"${BUILD_DIR}"/examples/uff-energy/uff-energy
+
+	cmake-utils_src_install
+}
diff --git a/sci-libs/chemkit/metadata.xml b/sci-libs/chemkit/metadata.xml
index d2802f9728df..ec37d80cac64 100644
--- a/sci-libs/chemkit/metadata.xml
+++ b/sci-libs/chemkit/metadata.xml
@@ -5,9 +5,6 @@
     <email>sci-chemistry@gentoo.org</email>
     <name>Gentoo Chemistry Project</name>
   </maintainer>
-  <use>
-    <flag name="applications">Build also applications not only the libraries</flag>
-  </use>
   <upstream>
     <remote-id type="sourceforge">chemkit</remote-id>
   </upstream>
diff --git a/sci-libs/octomap/Manifest b/sci-libs/octomap/Manifest
index 68d2a5d7ed84..c368e3951475 100644
--- a/sci-libs/octomap/Manifest
+++ b/sci-libs/octomap/Manifest
@@ -1,4 +1,7 @@
+AUX qglqt5.patch 8456 BLAKE2B babaed86e83e1403668b9c3c8cc693775f87783ab11f1f2bd1e3304dce7087186bad406909718244e1c7fa99101e95401c663022e23156a56230d4f5efac67de SHA512 7a9cbcfd49a84ac79b18c183c8d6f6244a76fa0acefdf4adff5f3952e2ad33c1ff1b8227a906d58f40bdff3d83c168e8af2c812e90837b1f98893afd060227ea
 DIST octomap-1.8.1.tar.gz 1679526 BLAKE2B 89d71ca43ce4e353d8cf758420907c8bb1e11aa42854178174594d03aaf04ed753a35c6e4ffc60a5ebe0297307aedee92bd69138af8598a8b5ae7ac716193c44 SHA512 e35567da0d6741747abbc87de49733d0e92bae8aedfe66a63766740cc6566f3cfdbc3c986369177497cc9a8fb208ed9b727da496cec48e2ad23328df06fbc8d6
+DIST octomap-1.9.0.tar.gz 1682421 BLAKE2B a299b4a956d5f9b6a67b05548f2239ad1181a4a1e673e5868d56d6e2d8f0101b2c75b114d1b7995c244c138fe04c8972104c25ca2f4ca6f75639f7326f06d8d7 SHA512 335a4ee3fe20f456afd2d8491f8fe6cfc2527d6e26aa690a69a39c1468e41d312fd84c85a1247deb11f513b9d50b8c69d34b46876f8257c205b0a99bac826237
 EBUILD octomap-1.8.1.ebuild 1839 BLAKE2B c23b4ec0a80d5e228072415465a53a82f10f008c49f9a0a4de42bfdc7018d56086e0392e01b3300ab223bfcd86f6d0d0534f2a526a777ef2940f405ecb9c9605 SHA512 d5b238fd8dcfa388bf9c8f9a6804766b7433e6e6c79e63846b0890963c994293ea955af6639eaf2cefd16a804a7077c5af36d91fbe50196796fdf6f37d36f74a
-EBUILD octomap-9999.ebuild 1839 BLAKE2B c23b4ec0a80d5e228072415465a53a82f10f008c49f9a0a4de42bfdc7018d56086e0392e01b3300ab223bfcd86f6d0d0534f2a526a777ef2940f405ecb9c9605 SHA512 d5b238fd8dcfa388bf9c8f9a6804766b7433e6e6c79e63846b0890963c994293ea955af6639eaf2cefd16a804a7077c5af36d91fbe50196796fdf6f37d36f74a
+EBUILD octomap-1.9.0.ebuild 2015 BLAKE2B 2f504d3e91d967338f6831af1e93a38d3d59949f470f52e41a1ae2914fc52814c532bb8db3ae1a9f5e35ba4280c4643b29101c077c05847753eb229343f9effa SHA512 71af329bdd24260600d9fd79f474b0e587ce674c8746935eb673b50a9374347d340bf00313dc32b71575f3ea92900cacf04a2f369da47387010188da4a666899
+EBUILD octomap-9999.ebuild 1975 BLAKE2B 63b34fd1c61e447e16c9e4b988e5b564d421cea9f15fad3a5e8579222c0f7f174e6c84167d7960c1e6e7d660aaa645ce88d92eba0ceb33c5254db3ef6bea7793 SHA512 018a25e757235bb8509c2e502bd87b286d484037aa4738e06014051675da58a24562580fc284276f18cbe2492779fa4214dd361aed49dbfa8170df6e81ea9f8d
 MISC metadata.xml 703 BLAKE2B 52e5edafca7a58ff0efddeea0eb60894c9bd26c5360fb77c41982edf0b27dec9517bb0470049d92dee05cc242effc7bb2e253a275f6e5d422e7e214676f7ffe8 SHA512 66b3c9143aea83a044a719031b4eb0d140e599048885ca6bb02e74ebebbbd2e9abccf11dc0af32e6ce94d3849dcf639ebaf34ff2c8d6e34f32767e08e465c6b0
diff --git a/sci-libs/octomap/files/qglqt5.patch b/sci-libs/octomap/files/qglqt5.patch
new file mode 100644
index 000000000000..3fad0a0fc63f
--- /dev/null
+++ b/sci-libs/octomap/files/qglqt5.patch
@@ -0,0 +1,231 @@
+Index: octomap-1.9.0/octovis/src/ViewerGui.cpp
+===================================================================
+--- octomap-1.9.0.orig/octovis/src/ViewerGui.cpp
++++ octomap-1.9.0/octovis/src/ViewerGui.cpp
+@@ -286,7 +286,7 @@ void ViewerGui::showOcTree() {
+   m_mapSizeStatus->setText(size);
+   //}
+ 
+-  m_glwidget->updateGL();
++  m_glwidget->update();
+ 
+   // generate cubes -> display
+   // timeval start;
+@@ -299,7 +299,7 @@ void ViewerGui::showOcTree() {
+   //    gettimeofday(&stop, NULL);  // stop timer
+   //    double time_to_generate = (stop.tv_sec - start.tv_sec) + 1.0e-6 *(stop.tv_usec - start.tv_usec);
+   //    fprintf(stderr, "setOcTree took %f sec\n", time_to_generate);
+-  m_glwidget->updateGL();
++  m_glwidget->update();
+ }
+ 
+ 
+@@ -983,7 +983,7 @@ void ViewerGui::on_actionSelection_box_t
+   m_glwidget->enableSelectionBox(checked);
+ 
+ 
+-  m_glwidget->updateGL();
++  m_glwidget->update();
+ }
+ 
+ void ViewerGui::on_actionHeight_map_toggled(bool checked){
+@@ -1040,7 +1040,7 @@ void ViewerGui::on_actionAxes_toggled(bo
+       it != m_octrees.end(); ++it) {
+     it->second.octree_drawer->enableAxes(checked);
+   }
+-  m_glwidget->updateGL();
++  m_glwidget->update();
+ }
+ 
+ void ViewerGui::on_actionHideBackground_toggled(bool checked) {
+@@ -1048,7 +1048,7 @@ void ViewerGui::on_actionHideBackground_
+   if (getOctreeRecord(DEFAULT_OCTREE_ID, r)) {
+     if (checked) m_glwidget->removeSceneObject(r->octree_drawer);
+     else         m_glwidget->addSceneObject(r->octree_drawer);
+-    m_glwidget->updateGL();
++    m_glwidget->update();
+   }
+ }
+ 
+@@ -1142,7 +1142,7 @@ void ViewerGui::on_actionOctree_cells_to
+       it != m_octrees.end(); ++it) {
+     it->second.octree_drawer->enableOcTreeCells(enabled);
+   }
+-  m_glwidget->updateGL();
++  m_glwidget->update();
+ }
+ 
+ void ViewerGui::on_actionOctree_structure_toggled(bool enabled) {
+@@ -1150,7 +1150,7 @@ void ViewerGui::on_actionOctree_structur
+       it != m_octrees.end(); ++it) {
+     it->second.octree_drawer->enableOcTree(enabled);
+   }
+-  m_glwidget->updateGL();
++  m_glwidget->update();
+ }
+ 
+ void ViewerGui::on_actionFree_toggled(bool enabled) {
+@@ -1158,7 +1158,7 @@ void ViewerGui::on_actionFree_toggled(bo
+       it != m_octrees.end(); ++it) {
+     it->second.octree_drawer->enableFreespace(enabled);
+   }
+-  m_glwidget->updateGL();
++  m_glwidget->update();
+ 
+ }
+ 
+@@ -1176,24 +1176,21 @@ void ViewerGui::on_actionSelected_toggle
+   //   } else{
+   //     m_octreeDrawer->clearOcTreeSelection();
+   //   }
+-  //   m_glwidget->updateGL();
++  //   m_glwidget->update();
+   // }
+ }
+ 
+ 
+ void ViewerGui::on_action_bg_black_triggered() {
+   m_glwidget->setBackgroundColor( QColor(0,0,0) );
+-  m_glwidget->qglClearColor( m_glwidget->backgroundColor() );
+ }
+ 
+ void ViewerGui::on_action_bg_white_triggered() {
+   m_glwidget->setBackgroundColor( QColor(255,255,255) );
+-  m_glwidget->qglClearColor( m_glwidget->backgroundColor() );
+ }
+ 
+ void ViewerGui::on_action_bg_gray_triggered() {
+   m_glwidget->setBackgroundColor( QColor(117,117,117) );
+-  m_glwidget->qglClearColor( m_glwidget->backgroundColor() );
+ }
+ 
+ void ViewerGui::on_savecampose_triggered() {
+Index: octomap-1.9.0/octovis/src/ViewerWidget.cpp
+===================================================================
+--- octomap-1.9.0.orig/octovis/src/ViewerWidget.cpp
++++ octomap-1.9.0/octovis/src/ViewerWidget.cpp
+@@ -67,13 +67,12 @@ void ViewerWidget::init() {
+ 
+   // background color defaults to white
+   this->setBackgroundColor( QColor(255,255,255) );
+-  this->qglClearColor( this->backgroundColor() );
+ }
+ 
+ void ViewerWidget::resetView(){
+   this->camera()->setOrientation((float) -M_PI_2, (float) M_PI_2);
+   this->showEntireScene();
+-  updateGL();
++  update();
+ }
+ 
+ 
+@@ -98,7 +97,7 @@ void ViewerWidget::enableHeightColorMode
+   for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) {
+     (*it)->enableHeightColorMode(enabled);
+   }
+-  updateGL();
++  update();
+ }
+ 
+ void ViewerWidget::enablePrintoutMode(bool enabled) {
+@@ -106,7 +105,7 @@ void ViewerWidget::enablePrintoutMode(bo
+   for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) {
+     (*it)->enablePrintoutMode(enabled);
+   }
+-  updateGL();
++  update();
+ }
+ 
+ void ViewerWidget::enableSemanticColoring (bool enabled) {
+@@ -114,12 +113,12 @@ void ViewerWidget::enableSemanticColorin
+   for(std::vector<SceneObject*>::iterator it = m_sceneObjects.begin(); it != m_sceneObjects.end(); it++) {
+     (*it)->enableSemanticColoring(enabled);
+   }
+-  updateGL();
++  update();
+ }
+ 
+ void ViewerWidget::enableSelectionBox(bool enabled) {
+   m_drawSelectionBox = enabled;
+-  updateGL();
++  update();
+ }
+ 
+ 
+@@ -145,7 +144,7 @@ void ViewerWidget::setCamPosition(double
+   camera()->setPosition(qglviewer::Vec(x, y, z));
+   camera()->lookAt(qglviewer::Vec(lookX, lookY, lookZ));
+   camera()->setUpVector(qglviewer::Vec(0.0, 0.0, 1.0));
+-  updateGL();
++  update();
+ }
+ 
+ void ViewerWidget::setCamPose(const octomath::Pose6D& pose){
+@@ -161,12 +160,12 @@ void ViewerWidget::jumpToCamFrame(int id
+   } else {
+     std::cerr << "Error: Could not jump to frame " << frame << " of " << kfi->numberOfKeyFrames() << std::endl;
+   }
+-  updateGL();
++  update();
+ }
+ 
+ void ViewerWidget::deleteCameraPath(int id) {
+   if(camera()->keyFrameInterpolator(id)) {
+-    disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(updateGL()));
++    disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(update()));
+     disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated()));
+     disconnect(camera()->keyFrameInterpolator(id), SIGNAL(endReached()), this, SLOT(cameraPathFinished()));
+     camera()->deletePath(id);
+@@ -243,7 +242,7 @@ void ViewerWidget::playCameraPath(int id
+     m_current_camera_frame = start_frame;
+     kfi->setInterpolationTime(kfi->keyFrameTime(start_frame));
+     std::cout << "Playing path of length " << kfi->numberOfKeyFrames() << ", start time " << kfi->keyFrameTime(start_frame) << std::endl;
+-    connect(kfi, SIGNAL(interpolated()), this, SLOT(updateGL()));
++    connect(kfi, SIGNAL(interpolated()), this, SLOT(update()));
+     connect(kfi, SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated()));
+     connect(kfi, SIGNAL(endReached()), this, SLOT(cameraPathFinished()));
+     kfi->startInterpolation();
+@@ -252,7 +251,7 @@ void ViewerWidget::playCameraPath(int id
+ 
+ void ViewerWidget::stopCameraPath(int id) {
+   if(camera()->keyFrameInterpolator(id) && camera()->keyFrameInterpolator(id)->interpolationIsStarted()) {
+-    disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(updateGL()));
++    disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(update()));
+     disconnect(camera()->keyFrameInterpolator(id), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated()));
+     disconnect(camera()->keyFrameInterpolator(id), SIGNAL(endReached()), this, SLOT(cameraPathFinished()));
+     camera()->keyFrameInterpolator(id)->stopInterpolation();
+@@ -261,7 +260,7 @@ void ViewerWidget::stopCameraPath(int id
+ 
+ void ViewerWidget::cameraPathFinished() {
+   if(camera()->keyFrameInterpolator(m_current_camera_path)) {
+-    disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(updateGL()));
++    disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(update()));
+     disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(interpolated()), this, SLOT(cameraPathInterpolated()));
+     disconnect(camera()->keyFrameInterpolator(m_current_camera_path), SIGNAL(endReached()), this, SLOT(cameraPathFinished()));
+     emit cameraPathStopped(m_current_camera_path);
+@@ -292,7 +291,7 @@ void ViewerWidget::setSceneBoundingBox(c
+ void ViewerWidget::addSceneObject(SceneObject* obj){
+   assert (obj);
+   m_sceneObjects.push_back(obj);
+-  updateGL();
++  update();
+ }
+ 
+ void ViewerWidget::removeSceneObject(SceneObject* obj){
+@@ -304,7 +303,7 @@ void ViewerWidget::removeSceneObject(Sce
+     else
+       ++it;
+   }
+-  updateGL();
++  update();
+ }
+ 
+ void ViewerWidget::clearAll(){
+@@ -364,7 +363,6 @@ void ViewerWidget::postDraw(){
+   glPushAttrib(GL_ALL_ATTRIB_BITS);
+ 
+   glDisable(GL_COLOR_MATERIAL);
+-  qglColor(foregroundColor());
+ 
+   if (gridIsDrawn()){
+     glLineWidth(1.0);
diff --git a/sci-libs/octomap/octomap-1.9.0.ebuild b/sci-libs/octomap/octomap-1.9.0.ebuild
new file mode 100644
index 000000000000..0472eb73728e
--- /dev/null
+++ b/sci-libs/octomap/octomap-1.9.0.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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/OctoMap/octomap"
+fi
+
+inherit ${SCM} cmake-utils
+
+if [ "${PV#9999}" != "${PV}" ] ; then
+	KEYWORDS=""
+	SRC_URI=""
+else
+	KEYWORDS="~amd64 ~arm"
+	SRC_URI="https://github.com/OctoMap/octomap/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+fi
+
+DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees"
+HOMEPAGE="http://octomap.github.io/"
+IUSE="qt5 dynamicEDT3D doc"
+LICENSE="BSD qt5? ( GPL-2 )"
+SLOT="0/19"
+
+RDEPEND="
+	qt5? (
+		virtual/opengl
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
+		x11-libs/libQGLViewer:=
+	)
+"
+DEPEND="${RDEPEND}
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+"
+
+PATCHES=( "${FILESDIR}/qglqt5.patch" )
+
+src_prepare() {
+	sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
+		-i */CMakeLists.txt \
+		-i */CMakeModules/InstallPkgConfigFile.cmake || die
+	sed -e 's/iewer-qt4/iewer-qt5/g' \
+		-i octovis/CMakeModules/FindQGLViewer.cmake || die
+	cmake-utils_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		"-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt5 ON OFF)"
+		"-DOCTOVIS_QT5=TRUE"
+		"-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)"
+	)
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	if use doc ; then
+		cd "${BUILD_DIR}/octomap"
+		emake docs
+		if use dynamicEDT3D ; then
+			cd "${BUILD_DIR}/dynamicEDT3D"
+			emake docs_dynamicEDT3D
+		fi
+	fi
+}
+
+src_install() {
+	cmake-utils_src_install
+	if use doc ; then
+		insinto /usr/share/doc/${PF}/html/octomap
+		doins -r "${S}/octomap/doc/html/"*
+		if use dynamicEDT3D ; then
+			insinto /usr/share/doc/${PF}/html/dynamicEDT3D
+			doins -r "${S}/dynamicEDT3D/doc/html/"*
+		fi
+	fi
+
+	insinto /usr/share/ros_packages/${PN}
+	doins "${ED}/usr/share/${PN}/package.xml"
+	if use qt5; then
+		insinto /usr/share/ros_packages/octovis
+		doins "${ED}/usr/share/octovis/package.xml"
+	fi
+}
diff --git a/sci-libs/octomap/octomap-9999.ebuild b/sci-libs/octomap/octomap-9999.ebuild
index 30141845c394..f5c2b0c615ac 100644
--- a/sci-libs/octomap/octomap-9999.ebuild
+++ b/sci-libs/octomap/octomap-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -21,15 +21,16 @@ fi
 
 DESCRIPTION="An Efficient Probabilistic 3D Mapping Framework Based on Octrees"
 HOMEPAGE="http://octomap.github.io/"
-IUSE="qt4 dynamicEDT3D doc"
-LICENSE="BSD qt4? ( GPL-2 )"
-SLOT="0"
+IUSE="qt5 dynamicEDT3D doc"
+LICENSE="BSD qt5? ( GPL-2 )"
+SLOT="0/19"
 
 RDEPEND="
-	qt4? (
+	qt5? (
 		virtual/opengl
-		dev-qt/qtcore:4
-		dev-qt/qtgui:4
+		dev-qt/qtcore:5
+		dev-qt/qtgui:5
+		dev-qt/qtwidgets:5
 		x11-libs/libQGLViewer:=
 	)
 "
@@ -44,12 +45,15 @@ src_prepare() {
 	sed -e 's/DESTINATION lib/DESTINATION ${CMAKE_INSTALL_LIBDIR}/' \
 		-i */CMakeLists.txt \
 		-i */CMakeModules/InstallPkgConfigFile.cmake || die
+	sed -e 's/iewer-qt4/iewer-qt5/g' \
+		-i octovis/CMakeModules/FindQGLViewer.cmake || die
 	cmake-utils_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		"-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt4 ON OFF)"
+		"-DBUILD_OCTOVIS_SUBPROJECT=$(usex qt5 ON OFF)"
+		"-DOCTOVIS_QT5=TRUE"
 		"-DBUILD_DYNAMICETD3D_SUBPROJECT=$(usex dynamicEDT3D ON OFF)"
 	)
 	cmake-utils_src_configure
@@ -80,7 +84,7 @@ src_install() {
 
 	insinto /usr/share/ros_packages/${PN}
 	doins "${ED}/usr/share/${PN}/package.xml"
-	if use qt4; then
+	if use qt5; then
 		insinto /usr/share/ros_packages/octovis
 		doins "${ED}/usr/share/octovis/package.xml"
 	fi
diff --git a/sci-libs/rtabmap/Manifest b/sci-libs/rtabmap/Manifest
index 66534ecb7fc9..c447468e391f 100644
--- a/sci-libs/rtabmap/Manifest
+++ b/sci-libs/rtabmap/Manifest
@@ -1,6 +1,4 @@
-DIST rtabmap-0.13.2.tar.gz 19488841 BLAKE2B 33157545066ddc3c5b133837cdc97de4122b899190445e5f53ea7bf2bd7131a3be6df7e98273b4eae035dd60590c728fb813fb0e9346c5c7fda7b4eb9f235be4 SHA512 ce80e55271e4b998c0ab11ad7d01c6a5b0df1be72057343ed0f4ffca9a2c95f946ea991c14d023772dee3bceee3ce97946207daf90a69eb6e450017c54495f2e
 DIST rtabmap-0.14.0.tar.gz 19515196 BLAKE2B 851017bd3114c4dfaf323ef7ba6c3e970480de4c227b06d625cec0363a144a220be587934b0d457eca587d39c0c0b609acebd71ce7a98f1193ab5723f6a47f9a SHA512 00e2996b11aef8e0f61dc59ac59626b5b695ac3b5281d7776d73b54edbd90473bfffa1daae148e090b601a4d56d7feff2190f362ea188640b93db06e3760042f
-EBUILD rtabmap-0.13.2.ebuild 1401 BLAKE2B 877164ca7375c4d39f6598b72019b16664c853f3c1ee16753c490df0efbcc600b7a7e0ae57957f11f0469ffc8f09f6c4a50a644191d111b19cd7ecc95bda774c SHA512 b47443ccdf33d69e61c6912951f7c816cfaa13ca8076dc627c1814b7bbffc4a2c547296d2995726a6203b3317e568b6df7933918d660594729bf436ef80382b6
 EBUILD rtabmap-0.14.0.ebuild 1401 BLAKE2B 877164ca7375c4d39f6598b72019b16664c853f3c1ee16753c490df0efbcc600b7a7e0ae57957f11f0469ffc8f09f6c4a50a644191d111b19cd7ecc95bda774c SHA512 b47443ccdf33d69e61c6912951f7c816cfaa13ca8076dc627c1814b7bbffc4a2c547296d2995726a6203b3317e568b6df7933918d660594729bf436ef80382b6
 EBUILD rtabmap-9999.ebuild 1401 BLAKE2B 877164ca7375c4d39f6598b72019b16664c853f3c1ee16753c490df0efbcc600b7a7e0ae57957f11f0469ffc8f09f6c4a50a644191d111b19cd7ecc95bda774c SHA512 b47443ccdf33d69e61c6912951f7c816cfaa13ca8076dc627c1814b7bbffc4a2c547296d2995726a6203b3317e568b6df7933918d660594729bf436ef80382b6
 MISC metadata.xml 471 BLAKE2B d5e9287982f5e772ca5b3570010bc79b18e3d86424c64ed501765a9ca4285349f4fdc1428c92817b7fbdfd2000e5c43ff49dd44d37d512b227e4ee4bec98f3fc SHA512 41752dfbb60d49072337438d49c313eec8a13b51bf8d3e65ad26ca519d3d8f105966756495111f01c6b365d57acb4f7be0b4dd017f8b7bfa483c08c354b0ca81
diff --git a/sci-libs/rtabmap/rtabmap-0.13.2.ebuild b/sci-libs/rtabmap/rtabmap-0.13.2.ebuild
deleted file mode 100644
index ec181ba72d33..000000000000
--- a/sci-libs/rtabmap/rtabmap-0.13.2.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-SCM=""
-if [ "${PV#9999}" != "${PV}" ] ; then
-	SCM="git-r3"
-	EGIT_REPO_URI="https://github.com/introlab/rtabmap"
-fi
-
-inherit ${SCM} cmake-utils multilib
-
-if [ "${PV#9999}" != "${PV}" ] ; then
-	KEYWORDS=""
-	SRC_URI=""
-else
-	KEYWORDS="~amd64"
-	SRC_URI="https://github.com/introlab/rtabmap/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Real-Time Appearance-Based Mapping (RGB-D Graph SLAM)"
-HOMEPAGE="http://introlab.github.io/rtabmap/"
-LICENSE="BSD"
-SLOT="0"
-IUSE="examples ieee1394 openni2 qt5"
-
-RDEPEND="
-	media-libs/opencv:=[qt5(-)?]
-	sci-libs/pcl:=[openni,vtk]
-	sci-libs/vtk:=[qt5(-)?]
-	sys-libs/zlib
-	sci-libs/octomap:=
-	dev-libs/boost:=
-	ieee1394? ( media-libs/libdc1394 )
-	openni2? ( dev-libs/OpenNI2 )
-	qt5? (
-		dev-qt/qtwidgets:5
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtsvg:5
-	)
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	local mycmakeargs=(
-		"-DWITH_QT=$(usex qt5 ON OFF)"
-		"-DWITH_DC1394=$(usex ieee1394 ON OFF)"
-		"-DWITH_OPENNI2=$(usex openni2 ON OFF)"
-		"-DBUILD_EXAMPLES=$(usex examples ON OFF)"
-	)
-	cmake-utils_src_configure
-}
-
-src_install() {
-	cmake-utils_src_install
-	# Needed since we force ros crawling to be done only in
-	# /usr/share/ros_packages/
-	insinto /usr/share/ros_packages/${PN}
-	doins "${ED}/usr/share/${PN}/package.xml"
-}
diff --git a/sci-libs/scikits_image/Manifest b/sci-libs/scikits_image/Manifest
index 23090976310c..ef515e64f22f 100644
--- a/sci-libs/scikits_image/Manifest
+++ b/sci-libs/scikits_image/Manifest
@@ -1,8 +1,3 @@
-AUX scikits_image-0.11.3-adapthist-backport.patch 3489 BLAKE2B 3f280a69a9a8c462934efdd081963327da84b0a159a5775fd140f1e5462e1d0c0c5d36ce71fce2f2d6bce8e36e446ea6ec64122640d961aca259670bec0e7041 SHA512 5f4e063bc2456f7e78f8485d8a2d68a19e77ab7a171332f758761173cc7608d64c81e69ea785265b71763ab6a0c43c35b17699b954064a38498ebdf0db92e91b
-DIST scikit-image-0.11.3.tar.gz 18589296 BLAKE2B 2b305bc1490050f893035cd727588ad624b66d2dceaceea8935bd2b768cf737d89156fc8b3017f67cdee41d805348ddfcf3e163db3d4f790606457064e618ddb SHA512 595acb66581ed3ca9679b7f031876e1974000a82ec0eccd14bfd283f829aa3db0fcca10166f4260138698f82b3a772fea83d77761a64fab45bbc35418ade7108
-DIST scikit-image-0.12.3.tar.gz 20701373 BLAKE2B 131c7bed2af0b52a86293f85107f069ca77b71028af22c14a331d8a4563f68470543b5898d534055306db9b7fb58f50cc1b767a168ff9bb780c7446c4888e92f SHA512 3a2d51f7b826569e5fc2a4502c62b85559ae9fa05555240894af1bb8bd2bad1798b786a2070b1f90b4c07339d8186fe5c118a89994503cce920e8e25fc5f3b51
 DIST scikit-image-0.13.0.tar.gz 26101533 BLAKE2B c28284f64abd58c7bafa8f5f0c781496e8bb28af79c5c730df7cbf2fede958eb88ea420fd7f89e7b8d0d91719a98dd0935af3b2cc50fe501cc8d8d1d0ee56cb9 SHA512 923015e373c406ae2fbbfdf83ce8b91e83790bdf7842c4439fdc9fd58cffe46efc0cfc7a1b0b06e1b2d092a909a6f085335640850883e7608dbccd1074046550
-EBUILD scikits_image-0.11.3.ebuild 1907 BLAKE2B 165ea16486fddeed229a9b29e71fe5bd92154e4754d63065a94165cee4d06def8c6653dcbf91ffee577e7fd7a9dfae81d0091d87120bb8d4c141ce044ccdde14 SHA512 449771233b266efe32d64093f0e02ced1c959958788bcce4e5902a0035b053428a17eee2b5aa61facdd2068389d6d5574929dfccfca03d722588d8c7d46e1d4d
-EBUILD scikits_image-0.12.3.ebuild 1826 BLAKE2B c04544ccd2d75ea10d71d008ab8ee4cad0ca54f95c26720265d8de0f22f9d09afac115249aa2f901303c32c6483631b29d830b23f9e5b6d8a0d7b4e39bab646c SHA512 d0788a9af25066908e6b83496619728bed1dbd551ef55a01a720a4a4e444cf1020a87cacaea367c90922bc6a883118b4b663e4bb9e5f9463e88d52b857bfa7b8
-EBUILD scikits_image-0.13.0.ebuild 1852 BLAKE2B 6cac72e3f7b22013bda6f60181c78eda7a0296b673b4014ffe6a6e1fade2a70d35f872b16a2e4ab75b88de3bb83479babb6ebcbf28a38838d2cd858c63f9bb43 SHA512 ecace053bf601c3b2133b2c1f965ac2bb303d12bb7e1e8aabc9997fbeb46876a4d083f8a279a38b96422adb4afafc801d979686188b1cda7e65f74f92f3da57a
+EBUILD scikits_image-0.13.0.ebuild 1804 BLAKE2B f4c2d48daf3d850951e757347420efbe2718a5376c34d07899694b0218ca5c597b79e7e0dc75085b4c62906d1ddbbe29b0fb2be358133315b5338a85642efc56 SHA512 830b93b83a1b595a28d0d24a7e3109dac0109925fee66de25d09e55eb558a1f84668b11b52fa7bede42f0d6b0c54d06775735806a0a3d27347f59f83b0240499
 MISC metadata.xml 834 BLAKE2B d6ed9731e0bfffb39fb127b1ccaa9d449e7cedc4038a5a4a915624fadad131d39df0d1d7123951539074758095d35c1b9730bb4a3da2278b02630903645eb769 SHA512 1c615479bc22c8c66b4f7a2189e38c69f9b8722f051c68473439069ef89598f0505dbd94fe06cbe56a07e41a1a6552f4d8d666703676ef9a165dbcf462e09e40
diff --git a/sci-libs/scikits_image/files/scikits_image-0.11.3-adapthist-backport.patch b/sci-libs/scikits_image/files/scikits_image-0.11.3-adapthist-backport.patch
deleted file mode 100644
index 0bd96916bfc1..000000000000
--- a/sci-libs/scikits_image/files/scikits_image-0.11.3-adapthist-backport.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From 41159f3fd24e7653c556ddbf6ba93ad2aa8b541f Mon Sep 17 00:00:00 2001
-From: Steven Silvester <steven.silvester@ieee.org>
-Date: Mon, 19 Oct 2015 18:07:32 -0500
-Subject: [PATCH] Fix adapthist mask logic
-
-Use minlength in bincount
-
-Fix mask logic
----
- skimage/exposure/_adapthist.py          |  8 +++++---
- skimage/exposure/tests/test_exposure.py | 14 +++++++-------
- 2 files changed, 12 insertions(+), 10 deletions(-)
-
-diff --git a/skimage/exposure/_adapthist.py b/skimage/exposure/_adapthist.py
-index 343f71b..757daff 100644
---- a/skimage/exposure/_adapthist.py
-+++ b/skimage/exposure/_adapthist.py
-@@ -247,12 +247,14 @@ def clip_histogram(hist, clip_limit):
-     while n_excess > 0:  # Redistribute remaining excess
-         index = 0
-         while n_excess > 0 and index < hist.size:
-+            under_mask = hist < 0
-             step_size = int(hist[hist < clip_limit].size / n_excess)
-             step_size = max(step_size, 1)
-             indices = np.arange(index, hist.size, step_size)
--            under = hist[indices] < clip_limit
--            hist[under] += 1
--            n_excess -= hist[under].size
-+            under_mask[indices] = True
-+            under_mask = (under_mask) & (hist < clip_limit)
-+            hist[under_mask] += 1
-+            n_excess -= under_mask.sum()
-             index += 1
- 
-     return hist
-diff --git a/skimage/exposure/tests/test_exposure.py b/skimage/exposure/tests/test_exposure.py
-index 8fb6d62..1b9c778 100644
---- a/skimage/exposure/tests/test_exposure.py
-+++ b/skimage/exposure/tests/test_exposure.py
-@@ -199,9 +199,9 @@ def test_adapthist_scalar():
-     full_scale = skimage.exposure.rescale_intensity(skimage.img_as_float(img))
- 
-     assert_almost_equal = np.testing.assert_almost_equal
--    assert_almost_equal(peak_snr(full_scale, adapted), 101.2295, 3)
-+    assert_almost_equal(peak_snr(full_scale, adapted), 102.066, 3)
-     assert_almost_equal(norm_brightness_err(full_scale, adapted),
--                        0.041, 3)
-+                        0.038, 3)
-     return img, adapted
- 
- 
-@@ -217,8 +217,8 @@ def test_adapthist_grayscale():
-                                               nbins=128)
-     assert_almost_equal = np.testing.assert_almost_equal
-     assert img.shape == adapted.shape
--    assert_almost_equal(peak_snr(img, adapted), 97.6876, 3)
--    assert_almost_equal(norm_brightness_err(img, adapted), 0.0591, 3)
-+    assert_almost_equal(peak_snr(img, adapted), 102.078, 3)
-+    assert_almost_equal(norm_brightness_err(img, adapted), 0.0529, 3)
-     return data, adapted
- 
- 
-@@ -238,7 +238,7 @@ def test_adapthist_color():
-     assert adapted.max() == 1.0
-     assert img.shape == adapted.shape
-     full_scale = skimage.exposure.rescale_intensity(img)
--    assert_almost_equal(peak_snr(full_scale, adapted), 109.6, 1)
-+    assert_almost_equal(peak_snr(full_scale, adapted), 109.393, 1)
-     assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.02, 2)
-     return data, adapted
- 
-@@ -256,8 +256,8 @@ def test_adapthist_alpha():
-     full_scale = skimage.exposure.rescale_intensity(img)
-     assert img.shape == adapted.shape
-     assert_almost_equal = np.testing.assert_almost_equal
--    assert_almost_equal(peak_snr(full_scale, adapted), 109.60, 2)
--    assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.0235, 3)
-+    assert_almost_equal(peak_snr(full_scale, adapted), 109.393, 2)
-+    assert_almost_equal(norm_brightness_err(full_scale, adapted), 0.0248, 3)
- 
- 
- def peak_snr(img1, img2):
diff --git a/sci-libs/scikits_image/scikits_image-0.11.3.ebuild b/sci-libs/scikits_image/scikits_image-0.11.3.ebuild
deleted file mode 100644
index 99d76385d71a..000000000000
--- a/sci-libs/scikits_image/scikits_image-0.11.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_4 )
-
-inherit distutils-r1 eutils virtualx
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="http://scikit-image.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc freeimage gtk pyamg qt4 test"
-
-RDEPEND="
-	>=dev-python/matplotlib-1.1.0[${PYTHON_USEDEP}]
-	>=dev-python/networkx-1.8[${PYTHON_USEDEP}]
-	>=dev-python/numpy-1.6.1[${PYTHON_USEDEP}]
-	>=dev-python/pillow-1.7.8[${PYTHON_USEDEP}]
-	>=dev-python/six-1.3[${PYTHON_USEDEP}]
-	>=sci-libs/scipy-0.9[sparse,${PYTHON_USEDEP}]
-	freeimage? ( media-libs/freeimage )
-	gtk? ( dev-python/pygtk[$(python_gen_usedep 'python2*')] )
-	pyamg? ( dev-python/pyamg[$(python_gen_usedep 'python2*')] )
-	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.21[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (
-		dev-python/nose[${PYTHON_USEDEP}]
-		)"
-
-S="${WORKDIR}/${MYP}"
-
-DOCS=( CONTRIBUTORS.txt CONTRIBUTING.txt DEPENDS.txt RELEASE.txt TASKS.txt TODO.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-adapthist-backport.patch
-)
-
-python_test() {
-	distutils_install_for_testing
-	mkdir for_test && cd for_test || die
-	echo "backend : Agg" > matplotlibrc || die
-	echo "backend.qt4 : PyQt4" >> matplotlibrc || die
-	#echo "backend.qt4 : PySide" >> matplotlibrc || die
-	VIRTUALX_COMMAND=nosetests
-	MPLCONFIGDIR=. virtualmake --exe -v skimage || die
-}
-
-pkg_postinst() {
-	optfeature "FITS io capability" dev-python/astropy
-	#optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk
-	#optfeature "io plugin providing most standard formats" dev-python/imread
-}
diff --git a/sci-libs/scikits_image/scikits_image-0.12.3.ebuild b/sci-libs/scikits_image/scikits_image-0.12.3.ebuild
deleted file mode 100644
index ed088bd06527..000000000000
--- a/sci-libs/scikits_image/scikits_image-0.12.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils virtualx
-
-MYPN="${PN/scikits_/scikit-}"
-MYP="${MYPN}-${PV}"
-
-DESCRIPTION="Image processing routines for SciPy"
-HOMEPAGE="http://scikit-image.org/"
-SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc freeimage pyamg qt4 test"
-
-RDEPEND="
-	dev-python/matplotlib[${PYTHON_USEDEP}]
-	dev-python/networkx[${PYTHON_USEDEP}]
-	dev-python/numpy[${PYTHON_USEDEP}]
-	dev-python/pillow[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	sci-libs/scipy[sparse,${PYTHON_USEDEP}]
-	freeimage? ( media-libs/freeimage )
-	pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] )
-	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )"
-DEPEND="${RDEPEND}
-	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? (	dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}/${MYP}"
-
-DOCS=( CONTRIBUTORS.txt CONTRIBUTING.txt DEPENDS.txt RELEASE.txt TASKS.txt TODO.txt )
-
-python_test() {
-	distutils_install_for_testing
-	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
-	echo "backend : Agg" > matplotlibrc || die
-	echo "backend.qt4 : PyQt4" >> matplotlibrc || die
-	#echo "backend.qt4 : PySide" >> matplotlibrc || die
-	MPLCONFIGDIR=. virtx nosetests --exe -v skimage || die
-}
-
-pkg_postinst() {
-	optfeature "FITS io capability" dev-python/astropy
-	optfeature "GTK" dev-python/pygtk
-	optfeature "Parallel computation" dev-python/dask
-	# not in portage yet
-	#optfeature "io plugin providing a wide variety of formats, including specialized formats using in medical imaging." dev-python/simpleitk
-	#optfeature "io plugin providing most standard formats" dev-python/imread
-}
diff --git a/sci-libs/scikits_image/scikits_image-0.13.0.ebuild b/sci-libs/scikits_image/scikits_image-0.13.0.ebuild
index cc09ed813cb9..fb9abe7e7c78 100644
--- a/sci-libs/scikits_image/scikits_image-0.13.0.ebuild
+++ b/sci-libs/scikits_image/scikits_image-0.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${MYPN}/${MYP}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc freeimage pyamg qt4 test"
+IUSE="doc freeimage pyamg test"
 
 RDEPEND="
 	dev-python/matplotlib[${PYTHON_USEDEP}]
@@ -28,8 +28,7 @@ RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
 	sci-libs/scipy[sparse,${PYTHON_USEDEP}]
 	freeimage? ( media-libs/freeimage )
-	pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] )
-	qt4? ( dev-python/PyQt4[${PYTHON_USEDEP}] )"
+	pyamg? ( dev-python/pyamg[${PYTHON_USEDEP}] )"
 DEPEND="${RDEPEND}
 	>=dev-python/cython-0.23[${PYTHON_USEDEP}]
 	dev-python/setuptools[${PYTHON_USEDEP}]
@@ -43,7 +42,7 @@ python_test() {
 	distutils_install_for_testing
 	cd "${TEST_DIR}" || die "no ${TEST_DIR} available"
 	echo "backend : Agg" > matplotlibrc || die
-	echo "backend.qt4 : PyQt4" >> matplotlibrc || die
+	#echo "backend.qt4 : PyQt4" >> matplotlibrc || die
 	#echo "backend.qt4 : PySide" >> matplotlibrc || die
 	MPLCONFIGDIR=. virtx nosetests --exe -v skimage || die
 }
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index d811bf0b458c..ed76f478a46b 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/pari/Manifest b/sci-mathematics/pari/Manifest
index 7256b17c1de5..561ae94ca2dc 100644
--- a/sci-mathematics/pari/Manifest
+++ b/sci-mathematics/pari/Manifest
@@ -1,14 +1,13 @@
+AUX pari-2.9.4-no-automagic.patch 2638 BLAKE2B a0e88763f7f69d6d284286961ad90719cf0a02e533164342dbc34206c44dd447cc1ee5aac27dbd0f61c850082f0d19049886fe9d05676ef506e6154c5395c03f SHA512 1f9ded97ebffa20a248ad86c635e90fc2e38d318a7d47caa27c695b153dbefe2107d6a2e67d87653f4d0c703b047073b025e01a528b7ef4422d50a96aaf8b3fd
+AUX pari-2.9.4-ppc.patch 363 BLAKE2B 135e76972e4121362666a25e3da236c4a5b7cffa058bbc25b59ca19ea20ccb0665327f70701adca5239cb936d513976e3ba7b5cda915a3f77c7b2eb28e75eaa0 SHA512 aaf5960010e56722f11234079a20ee7a7f8819dc084e1f6567fd11ad2820e3ae47617608f312941c2f373b5312a8c09c9cd51bfa44e263ffe1e8062c9fd9877d
+AUX pari-2.9.4-strip.patch 323 BLAKE2B 85a2b56f5501b4dafc0bffe48249c1662d6f96e81f8e8260ad52ecf84f053efef2ee6d6be6a6fda47886c372eb338d8bbf4443910df79a0d4e168b2666228c37 SHA512 50624ead82da41819ccfadfbdb746fb6ff414196ae2576c5d6a86e83c67355740b0e6e901a2860cab202db15adb1b00e346aabba338ab303230bc6aee8d33076
 DIST elldata.tgz 14185595 BLAKE2B eb90a0e392eeeaad81b6b01ba4e8258aaf2a4b4a01950b18a0e91f176629aecc693453d8fe99b49a28f2dfbbb6fae1a06d7d4137cb13ced298e64e5aa4062f53 SHA512 dc13d1cacb98a6c2774936997452bd34ae198da9206fea69bc7cdd28240d0cdd07bb0ec1f14b8e97bea4321a60a6a6144464ab3b629be2e37dd76a73efaf43ef
 DIST galdata.tgz 53229 BLAKE2B 08f0a1be3c5252fbe534b2ed7e66b9bc8cddab807b7caf12b783aacc2e75de82dc000e762da2ec895d52424281234af121e1edfd84adf9f02c26c4e59d23e2f3 SHA512 bc89c8a42416e8ca25c356b7ad6d80ffcfff127e561fc338df87147a9e370ec71f7ae2eb6bef73d634cc7a8f18c794d7fd5ebfd0a042d3d356526a2eee28125a
 DIST nftables.tgz 8393731 BLAKE2B d33cbf1f52d3e8a040087da28014ab727b59c641d1a53c97d311a9d1613b59f6b317b7632e0fc89943bea0a507a737543890109b888707c4fb7879279549a2e9 SHA512 cccc62fb0f6d8c578a4e165a1f2daf3b87acbbc38377044ddd98e2901a8e0554a46c8714bad0f4f4e09107b0c0c8f43069b4ddf4fba9c7832bad65ce3c901183
 DIST pari-2.3.5-patchset.tar.bz2 1773 BLAKE2B 08358dcb7e353eb41a784a6daa9400b74b8f331a54eea8ef159fbbecdbed5d00955a821db20e3a4f7e254160cd600d0255d6648aa0e1b2b7aca9910d5cd17f1d SHA512 f616eac3049fea684413f8f221a1604a5e62ae2804207513fcfff513d8b162a3a4d1063dad059907682404ee30f840182d75e29a44b44cda4f80266b46f75364
 DIST pari-2.3.5.tar.gz 2018097 BLAKE2B b5f4f8bc83cd77aceab791263e1a2f0294d0663d354fea454bad8cac3cdbac9c4c8381cc83bc947d518522701c36e94ce1d6862125a9bfd3b17b1a31c9baabc8 SHA512 0e49e6310b4c76ef3370786a13aa8cbc5bb0b7dc84ec1665866d623e6284f45db8584eea759e8b5954dc9b5c8a3e866e77a377d18073ed33f11708a7e88a4cca
-DIST pari-2.5.4-patchset.tar.bz2 11050 BLAKE2B 0ea4727bb03045c7cda9b39cd429db8ea1b8d9e2656cf81fb4d401abc57803d8a6b4c538727f6744dd75c6b95530a0cca058cfdb0e85d4b9eaf39e7d43a14929 SHA512 5b70b6e15e651118c5dba339601eee1b8dfe55eb37f30d0b350d73eef33a4119ba366ba48fa171e450e27af2823b96d8006aadf0f994ae76002f98a76adcf6bb
-DIST pari-2.5.4.tar.gz 2721861 BLAKE2B 003113716c4aaea3836ee7f813ff4aacecb40e6c7d9119c0a6d6073f951e6c5fae887ee22d87d5c7d7320e0d873585f145dd14e7014075bf198143dde68325f9 SHA512 de2f0593682d638288908636d848489acf115f4858b91c574168db26c4ab7443465a21d1e6c43be19ecc57dcedcd883e5af72b65467a59a2c8811e4eec64e0b9
-DIST pari-2.7.1-patchset.tar.bz2 4318 BLAKE2B 881354eec4f89f7b7e0a1d53d5fa169b0ea0de3964baff454f2e7aca1b7bd2e7ffa2f404e4df7a8ff7a662aed3920e10df4a3a1d5d86967579c360869abce557 SHA512 1ff40adcf638230e1aca951b4fdb291cd4d2048ef66215de0ec157b9ec0040e28c115c2684056cf582695e66ee8363aa776a4a50f8654c8dde7bad490a47b304
-DIST pari-2.7.1.tar.gz 3140893 BLAKE2B 0f5c69ac2decb0ac26f51de7843c282606f854c257b06d1596eb7f4157e8f64d65b65f887e2d9bb8b77cbdffdac0bb1902e373b1d44e457ac25993bc308d3e09 SHA512 ff32c181e6810af8a38f0dfe45b9f15d930923da5759c3e88595f56bf3c65ec0a79fdb9fb5f0e4ce0adb1ebc56a84e6b1606085057762073a85c0d1946857d5f
+DIST pari-2.9.4.tar.gz 3851772 BLAKE2B 648e7fd14888bed2dfb7bbb9a25d097aa91899780da9734b444e29997916c27773109e735ecb2d3e9d164a596f3bb8da607d83f278e52d84c49a56df5c89b530 SHA512 539534496e9733bd905b6131374eef8019f93398423710d339bd3c01245e1af675a0a3f9489a05c3ceb2cf3b3426e6b1fb11ea4886b76a1b2e793b59f52e8787
 DIST seadata.tgz 19214199 BLAKE2B cafb89905180ff481f578ff2cdb150b04533ecbccfa96d045bdb61e5fe2c230262f3459d31b11f049ad1e16ed9dd6fb734569ee621efa3831800cc3d99583e60 SHA512 393f2fae45964ad0921fcf417113e10b296cb4c3a0e0eec138c896827f43a5464c4b42a07313e0f3a4383e8df97912e2e359a4cd5225d014d7575e80c7dd996a
 EBUILD pari-2.3.5.ebuild 3950 BLAKE2B ae0e6d47d07e75865d4d7352ea336582a605f26a786f353925378b80a6a2049f6b4c085402859f5a4fe48389473ce7f7445e4691bd8b133bb167e2ada8d01207 SHA512 cdd3fe315addc1620c8fafaa211697171f9859d66d7019544a3cfd4b21102b23701eb2c1d159ab47f548caacd3f3513d939e14f4e94ab28a95be3d6a584f8e27
-EBUILD pari-2.5.4.ebuild 4430 BLAKE2B 4c303b5a150752a837ac1f67217e91a606dca3063be97c919c71b39c48a64bdd97b6d6b278fddbe9ffc2fc6a735f508afd48b0714360c1be6dc0ff1d7c27a67a SHA512 141e30e638ab119fb46bb8a1632ff5ae6e9f026ee4806bcecc35ae27c4aa9e47014b229a67718fef92d8397bce7eaed1d0bf37606ce6029dbc0a216df4b29520
-EBUILD pari-2.7.1.ebuild 4166 BLAKE2B a3423c5d16f663125b10640b1394a382e742e4fe5cc754516aab88ea17adcefbc41e7581a8a0e488ed6d715fcbac7dedb3f1e8014e8105280f0e0725fce423e2 SHA512 21b57078628b8654d187cb00258da87e7a78bb420c89691680b711c8b7d4e482ebb3ffa4eb5ca389e1e1f78e0e8642e1741a43942b73e4ab3d0f6df6cece767c
+EBUILD pari-2.9.4.ebuild 3477 BLAKE2B c6c67a3d566a3772086f27e80c7dd6125f4ed33df583a45194cb903b8256007062c1e43330246f442607114a926bea8f925a98641568beb0d72ffccede8a5fc1 SHA512 7c85feed4950b02e8fab5d5cac9ed517a94fccfc800741f6e473db13af65f20a423e019b13aa951fded5611eae2906e119d931a1be4ecfce9e3ec4af7a40107d
 MISC metadata.xml 1223 BLAKE2B 57268bb1e2649602e4a6228924f0ea7b32d8fea2718f83595b971e1d5338a8cdd8b91ecf245401f2eefbf206b80dde0e56784d8e147128733fa45dc7edd2eece SHA512 3bb69fc9e0757e6fd1ed9f9394565a34269cd9ccc8dc2ce88283e2f2da8b4ef586b20fb914be28a4b3617ff074319f5925e0fc7a1e264b655303e943a63d6bfe
diff --git a/sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch b/sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch
new file mode 100644
index 000000000000..3612d8f020fc
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.9.4-no-automagic.patch
@@ -0,0 +1,66 @@
+diff -r -U2 pari-2.9.4.orig/config/Makefile.SH pari-2.9.4/config/Makefile.SH
+--- pari-2.9.4.orig/config/Makefile.SH	2017-11-09 16:26:14.000000000 +0700
++++ pari-2.9.4/config/Makefile.SH	2018-01-13 17:31:02.404210285 +0700
+@@ -80,10 +80,10 @@
+   graph=plotQt;;
+ Qt4)
+-  PLOTCFLAGS='-D__FANCY_WIN__ -I$(QTDIR)/include'
+-  PLOTLIBS="-L\$(QTDIR)/lib $QTLIB"
++  PLOTCFLAGS='-D__FANCY_WIN__ `pkg-config --cflags QtGui`'
++  PLOTLIBS="`pkg-config --libs QtGui`"
+   graph=plotQt4;;
+ fltk)
+-  PLOTCFLAGS=
+-  PLOTLIBS="$FLTK_LIBS"
++  PLOTCFLAGS="`fltk-config --cxxflags` $X11_INC"
++  PLOTLIBS="`fltk-config --ldflags`"
+   postconfig='fltk-config --post '
+   graph=plotfltk;;
+@@ -277,5 +277,5 @@
+ # Graphic library.
+ QTDIR      = "$QTDIR"
+-MOC        = \$(QTDIR)/bin/moc
++MOC        = "`which moc`"
+ PLOTCFLAGS = $PLOTCFLAGS
+ PLOTLIBS   = $PLOTLIBS
+diff -r -U2 pari-2.9.4.orig/config/get_Qt pari-2.9.4/config/get_Qt
+--- pari-2.9.4.orig/config/get_Qt	2017-05-12 16:45:12.000000000 +0700
++++ pari-2.9.4/config/get_Qt	2018-01-13 17:35:49.481198212 +0700
+@@ -6,5 +6,5 @@
+ yes)
+    pth="/usr/local/lib /usr/local/share /usr/lib /usr/share"
+-   QTDIR=`locatedir qt4/bin $pth`
++   QTDIR=`locatedir qt4 $pth`
+    if test -n "$QTDIR"; then
+      QTLIB="-lQtCore -lQtGui"
+diff -r -U2 pari-2.9.4.orig/config/get_config_options pari-2.9.4/config/get_config_options
+--- pari-2.9.4.orig/config/get_config_options	2017-11-09 16:26:14.000000000 +0700
++++ pari-2.9.4/config/get_config_options	2018-01-13 17:38:39.264191072 +0700
+@@ -87,8 +87,10 @@
+       with_ncurses_lib=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
+ 
++  --without-qt|--with-qt=no) without_qt=yes ;;
+   --with-qt) with_qt=yes ;;
+   --with-qt=*)
+       with_qt=`echo "$1" | sed -e 's/[-a-z]*=//'` ;;
+ 
++  --without-fltk|--with-fltk=no) without_fltk=yes ;;
+   --with-fltk) with_fltk=yes ;;
+   --with-fltk=*)
+@@ -168,5 +170,7 @@
+ 
+   --with-qt[=DIR]        use the Qt graphical library [prefix for Qt dir.]
++  --without-qt           do not try to use the Qt lib
+   --with-fltk            use the FLTK graphical library [need fltk-config]
++  --without-fltk         do not try to use the FLTK lib
+ 
+ Miscellaneous
+diff -r -U2 pari-2.9.4.orig/config/get_graphic_lib pari-2.9.4/config/get_graphic_lib
+--- pari-2.9.4.orig/config/get_graphic_lib	2017-11-09 16:26:14.000000000 +0700
++++ pari-2.9.4/config/get_graphic_lib	2018-01-13 17:42:45.760180706 +0700
+@@ -8,4 +8,5 @@
+ if test -n "$with_fltk"; then which_graphic_lib=fltk; fi
+ if test -n "$with_qt";   then which_graphic_lib=Qt; fi
++if test -n "$without_fltk" -a -n "$without_qt"; then which_graphic_lib=none; fi
+ if test "$fastread" != yes; then
+   cat << EOT
diff --git a/sci-mathematics/pari/files/pari-2.9.4-ppc.patch b/sci-mathematics/pari/files/pari-2.9.4-ppc.patch
new file mode 100644
index 000000000000..558f7eb9eda4
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.9.4-ppc.patch
@@ -0,0 +1,9 @@
+diff -r -U2 pari-2.9.4.orig/config/arch-osname pari-2.9.4/config/arch-osname
+--- pari-2.9.4.orig/config/arch-osname	2011-09-23 03:02:11.000000000 +0700
++++ pari-2.9.4/config/arch-osname	2018-01-13 16:22:39.623382825 +0700
+@@ -40,4 +40,5 @@
+   linux)    arch=`uname -m`
+ 	    case $arch in
++		ppc) arch=powerpc;;
+ 		sparc64) arch=sparcv9;;
+ 		parisc*) arch=hppa;;
diff --git a/sci-mathematics/pari/files/pari-2.9.4-strip.patch b/sci-mathematics/pari/files/pari-2.9.4-strip.patch
new file mode 100644
index 000000000000..f4a8af322c45
--- /dev/null
+++ b/sci-mathematics/pari/files/pari-2.9.4-strip.patch
@@ -0,0 +1,10 @@
+diff -r -U2 pari-2.9.4.orig/config/Makefile.SH pari-2.9.4/config/Makefile.SH
+--- pari-2.9.4.orig/config/Makefile.SH	2017-11-09 16:26:14.000000000 +0700
++++ pari-2.9.4/config/Makefile.SH	2018-01-13 16:18:04.208394407 +0700
+@@ -250,5 +250,5 @@
+ LN = $ln_s
+ CP_F = cp -f
+-STRIP      = strip
++STRIP      = true
+ STRIPFLAGS =
+ 
diff --git a/sci-mathematics/pari/pari-2.5.4.ebuild b/sci-mathematics/pari/pari-2.5.4.ebuild
deleted file mode 100644
index 78f5d5418c9c..000000000000
--- a/sci-mathematics/pari/pari-2.5.4.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="Computer-aided number theory C library and tools"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="data doc fltk gmp qt4 X"
-
-RDEPEND="
-	sys-libs/readline:0=
-	data? ( sci-mathematics/pari-data )
-	doc? ( X? ( x11-misc/xdg-utils ) )
-	fltk? ( x11-libs/fltk:1 )
-	gmp? ( dev-libs/gmp:0= )
-	qt4? ( dev-qt/qtgui:4 )
-	X? ( x11-libs/libX11 )"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-get_compile_dir() {
-	pushd "${S}/config" > /dev/null
-	local fastread=yes
-	source ./get_archos
-	popd > /dev/null
-	echo "O${osname}-${arch}"
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-strip.patch
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
-	# fix parallel make
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-doc-make.patch
-	# sage error handling patch
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-mp.c.patch
-	# OS X: add -install_name to the linker option
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-macos.patch
-	# Fix Perl 5.26
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.0-no-dot-inc.patch
-	# fix automagic
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.1-no-automagic.patch
-	# sage-on-gentoo trac 13902: Slowdown for PARI integer determinant
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.4-slow_determinant.patch
-	# sage-on-gentoo trac 13054: polred bug / pari bug 1395
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.5.4-polred.patch
-
-	# disable default building of docs during install
-	sed -i \
-		-e "s:install-doc install-examples:install-examples:" \
-		config/Makefile.SH || die "Failed to fix makefile"
-
-	# propagate ldflags
-	sed -i \
-		-e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
-		config/get_dlld || die "failed to fix LDFLAGS"
-	# move doc dir to a gentoo doc dir and replace acroread by xdg-open
-	sed -i \
-		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
-		-e 's:"acroread":"xdg-open":' \
-		doc/gphelp.in || die "Failed to fix doc dir"
-
-	sed -i "s:/\(usr\|lib64\):${EPREFIX}/\1:g" \
-		config/get_{Qt,X11,include_path,libpth} \
-		|| die "Failed to fix get_X11"
-
-	# usersch3.tex is generated
-	rm doc/usersch3.tex || die "failed to remove generated file"
-}
-
-src_configure() {
-	tc-export CC
-	export CPLUSPLUS=$(tc-getCXX)
-
-	# need to force optimization here, as it breaks without
-	if is-flag -O0; then
-		replace-flags -O0 -O2
-	elif ! is-flag -O?; then
-		append-flags -O2
-	fi
-
-	# sysdatadir installs a pari.cfg stuff which is informative only
-	./Configure \
-		--prefix="${EPREFIX}"/usr \
-		--datadir="${EPREFIX}"/usr/share/${PN} \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
-		--mandir="${EPREFIX}"/usr/share/man/man1 \
-		--with-readline="${EPREFIX}"/usr \
-		--with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_with fltk) \
-		$(use_with gmp) \
-		$(use_with qt4 qt) \
-		|| die "./Configure failed"
-}
-
-src_compile() {
-	mycxxmake=LD\=$(tc-getCXX)
-
-	local installdir=$(get_compile_dir)
-	cd "${installdir}" || die "failed to change directory"
-	# upstream set -fno-strict-aliasing.
-	# aliasing is a known issue on amd64, work on x86 by sheer luck
-	emake ${mymake} \
-		CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
-	emake ${mymake} ${mycxxmake} \
-		CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
-
-	if use doc; then
-		cd "${S}" || die "failed to change directory"
-		# To prevent sandbox violations by metafont
-		VARTEXFONTS="${T}"/fonts emake docpdf
-	fi
-}
-
-src_test() {
-	emake dobench
-}
-
-src_install() {
-	emake ${mymake} ${mycxxmake} DESTDIR="${D}" install
-	dodoc MACHINES COMPAT
-	if use doc; then
-		# install gphelp and the pdf documentations manually.
-		# the install-doc target is overkill.
-		dodoc doc/*.pdf
-		dobin doc/gphelp
-		insinto /usr/share/doc/${PF}
-		# gphelp looks for some of the tex sources...
-		doins doc/*.tex doc/translations
-		# Install the examples - for real.
-		local installdir=$(get_compile_dir)
-		cd "${installdir}" || die "failed to change directory"
-		emake EXDIR="${ED}/usr/share/doc/${PF}/examples" install-examples
-	fi
-}
diff --git a/sci-mathematics/pari/pari-2.7.1.ebuild b/sci-mathematics/pari/pari-2.7.1.ebuild
deleted file mode 100644
index 8a6913099592..000000000000
--- a/sci-mathematics/pari/pari-2.7.1.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-DESCRIPTION="Computer-aided number theory C library and tools"
-HOMEPAGE="http://pari.math.u-bordeaux.fr/"
-SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
-IUSE="data doc fltk gmp qt4 X"
-
-RDEPEND="
-	sys-libs/readline:0=
-	data? ( sci-mathematics/pari-data )
-	doc? ( X? ( x11-misc/xdg-utils ) )
-	fltk? ( x11-libs/fltk:1= )
-	gmp? ( dev-libs/gmp:0= )
-	qt4? ( dev-qt/qtgui:4= )
-	X? ( x11-libs/libX11:0= )"
-DEPEND="${RDEPEND}
-	doc? ( virtual/latex-base )"
-
-get_compile_dir() {
-	pushd "${S}/config" > /dev/null
-	local fastread=yes
-	source ./get_archos
-	popd > /dev/null
-	echo "O${osname}-${arch}"
-}
-
-src_prepare() {
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-strip.patch
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.3.2-ppc-powerpc-arch-fix.patch
-	# fix parallel make
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-doc-make.patch
-	# fix automagic
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-no-automagic.patch
-	# sage-on-gentoo trac 15654: PARI discriminant speed depends on stack size
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-slow-discriminant.patch
-	# Fix Perl 5.26
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.0-no-dot-inc.patch
-	# fix building docs with perl-5.22
-	epatch "${WORKDIR}"/${P}-patchset/${PN}-2.7.1-perl-5.22-doc.patch
-
-	# disable default building of docs during install
-	sed -i \
-		-e "s:install-doc install-examples:install-examples:" \
-		config/Makefile.SH || die "Failed to fix makefile"
-
-	# propagate ldflags
-	sed -i \
-		-e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
-		config/get_dlld || die "failed to fix LDFLAGS"
-	# move doc dir to a gentoo doc dir and replace acroread by xdg-open
-	sed -i \
-		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
-		-e 's:"acroread":"xdg-open":' \
-		doc/gphelp.in || die "Failed to fix doc dir"
-
-	# usersch3.tex is generated
-	rm doc/usersch3.tex || die "failed to remove generated file"
-}
-
-src_configure() {
-	tc-export CC
-	export CPLUSPLUS=$(tc-getCXX)
-
-	# need to force optimization here, as it breaks without
-	if is-flag -O0; then
-		replace-flags -O0 -O2
-	elif ! is-flag -O?; then
-		append-flags -O2
-	fi
-
-	# sysdatadir installs a pari.cfg stuff which is informative only
-	./Configure \
-		--prefix="${EPREFIX}"/usr \
-		--datadir="${EPREFIX}"/usr/share/${PN} \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
-		--mandir="${EPREFIX}"/usr/share/man/man1 \
-		--with-readline="${EPREFIX}"/usr \
-		--with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
-		$(use_with fltk) \
-		$(use_with gmp) \
-		$(use_with qt4 qt) \
-		|| die "./Configure failed"
-}
-
-src_compile() {
-	use hppa && \
-		mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
-
-	mycxxmake=LD\=$(tc-getCXX)
-
-	local installdir=$(get_compile_dir)
-	cd "${installdir}" || die "failed to change directory"
-	# upstream set -fno-strict-aliasing.
-	# aliasing is a known issue on amd64, work on x86 by sheer luck
-	emake ${mymake} \
-		CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
-	emake ${mymake} ${mycxxmake} \
-		CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
-
-	if use doc; then
-		cd "${S}" || die "failed to change directory"
-		# To prevent sandbox violations by metafont
-		VARTEXFONTS="${T}"/fonts emake docpdf
-	fi
-}
-
-src_test() {
-	emake dobench
-}
-
-src_install() {
-	emake ${mymake} ${mycxxmake} DESTDIR="${D}" install
-	dodoc MACHINES COMPAT
-	if use doc; then
-		# install gphelp and the pdf documentations manually.
-		# the install-doc target is overkill.
-		dodoc doc/*.pdf
-		dobin doc/gphelp
-		insinto /usr/share/doc/${PF}
-		# gphelp looks for some of the tex sources...
-		doins doc/*.tex doc/translations
-		# Install the examples - for real.
-		emake EXDIR="${ED}/usr/share/doc/${PF}/examples" \
-			-C $(get_compile_dir) install-examples
-	fi
-}
diff --git a/sci-mathematics/pari/pari-2.9.4.ebuild b/sci-mathematics/pari/pari-2.9.4.ebuild
new file mode 100644
index 000000000000..37593bb6748b
--- /dev/null
+++ b/sci-mathematics/pari/pari-2.9.4.ebuild
@@ -0,0 +1,125 @@
+# 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 multilib
+
+DESCRIPTION="Computer-aided number theory C library and tools"
+HOMEPAGE="http://pari.math.u-bordeaux.fr/"
+LICENSE="GPL-2"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="data doc fltk gmp X"
+SRC_URI="http://pari.math.u-bordeaux.fr/pub/${PN}/unix/${P}.tar.gz"
+
+RDEPEND="
+	sys-libs/readline:0=
+	data? ( sci-mathematics/pari-data )
+	doc? ( X? ( x11-misc/xdg-utils ) )
+	fltk? ( x11-libs/fltk:1= )
+	gmp? ( dev-libs/gmp:0= )
+	X? ( x11-libs/libX11:0= )"
+DEPEND="${RDEPEND}
+	doc? ( virtual/latex-base )"
+
+get_compile_dir() {
+	pushd "${S}/config" > /dev/null
+	local fastread=yes
+	source ./get_archos
+	popd > /dev/null
+	echo "O${osname}-${arch}"
+}
+
+PATCHES=( "${FILESDIR}"/${P}-strip.patch
+		  "${FILESDIR}"/${P}-ppc.patch
+		  "${FILESDIR}"/${P}-no-automagic.patch
+		)
+
+src_prepare() {
+	default
+
+	# disable default building of docs during install
+	sed -i \
+		-e "s:install-doc install-examples:install-examples:" \
+		config/Makefile.SH || die "Failed to fix makefile"
+
+	# propagate ldflags
+	sed -i \
+		-e 's/$shared $extra/$shared $extra \\$(LDFLAGS)/' \
+		config/get_dlld || die "failed to fix LDFLAGS"
+	# move doc dir to a gentoo doc dir and replace acroread by xdg-open
+	sed -i \
+		-e "s:\$d = \$0:\$d = '${EPREFIX}/usr/share/doc/${PF}':" \
+		-e 's:"acroread":"xdg-open":' \
+		doc/gphelp.in || die "Failed to fix doc dir"
+}
+
+src_configure() {
+	tc-export CC
+	export CPLUSPLUS=$(tc-getCXX)
+
+	# need to force optimization here, as it breaks without
+	if is-flag -O0; then
+		replace-flags -O0 -O2
+	elif ! is-flag -O?; then
+		append-flags -O2
+	fi
+
+	# sysdatadir installs a pari.cfg stuff which is informative only
+	./Configure \
+		--prefix="${EPREFIX}"/usr \
+		--datadir="${EPREFIX}"/usr/share/${PN} \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		--sysdatadir="${EPREFIX}"/usr/share/doc/${PF} \
+		--mandir="${EPREFIX}"/usr/share/man/man1 \
+		--with-readline="${EPREFIX}"/usr \
+		--with-ncurses-lib="${EPREFIX}"/usr/$(get_libdir) \
+		$(use_with fltk) \
+		$(use_with gmp) \
+		--without-qt \
+		|| die "./Configure failed"
+}
+
+src_compile() {
+	use hppa && \
+		mymake=DLLD\="${EPREFIX}"/usr/bin/gcc\ DLLDFLAGS\=-shared\ -Wl,-soname=\$\(LIBPARI_SONAME\)\ -lm
+
+	mycxxmake=LD\=$(tc-getCXX)
+
+	local installdir=$(get_compile_dir)
+	cd "${installdir}" || die "failed to change directory"
+	# upstream set -fno-strict-aliasing.
+	# aliasing is a known issue on amd64, work on x86 by sheer luck
+	emake ${mymake} \
+		CFLAGS="${CFLAGS} -fno-strict-aliasing -DGCC_INLINE -fPIC" lib-dyn
+	emake ${mymake} ${mycxxmake} \
+		CFLAGS="${CFLAGS} -DGCC_INLINE" gp ../gp
+
+	if use doc; then
+		pushd "${S}" > /dev/null || die "failed to change directory"
+		VARTEXFONTS="${T}"/fonts emake -j1 docpdf
+		popd > /dev/null || die
+	fi
+}
+
+src_test() {
+	emake dobench
+}
+
+src_install() {
+	emake ${mymake} ${mycxxmake} DESTDIR="${D}" install
+	dodoc MACHINES COMPAT
+	if use doc; then
+		# install gphelp and the pdf documentations manually.
+		# the install-doc target is overkill.
+		dodoc doc/*.pdf
+		dobin doc/gphelp
+		insinto /usr/share/doc/${PF}
+		# gphelp looks for some of the tex sources...
+		doins doc/*.tex doc/translations
+		# Install the examples - for real.
+		emake EXDIR="${ED}/usr/share/doc/${PF}/examples" \
+			-C $(get_compile_dir) install-examples
+	fi
+}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 68f69fcc7dea..932fc3774835 100644
--- a/sci-visualization/Manifest.gz
+++ b/sci-visualization/Manifest.gz
diff --git a/sci-visualization/gle/Manifest b/sci-visualization/gle/Manifest
index a17ec4e710e2..0deb347d0de5 100644
--- a/sci-visualization/gle/Manifest
+++ b/sci-visualization/gle/Manifest
@@ -1,6 +1,6 @@
 AUX 64gle-gentoo.el 161 BLAKE2B 89fd74e68819e2f4653861a110ba977f205e2a200810c03f81297c87ea55167aec2dfcee87b187d310516fd36dd04e365afcaf8fa17c4691b4847071f2a35ad0 SHA512 eda9f1f3ef933aa9f43054c7eae6ec9200022723d91259fb6ba42ddbfbd01f8953d4dcd9aa541211b054c6c93947d7cada1db599db046443b90451cce9e3d7f8
-AUX gle-4.2.4b-parallel.patch 464 BLAKE2B 93348570ff1eb5d489ca6ed9eb3b5092c85a9e2e92dafc9dd208d580bd294603571cea8f2f2c4a04089805b2025faaeb425e4f576fb826c58519b7b428af74e3 SHA512 aeb1c1df07716844105cab33d84ffc5837a4a8b0452872360eaa169157ffdba88720783d421a0fd236a8ac89d128a1e75349d96566dc92f89b50a47352375cab
+AUX gle-4.2.5-c++14.patch 1113 BLAKE2B a75d450b3f067d3f1158618fbdbed69352e9660a60662de730a73b5c7917f1f64a6a2c10472a7f4ba8ae49f8860ba72e919385b863de74878933e3c8022e246b SHA512 aef210745cbf2deb265fde3839e5156eadd52d28029583b52bb53a9e2db26f6dfc6fd2243626be67ae6d00b1e0dbd1b03ed32f594541a569b1df289e78d8d367
+AUX gle-4.2.5-parallel.patch 572 BLAKE2B 03617a63dac035582a90cd0d872c114cc8b4426e05483130ead443a6d136f7c54cafabd7312e0c8eae5c90b704bd4d0a475f49feea69de464deba2c47970c066 SHA512 95d2c9fb1023f6f468b7258c52c04635dfe297da579de0bf429d90bfc1849348191f0821f18b048057271260ad0a9511fd811bdb1494fe51aa1dcd84276b2259
 DIST gle-graphics-4.2.5f-src.tar.gz 2330270 BLAKE2B 46435a2366a278a88786a2dd0e0cbcc48d3ba2fc6d895fb07c81216089a10b2223b2ba692b951ee01a6ab014e84cce9aa3969d063ddf7d04501820aa33084c5c SHA512 d459b24577c9c3f8825c368f864532c97d0a37c94018276a60c941d17dce0e55fe738f7eda3227a47848f2fb32fea1dcec29d9751a5be92cde4d8d38a2eeb0f5
-EBUILD gle-4.2.5-r1.ebuild 2091 BLAKE2B 36a1c0489a6fe3c0e7b814d0b04d5a973559cb44c4e6ac83b79efb76a633c85058b7d65aedd1932c20fbf4a8e01d14f448a9582ca85118cb4f780f1e12604ca4 SHA512 f8ecf99e0d53b2bfe71ad18b6ffb7c485c68cc027e236ea50d350dc1c7f20942d5f7c33d0f5c182d323d355432ff51fa23f5138672662a08df755928888762ae
-EBUILD gle-4.2.5.ebuild 2314 BLAKE2B e90414a83df92d6be1313726d7c2b5c9074b4e3da697c95b944fe5bed07eb4133301ffe8d1b69e027d4dc440578171ea34dac4d76ec7fca22604c96f8b16e08f SHA512 b1a4be632e722a9aa6fb6f9b344076cc45738e34e961a5e3071b1868204450208700901d0a04bd6e450514a4ffa046d09c4a0bb049bb8f5b77d14d43d769c96d
+EBUILD gle-4.2.5-r1.ebuild 2134 BLAKE2B bf4ea6ed5aed48ee23ea93bfbeceb9ff4031acf648629a1725d11dee5d0111af625fd502ac8ec5cf4ad02845e81500e2e4b5315f1458fd72fa9835fca1c23c96 SHA512 b8b7a648fb506ffc380dc287881def9116295a1447339268c9f064ca73f3410847c8468db4bf0682a34509c01a2a790555512d0cac880c4a3402e422678cb5af
 MISC metadata.xml 725 BLAKE2B a9da0308b21e8f2faea7a58fcba4ed9c4d2a136fc64992768236dd3c21705f3f324abfa83a0b598234a86e7bac5539be2b527ea6efa56fd4b44e44c43428ba45 SHA512 745264b5ccf026947f5a3c0a39b4199589d7831ec1f5de7c03f82b48ebbc590d57d973a7007a09d71135b60cf8129d38eeaab2a95785b62f76fccc6727db61ee
diff --git a/sci-visualization/gle/files/gle-4.2.4b-parallel.patch b/sci-visualization/gle/files/gle-4.2.4b-parallel.patch
deleted file mode 100644
index 1eff8c067102..000000000000
--- a/sci-visualization/gle/files/gle-4.2.4b-parallel.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/gui/MakefileAC.in.orig	2010-01-06 20:10:04.000000000 +0000
-+++ src/gui/MakefileAC.in	2010-01-06 20:21:15.000000000 +0000
-@@ -84,14 +84,14 @@
- qmake:
- 	$(QMAKE_PROG) $(QMAKE_OPTS)
- 
--domake:
--	$(MAKE_PROG)
-+domake: Makefile
-+	$(MAKE)
- 
--repmake:
-+repmake: Makefile
- 	perl ../../platform/autopackage/qt-replace.pl Makefile
- 
- doclean:
--	-$(MAKE_PROG) clean
-+	-$(MAKE) clean
- 	-@$(RM) qgle install_qgle_name_mac Makefile
- 	-@$(RMDIR) moc
- 	-@$(RMDIR) objects
diff --git a/sci-visualization/gle/files/gle-4.2.5-c++14.patch b/sci-visualization/gle/files/gle-4.2.5-c++14.patch
new file mode 100644
index 000000000000..b548816ae065
--- /dev/null
+++ b/sci-visualization/gle/files/gle-4.2.5-c++14.patch
@@ -0,0 +1,27 @@
+diff -r -U2 gle-graphics-4.2.5.orig/src/gle/fitcf.h gle-graphics-4.2.5/src/gle/fitcf.h
+--- gle-graphics-4.2.5.orig/src/gle/fitcf.h	2015-08-16 13:51:24.000000000 +0600
++++ gle-graphics-4.2.5/src/gle/fitcf.h	2018-01-13 13:57:23.140749391 +0700
+@@ -182,8 +182,8 @@
+ typedef struct Namelist Namelist;
+ 
+-#define abs(x) ((x) >= 0 ? (x) : -(x))
++/*#define abs(x) ((x) >= 0 ? (x) : -(x))*/
+ #define dabs(x) (doublereal)abs(x)
+-#define min(a,b) ((a) <= (b) ? (a) : (b))
+-#define max(a,b) ((a) >= (b) ? (a) : (b))
++/*#define min(a,b) ((a) <= (b) ? (a) : (b))*/
++/*#define max(a,b) ((a) >= (b) ? (a) : (b))*/
+ #define dmin(a,b) (doublereal)min(a,b)
+ #define dmax(a,b) (doublereal)max(a,b)
+diff -r -U2 gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp
+--- gle-graphics-4.2.5.orig/src/gle/surface/ffitcontour.cpp	2015-08-16 13:51:24.000000000 +0600
++++ gle-graphics-4.2.5/src/gle/surface/ffitcontour.cpp	2018-01-13 14:08:08.169722265 +0700
+@@ -49,7 +49,7 @@
+ #include "f2c.h"
+ #else
+-#include "f2c.h"
+ #include <stdio.h>
+ #include <math.h>
++#include "f2c.h"
+ #endif
+ 
diff --git a/sci-visualization/gle/files/gle-4.2.5-parallel.patch b/sci-visualization/gle/files/gle-4.2.5-parallel.patch
new file mode 100644
index 000000000000..eeca1f5946ba
--- /dev/null
+++ b/sci-visualization/gle/files/gle-4.2.5-parallel.patch
@@ -0,0 +1,20 @@
+diff -r -U2 gle-graphics-4.2.5.orig/src/gui/MakefileAC.in gle-graphics-4.2.5/src/gui/MakefileAC.in
+--- gle-graphics-4.2.5.orig/src/gui/MakefileAC.in	2015-08-16 13:51:24.000000000 +0600
++++ gle-graphics-4.2.5/src/gui/MakefileAC.in	2018-01-13 14:23:09.066684378 +0700
+@@ -83,12 +83,12 @@
+ 	$(QMAKE_PROG) $(QMAKE_OPTS)
+ 
+-domake:
+-	$(MAKE_PROG)
++domake: Makefile
++	$(MAKE)
+ 
+-repmake:
++repmake: Makefile
+ 	perl ../../platform/autopackage/qt-replace.pl Makefile
+ 
+ doclean:
+-	-$(MAKE_PROG) clean
++	-$(MAKE) clean
+ 	-@$(RM) qgle install_qgle_name_mac Makefile
+ 	-@$(RMDIR) moc
diff --git a/sci-visualization/gle/gle-4.2.5-r1.ebuild b/sci-visualization/gle/gle-4.2.5-r1.ebuild
index b16b4ee3425d..c9157c018093 100644
--- a/sci-visualization/gle/gle-4.2.5-r1.ebuild
+++ b/sci-visualization/gle/gle-4.2.5-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 inherit eutils elisp-common flag-o-matic autotools
 
 DESCRIPTION="Graphics Layout Engine"
@@ -30,8 +30,12 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}"/${MY_P}
 
+PATCHES=( "${FILESDIR}"/${P}-parallel.patch
+		  "${FILESDIR}"/${P}-c++14.patch
+		)
+
 src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.4b-parallel.patch
+	default
 	eaclocal
 	eautoconf
 }
diff --git a/sci-visualization/gle/gle-4.2.5.ebuild b/sci-visualization/gle/gle-4.2.5.ebuild
deleted file mode 100644
index 178b6e82de0c..000000000000
--- a/sci-visualization/gle/gle-4.2.5.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils elisp-common qt4-r2 flag-o-matic autotools
-
-DESCRIPTION="Graphics Layout Engine"
-HOMEPAGE="http://glx.sourceforge.net/"
-MY_P=${PN}-graphics-${PV}
-MAN_V=4.2.2
-SRC_URI="mirror://sourceforge/glx/${MY_P}f-src.tar.gz"
-SLOT="0"
-LICENSE="BSD-2 emacs? ( GPL-2 ) qt4? ( GPL-2 )"
-IUSE="X qt4 jpeg png tiff doc emacs vim-syntax"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-DEPEND="
-	sys-libs/ncurses:0=
-	X? ( x11-libs/libX11 )
-	qt4? ( dev-qt/qtopengl:4 )
-	jpeg? ( virtual/jpeg:0 )
-	png? ( media-libs/libpng:0= )
-	tiff? ( media-libs/tiff:0 )
-	doc? ( dev-texlive/texlive-latexextra )
-	emacs? ( virtual/emacs )"
-
-RDEPEND="${DEPEND}
-	app-text/ghostscript-gpl
-	virtual/latex-base
-	vim-syntax? ( || ( app-editors/vim app-editors/gvim ) )"
-
-S="${WORKDIR}"/${MY_P}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-4.2.4b-parallel.patch
-	eaclocal
-	eautoconf
-}
-
-src_configure() {
-	# CPPFLAGS are understood as C++ flags
-	append-cppflags ${CXXFLAGS}
-	econf \
-		--without-rpath \
-		--with-manip \
-		$(use_with qt4 qt "${EPREFIX}"/usr) \
-		$(use_with X x) \
-		$(use_with jpeg) \
-		$(use_with png) \
-		$(use_with tiff)
-}
-
-src_compile() {
-	emake
-	if use doc; then
-		emake -j1 doc
-	fi
-	if use emacs; then
-		cd contrib/editors/highlighting
-		mv ${PN}-emacs.el ${PN}-mode.el
-		elisp-compile ${PN}-mode.el || die
-	fi
-}
-
-src_install() {
-	# -jN failed to install some data files
-	emake -j1 DESTDIR="${D}" install
-	rm -rf "${ED}"/usr/share/doc/gle-graphics
-	dodoc README.txt
-
-	if use qt4; then
-		newicon src/gui/images/gle_icon.png gle.png
-		make_desktop_entry qgle GLE gle
-		newdoc src/gui/readme.txt gui_readme.txt
-	fi
-
-	if use doc; then
-		insinto /usr/share/doc/${PF}
-		doins build/doc/gle-manual.pdf
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} contrib/editors/highlighting/gle-mode.{el,elc} || die
-		elisp-site-file-install "${FILESDIR}"/64gle-gentoo.el || die
-	fi
-
-	if use vim-syntax ; then
-		dodir /usr/share/vim/vimfiles/{ftplugins,indent,syntax}
-		cd contrib/editors/highlighting/vim || die
-		chmod 644 ftplugin/* indent/* syntax/*
-		insinto /usr/share/vim/vimfiles
-		doins -r ftplugin indent syntax
-	fi
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sci-visualization/veusz/Manifest b/sci-visualization/veusz/Manifest
index 261f12951487..fd0b2b0c55f0 100644
--- a/sci-visualization/veusz/Manifest
+++ b/sci-visualization/veusz/Manifest
@@ -1,9 +1,5 @@
 AUX veusz.desktop 248 BLAKE2B 02c9b85f9ea12ef0ee9bf8f538788f577ab4314468e94140b80351accece2dcbcf11b39b26468d8c31e3feb9fc8422a1fe5051b00100743f263eba2558861236 SHA512 986479153d6409a639f0daab4c2c11836927fce93feecf0bffefd7643cfa9c3ee2c24d374f2c6eaef475bc4bcfe39095c6b12bd0731c585ad213f0a4672c8047
 AUX veusz.xml 346 BLAKE2B c99688c930b3901edcf500c4a99447074a01be6abfd2be714f8c1dccd4318a0270d30f47f92636280f406ba9003540434c52683b0a8f66fb4d672e3436fdb5a1 SHA512 c4f049d4648192d932560a2e73088843ecb0a2beea2e628424488d552684a8e69b84628773a08947741690eb732901bc8ae8c52fa926d1b44bf02b9046cb569e
-DIST veusz-1.25.1.tar.gz 1883416 BLAKE2B 5c8b23fa12b7718f32bfd0dced5cb416151002c145b2ad126b119ee422940d22ea9c97df0262f8828d17374e9c35786772225cab7ecdbf9337aa22aad7f16134 SHA512 0820d2a2d30dd525656b4aad4d39eef1d24c7b98fd93d263974ba2dfb13e4c0d3914f4cb94b016aa1780f20f653df10ce5bf5ee59e9532f26471947565f0a560
-DIST veusz-1.26.1.tar.gz 1904197 BLAKE2B 57aebb9ec62b255153f67cd6866cf935adf59874234dbf878f432276b080f052675de7b969b30738a2426c854f2faa9f54db0e475bd51acc4cd56a49878d565f SHA512 eba9382e91c2653ded0ed409874b7c4db6309c93f5b2ff1b7d5c15fb88ab330f1d626f0a110055c7647a929bf8cad9c78886c2035a1cb5b8cc27159ae7bf481d
 DIST veusz-2.1.1.tar.gz 2440253 BLAKE2B 1bfbe3bf6a026fbbd4acf5d722a1d2282331d71548650606c474c81399e8f0e8dcef643e0ab61a3eff62e111392a0668e1ae3d0bb2a76d7abc1f57e10a6e0506 SHA512 894dd12ea89671d71bd1abb2367c19d76c599c59edd302c29e5f99bbd1798fea8cb1489ca3446e8f88fedaf287fb48ee63617f928c77e4bd366a4f00a878b994
-EBUILD veusz-1.25.1.ebuild 1960 BLAKE2B 5c8748c92ae546575c9fde782ef05559a44a2d66c080bae0ddcf74980aac204feb96af4e1d3908634234eb4da6081f76cbdb7cc435c55e16d3ec288683e1422d SHA512 daeee8ac7b1a8c2d62fdf0ec2d902b37556f5b965ea1d45b7205e304a26976429dcc9792390355dc68e8ebcd88cd404bb4567b1f1063d1d489acc2e8ff9dd701
-EBUILD veusz-1.26.1.ebuild 2029 BLAKE2B 9549e6170e4c8ff214e3589af50d17e8cdad3b37cc718ffd2c9d9cf5567a870740aa5189bcb41d558bcc504d2521f8c588dacbb9cfd447fde5d2e60addf1b557 SHA512 d39fdffd56d2ef4760a81f5b29a87dc38c381604acfddc77ed246a2e6ab07b2c2ee448a5e44327fb901a266a43e199ef1813b6efd5f68745687eb398cb00af79
 EBUILD veusz-2.1.1.ebuild 2106 BLAKE2B ed9b696f062a6ee7fd62f9d48867158eef884be820595609831c71f9ccd71e9d39eff5a1d61c783a2496bb7682559c3acf31ad218b076124719fd1a8eceb2c62 SHA512 b3c515b6d8050598d5539caa295e60f0a2656ebdfa41908070d2791816c1b0198799de44263aa3bc688399db2d06291a01348ca03309cc3f4b17e72ab22cf139
-MISC metadata.xml 976 BLAKE2B 27c26515c0b822aceb9b094391825186aa96df29035268311151a83297fa076d94043e0449ae6769dc90744d554aae7d85201b2c50380795cb668bdda68b8d93 SHA512 0bb2b631d782f6c231775f4838d78f86612fda9fdf8f6ae2fe4ae157c1d4953cc8c54250d02b68ef4b2ee0ea50c4fb2633fd813d0049025365f7a28ba9840ea9
+MISC metadata.xml 885 BLAKE2B 90529e34d78f5225e62c2675e15fef6e0fa1898eca31df061f5438460be53f5bad3d1395d5dcb6e300f861c2c52689bca26fcf012ffbbdaf9cf579b9b252a697 SHA512 2e6838e7cc1a152af665c771950f5b53f942ceedb40b118511c2c9b9801a4a170dbc557e3fa389986b0edf2b12b4f008fbbab9c258c59a1b4acd2063c3ef79ac
diff --git a/sci-visualization/veusz/metadata.xml b/sci-visualization/veusz/metadata.xml
index 6f5dc7659c62..143fe2727aa6 100644
--- a/sci-visualization/veusz/metadata.xml
+++ b/sci-visualization/veusz/metadata.xml
@@ -15,7 +15,6 @@
     <flag name="fits">Add FITS format via <pkg>dev-python/astropy</pkg></flag>
     <flag name="emf">Add FITS format via <pkg>dev-python/pyemf</pkg></flag>
     <flag name="minuit">Use Minuit during fitting via<pkg>dev-python/pyminuit</pkg></flag>
-    <flag name="vo">Add Virtual Observatory tools via <pkg>dev-python/astropy</pkg></flag>
   </use>
   <upstream>
     <remote-id type="pypi">veusz</remote-id>
diff --git a/sci-visualization/veusz/veusz-1.25.1.ebuild b/sci-visualization/veusz/veusz-1.25.1.ebuild
deleted file mode 100644
index 8ede2c5b7ed4..000000000000
--- a/sci-visualization/veusz/veusz-1.25.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit eutils fdo-mime distutils-r1 virtualx
-
-DESCRIPTION="Qt scientific plotting package with good Postscript output"
-HOMEPAGE="http://home.gna.org/veusz/"
-SRC_URI="http://download.gna.org/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc emf fits hdf5 minuit vo"
-
-CDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/PyQt4-4.11.4[compat,X,svg,${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	emf? ( dev-python/pyemf[$(python_gen_usedep 'python2*')] )
-	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	minuit? ( dev-python/pyminuit[${PYTHON_USEDEP}] )
-	vo? (
-		dev-python/astropy[${PYTHON_USEDEP}]
-		dev-python/sampy[$(python_gen_usedep 'python2*')]
-	)"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	"
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	VIRTUALX_COMMAND="${EPYTHON}" \
-		VEUSZ_RESOURCE_DIR="${S}" \
-		virtualmake runselftest.py
-}
-
-python_install() {
-	distutils-r1_python_install
-	# symlink the license, bug #341653
-	rm "${D}/$(python_get_sitedir)"/${PN}/{COPYING,AUTHORS,ChangeLog} || die
-	mkdir -p "${D}/$(python_get_sitedir)" || die
-	cat >> "${D}/$(python_get_sitedir)"/${PN}/COPYING <<- EOF
-	Please visit
-
-	https://www.gnu.org/licenses/gpl-2.0.html
-
-	for the full license text.
-	EOF
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dodoc Documents/manual.pdf && \
-		dohtml -r Documents/{manimages,manual.html}
-
-	doicon icons/veusz.png
-	domenu "${FILESDIR}"/veusz.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-visualization/veusz/veusz-1.26.1.ebuild b/sci-visualization/veusz/veusz-1.26.1.ebuild
deleted file mode 100644
index ff2798d960f4..000000000000
--- a/sci-visualization/veusz/veusz-1.26.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-
-inherit eutils fdo-mime distutils-r1 virtualx
-
-DESCRIPTION="Qt scientific plotting package with good Postscript output"
-HOMEPAGE="https://veusz.github.io/"
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${P}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="dbus doc emf fits hdf5 minuit vo"
-
-CDEPEND="
-	dev-python/numpy[${PYTHON_USEDEP}]
-	>=dev-python/PyQt4-4.11.4[compat,X,svg,${PYTHON_USEDEP}]"
-RDEPEND="${CDEPEND}
-	dbus? ( dev-python/dbus-python[${PYTHON_USEDEP}] )
-	emf? ( dev-python/pyemf[$(python_gen_usedep 'python2*')] )
-	fits? ( dev-python/astropy[${PYTHON_USEDEP}] )
-	hdf5? ( dev-python/h5py[${PYTHON_USEDEP}] )
-	minuit? ( || ( dev-python/iminuit[${PYTHON_USEDEP}] dev-python/pyminuit[${PYTHON_USEDEP}] ) )
-	vo? (
-		dev-python/astropy[${PYTHON_USEDEP}]
-		dev-python/sampy[$(python_gen_usedep 'python2*')]
-	)"
-DEPEND="${CDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/sip[${PYTHON_USEDEP}]
-	"
-
-python_test() {
-	distutils_install_for_testing
-	cd tests || die
-	VIRTUALX_COMMAND="${EPYTHON}" \
-		VEUSZ_RESOURCE_DIR="${S}" \
-		virtualmake runselftest.py
-}
-
-python_install() {
-	distutils-r1_python_install
-	# symlink the license, bug #341653
-	rm "${D}/$(python_get_sitedir)"/${PN}/{COPYING,AUTHORS,ChangeLog} || die
-	mkdir -p "${D}/$(python_get_sitedir)" || die
-	cat >> "${D}/$(python_get_sitedir)"/${PN}/COPYING <<- EOF
-	Please visit
-
-	https://www.gnu.org/licenses/gpl-2.0.html
-
-	for the full license text.
-	EOF
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	use doc && dodoc Documents/manual.pdf && \
-		dohtml -r Documents/{manimages,manual.html}
-
-	doicon icons/veusz.png
-	domenu "${FILESDIR}"/veusz.desktop
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}"/veusz.xml
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index dbe483135fe2..93baec1391a3 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 459de10b7018..a07d001f3ced 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,7 +3,7 @@ DIST kmod-23.tar.xz 450376 BLAKE2B dd38b6d8853e40cb8c9939cd3c68bfe3b36e58445cac9
 DIST kmod-24.tar.xz 536864 BLAKE2B 2d61a4a5e598c864cc1bae4f3d2dc5e434e1df8685ceb2462315c0e5dc955b58f02ffd0504a77859b7030c3619f1b5f6a7fa3fb25ec99d90ac67f0167b1eb889 SHA512 58c8da100418b6325de1595bceee4115cbdd7151d03a028c0b1f6d5d3e6611c667e27f3a0245d29781125581849fd1e854fa8d87b63c4b8fa3f196d0a97e1779
 DIST kmod-25.tar.xz 545416 BLAKE2B 2ad428f70630a1ef509be888a9ebc45f164695365f0f722f5e7793e96b60c035040b4d9a27f926361cea6d665310fc6cc5599ff4aefeda0fae8571c6510a25a7 SHA512 d579cd0cea24a06362a74927b7a3c777e9e01c990306e1032e4781cd441ffe435c70f2c2c4f6ae39eb1d857e622746411d5824d0c0d8bb79f91dc9fa51956252
 EBUILD kmod-23.ebuild 4902 BLAKE2B 22ef9ed75e115712545c6923ba982d5e1a271b4a61576760a2af471885a32727d70c5e44542d68b545e333440e417052c16f069b50efe92c54b3d480ae1e09ae SHA512 b38be77d4f89ffda2551a3c5ef2b85146ba27254d0c109425b7ad0fbfdc1528381f605a1e354a06f3321eb5b63bba6d6ec955245135f54a3a2a5d131667360e5
-EBUILD kmod-24.ebuild 4914 BLAKE2B d44e7e1a325d992cc650d25227c55b3cce916cf92a148e1e429f6b4dd41146c01dce144e029f3138900a5903bd82fa59a0562284cfd3c9e9b8cc837d3f23dec8 SHA512 84d2501285ef621e977dcd94fff0c4597f8af303174533b69c17e1782afa831d12647fcbe83bc6ceb67d321ca50940191e29d180e1bbb496e4567c8045317272
+EBUILD kmod-24.ebuild 4913 BLAKE2B ff9c43cc4926945948bb064598900d31c88009a651560f800c45be38fb6b2a34b8aeaddeff02825d839ae539f85cef308b13713a4e0d255825160003403842f2 SHA512 1c97638223889cf8a9b177ded5726c8a9a245ba557610bf71361f4168f0dcda5d7ae997aa1a8a77f58c3b6758cf8e39695471fd6fab8b4287c1f2539bbdf27d5
 EBUILD kmod-25.ebuild 4931 BLAKE2B 99cf8a56f86668414041e08c2d07664d55696d70bdf7c6230a9e5fa0dcf0080aac13308c13c201ba4687fd66cff78f130192ce07cf6f8fa5a2033d57c5199027 SHA512 27aa9d2c5e85af98778df261cda4e5aae65a6490f2f28b72dd9475e22eb0b75a5ad1bd4207462b21c60a04265cab91027d628a0dee12d8444fa450318514e6d6
 EBUILD kmod-9999.ebuild 4931 BLAKE2B 99cf8a56f86668414041e08c2d07664d55696d70bdf7c6230a9e5fa0dcf0080aac13308c13c201ba4687fd66cff78f130192ce07cf6f8fa5a2033d57c5199027 SHA512 27aa9d2c5e85af98778df261cda4e5aae65a6490f2f28b72dd9475e22eb0b75a5ad1bd4207462b21c60a04265cab91027d628a0dee12d8444fa450318514e6d6
 MISC metadata.xml 540 BLAKE2B ec5ee262fe76215688d99e32778848e71de5825f488eea2219e076290e020aa86de6138ab8366d5e077d44797789a27c22fea1c64f9c6e2713cf315b4b891455 SHA512 c4f47a77dfa7bc4cbaa61744fc46c5547763b51b48521cd229ac89680325ecbf415bd9e1ce9c71982ea721d0d5c4cf3677a0f70e8dad65235f523840cd14de94
diff --git a/sys-apps/kmod/kmod-24.ebuild b/sys-apps/kmod/kmod-24.ebuild
index ae6cb6730b93..8b936bac362f 100644
--- a/sys-apps/kmod/kmod-24.ebuild
+++ b/sys-apps/kmod/kmod-24.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit autotools git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/kernel/kmod/${P}.tar.xz"
-	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"
 	inherit libtool
 fi
 
diff --git a/sys-apps/less/Manifest b/sys-apps/less/Manifest
index a5305c5eae02..299d50a4136f 100644
--- a/sys-apps/less/Manifest
+++ b/sys-apps/less/Manifest
@@ -6,5 +6,5 @@ DIST less-520.tar.gz 337959 BLAKE2B e3008ec61b9095c7e0f696a662478e1aaeb9108dc26a
 DIST less-529.tar.gz 339651 BLAKE2B 745146fd584c6144b4052d18bae07a2b4c7a719d36c556c69837f2018ef95efeea35acadcb9946bdde0272848d1bd8537c847e89591d980ceb2eda5a4c5963c4 SHA512 902e3ed86161c5a9eb3c08567b6b702371b5c88a85ef0b21beada223eaa47e0abf4d4d166a4a7a195caef67509fa683d07d0b6a40b529d703ee26aa8910c360a
 EBUILD less-487.ebuild 1440 BLAKE2B dded5fb96b09a7de894e13c701ecd479ad1b1569094500f3701aa58f58b8f2d46106b8d9c82ac16f9b9e648655f87d788de5a71d7d0f69d357184a656a1bec51 SHA512 b7a1ee3d58a3ad29c3ef7d50f5f37c9fea7bbd0bf15a157f323ced895daf6a1aa31544374428df2ebd4e3385897e6721cf530b0c21de688e3cd0dee9c7e2939c
 EBUILD less-520.ebuild 1404 BLAKE2B 3a09547f4565168340d4a2c33b84a1380af245d6e949fc4a88f7be0c6829c8470ad4d20a59682268adb32592deff948f8f86ec2f05f3e023708d2a8ba62c0f8c SHA512 10b5c220228b1adf41271de6d7ffc3b222ad2b417194b4f47f0d96f682b73dc0644c1a6ca6d8d8ca2e0712c05cf66d0fa19d0aa612e568d04c95cda763288ac5
-EBUILD less-529.ebuild 1396 BLAKE2B 53eea4b5a010a9ed93d1b7b75ead9b3e4c2d0a50c79a4d3ceff0401f680f4d6811fef1f2818312e93df9cb53a75f402aaa9cd8e9983e16c34cce229d66a2af31 SHA512 c0c39767bb50ae6fbb7f8c9fbd8939a357191d3dd442c33aff9c029bf48a893f979f283a6425ae31b6c4bae843254a029c3269fb7272b1d4f61193c0ea0651dc
+EBUILD less-529.ebuild 1392 BLAKE2B e553fd8175982f06c0b4aed598df102eb79f0c8d3317966d87c7e81118acdc5ac24077631c393f2086ca4f197483c515742e09caf84f57a3c858df1a0ca6c1ea SHA512 90b9cafcc6541bd5c47ffc742ddcf2a3bcd84e1e7ed979e0f25c5669c973b91647b5b7f08841f529c32de88469342d7cf15471b69c6108b7868e5c1aa908edb5
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/less/less-529.ebuild b/sys-apps/less/less-529.ebuild
index 57676b011a04..78d7018ad037 100644
--- a/sys-apps/less/less-529.ebuild
+++ b/sys-apps/less/less-529.ebuild
@@ -9,7 +9,7 @@ SRC_URI="http://www.greenwoodsoftware.com/less/${P}.tar.gz"
 
 LICENSE="|| ( GPL-3 BSD-2 )"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="pcre unicode"
 
 DEPEND=">=app-misc/editor-wrapper-3
diff --git a/sys-apps/sandbox/Manifest b/sys-apps/sandbox/Manifest
index 8791236d1160..a238b991c5ef 100644
--- a/sys-apps/sandbox/Manifest
+++ b/sys-apps/sandbox/Manifest
@@ -7,5 +7,5 @@ DIST sandbox-2.10.tar.xz 417068 BLAKE2B 78bb5b29b520d41c582e7f7cb444ce580f9f8f05
 DIST sandbox-2.12.tar.xz 424252 BLAKE2B 55eb06cbc15ad9ff8b0c272b8d071591ce3533a6ff807719df79131e6c966d60c3b37d9d8e4e1d466df0992836c4594bf6927b496ecb343a71d7b0656219a6d7 SHA512 98bd2ee8807d81e65ee0c9f11cfaf2b37da2ee4d8763c68d18c0ff6b14f3cc847ae2d3a0aa30cbe86063a2108ed4d4dcf7cc3fc4f37cb7549d266d4c1989c2a9
 EBUILD sandbox-2.10-r3.ebuild 2168 BLAKE2B fa95588691da010c6239e89a52e55f5d7b006276e269527319ef2628956f35719af65d918ef046fa6feb2a8c7d28531e49c218e0b26c3c41209138e114300fd6 SHA512 13daa106179f4203616524cda931e3c79ecc510c09a0991f8165eedbb2e612569f648881183679941a75ee280757fcb3e6176cb61a0c2f2096573ac7a3110dfc
 EBUILD sandbox-2.10-r4.ebuild 2234 BLAKE2B 7ec0b2ea8c5aa220f6a99bbc7135b5f9ed0d57c119988d37a75a02b8f0797a68c6dd0ad1b90c45a69e7e941b61cbdac0705c53194dfdc61704155e0ae8675b2e SHA512 08ca4e1d4923b663483d097541020725a8f50efc36779519ccf591d4cedc55017d368b474da5b7d010cf15cc3814b5d31937e742b02a327bbb18b225d92cf78d
-EBUILD sandbox-2.12.ebuild 1949 BLAKE2B 72871c0b3ce7c45d1ea56a64ceaa020f668267eb43ae34bfa525b4f4db6aefe3a0fbee5afe72e6d330d54612d82171abd26c18f98beaaf6d14939bf5bbfa631f SHA512 7e85fd6df9846ba79513976d9de4c200ff6570255c79794c22b09dba4e0206e113bcbe885ced7b8c257d2fffc480f71ecf273d100e0b6e600dbaf28042d55142
+EBUILD sandbox-2.12.ebuild 1943 BLAKE2B 3d9e79d200e30c891a3c81c2a779046da49e57f943b500ace6eaf820c536c39643f0c5fbdad3fa9e369f829225ca8aa955470c787f2213f763e1c737e3a09b8f SHA512 238eb5b34c72430fa4854eb70e7ec3ffbc74e387c61ba85c6a05799533951edb0c6b12f6ffa6a877ed887e5e2f5da71d621a204d77ad348a99da83280f677866
 MISC metadata.xml 266 BLAKE2B f0eff1a6b8face69d2c99fb4c4426deb3800b2b0c4a009ead29e2c5898fa0650e8003c85961ba4c3303053ae9dd6707619d25d03a40e0919ff779c2f1f893316 SHA512 8dcc34d3a08407d6807bc5e30b23c6696dbfc63c19106338780d4e2a61be360e17faeb54af993c962f347ada5d24cb314de866506484b04de4c619d6a88787e3
diff --git a/sys-apps/sandbox/sandbox-2.12.ebuild b/sys-apps/sandbox/sandbox-2.12.ebuild
index 0347d33d7d1d..78b591933e89 100644
--- a/sys-apps/sandbox/sandbox-2.12.ebuild
+++ b/sys-apps/sandbox/sandbox-2.12.ebuild
@@ -11,7 +11,7 @@ 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 ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 DEPEND="app-arch/xz-utils
diff --git a/sys-apps/smartmontools/Manifest b/sys-apps/smartmontools/Manifest
index e929993e8717..a3cafe9ee040 100644
--- a/sys-apps/smartmontools/Manifest
+++ b/sys-apps/smartmontools/Manifest
@@ -1,6 +1,7 @@
 AUX smartd-r1.rc 614 BLAKE2B ec80520e3c8762e39d89eadc63e16bb9d9d4f7dec84507faeba692cfcf106557047ce4ecb2756addff2800f75ae2d550e209a83d1399484f7c1bf1c7f7f859b9 SHA512 7a46212d2d76b335ac7470b51b44e40b1cdd4814e5db4a8a2f013803bb40ea5072fde64590ffd51754b03a6f80a43e835605a5bb3ac2c23e456633995191ec31
 AUX smartd.confd 107 BLAKE2B fe687733a13f7a9c32aee16a759feef798fe7db158783497c6cc0ccba2baaff7cf48acffea0a4becb47d470c691855a046617d3f8e934eeebd54df7030ef4877 SHA512 ff45462944f01c0e7cac99443078b253dcbaed4f99ffab85052b12361d9eec4beec81cab334fbede9148b3dd503d5205add32ef4327a788f02a8b1e37f460437
 AUX smartd.systemd 258 BLAKE2B 9aadec117adeacff070f127ff34df520d5deebe152d0a72e34f36a34b267f854c52640644b285c57de460c7b91f5fb54a5e1c704706540fd5813ed1954f74e7d SHA512 73c49bca755adf0ff1c6ccd221de0fd2bb7804250968fbcb3799e19c66dacc85a6c7a3e0d1eecea683f57d6a3ff01fbd4b4fc47b0eab5747006f0edc21876a7c
+AUX smartmontools-6.6-fix-build-on-musl.patch 416 BLAKE2B 3c7eec408c3ea346ebad3df77e8b2beb89e2565c61d7b85c69404d354b662ee0679389b10cfb110728d99b8df8434a590865a4bb2b46c1ce108ca635dd2a6ebc SHA512 cf2ec3c0366c5ec79cccbe181b4dfed74f051d2236e851f81125e57f7893221a3e311c46556a8854c7c50ee6378d34c917089a90fcb6c3e07cc0c0716085540d
 AUX smartmontools-update-drivedb 42 BLAKE2B d3a501dc6a3855bd665a16ce0f105269754a29450201f312369acdbf429c8e0c7c4162de8854ca945b2082cb734dbbbb1326df39e4fb1adf271f215329bd2105 SHA512 8ad70fc85ab67b7c32eda95dd37517382c2447862df08b810a54dcdedb1eb8148f3a0e29f402a54adff31d1e88d80d09a258ed9e1e13b597ab2a358ebeda0ce8
 DIST smartmontools-6.4.tar.gz 822539 BLAKE2B be76ec24cf24b2388a77758a1df5b5b9b19bd455dda26df6c13184051a51feeb0baf164265fcfe15b1d2ac41767d546109dea53cd7ac290d02f6e03b44da454f SHA512 366cd55ec668da1ca8a3d9ba79d5bee6e0c59032936b7f2f161f8fbb1c9f869c505d715cc10562b6241f808bb8b534feaf9d9fd752f6cb1593ee893611742adc
 DIST smartmontools-6.5.tar.gz 855642 BLAKE2B 25f78de8fd58497cf052e75aef746c15af8d56d2694007c1d6e2f8e31cae3b517babfc52ef73d3ae4bc5104a49e4bac16a48f23f3b3145228997bef0aad823dd SHA512 dca7a6363ab7280ee4197155025f624c978886dcc94fc47b524f6f849138b62c471e966c0d4bf59c7bba50519dc122264618e5ded80a406863ddd10b43d928d3
@@ -8,6 +9,6 @@ DIST smartmontools-6.6.tar.gz 903847 BLAKE2B 6c18884cf763c146abceed47587de0e77cd
 EBUILD smartmontools-6.4-r1.ebuild 2534 BLAKE2B 3395b22b8bdd26c78404016cbb5f48a91b9858ffbff70ae3ca486fc3d32ca9603cbd752111693691a91b5c04982f07987391745514af782bf31d4644d8314223 SHA512 1b0d02e5d4a493cd7926a93c92b3b78951f3580228ca19864113dbb09f12ce936866d50d528bdfb66f94b88b8f99660fa5d7181a81008b4badfaa7ef362a187c
 EBUILD smartmontools-6.4.ebuild 1639 BLAKE2B 103e33da5b3605be940863b879ab2a4859036c3ce1206052b08cd9f0f88acca4d3f56513049a24ac57dcbd2e3c2413fdfcf4dc973fc19645c735feb2063ba122 SHA512 c9b07c80d4e4355bc2c4ebce895efe35ed70d5a31eab3eb8298c1cc947a42cb1c4bb81d57cb46816619580067aeec246f49bc581a788abb7c912d0ef898f8448
 EBUILD smartmontools-6.5-r1.ebuild 4043 BLAKE2B cb6764d3186c03fc1df0878d00b7ced1d1e5036e8e3e7afeeb552e3d257cb51c3173edc07b738d111b41eb73f83f67967a9bd9ed071ab11478e12fdf5a0ea20c SHA512 7bc661356535cf00b2783f4a4bf323eae05c688d3db0ef81e7ccccb8d8aeeff24b2bbfca50b233d96b0f22d2aecf2d39f5bcd53d90b9076424b3c744f48341a5
-EBUILD smartmontools-6.6.ebuild 4086 BLAKE2B 7b92f551ff490dfa7cb7fa070b636a2ce36d459b9951ed2d1a9bd081d430f6fa1fa9f3dc530000a4c1f337c4967bdbd9f869998edf58b0fd6c227f3cedb1a083 SHA512 8377874dc696ccccd7b31d8a33875b40d2fcb9c334a0fe34e781e5a367c36137edd999738416fa89389948689f5ad8338d1cad69bbe7167ef26be1ed4e35975b
+EBUILD smartmontools-6.6.ebuild 4142 BLAKE2B 5ad0f6fd28cd296afefc228e641697d96f9c6dd3e8985d1490e02ad223ae1cae1056eef516c3849820444fb48a727f9961d9521a45aaed66e6b2caaf2934417a SHA512 e207b080d2baa723243d50a25e45e20f4995863cab7bcab0f6029372e900fee0279697776537230738930c5afe589347e6a1cb8fd0d4b7378497c98adfadd22f
 EBUILD smartmontools-9999.ebuild 4094 BLAKE2B 2af97f4da8bb0b0f5a1c6f9bc275724d69b4687e3ab7890f021d9e2fa25fccab24769dde1a08d61464f8977b6cd8c912b906307feb119e9f94eb83ce204cf0c7 SHA512 3b284a9deccd3b3e9e02d38565bc2a844f3e9478f20811742c35e5bd57cec653471f742921f37a0a48f1d5a533e51eeda11455e6bfb5fbf93eaba478d3174f2a
 MISC metadata.xml 718 BLAKE2B 4172ef96f081f77b7f701d2f11ed1eae3cd7342815fd3643373f8bb60802a273d8308dc4ff8e8d36349f8361e04213ee2d94619045a16739aa2fa75560c7cfae SHA512 a6a07e57bd09402839295ee859481d784445afadb12ffd644c6de3af41a4a763225f63d098c328193123d72cdad3b98e278256bb3e67b104015399def014ee54
diff --git a/sys-apps/smartmontools/files/smartmontools-6.6-fix-build-on-musl.patch b/sys-apps/smartmontools/files/smartmontools-6.6-fix-build-on-musl.patch
new file mode 100644
index 000000000000..2cd36e0dce5e
--- /dev/null
+++ b/sys-apps/smartmontools/files/smartmontools-6.6-fix-build-on-musl.patch
@@ -0,0 +1,13 @@
+Bug: https://bugs.gentoo.org/644586
+
+Upstream fix: https://www.smartmontools.org/changeset/4603
+
+--- smartmontools-6.6/os_linux.cpp
++++ smartmontools-6.6/os_linux.cpp
+@@ -3177,5 +3177,5 @@
+   char path[128];
+   snprintf(path, sizeof(path), "/sys/block/%s/device", name);
+-  char * syshostpath = canonicalize_file_name(path);
++  char * syshostpath = realpath(name, (char *)0);
+   if (!syshostpath)
+     return false;
diff --git a/sys-apps/smartmontools/smartmontools-6.6.ebuild b/sys-apps/smartmontools/smartmontools-6.6.ebuild
index e96fcf919473..5edbb8d138d3 100644
--- a/sys-apps/smartmontools/smartmontools-6.6.ebuild
+++ b/sys-apps/smartmontools/smartmontools-6.6.ebuild
@@ -47,6 +47,8 @@ RDEPEND="${DEPEND}
 
 REQUIRED_USE="( caps? ( daemon ) )"
 
+PATCHES=( "${FILESDIR}"/${P}-fix-build-on-musl.patch )
+
 src_prepare() {
 	default
 
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 8d97746a8d84..fd01755e923c 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -13,9 +13,11 @@ DIST systemd-233-patches.tar.gz 12553 BLAKE2B 5d19f2dc82cc6cbd9b2e9393f932dfa3c8
 DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e
 DIST systemd-235.tar.gz 6586406 BLAKE2B f2e46a6c51fc9445800c4b7eee66f23ae83b42c2fedf2304acf612e6cb99122afe67f1b93cf72ed022b52384975afb92ab38cfb4efc6026384602c973d2eb98e SHA512 243f2eb5340fa37dd1286eaa63e83387bda9e03953af266cd6196a37535a13491482caf14c6ab10608bba4ed23b6c41923608e52017e0c26988ed72ddd2b9993
 DIST systemd-236-patches-1.tar.gz 3331 BLAKE2B c4ef8881252e79f920572eb73210b205f36ee2a45aaba4bea5e5e8b2f89b92b79deb8e30a62c9163fd0bb2fbc2215e0dda6ca3388b71e4349a8659591c23064e SHA512 d4c93968d03b5f2f2279b030e65399a7d1971eab4d9be8f2122eab67b1fb7b24eef46993beab8400fc782954dc78f400778c3fff5ba4f6c51a14eeb1931c3862
+DIST systemd-236-patches-2.tar.gz 54737 BLAKE2B bce5f9e234c975a2b6e474ca2a0c2c82e704f02cf19885134dddc5edbd0b7bfb3773d737f88f78ba2ab81093dfceeb44d76ecda99cf2b916072dcdfa84720c19 SHA512 b74ab6944135c938b2d0d2a1dd40ac4cc4ff26d072603d6bfbe4529d808b2e481eb910155895bce14607842ad6d30751aded51654a53f76278becbb5e317b875
 DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d
 EBUILD systemd-233-r6.ebuild 13593 BLAKE2B 888f373f78f0ba49f91d765b1568c7b6183b2cc2794f66cff37bf1518aa926148ce67411077de68f45419021bd4b99610e4552b1bd7d84dd2a3ce594f109be43 SHA512 ba05ead8530e2276ebde9b5dbd76d129ddb80224cb551114bcd0d55a079597a77b57f1bf58be520b74bbbb419a0c4020cf1039897a6d01c1e839fe3b67cac711
 EBUILD systemd-235-r1.ebuild 13515 BLAKE2B a7c8172b85924b970a5104681c0577c447408d88232eff3dd9a607b86f18952db48ed358c7451834291214432424694e5873719a1e0d2d30888d9747d3313729 SHA512 263a14227163ca7d4a993f150e864a67e7ccc1092f808a14493206f418780453e4e74df3b700cb746060d46da5025d8c0db5841404db09afc13e2e968bdf93b8
 EBUILD systemd-236-r4.ebuild 12986 BLAKE2B 1ea709672003c2864317751b1471e088bdc5cd430a9449fe28b43840d9af53ecbcfa4877bf6a9eb0f96999a5d4ad4c47c7b548d5125196c5df5984a187868210 SHA512 ed6f3ff41b7266f6010e73d67659619836f17f8900e64d0172b335631ae75e2d357af0ceeb5424c691a546e9b4cf5f68ff2a01d766fa73319567a0b628752ac7
+EBUILD systemd-236-r5.ebuild 12986 BLAKE2B fa47e67d13fc1dff405f14d9d55aee478b9cf6efb1ade36481101929f476421703fe75633479a497be7dfe69fa2021df5c73268c5f2adb3c6a17c3fcde708db2 SHA512 9715f12f3a27756a07acafbf8001353c23c6194a5c53d77b52e0a845ccef8d4452e283a79f1e6224dfbd87bf233d96e1e1ad780551c091895b83a4d5691ceaef
 EBUILD systemd-9999.ebuild 12925 BLAKE2B 44e3ff49e2898a8199a1d106de12ceb286e33dd810e6fcc046ededd7f720914c355f5ab189af07b2f8d4951dbee1ad4046fc403fc357d6d6a13c67e67045d39c SHA512 f31ee8d40c1eb31af6a06b58a79c3121b824eec0ecbc0e8d3a37ba77368d8c3f3b96e2167f1d7ca10690c1963da37a0394989c0d4ba8789e39666924c5188b26
 MISC metadata.xml 2032 BLAKE2B a554cb3dc21d5c5a5a4227f05f4a91054080999d23022051252f3461fb9c4398112fa1c96982205b4e1709de00ae395706ac46b86ae44610ecf85ededc3ceca7 SHA512 1c97f2c573c63a63d2ed78820d891d9593c5d8636574270c4306dc3c8ce739e52f6829e7e219cc2744acd7f3e2362e340b7c2406923f1aaf9adebc785cdb6544
diff --git a/sys-apps/systemd/systemd-236-r5.ebuild b/sys-apps/systemd/systemd-236-r5.ebuild
new file mode 100644
index 000000000000..6066595bd1b7
--- /dev/null
+++ b/sys-apps/systemd/systemd-236-r5.ebuild
@@ -0,0 +1,437 @@
+# Copyright 1999-2018 Gentoo Foundation
+# 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}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~floppym/dist/${P}-patches-2.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+PYTHON_COMPAT=( python{3_4,3_5,3_6} )
+
+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 policykit qrcode +seccomp selinux ssl +sysv-utils test usrmerge 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}] )
+	qrcode? ( media-gfx/qrencode:0= )
+	seccomp? ( >=sys-libs/libseccomp-2.3.1:0= )
+	selinux? ( sys-libs/libselinux:0= )
+	sysv-utils? ( !sys-apps/sysvinit )
+	!sysv-utils? ( sys-apps/sysvinit )
+	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
+	abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
+		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )"
+
+# baselayout-2.2 has /run
+RDEPEND="${COMMON_DEPEND}
+	>=sys-apps/baselayout-2.2
+	selinux? ( sec-policy/selinux-base-policy[systemd] )
+	!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
+	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() {
+	local PATCHES=(
+	)
+
+	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/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.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 usrmerge false true)
+		-Drootprefix="$(usex usrmerge "${EPREFIX}/usr" "${EPREFIX:-/}")"
+		-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)
+		-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
+		-Dpath-kill=/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() {
+	eninja test
+}
+
+multilib_src_install() {
+	DESTDIR="${D}" eninja install
+}
+
+multilib_src_install_all() {
+	# meson doesn't know about docdir
+	mv "${ED%/}"/usr/share/doc/{systemd,${PF}} || die
+
+	einstalldocs
+	dodoc "${FILESDIR}"/nsswitch.conf
+
+	if use sysv-utils; then
+		local app
+		for app in halt poweroff reboot runlevel shutdown telinit; do
+			dosym ../bin/systemctl /sbin/${app}
+		done
+		dosym ../lib/systemd/systemd /sbin/init
+	else
+		# we just keep sysvinit tools, so no need for the mans
+		rm "${ED%/}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 \
+			|| die
+		rm "${ED%/}"/usr/share/man/man1/init.1 || die
+	fi
+
+	# Preserve empty dirs in /etc & /var, bug #437008
+	keepdir /etc/binfmt.d /etc/modules-load.d /etc/tmpfiles.d \
+		/etc/systemd/ntp-units.d /etc/systemd/user /var/lib/systemd \
+		/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 usrmerge && udevdir=/usr/lib/udev
+
+	rm -r "${ED%/}${udevdir}/hwdb.d" || die
+
+	if ! use usrmerge; 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/texinfo/Manifest b/sys-apps/texinfo/Manifest
index f7c24ffbde90..61c6dc00c30f 100644
--- a/sys-apps/texinfo/Manifest
+++ b/sys-apps/texinfo/Manifest
@@ -3,7 +3,7 @@ DIST texinfo-6.3.tar.xz 4468048 BLAKE2B ef255225e1f66dc5e6646761d78dcf3e7ba9c79a
 DIST texinfo-6.4.tar.xz 4497624 BLAKE2B 7081131868f748036c39812674fa8b962144fe6b96445ff72b5a88537a9a044c45cab33bfaf0d3169c0bfb6ce60832c908e49a04ef04d7631ba345002b552f92 SHA512 628e7fb64c4cb6d4ec879d5593e3660dbbbf41915c7aec68b6af209a1c496bee8a3879a69e4e047c3bee0cb476540ffd6ebdef5ec7b712edd191a82ce9ac4006
 DIST texinfo-6.5.tar.xz 4503048 BLAKE2B 9e194115a252500fe6048614a96c6992b6fbf9f3557265d8bdda143e10f781769ca5e97ded2d330da7c0ae1581bfdebbf2dbde736689412980b098ea935d9580 SHA512 06831b4c74a1ba7a9cff937069e40ab26db1204aa8761d63254651ffacf6b0cb95d7078ba1cc59d95427239ab7e4f4aedf582967854281bfea3850b1ed5b1fdc
 EBUILD texinfo-6.1.ebuild 1118 BLAKE2B f6148426cb8877028d7dd1922f7c3156f3b9d2f670c8b83b2ffda6bd09f04795d7849f07c53f3ef8988f40a3397d7a9b2d25a1dce675c7f1b2488b33bb6a415a SHA512 6b73e1c59c2e8ef12fa8ca5699a5c5b1da4e5f97b969fd5e31c292625a60fa09c7f9301a172a919e127de9287fcd2279a672459c0009d21f6686b2a1152e8165
-EBUILD texinfo-6.3.ebuild 1123 BLAKE2B fdd2bce5a8ceab3775395619121a4695da1822afb73a6c549aa166e7a6965f50870e6b368932aaf292f44614b07aac07282560bb9ad777798a393a3f809bbb06 SHA512 bbdbbbbfc507aff742f1763027186738f0001e7f0017aa8ba9fe3498157ee3c799ffc2331b93492b06d0c3ae5f82e8b227e1ce97ae93bb94276c7da064fce8ce
+EBUILD texinfo-6.3.ebuild 1118 BLAKE2B a0798af983fa3aed9601049874198e02b2609af1e2a41b8765e096d35092f9f3f094da6cbf7490b6ee1301a831e8fa1cd597c47c925108223db99ea283fba790 SHA512 88823b265dcb5ad8dbc185372922338cdb4e8492054c14ac7c4e1f811bdf2a24077f698e2afa0727cee85552326885359d32d56c55bee8b4f085922d7a7983b8
 EBUILD texinfo-6.4.ebuild 1131 BLAKE2B f9fc3ecfe6cfc405fe223a0fb43436df46b3250e89c63fc680446fab541d2adb52c1ac2636b2deed927d1f9e99eb6340b1ed79292aaf370711a07d5ee26fe381 SHA512 b6500793ac06068572006959e5a029b06fe12099b2a6b34fbef76f6ca5f555400595e422ad8b4526ffd07d9c44d1e6ca8702e84b5c470fc9818d0a4abf92b7ad
 EBUILD texinfo-6.5.ebuild 1165 BLAKE2B 56fb3747536631391c7db2e9ea855c02575f8952be4f6bdf6999545814758e88ef8e0e65672df09dd971e2174ed5b093fe5b32b1584462081b3387c97bd04027 SHA512 e60fda9767bd71c97c52bebef5f4fc44369aef6b5a06a75f5368d74ad930976d45191770a56d282376442e5188fa9baea605df4ec90d4b8e21fdf0f12569c57e
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/texinfo/texinfo-6.3.ebuild b/sys-apps/texinfo/texinfo-6.3.ebuild
index e0b156fd28e1..2528cc03f8a6 100644
--- a/sys-apps/texinfo/texinfo-6.3.ebuild
+++ b/sys-apps/texinfo/texinfo-6.3.ebuild
@@ -15,7 +15,7 @@ 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 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE="nls static"
 
 RDEPEND="
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index d5e0ec3c9487..99eec9ab989c 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,8 +6,8 @@ AUX util-linux-2.31-too_generic_symbols_pt3.patch 1118 BLAKE2B e2f098346f7359945
 DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d
 DIST util-linux-2.31.1.tar.xz 4510096 BLAKE2B f2e4a398fe4ecc0bbfb7c2240698e3a37deed57eb48a028ddfb578ecc057c1c928b2082d13014f0dfdaf5a8274ee3a13993fdbc19b7e05e5a992505ac90de79a SHA512 d45c1e62e39f5d5c7a642071e7ccce44fe4ecaafec54d8c9a4e9d526280a6e25723bfa0eb068401e291579c0d067661775bbe085190d13ff16493f47360b7760
 DIST util-linux-2.31.tar.xz 4503892 BLAKE2B 8a9e2fc674cacbfabfc76cc0ab671f3fdb35d49de9f4ae8660b49df9e196878c2459d8fc57f6c9b6d2ad73cc56d970656ffcbc22deed97bb7a0cc28490a1fbb0 SHA512 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5
-EBUILD util-linux-2.30.2.ebuild 6073 BLAKE2B b6f3b9f6c73513e37f5971c3c995f523c086e8cfc33f18c032eea51d102cf2a67912b52ac7461f7407d50459709997972042c6249fbe3d38638de33686d97c9c SHA512 95efdfcee3b9e6dbae06024fd47bb3da4f316dfbc060f4e3e84f1ea227b1e316aa2e2141a2cf3c6ed4c627e2df6b104c1a6a6e45a4585fd22b527bc10a22367f
-EBUILD util-linux-2.31-r1.ebuild 6185 BLAKE2B 8aae4e20de31ab9161b78af51d8038a98f8ea4909277aa9a499b1aa47fe7c6821a965241a218d4ce166a462889c2e6375cda43e580922ac90ee805f196142ce6 SHA512 4bc749571b57a6720c7bbae2ca8b63d79ae8e2f46de686ff1978b35531d4945e1cab3afd61ec6b76718c31151e3838f06044e15b8bd7143c161a5f7860c74bca
-EBUILD util-linux-2.31.1.ebuild 6108 BLAKE2B 6c27812bdb0f88e254fb030dd85224788dd7f40704492d679fd11e26b50fbd7ea2b4ae8c85d960c79049f8e7254873326ca63bb40c2a3b78295bcd30264fff59 SHA512 6c98e8ef184d56fc383d9df07fac71763d106413ef053a158e993894ea25f1685eb57e0da94203afdd75868c15f184c9e307d5cfd5223ac3ec6c3a001b583466
+EBUILD util-linux-2.30.2.ebuild 6106 BLAKE2B 2b0dabe265e415e43075cb9fec515e53a1cf1983f9d94141438bad1f1d9cd3c0f577a16a4b8ff6179909edae701ee82e75ecf6ab06799085919154bed8f92fdc SHA512 7a868edc01fd28a910ceea86b47c1c9d663bedb04809ac7cd70b19c80af3f97b53699fa3959fb99a318fe745afecc5862ea590538e9e2bd1555259427bc81e52
+EBUILD util-linux-2.31-r1.ebuild 6218 BLAKE2B a99d0b36f48496caeab7d478664748f6844c9f696c66520927f7b38177daacb88daaa67830216aabc34dc7ef93ab0cf309acb4ce4353dbdec060491ce5c139bf SHA512 7a10a69393c664a9467c254e44b0049352ab4a3c7f72f8187177a415a91a7bf0ed8956a026f41afd5fb94e58d5b236876b25e00e8d2e6f447ef741acdf466a49
+EBUILD util-linux-2.31.1.ebuild 6141 BLAKE2B 6011ed4d8ea642b73ae1d0e30508ba18d53034b0b3c5f5a331836a37a2fb258bdac304a86cab175fb4dff26a0a9df4e888ffcd4b2d8bd44704ed6b8fd052d7e6 SHA512 e2d0d9eed1874f7bd50b467433a6e8eb4c49d9f60d5401dcdf16e6e8154756cc04a2ad6f34b8cd5086f9ffcd83ed71e063195a7d62faaf3032036adfd9d7e438
 EBUILD util-linux-9999.ebuild 6108 BLAKE2B 92ce3d425be12339dac8fb7296dc2e51dc2acff2d7d3382f4103b6c971a72c346564a2be31dcea835b58d5c88292cae7b2b8944408ab96d5d39d3db872e43ec7 SHA512 206118f5ff5fa5d4b21c734965c967d5eaf5934d57aef26199196b9800b89f252d17d676d4c288846062a0ff3d5304edeeda005f7dd62a427b3f6e19bc049da1
 MISC metadata.xml 947 BLAKE2B aeb1eef359b4be20e0df592245a2d432d92adf29336ecb1519bb4a97deed47c75bd14ca6c132f2e2ffe5c2d2ddcd7638ee38d03c7f8bcf8c8accb36a916663b5 SHA512 3822f7f3ccd120bbc788c64db0b79d55ad892bed99d01f8e0988c57ca7277a1936e03dbffd2898e68a2b6da25c301bc2cafb1da9658cdbbdfee1c9fb65e1699c
diff --git a/sys-apps/util-linux/util-linux-2.30.2.ebuild b/sys-apps/util-linux/util-linux-2.30.2.ebuild
index 941bf4695f5c..d3177f65d394 100644
--- a/sys-apps/util-linux/util-linux-2.30.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.30.2.ebuild
@@ -55,7 +55,8 @@ RDEPEND+="
 	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.3-r2"
+	!<app-shells/bash-completion-2.3-r2
+	!<sys-apps/s390-tools-1.36.1-r1"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/util-linux/util-linux-2.31-r1.ebuild b/sys-apps/util-linux/util-linux-2.31-r1.ebuild
index 8b029289f46e..bcacb9a8876f 100644
--- a/sys-apps/util-linux/util-linux-2.31-r1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.31-r1.ebuild
@@ -56,7 +56,8 @@ RDEPEND+="
 	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.7-r1"
+	!<app-shells/bash-completion-2.7-r1
+	!<sys-apps/s390-tools-1.36.1-r1"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-apps/util-linux/util-linux-2.31.1.ebuild b/sys-apps/util-linux/util-linux-2.31.1.ebuild
index 9b6633597d39..e9e1cbcda502 100644
--- a/sys-apps/util-linux/util-linux-2.31.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.31.1.ebuild
@@ -56,7 +56,8 @@ RDEPEND+="
 	!sys-block/eject
 	!<sys-libs/e2fsprogs-libs-1.41.8
 	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.7-r1"
+	!<app-shells/bash-completion-2.7-r1
+	!<sys-apps/s390-tools-1.36.1-r1"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 5fec348fc8c9..f11cfb14245d 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-auth/elogind/Manifest b/sys-auth/elogind/Manifest
index 787a5a16c38d..a85411f9e6d6 100644
--- a/sys-auth/elogind/Manifest
+++ b/sys-auth/elogind/Manifest
@@ -1,6 +1,9 @@
 AUX elogind-226.4-docs.patch 355 BLAKE2B 6e2ffcfe0e4b8d8822cb41133302757cc02c09298dd53cb4eb277b3e3200764f6beb90d4a702870e00d0ff5338cb5a0a7d228a563a6f9c51fb340e4c63650a59 SHA512 dc942f190ea2064e194808db7c6ede618d536778f1b574658ddb9c0aa4a106f6129cc18000eaa63aeca1b16ad28fe5f5dbee441bd93436ae62eb4740236f94ae
+AUX elogind-235.1-docs.patch 714 BLAKE2B 93271996cbff4cc8f1cb222c83672f491d3473839fffea4818e7a7341fdb0060de23cca70576d81d0c6783fc796d998b0b70a38237ec7ab14dd8e2521659d49e SHA512 2e530aa318d3ba0de3a1fceb4d8316f8215e1a8d769b077cf4b223ae2f8103c62c2852dd3fd45540646ad6272b0edbb4b23d70a379a2601765c61b4d78b4d81e
 AUX elogind.conf.in 218 BLAKE2B 7ee0a72c4a628a233fdbb2d3104487859aaa7e5c4f2624e5a4eafb37ed90fb8f64349b1a8acc92e69ec618496bb7f6263b7a5d0fe15a1afe1c03f5955743f079 SHA512 2c62ab28d7db9cd52489069f80363159000385a25dd7f2afe5a03598a0b7a1f61af7c18df71f6286e72f5966e55b62a4029e30cb786dd813bb201b9e20adccd7
 AUX elogind.init 490 BLAKE2B 71c102f89a71a2963da50b153d8696a9480d81caa48e8422e7f39614e9bfb0b09037bc4dea202c3735e170140752429dd54747b99941d861453b4714dcb98819 SHA512 60fe1cb55ec0f605f06fb3744a0300accebfc14c4ecd24b7db2e8b0cb1537e816a4a4ccbc4b2eeac45e2f3ca8942dd10d24bdcd814cccbc2ceed198b2657238a
 DIST elogind-234.4.tar.gz 973370 BLAKE2B 4fe00d2e22e3f94dfb6385fe61825be72ad2200f1368807ea816a971104cf384e3508ecf2877fa08394c6d0259874b2ceb7c4014f9e861dcd3b19c01bcd04602 SHA512 2df4fa318074d4f5e5dbba353cf817068a2703ffed40cdeae4cba2dea4ee143d1c5fc076b19419f1c4299392088c2c14b430d8aa1ded03b62117311802305d5e
+DIST elogind-235.2.tar.gz 975652 BLAKE2B c568b5eec89da14f55211cf4405d96b4bb1ea274d1237739a92c4f3585a6181a3e17dc7ed2af5161c649cae2149b3bd25f4212cf5a304383b254e39d7aa0b378 SHA512 6fa9194e8c21fa3d3caf6f9499f772dbfe38b9d40d8a0fe43ee32ad4b2acd672a78798d00694d1e0d6107625f4f3f06b71e0a5466ed4be446d670f9bcd961313
 EBUILD elogind-234.4-r1.ebuild 2904 BLAKE2B 01348724ce12ee709bf444794544e1cd15a9b97a976f50c41f0686ad82d935f99a12f081481c22e0dfaf63c99426ec63961b1aa7bee926b377744b7bf09a247d SHA512 dfd1fa283a1110092b32bec7ec6627b3819c44242de6387eac9abbac457f11fe31bb93f76852fbfd1a88e646273eccd884fc90b353cec718f82dbd1ea8759982
+EBUILD elogind-235.2.ebuild 3437 BLAKE2B fd17797c07dade1d5c4250fe638d0458f6be4fc853b145ac39a363da317e5af6d2bc39ea17028f93127df6b12338b057b0270f833e22d0202e6dc06bd92f0c86 SHA512 0b332b0fd3fcd898bc2b5ef74534cddf9d77e109c2a4a9590d2e53c9c93b423d0937f0f5fceadd0e8d5147490846b31dee3cac62cfb94462866ed87d37bc0536
 MISC metadata.xml 379 BLAKE2B fc63654412fa4cb02122205ad53d29ed35153457c5dd5c5ab8fa3c3dbfcc7c00b2704220d4cb9040f8d6f794bbb9bd0f8cb9be80d410efb6cf85eeee8ce46503 SHA512 30be0eb7903ffb83d9e24fbcacc8db09c0f8cd7187df5f75b2c12fb5cfae1110d52f29aba502ea92af53df02451cc40e0f3789382f87a16bd281f06e9cad6c68
diff --git a/sys-auth/elogind/elogind-235.2.ebuild b/sys-auth/elogind/elogind-235.2.ebuild
new file mode 100644
index 000000000000..d6c31d67e037
--- /dev/null
+++ b/sys-auth/elogind/elogind-235.2.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info meson pam udev xdg-utils
+
+DESCRIPTION="The systemd project's logind, extracted to a standalone package"
+HOMEPAGE="https://github.com/elogind/elogind"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CC0-1.0 LGPL-2.1+ public-domain"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+acl debug doc +pam +policykit selinux"
+
+COMMON_DEPEND="
+	sys-apps/util-linux
+	sys-libs/libcap
+	virtual/libudev:=
+	acl? ( sys-apps/acl )
+	pam? ( virtual/pam )
+	selinux? ( sys-libs/libselinux )
+"
+DEPEND="${COMMON_DEPEND}
+	app-text/docbook-xml-dtd:4.2
+	app-text/docbook-xml-dtd:4.5
+	app-text/docbook-xsl-stylesheets
+	dev-util/gperf
+	dev-util/intltool
+	sys-devel/libtool
+	virtual/pkgconfig
+"
+RDEPEND="${COMMON_DEPEND}
+	!sys-apps/systemd
+"
+PDEPEND="
+	sys-apps/dbus
+	policykit? ( sys-auth/polkit )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-235.1-docs.patch" )
+
+pkg_setup() {
+	local CONFIG_CHECK="~CGROUPS ~EPOLL ~INOTIFY_USER ~SIGNALFD ~TIMERFD"
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+	xdg_environment_reset
+}
+
+src_configure() {
+	local emesonargs cgroupmode rccgroupmode
+
+	rccgroupmode="$(grep rc_cgroup_mode /etc/rc.conf | cut -d '"' -f 2)"
+	cgroupmode="legacy"
+
+	if [ "xhybrid" = "x${rccgroupmode}" ] ; then
+		cgroupmode="hybrid"
+	elif [ "xunified" = "x${rccgroupmode}" ] ; then
+		cgroupmode="unified"
+	fi
+
+	emesonargs=(
+		-Ddocdir="${EPREFIX}/usr/share/doc/${P}" \
+		-Dhtmldir="${EPREFIX}/usr/share/doc/${P}/html" \
+		-Dpamlibdir=$(getpam_mod_dir) \
+		-Dudevrulesdir="$(get_udevdir)"/rules.d \
+		--libdir="${EPREFIX}"/usr/$(get_libdir) \
+		-Drootlibdir="${EPREFIX}"/$(get_libdir) \
+		-Drootlibexecdir="${EPREFIX}"/$(get_libdir)/elogind \
+		-Drootprefix="${EPREFIX}/" \
+		-Dsmack=true \
+		-Dman=auto \
+		-Dhtml=$(usex doc auto false) \
+		-Dcgroup-controller=openrc \
+		-Ddefault-hierarchy=${cgroupmode} \
+		-Ddebug=$(usex debug elogind false) \
+		--buildtype $(usex debug debug release) \
+		-Dacl=$(usex acl true false) \
+		-Dpam=$(usex pam true false) \
+		-Dselinux=$(usex selinux true false)
+		-Dbashcompletiondir="${EPREFIX}/usr/share/bash-completion/completions" \
+		-Dzsh-completion="${EPREFIX}/usr/share/zsh/site-functions" \
+	)
+	meson_src_configure
+}
+
+src_install() {
+	meson_src_install
+
+	newinitd "${FILESDIR}"/${PN}.init ${PN}
+
+	sed -e "s/@libdir@/$(get_libdir)/" "${FILESDIR}"/${PN}.conf.in > ${PN}.conf || die
+	newconfd ${PN}.conf ${PN}
+}
+
+pkg_postinst() {
+	if [ "$(rc-config list boot | grep elogind)" != "" ]; then
+		ewarn "elogind is currently started from boot runlevel."
+	elif [ "$(rc-config list default | grep elogind)" != "" ]; then
+		ewarn "elogind is currently started from default runlevel."
+		ewarn "Please remove elogind from the default runlevel and"
+		ewarn "add it to the boot runlevel by:"
+		ewarn "# rc-update del elogind default"
+		ewarn "# rc-update add elogind boot"
+	else
+		ewarn "elogind is currently not started from any runlevel."
+		ewarn "You may add it to the boot runlevel by:"
+		ewarn "# rc-update add elogind boot"
+	fi
+	ewarn "Alternatively you can leave elogind out of any"
+	ewarn "runlevel. It will then be started automatically"
+	if use pam; then
+		ewarn "when the first service calls it via dbus, or the"
+		ewarn "first user logs into the system."
+	else
+		ewarn "when the first service calls it via dbus."
+	fi
+}
diff --git a/sys-auth/elogind/files/elogind-235.1-docs.patch b/sys-auth/elogind/files/elogind-235.1-docs.patch
new file mode 100644
index 000000000000..bb28bf412d4a
--- /dev/null
+++ b/sys-auth/elogind/files/elogind-235.1-docs.patch
@@ -0,0 +1,20 @@
+--- a/meson.build	2018-01-14 18:59:36.141461154 +0100
++++ b/meson.build	2018-01-14 19:00:46.208461781 +0100
+@@ -2634,16 +2634,7 @@
+ # install_data('modprobe.d/systemd.conf',
+ #              install_dir : modprobedir)
+ #endif // 0
+-install_data('README',
+-             'NEWS',
+-             'CODING_STYLE',
+-#if 0 /// UNNEEDED by elogind
+-#              'DISTRO_PORTING',
+-#              'ENVIRONMENT.md',
+-#endif // 0
+-             'LICENSE.GPL2',
+-             'LICENSE.LGPL2.1',
+-             'src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
++install_data('src/libelogind/sd-bus/GVARIANT-SERIALIZATION',
+              install_dir : docdir)
+ 
+ meson.add_install_script('sh', '-c', mkdir_p.format(systemdstatedir))
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index da6a722c15ad..2878db40f350 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/raid-check/Manifest b/sys-block/raid-check/Manifest
index 9ad7068259dd..4f50f04311b5 100644
--- a/sys-block/raid-check/Manifest
+++ b/sys-block/raid-check/Manifest
@@ -1,5 +1,5 @@
 AUX raid-check-20140719-makefile.patch 1451 BLAKE2B dbd8b448a59dcc67564c021e675d3cd7f527e0349a37d3fd319afa711e4b78abc94cb45bc9675161df848a1d2374410ed51c189b416e448e186badb40bacb59a SHA512 50ef4c4eafae33a0479d06cd162b54bd89c3ce89b92fb48aa286f9f1fb322ecb6c58c58d29ddbe1b7a42813a2a1fdd6ae4f65242215205eab5acbb0e9d9c9ed5
 AUX raid-check-20140719-path.patch 293 BLAKE2B b678612376f89f896ddd6949c00caa08b5bbaae0aed861375704fd335e2113f091e15d2ed521a407afdf3864cf67af149ee7cedd53b9aa548a6cb546ee5fdfac SHA512 7b9939b9ac05d6c04af5a1422713a316ac18826b7d6f9ed1d5b66e4d557e0069f91e4e04e627a827070c676a845af53eeb2ef7be8bc15455229117727bd4e1e2
 DIST raid-check-20140719.tar.xz 4000 BLAKE2B d9ece0d24d0d32fa68debb7960b74d95f90acc556fdbdd2802597b738cf88e7e993c8d410e9f6b5474484c441b8da3653b4953de9cea8f84a48d2693fc6aac93 SHA512 dc7b4c6e784b3ef2ca89e9dac0bbe3e47056439dfe48615b79922b47cb3b0df7f157ae52ab9de0b9abf5373bd769090088fc8712b492b0aa5327aeaeaee52edb
-EBUILD raid-check-20140719-r1.ebuild 566 BLAKE2B f454c7ebd35a47f8408f2ef74e4d15e5db3d284f32b967c636d5e5162c32f334771e07819c30d92d646376e547e106fd762931e04a6838cd4675e0fc99c41120 SHA512 ad9a68cb6d65854b4ca78f162cf4ee0102247343571c0d73a4296c55061295c89622341c95ece476b3d13e27fdc6e9f028eec83ae0c8619f22bf2d0fb7bbbd29
+EBUILD raid-check-20140719-r1.ebuild 565 BLAKE2B d5d43b986ec3bc63d711b996b09e24385738fdee5dd418706681e0ea7d552eb4563f0cd5fb661bfbbc4720e5b94e75271fdc279eed2853e6e3ce88f3d5b50656 SHA512 19ec1641b943732a75beac267a426dd0e4425e33c5f2ac5c6d914fddd0d65c4f570e714f381eb0cdf5f193af023ae23c0e2012b324bf03b0e45147be6785f7ee
 MISC metadata.xml 539 BLAKE2B d281d33deb27a9730a45dc9a2c001f2afc1fdfef6c2e8b5b875d4ce7e66481fad16c475007dcfafdfeba983a382c97ce0ac391e33f16499f3408e899a8ba36a7 SHA512 6700dd1dbdb3b43e731f92e8b2e8c225ae2e0d53563d5342a9d304333b5d617c06e48d7d5aa32b05069525c509bc9511ba7825598e91aee7fbd08cf3be28b709
diff --git a/sys-block/raid-check/raid-check-20140719-r1.ebuild b/sys-block/raid-check/raid-check-20140719-r1.ebuild
index 5b6d6cd7de2c..1251ad1189b4 100644
--- a/sys-block/raid-check/raid-check-20140719-r1.ebuild
+++ b/sys-block/raid-check/raid-check-20140719-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 PATCHES=(
 	"${FILESDIR}"/${P}-makefile.patch
diff --git a/sys-block/thin-provisioning-tools/Manifest b/sys-block/thin-provisioning-tools/Manifest
index 6fc252729e8f..7cc0d5764c0a 100644
--- a/sys-block/thin-provisioning-tools/Manifest
+++ b/sys-block/thin-provisioning-tools/Manifest
@@ -9,7 +9,7 @@ DIST thin-provisioning-tools-0.7.4.tar.gz 276652 BLAKE2B 5ed00d6c2b34524656e37e9
 DIST thin-provisioning-tools-0.7.5.tar.gz 278856 BLAKE2B f554a9001bc9dde3510e3702f184d48cd77ddfc04f16c7e054fea8a3a47fdce7796ca4fcdb8d155e3d22526535ae965e344b3c2735f6275a7702044536dff923 SHA512 65268cc0c68428fa89f039c097794f574ef79b1862de3208715b9180ba73b197f37d879b386b110c52d9f2d3e80fb069a8d48ee2939aa1fd2b88f2513babc763
 EBUILD thin-provisioning-tools-0.4.1.ebuild 1556 BLAKE2B 8165b1872b9dcbe29d1b290444a6fbc1e4ec3eed6b0840e2e9f66cb1c0be125934b9d4c74fa73f0a2129ed178d36837a4c71f7573d74f61ada14bd7bc99e8b06 SHA512 aa53f7f3f63c1ba9b1f4921d08924a9a38db2346a96520f4b2fe3a43b8c13c824c8cf93f6651c2c3bbce8902e484351c710dd729bda15b5ade160f3a522f3d0a
 EBUILD thin-provisioning-tools-0.6.3.ebuild 1535 BLAKE2B 6acc6c05cfcd1081401ce8408c76d907a4a8d3683027c713268e86bf27e03fe621a1a8f6f90010366c0d21d4ae94477f926e6eaba465b6cdf5c1dace5962bb32 SHA512 2d0b39da75af09bb22226fe5e5078de529a50218fe0036ca4b5145b142147030609a6ab906fc216f056c90ef219c4d533ea08f013d25a316efc31648bfb13d7d
-EBUILD thin-provisioning-tools-0.7.0.ebuild 1519 BLAKE2B 898de2390f23ff38c80cb9bc36f530d2c3a3534d602f2cbad308acc57f018a320ca9bc9eed89fb30da52d5a1e81bf45acfd302f7a23e13752e980c93f0217f15 SHA512 63ab3a283e2581b98b7b320966223ad98ae061888da7eeae4a03a18d74a0b261db6c8a0424c31be208bf62fe2f53e99433115bf99612730377a3010d138c1962
+EBUILD thin-provisioning-tools-0.7.0.ebuild 1518 BLAKE2B 9c5acb31448ec09539be8db4465ffe5f9c6c11e96e32f28fcab0024a1770da6526df2ad47739d69edd58d6cc6a4f3dc11b3a86171578ad3e515355be29ef2f98 SHA512 934437e0361af63723e722cf67bd7f211fd7d4c93bfa4e124bc4515b590937bca99139eef1a2cc743f54cdccdca04335949808129ded414f62bc49c06c137f9d
 EBUILD thin-provisioning-tools-0.7.2.ebuild 1526 BLAKE2B 6830414d9993af6dd77cb0aacf921c794d9e28aadf0331b4fc30eb5df501452d8c91d8789d3c6f47c7b4b3335ac02bf3b400aaf4dd107e7b3f526169cb068041 SHA512 8dd47fbcb609a0ae5ce12962f81c758e4108b4e68b7464749fbe0dee268578f049e5aa10d1b2083a3c320a6b77c1bb938ca8912241731ac64951a741bbd65b8b
 EBUILD thin-provisioning-tools-0.7.4.ebuild 1586 BLAKE2B 04245152d500696951ce7ce04a03cad62956adadfa12631b3adf70e6b71873789445c56193ac2f7ae26b1a5113dd8ffa6020d1128ecd81f5cabc89ee7b19fa82 SHA512 1deb6732a34855f7d0ae235f4aaa5d8a176569c3b48ea0dad2888d5d71bd5b6dc9b535215d8f6320f8f370ff316a3d19c11dae17ebb33ac68ac97a62e3ea253a
 EBUILD thin-provisioning-tools-0.7.5.ebuild 1527 BLAKE2B 1da99f923d7338d53d20f9981aef07c42f7df3844b8102e954488e42af5536b43fca17154e41c455ef79e3a6320622ffd6d0b426820798fa9ca789d6dcaa013b SHA512 7bf6a5d6554dc5d26759e38960fc0b8b1e08139383e0cbf4b4ccbb4a5b6cbe698d8c58287448753617b057981aff907d2fc412d377d383b22fcf0555f956e907
diff --git a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
index 22efe209434a..2240a8d736ab 100644
--- a/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
+++ b/sys-block/thin-provisioning-tools/thin-provisioning-tools-0.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/jthornber/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 IUSE="static test"
 
 LIB_DEPEND="dev-libs/expat[static-libs(+)]
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index aafe6b04b576..e2d13c328b6e 100644
--- a/sys-boot/Manifest.gz
+++ b/sys-boot/Manifest.gz
diff --git a/sys-boot/grub/Manifest b/sys-boot/grub/Manifest
index 509027e71748..f37e06bad637 100644
--- a/sys-boot/grub/Manifest
+++ b/sys-boot/grub/Manifest
@@ -12,7 +12,7 @@ DIST grub-2.02.tar.xz 6113260 BLAKE2B 7c5ec61a8dc5a00e9cdc91c489f0d2ee37cd7e673e
 DIST splash.xpm.gz 33856 BLAKE2B e8d0ee91a87ed45f47fa58b07a6476b19ddb3f98ffee41adce46fe9bc4926bbefcac5cd01efc41794049b1c905502b18e69b5f0546bcf3cea79bf351e1817574 SHA512 5ae1f786f7d46a95a7061068d5b2b3ad64607c7b190d6f28379508c5dce67e26308325bfd637542a84855dfcf1ea3d143947326fdb189a6a8972208d3ead23da
 DIST unifont-9.0.06.pcf.gz 1360354 BLAKE2B 09b96e1711c729ef159d62e3ea7b289ca2d01dc0ea417e35a18b73dc02a23f62ce7821d9761bceee4002d9eeaabd91cfb69bbacc6fbdfdfa00445d18fe8f1d66 SHA512 dd0a1afa72f5204c62055d83f22750c74af38ffafdb8eda8e1f1cf7292e572a14969b8a9a6a2cb336d5bed4ab633f6b5a962c59117a590e4238788959cb82774
 EBUILD grub-0.97-r16.ebuild 9596 BLAKE2B ff6e369d331c18300a8a5b73232d5381ffecac3364ce2c789e3db2f510f1d0ebc929994eaafa41cec4193676c39022f4bda868afd95d5ee15dfa61fadba29bf8 SHA512 26aa6178cc463e79cf3416773517e35606aca9d8721da2f6aee0d5b7db223b32e4ca812188a488734784a5725646daceff24b3ae9d8e14452becad1ce25ebff1
-EBUILD grub-0.97-r18.ebuild 10143 BLAKE2B ee8f387c364af84203d991914a2f3f342ac63ab28777f18e72269df5897aa091f3237549f23128502cd5eb3309ff0ff38682da8ac2fdfba31cbf034525a2a407 SHA512 7f4abe2696425e41b27ef03cf8b9598209f71487b387edd15466c7ebeedd4636f9f456d5bc588895690b2cacf2e304c27d407331e1c4c155533fc652f6b93072
+EBUILD grub-0.97-r18.ebuild 10142 BLAKE2B fcd0b9979f99f88d26c80e272ed3165f65e28aca258516caa40c6a81b32dc3a10c45921e55c0b225cdc06e6334e6c899b59af7a02c03e8fca9c3be7825167cb4 SHA512 0a23cda09d823f5e2a0af7749debbeafef7b9c0ddb890da7bd36dc1c9d70f18267365e22a5fd00bd9c9445ff6271f358e4b6d5ad852fbff218eb74e0f3ed3c14
 EBUILD grub-2.02.ebuild 7597 BLAKE2B 31631da1a5c9c871ecfff60f9508bc81b557ed25226b70f31b0157611db6ea237e269f44fc0789215c19c32f4633cb9e0ca1293c3af2dc86b6e6b4ffb78538ed SHA512 d3aa7a602989d0eee9c48ddd527253099cfb81887171c69add1f83fea36bac295147fc11cd9cdd2c06410670c435cf1c3f20303660675aa936668b04178cb8ba
 EBUILD grub-9999.ebuild 7599 BLAKE2B 1a4dea600c7763b2be97adb02a9ccb3004f1dd565e6bb98f1fd14e063931c98698332bf0a58c1d709f645afff834cadfc021032044229b1313af658bc1551b60 SHA512 cfb7ffc4a2d94d0ceaaf6fa63d6c587b8c35488c3f00cc667073926a00c90044c58e94f69e53d765b13ea792f7e79e49b59529ad2788460367259ad2524bd410
 MISC metadata.xml 1488 BLAKE2B 3aa41f3c6c45258892bcf2800bfe09b506d11aa69a3071977e58736e496b72b71df579cfcaf1d14a3b81db695aca0bf7dbcc7a18faf1c62dd05f033bdafb00c8 SHA512 71f3e48b73c3d20f213ae928b16499131417562d98b83f2d82a5fb026c8cc06ecddf9db32565d9e1602d4258f7a2cc1796eb523c4cb98fb6b7753328a29e93ba
diff --git a/sys-boot/grub/grub-0.97-r18.ebuild b/sys-boot/grub/grub-0.97-r18.ebuild
index 9d5aeede6898..a286b4a55275 100644
--- a/sys-boot/grub/grub-0.97-r18.ebuild
+++ b/sys-boot/grub/grub-0.97-r18.ebuild
@@ -30,7 +30,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~x86 ~x86-fbsd"
 IUSE="custom-cflags ncurses netboot static"
 
 LIB_DEPEND="ncurses? ( >=sys-libs/ncurses-5.9-r3:0[static-libs(+),abi_x86_32(-)] )"
diff --git a/sys-boot/palo/Manifest b/sys-boot/palo/Manifest
index 3fb24d7c80ad..386a9561b873 100644
--- a/sys-boot/palo/Manifest
+++ b/sys-boot/palo/Manifest
@@ -1,8 +1,11 @@
 AUX 99palo 19 BLAKE2B 6c0aef7b3b54456a283f112c2046ae8d4d99633c8a7ac943d1a8f826275d6521ed1d4ca2c3fa166a50cb4fbdbf06c9f948907b967012d8d886a123752ffc7c71 SHA512 1ca106eff8f34386b5fa6bd9f0bfb656567040a2d3bc18de8f6913c3b533369f7c267932904556517f599674226feec8a09df6965bc8f844cb7ca873f5f5d174
 AUX palo-1.96-toolchain.patch 742 BLAKE2B 05e5b069ebd4323adaff7fe324d21aa06b303e686aa603f95bb255f74fa17a02cf133159ac04f3cc3a1ac64b5f54180c713eed8b03efa5e43c5ed78fccdb3937 SHA512 3b095d9cdd77fc9cc06731cccd2d7048bf18ba9e0348b74a0b77291dc543979c2107bc44a56b6820844c20cdb921bdebb8d4eb115246b2a1e6da073953cc1ce1
+AUX palo-2.00-toolchain.patch 532 BLAKE2B ef8df5bd7874ac88aa27b2864ee0baeb57e470e65bf39f9d33f19f42961f928f6a6e3ec69665750a0d1d90c66a4ab8479beb0d653a9e6a930d03b2bfadb8d65b SHA512 1c92b555f1456623e8657b33067693e4e13bbbbbebd55b13f2f6c86615133a39789cf323601993ffbcfac6c7f9e322ea4a1422f5663083d0b07f7efcdab34ab4
 AUX palo-9999-toolchain.patch 607 BLAKE2B 1c20bd83d3ed1dee37631d66c2a160e2f56b55d82b16dca5ef738d8d9c563390f59d35c1a901e23177a1d8424857ab42fa530bfebe1d0688652a4f8bf1b6ea63 SHA512 8ef234d83d0c09c4a43f802990f5fa5638525d7ce05c89c6ae57871a076a840a09085ac05cce490d5c4ff94466fccc83650f39ab1d5ab94ea6b4f4825c77ab9d
 AUX palo.conf 260 BLAKE2B 1e81466dcecedc4ca1894863491f4c91e88becc9a5c5815e69028eeadc98ca61e99951fb754a8261a6cdb763aaa22201ae77f65fd4de07bbbd3f3c801322e277 SHA512 4147e480362161cd61ad9af8fb7048b87f9126c213661ab26f77ba98fe7f1acd03791b154667137e4a265e3c31e54e703d32daa86ff0805f47bc7c1b8b03cfe6
 DIST palo-1.99.tar.gz 123906 BLAKE2B 0180cc8398622119debbfaab34e7ace32e74fa60f0e8cb1fc5b36ee435f32f86c79f9beffa1e3d21c9fa3422f72cb8868b244e75aff022e9a6b03b16397d068f SHA512 b859144a5b145aa47d44926b69172818f1fdd577958649d72a99be26dd68d4e2f366acfaec406c8d09ac751ffcdd380b70606e4f3f66e42328d387fcd9022b73
+DIST palo-2.00.tar.gz 124484 BLAKE2B b46b616acf51534382f6a775b456cdcbd4771d6bc9d7a8339ad788a5c5a4a333e98a6e4815c40a6750408b1e8168a19800da11ddf7125621f77d478a651d9c75 SHA512 b6dab81e6c2641a64a40561a65b5412ee702136ac79dab94619e0094faf011e158c67e681f45d5aa51423f5f162da7c1fd07b391b58e8a2100e1306eb7148056
 EBUILD palo-1.99.ebuild 882 BLAKE2B 59a732868a3db5eb6059d2020b607f20485ee99c5c30fb22cc0ce3bd48bbfb00599e7a0213e26d99e2e40804850ae36b62e333be1acdbf75cd313dca30e23c82 SHA512 4c2e26fa3b2a43b2fa20e0236485053a772364662d6b9a3f92994d427cc3382b00e0505b1f538e155e13706d01984884fe8505e50601d32a423571d815c98698
+EBUILD palo-2.00.ebuild 883 BLAKE2B 4a4d9c9f54b9d0461e098f3345dfec2bc2cc19c75f8713e1c137b2993d801c4c5339c7718cf4011fb1cccd44100e28b336c7feae4dca98c488f9ff7392a89e3c SHA512 5232fcd915edcc538625f9c0f909f517ddb39284ef3f9b79971c5129d58dd02ca40923f9d5efd2b364e1e9f090ea52d62202167432bb27f417d93b5ee96abc4b
 EBUILD palo-9999.ebuild 968 BLAKE2B e5fa219a7f3d52e38adfef6cbbfba705d705d54a109d40c82f60feca03f85d260888041a3837c7fe7ad83d037107d95aa48bdad999a63e2b246d060abc899f51 SHA512 373154c2d8f19d8b64f5504190f97d8fce42fd49fef7503e5f5179ca3d7b9c7f5c7290ac09b46a79285a0983d6f5820008486aabf0bab1ae82195b8d30cab609
 MISC metadata.xml 318 BLAKE2B 0d17e33c45886d0c0e03044b5b2513d44c1bb4a28d758a8575929536e866419328c68971ba3f324a5677ff68bf37b38a22645e4b02810a118b5f18026d0476c4 SHA512 7ff12a5eb42ac39840f8c9eb78b24aeecd9cbfe780d11eccd75fd6f02b11f4abafd514bc32f47f727047b069e446e9252914dcaf5c33d6f1054981a3c175fdef
diff --git a/sys-boot/palo/files/palo-2.00-toolchain.patch b/sys-boot/palo/files/palo-2.00-toolchain.patch
new file mode 100644
index 000000000000..168031714bc9
--- /dev/null
+++ b/sys-boot/palo/files/palo-2.00-toolchain.patch
@@ -0,0 +1,22 @@
+--- a/palo/Makefile
++++ b/palo/Makefile
+@@ -10,9 +10,9 @@
+ OS := $(shell uname -s)
+ CC?=cc
+ ifeq ($(strip ${OS}),HP-UX)
+-CFLAGS=-g -O -I../include -I../lib -I$(PA)/include
++CFLAGS=-O -I../include -I../lib -I$(PA)/include
+ else
+-CFLAGS=-g -O -I../include -I../lib -D_FILE_OFFSET_BITS=64
++CFLAGS=-O -I../include -I../lib -D_FILE_OFFSET_BITS=64
+ endif
+ 
+ ifneq ("$(wildcard /etc/debian_version)","")
+@@ -22,7 +22,6 @@
+ endif
+ 
+ # LDFLAGS=-Wl,-Bstatic 
+-LDFLAGS=
+ 
+ OFILES2=mkbootable.o elf64.o load.o paloio.o elf32.o error.o gzip.o
+ 
diff --git a/sys-boot/palo/palo-2.00.ebuild b/sys-boot/palo/palo-2.00.ebuild
new file mode 100644
index 000000000000..db1c24ddc6bb
--- /dev/null
+++ b/sys-boot/palo/palo-2.00.ebuild
@@ -0,0 +1,42 @@
+# 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
+
+DESCRIPTION="PALO : PArisc Linux Loader"
+HOMEPAGE="http://parisc-linux.org/ https://parisc.wiki.kernel.org/"
+SRC_URI="https://git.kernel.org/pub/scm/linux/kernel/git/deller/${PN}.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~hppa"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.00-toolchain.patch
+)
+
+src_compile() {
+	local target
+	for target in '-C palo' '-C ipl' 'iplboot'; do
+		emake AR=$(tc-getAR) CC=$(tc-getCC) LD=$(tc-getLD) ${target}
+	done
+}
+
+src_install() {
+	into /
+	dosbin palo/palo
+
+	doman palo.8
+	dodoc TODO debian/changelog README.html
+
+	insinto /etc
+	doins "${FILESDIR}"/palo.conf
+
+	insinto /usr/share/palo
+	doins iplboot
+
+	insinto /etc/kernel/postinst.d/
+	insopts -m 0744
+	doins "${FILESDIR}"/99palo
+}
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index d07552fcc9cb..9c42098f6529 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/drbd-utils/Manifest b/sys-cluster/drbd-utils/Manifest
index f28783928242..49c61998d5f0 100644
--- a/sys-cluster/drbd-utils/Manifest
+++ b/sys-cluster/drbd-utils/Manifest
@@ -3,6 +3,6 @@ AUX run-lock.patch 564 BLAKE2B 53062442dcc45c71eedde79e9d09b543ca6b6b48f552a5de9
 DIST drbd-utils-8.9.3.tar.gz 768700 BLAKE2B 4d6989e69ecb68b3f4d68b0e807aa911e60511fc91c0ea4e7500d044262348ad00a5517505c9bb912ba392677cb4b6a64405a9821cf59f1200f8eb7b662d89ec SHA512 1b1cb3d1eb7f14f693e8a73b9864257e439e443ce685084c3864da4340113f18355d1e447177956ee0d8edcee35e771442b9f85b89ec5a6eb0ad717738461ca2
 DIST drbd-utils-8.9.6.tar.gz 788183 BLAKE2B 314c3c647f7fc52f82e94853949185daf4092e8c182c5799773e5d6b3e77995d2068087a10cf33133414c5fba91498a7cd1e5d487887aea03df3e18c0426dcb4 SHA512 cbdeeb7b298bc21de0d2188566362d7a634a72df243403f4bc91d5836c757f15ee86314b1385860aecda5657be5dc6309f2481b0403012bde841dd0618188938
 EBUILD drbd-utils-8.9.3.ebuild 2410 BLAKE2B 562b48faffe5e6c4e4e9984a3aea88dbf2d125c3822c361637588b40a01b0917e0a3fb67a4c25dd07001ed5263fde53c51210adf86b62ff63a5a8f5f6cc3818f SHA512 91530010427a1cbc5cc5ae8d6026954b626b21495dfc90c34ae92acead467813f7c7d929d32a3401b01b26cba31199c9ef78ad69d74484d59f924b51faf43928
-EBUILD drbd-utils-8.9.6-r1.ebuild 2422 BLAKE2B d26972f0f86e93b7038a963921c888aa797898f67fbe2f59aead44b3c4e6452b608dc8bb43346de0fa2b25569c5980ec41c44ea2c016c1613ae99658e00a3bfd SHA512 d2c4b3ccc0ebefc7212a9575a4042770764ad922b6fa99bf25b85df3ccd55e477101b0ea2c9a885aa61800b42041aa0c29460223329f88934aecea5debba53b8
+EBUILD drbd-utils-8.9.6-r1.ebuild 2421 BLAKE2B e93635f378ed7a92cf8692c7bf6d55eff5b874ecf53217f03572c1c5fd3163b7ab55b10821fd69a48946f3867531d30406008eb002e87469196e80498fea1a99 SHA512 b6bc0a6cf662d07312bfcbd5f5bd5da59dcb501b38ac10581ef745c49bfe66b865d6287cc42c4422192ad09995e10b30f6b6f03dffd264b831a95b2a09d2c8ea
 EBUILD drbd-utils-8.9.6.ebuild 2422 BLAKE2B d26972f0f86e93b7038a963921c888aa797898f67fbe2f59aead44b3c4e6452b608dc8bb43346de0fa2b25569c5980ec41c44ea2c016c1613ae99658e00a3bfd SHA512 d2c4b3ccc0ebefc7212a9575a4042770764ad922b6fa99bf25b85df3ccd55e477101b0ea2c9a885aa61800b42041aa0c29460223329f88934aecea5debba53b8
 MISC metadata.xml 677 BLAKE2B 79183e6930396061e7cf5c881ced8b4e3082a2b0dfdb4520e9de6afd54269b35ba972efd7dd3c3bd67cd103fd7d40693575a9d87b7b437438d5226e6e3453b5e SHA512 b97a7c5bb6ffe6de872f535d595507cd155923c920b9e7836f9a50afa992300b0b27d43805491cbbe6c348ecf99fc24367c375b6416dae73bffb4b6706f4b89a
diff --git a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
index d66c244db4a2..db01746928d3 100644
--- a/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
+++ b/sys-cluster/drbd-utils/drbd-utils-8.9.6-r1.ebuild
@@ -11,7 +11,7 @@ DESCRIPTION="mirror/replicate block-devices across a network-connection"
 SRC_URI="http://oss.linbit.com/drbd/${P/_/}.tar.gz"
 HOMEPAGE="http://www.drbd.org"
 
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="heartbeat pacemaker +udev xen"
 SLOT="0"
 
diff --git a/sys-cluster/heat/Manifest b/sys-cluster/heat/Manifest
index e6329697e2df..34be18981287 100644
--- a/sys-cluster/heat/Manifest
+++ b/sys-cluster/heat/Manifest
@@ -6,8 +6,8 @@ DIST heat.conf.sample-2017.1.9999 88798 BLAKE2B 5cfd2a466ba86dffffaa98bb9ab5793f
 DIST heat.conf.sample-2017.2.9999 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
 DIST heat.conf.sample-8.0.6 88798 BLAKE2B 5cfd2a466ba86dffffaa98bb9ab5793fa5315a1302e9e9d7c8f73549f1794971bf2ed3169c80e471a987658def9f706ea6246519a855e1cf623b7b89fe6b5e1d SHA512 5ea23f33ddc2b34414371a612041abd075694a7d63bb55efd1e75f313b4e9f35e0d68b420536bc474cd4896b0295d8763bdecbb07c71d29c462c14183159e560
 DIST heat.conf.sample-9.0.2 88901 BLAKE2B 050cfaacb46a8d9b79a17b7406acf6bca9be27a21f8278194021cadc69fb364c630ca0f0e7a320dfe9d46303d779eb8b5c31efaa9c25d3695caf70cab18b1b4d SHA512 f62feaa4a0d27866876aed9f78099501247ae4b7deaefd04d77b1f4b2a1d1c991e6f3e68d9f82e3b6a4358c99fbffd90f14a05ff98105df0ef0db68ef8bc6932
-EBUILD heat-2017.1.9999.ebuild 5666 BLAKE2B e2ea89d7d4fb2c0858e168fbd38b039f36c95e63b1a61d48f5a71fe7be4d99f1fb0bd9c740d23671fac817f23b6a2c6786a6fef459fe0d5e753317f6f77d0c7a SHA512 3b99e7e4b8fa48d17e72b2e404c818da31ba668f63d76f4404ff42a6862f0918e4b9ac91fdc95977dda98c931ebd893cadba35553dcb437f563b75905b6ce058
-EBUILD heat-2017.2.9999.ebuild 6456 BLAKE2B eb38ccd3039c3c51a14a0e1450196610636e0c19f7938c8073c86b3ed947a8610b68e33d0654bbe882c4a6b12366ad7b1dc3346aaa1e22508730c4fabc196125 SHA512 5f57c8610494a03382c9f2e60716eb221b26e39f56354637960bfc2166437e0d217297911460c8d34a60b5f2dc00e2aa00d10f8b17d0d025c7d5341510e53a7f
-EBUILD heat-8.0.6.ebuild 5644 BLAKE2B 0e58731d3815d94140cbfd98962694befd0b8a6a48971a4d3670825a95394e7a5fa389bd8ddaa251f263568105dd40162e12ad2014e02dc69a7a08939641a5ef SHA512 92ef6c6188e0b6d8a3e643076801db4f8182cc7206355b148462a0bfe6028af86560d8af8740865721e8cb2d5c49f20895d10e5977f07867c43d8f68f33de314
-EBUILD heat-9.0.2.ebuild 6374 BLAKE2B 46140a92469b75b5c04d91541894bb26a1d467b2fc5ea315f67493a8f359e9c1ef441d7e71599aca904d011f59da732f1f8d1a6efaeec5a0c19460e5ef4d81a6 SHA512 51865ad11d08e6c3a4142bf24c31160bc172c9f3399b6d6f78c638e7d72231945f94b486feb431a356dad55d1e6e029fa14d182ae9bd1d1c665727b7fb6d6da8
+EBUILD heat-2017.1.9999.ebuild 5666 BLAKE2B 6dfcb88efe1fa822bc40384fb77b51bcea587bc86ee03333ebb6840f5cbfe14fcdc82b1113f1cc43819f48191dc13a6ab94657c647a659c9dbdda990be6058d3 SHA512 7a279c78a9a087ed03871e0c4f3abd9a4e7cfd522348b6b0cf8bbe63cee5c815f5c68f0d652f89f76f8f343361295a3d032403c53a59ca67b729ea544862fee6
+EBUILD heat-2017.2.9999.ebuild 6456 BLAKE2B 9bd213139208ba745c067eec495e02640b54276d0477fb4c0e4e91f9a756536cfc9499b5c9993df3724fe921c2be3c77b9c2d0dd1ee9aad04aea1b29cbe79b93 SHA512 428dea0fd7a71b47dd271a5401270195542528c304d5c168cbea3b0ae4c130cad1c362069cf6a2df1e92c46e65fe6f542b115bf5f04f97e190f8c6cb1fe98e64
+EBUILD heat-8.0.6.ebuild 5644 BLAKE2B 7f1deb14634bf21425c6c4d0d76a468efcf1149b02c8c606a682dbd1e091944b43e64b461c6ae593fbd67b3b8406de0754f16b6bd3c5371ff353b5257e91fb87 SHA512 cb84411a7412296bce7ab2b8dfa47fe6737f2b1dfa674f10b9210369abacdcac39ed3341a32b261254b5d04e3a2de450574d7d381198cb6627a910969ca1c483
+EBUILD heat-9.0.2.ebuild 6374 BLAKE2B 97d2c64303f39252f8073f5b996af6da53a93c4a456fd3caab016bdc5f70ad5f845405302f41beb72ef2c5bb1b7433240cacbf05adc1c6b28f9f23876fef1eef SHA512 5b1d92c5a075bc5b4defbf1388d50c3a73145e3e3ddf37e96d11c4099f0c31cffbb9f7c2773de86c64fc1e4365a841f05e70d3f3613740b379d181bdd60e45fa
 MISC metadata.xml 631 BLAKE2B 566d35b5533177a6d8b0ef428c9bd1a320aace6b43e186139c4b53cde224c1bf488340be8b6bcac14bf6c7a51212952dc13940d34edc38e24d7d2fbea5ce0c68 SHA512 44e741975cc462454bfd08fce461b019c5ef141997f272796052f7f3aa7297646304cdc7d75a2ed01319bcba753475ba5861306c3ac74f3d97218bce60d42429
diff --git a/sys-cluster/heat/heat-2017.1.9999.ebuild b/sys-cluster/heat/heat-2017.1.9999.ebuild
index b08a1e34c776..848baeb909fd 100644
--- a/sys-cluster/heat/heat-2017.1.9999.ebuild
+++ b/sys-cluster/heat/heat-2017.1.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 
 inherit distutils-r1 eutils git-r3 linux-info user
 
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchistration engine."
+DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
 HOMEPAGE="https://launchpad.net/heat"
 SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-${PV}"
 EGIT_REPO_URI="https://github.com/openstack/heat.git"
diff --git a/sys-cluster/heat/heat-2017.2.9999.ebuild b/sys-cluster/heat/heat-2017.2.9999.ebuild
index 04ed5348102c..64992465d1a3 100644
--- a/sys-cluster/heat/heat-2017.2.9999.ebuild
+++ b/sys-cluster/heat/heat-2017.2.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 
 inherit distutils-r1 eutils git-r3 linux-info user
 
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchistration engine."
+DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
 HOMEPAGE="https://launchpad.net/heat"
 SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}"
 EGIT_REPO_URI="https://github.com/openstack/heat.git"
diff --git a/sys-cluster/heat/heat-8.0.6.ebuild b/sys-cluster/heat/heat-8.0.6.ebuild
index 05a523589651..395c670c7440 100644
--- a/sys-cluster/heat/heat-8.0.6.ebuild
+++ b/sys-cluster/heat/heat-8.0.6.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 
 inherit distutils-r1 eutils linux-info user
 
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchistration engine."
+DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
 HOMEPAGE="https://launchpad.net/heat"
 SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz
 	https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.ocata -> heat.conf.sample-${PV}"
diff --git a/sys-cluster/heat/heat-9.0.2.ebuild b/sys-cluster/heat/heat-9.0.2.ebuild
index fe3f15b0382f..05e13dfb05dc 100644
--- a/sys-cluster/heat/heat-9.0.2.ebuild
+++ b/sys-cluster/heat/heat-9.0.2.ebuild
@@ -6,7 +6,7 @@ PYTHON_COMPAT=( python2_7 python3_{4,5} )
 
 inherit distutils-r1 eutils linux-info user
 
-DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchistration engine."
+DESCRIPTION="A CloudFormation-compatible openstack-native cloud orchestration engine."
 HOMEPAGE="https://launchpad.net/heat"
 SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/heat/heat.conf.sample.pike -> heat.conf.sample-${PV}
 	https://tarballs.openstack.org/${PN}/${P}.tar.gz"
diff --git a/sys-cluster/minikube/Manifest b/sys-cluster/minikube/Manifest
index 4dd8d4384086..287055c3a7b0 100644
--- a/sys-cluster/minikube/Manifest
+++ b/sys-cluster/minikube/Manifest
@@ -1,5 +1,3 @@
-DIST minikube-0.23.0.tar.gz 19015892 BLAKE2B 24c35372a14eecbc1eaced0ff0f9e55e60246c709c0983faf226f558b7e2175002998cc0b455ac48b019f9e366a82fe65043dc2daee1eae8a01d3cf04cb8c4f4 SHA512 c89c633b6edf5dcabdc60e6c361b16934c47ee141b49d48192b7f5167e5612a7a7d44d79cf595161ac44826f8053051ace5300cdf64c710bd2c3b4247c159522
 DIST minikube-0.24.1.tar.gz 19029537 BLAKE2B 09e179297e3b1b4691d6e865be3e8a989b695fd46badbb488fbaaf33c4fabec8daafcdf7e0b28e140f4648e0109a98cc8744e932c69337102508c28dcbe30e05 SHA512 5f9bf0a7898ff2a074d35885a1ec55f7d23b45751ccf5532616c21eca1adee84fdedbd3971b673628d09a34659296a84fd78655b983411038a6b7e22ab608116
-EBUILD minikube-0.23.0.ebuild 1236 BLAKE2B 4616683a376b18613b3e5e43de0c2d2ce20c8d79de087f6f11e90358722b1ba7d5818e55f3987d2593c3fdbeec354121202877fba3c6a22073ad70a17d9065f4 SHA512 5feaae850de8df546c9439d56d08117419b0d920e260957a1daf47ae66f6ef61585be8023a6a501d307651fccc089ec8dde0d2c70d57efb1c63c7e4e792e9599
 EBUILD minikube-0.24.1.ebuild 1236 BLAKE2B 4616683a376b18613b3e5e43de0c2d2ce20c8d79de087f6f11e90358722b1ba7d5818e55f3987d2593c3fdbeec354121202877fba3c6a22073ad70a17d9065f4 SHA512 5feaae850de8df546c9439d56d08117419b0d920e260957a1daf47ae66f6ef61585be8023a6a501d307651fccc089ec8dde0d2c70d57efb1c63c7e4e792e9599
 MISC metadata.xml 329 BLAKE2B bee02eda560e62d3acfec815f602b025d2954be0e51e9d03866de095999db40208a582d8e135bb7403d6dc474f07a08c2a742d083606d6e11ff405af5b627030 SHA512 4b280d1e0c76f5f571d1b31cda9cad9c564e03d99891ff7ae83f6e61e078636608aed240d088bc2d4b309f9315645abdba751cdba11bfd8268b89adc8c339857
diff --git a/sys-cluster/minikube/minikube-0.23.0.ebuild b/sys-cluster/minikube/minikube-0.23.0.ebuild
deleted file mode 100644
index a345c984a945..000000000000
--- a/sys-cluster/minikube/minikube-0.23.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
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit python-any-r1 golang-build golang-vcs-snapshot
-
-EGO_PN="k8s.io/minikube"
-ARCHIVE_URI="https://github.com/kubernetes/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~amd64"
-
-DESCRIPTION="Single Node Kubernetes Cluster"
-HOMEPAGE="https://github.com/kubernetes/minikube https://kubernetes.io"
-SRC_URI="${ARCHIVE_URI}"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="hardened"
-
-DEPEND="dev-go/go-bindata
-	${PYTHON_DEPS}"
-RDEPEND=">=sys-cluster/kubectl-1.8.0"
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-	sed -i -e 's/ -s -w/ -w/' -e 's#$(GOPATH)/bin/go-bindata#go-bindata#' -e 's#GOBIN=$(GOPATH)/bin go get github.com/jteeuwen/go-bindata/...##' src/${EGO_PN}/Makefile || die
-	sed -i -e "s/get_rev(), get_version(), get_tree_state()/get_rev(), get_version(), 'gitTreeState=clean'/"  src/${EGO_PN}/hack/get_k8s_version.py || die
-}
-
-src_compile() {
-	export CGO_LDFLAGS="$(usex hardened '-fno-PIC ' '')"
-	LDFLAGS="" GOPATH="${WORKDIR}/${P}" emake -C src/${EGO_PN}
-}
-
-src_install() {
-	pushd src/${EGO_PN} || die
-	dobin out/minikube
-	dodoc -r docs CHANGELOG.md README.md
-	popd || die
-}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 0b482b1ded0b..d31cfe35504c 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/autoconf/Manifest b/sys-devel/autoconf/Manifest
index 80bce6c14a85..0601543657b8 100644
--- a/sys-devel/autoconf/Manifest
+++ b/sys-devel/autoconf/Manifest
@@ -10,7 +10,7 @@ DIST autoconf-2.64.tar.xz 1113892 BLAKE2B 598873209a67725150cd4cf09c4b78b26b3d17
 DIST autoconf-2.69.tar.xz 1214744 BLAKE2B 71d33d72a06e9a05fbed0eda73bc9d8a3805c7c90bf082959862f93f3c5f01192114176e84d84ecb58fa99512eafbc0ab21ad1407be18c8c63bb3dc1117c482d SHA512 995d3e5a8eb1eb37e2b7fae53c6ec7a9b4df997286b7d643344818f94636756b1bf5ff5ea9155e755cb9461149a853dfbf2886fc6bd7132e5afa9c168e306e9b
 EBUILD autoconf-2.13.ebuild 1521 BLAKE2B 745ce1ba4d39b75cf89ed701bbf102092854922f1dc0be421326c0f3a95f2a32aa69dae8ca4ac0e7b0e738f0e4c0553126636674571376df8870d77afa5e1998 SHA512 493ba0d22c90ed02e77e2406f76bc6e2cc6c9c56e824ca8c7ce73a2e3e265868de5824ed9b0261f457903ca12068e24ea55c77e2709f9d28366fc25c9ac13091
 EBUILD autoconf-2.64.ebuild 566 BLAKE2B a0488603af961a72257e96959d28ff6fb552de3b19a9773a8af845f8a0c5e0f54ee5f93c40192d3c3409b7d16489cd4ae5aaad8925404962fc0c4d9fe0357bed SHA512 9449a2616671cac6a34f632c965a0bb59f38d0c0694b4412e547769d5f957b7ab82cef995c77641814c7c6e0682df3f3b754cd48252f44e38ba71e7d72fc448f
-EBUILD autoconf-2.69-r4.ebuild 1553 BLAKE2B 82579d50bca35fb8006d9868a3b8adf274fdc751c59f0a2ab82b3bc231a2272dc84b8bc2bbc104f0c8ef54c4bd11c1678f55235c280429e1396a1d41c546e939 SHA512 880dbb0f56b07d53d2e73309054d99739ce36866e1b2208df5e1eced9cc77e756157a4f96852795da17a802c32fe8c5f24635fff951e7f020c736d21a1a124c5
+EBUILD autoconf-2.69-r4.ebuild 1552 BLAKE2B a08275b31c04915ee5700e62fb0edd31f192e5a8e70e00e2343d248ce29e5ebbccb67f65e2bf96e44c16737c1f132bbcc3232386768f432e7d5bb5df94cd3ed1 SHA512 807fe30809f095873e535c9b0e385550f59432e9c0f65fd66642700d25417362dfdcebca1ef4d0ce71a54a343546b79cd308df039af5e1f4f89ee40df4e7ed45
 EBUILD autoconf-2.69.ebuild 1517 BLAKE2B 0ffa84941b0f394404b767506cc3a0efedbc19e6b50e8cd3386ebbb75ae657e3c828791f72c01e95982670ab1783c4be301f7562884b93c1eca6c8d5065b912c SHA512 9ac5e366d81466493aa7e8202bc688670e219071b8bcf0801dec14df0c2977bd3520a95cd343b9658ae7327a4e09b5b9fe4e5c5f9faa4982260b83c1e4368cd4
 EBUILD autoconf-9999.ebuild 1361 BLAKE2B 70f04f869ac9481058e94197b617498fc5551ba3358a7f418d4fe2dd87a2263f47eeb431a2422e872a2e4d7fed903933a8914bfc19ba2e372e6a7b2285854a1b SHA512 cbd6d7f64866419b258c7f711eff2dff2f1dbb11847d80d2d7dfa3cadc11c37ec457e9e351ca56dadbeb73b0466e81d24efae4121a02751abdbf63c7595cbce2
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-devel/autoconf/autoconf-2.69-r4.ebuild b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
index de76549b8181..98a89a19379c 100644
--- a/sys-devel/autoconf/autoconf-2.69-r4.ebuild
+++ b/sys-devel/autoconf/autoconf-2.69-r4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
 		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 inherit toolchain-autoconf
diff --git a/sys-devel/binutils/Manifest b/sys-devel/binutils/Manifest
index 05e22676e69a..20f1a285b08e 100644
--- a/sys-devel/binutils/Manifest
+++ b/sys-devel/binutils/Manifest
@@ -13,7 +13,7 @@ DIST binutils-2.29.1.tar.bz2 29123355 BLAKE2B 83de518a27bae0f13c57b1979493dd7f7c
 EBUILD binutils-2.25.1-r1.ebuild 292 BLAKE2B 58cca7cd2e70891e48c8584f22a565fa7cbe0e21572b4576d7caa564949b1de0cc080c7797d0dae5e8d6dc48240b81b857eb7c0445147b0a9605c64423cd9cb3 SHA512 1cfad3df5fee60fcf6276ce37d9c5fb5dce649af43491ef02f258f277d8daa64d7937dafc972336b20e945c16b0a356d97adc85e8eb1c74ab535362170dab8ba
 EBUILD binutils-2.26.1.ebuild 292 BLAKE2B c7f4d10819d40799f39b2b8425f061d995b25c76d6f3744139432a18765981438b09a0f6be06b483eeb96cbc3f8f8f8d79056806b7d2df1038531e3a40182208 SHA512 0b27ea4b0f4653b80502f0d3519be3f0cfd8644e18eb52b5a1aa8bf5ebfae3b7a8dfd8242800185cb20611be9014d625c93658f24b4561432c39a3b9e3c2d564
 EBUILD binutils-2.27-r1.ebuild 305 BLAKE2B 8df34ec1e3550bf81b69cce2b0520b206d02d3d77d652ab787cb1fef32d910ddded25b8c6098e6406586cace96d70d9d77198ffd13ca167c39a25953dac09ec8 SHA512 a8f2a1594d97092195cb9d59b3ab7783eb777df6a175fa4361b92b4d8d415920b2e383174732f26a780dc1d4844eae1412654fb07eeeea6fb01399ad9e8ca17a
-EBUILD binutils-2.28.1.ebuild 296 BLAKE2B b2664d411b30f63ed4aec46c55a3367a3983aeafb3772ebd059f71536f8098be5f2474af2feb02e3b49ae76c83f4d386d7435434219ca1afbbc6d0d21c1f94e8 SHA512 3f8eeced53288d9ee9ead1f8a3807967973cf81e118162aff157702e07eb959ce2d5cbb14eb86918ed0987939d8b6a73e697e2be7f4c838987bcd61b10256182
-EBUILD binutils-2.29.1-r1.ebuild 343 BLAKE2B 8e90a02c70e3c95871787c0b4e4297068d1276d0dd6c9695a4f8526702a4a54d3baae9415d65ca01a796de913d8bf4d4a701d641879be89d17294a5111d8381e SHA512 56b38bbc932d2f5eb71065c03dd8fea38b37361edc19bf188284f010b6cf80bf2702e09b7e7113cfe3f30ab653872acbc026f06ef078f30c0b43fc183d4bbb28
+EBUILD binutils-2.28.1.ebuild 292 BLAKE2B c7f4d10819d40799f39b2b8425f061d995b25c76d6f3744139432a18765981438b09a0f6be06b483eeb96cbc3f8f8f8d79056806b7d2df1038531e3a40182208 SHA512 0b27ea4b0f4653b80502f0d3519be3f0cfd8644e18eb52b5a1aa8bf5ebfae3b7a8dfd8242800185cb20611be9014d625c93658f24b4561432c39a3b9e3c2d564
+EBUILD binutils-2.29.1-r1.ebuild 340 BLAKE2B c04237983a1e515e1f0e3c1ec2c379bd79ffc36bd8ff6d128ab24b6a255dc6c968137dcfa0e44e11c9a9dee4201aac62e0b22b750b162c1cc1ede9c4af426e9f SHA512 0412eaf0614c6bf9f3888cf5a04fc6c0c869d3f3d3e239d04354735851be564ba1ed347dc4db1a7e881b401d9974ee3320dbaf88668abdfdca813619415247d9
 EBUILD binutils-9999.ebuild 10747 BLAKE2B 4a45c17c7462dc5ff6898df8b4422d12d9c522fbf00dd77f023790d9be9c33d9aed4f171ac1952c993b3d27d14801fec962d024684580ae88d34afc57e09d2f4 SHA512 647674e10ffd4482e9baf0e7cee69db1210b66b9da0bdafabc61e4541bcc7b833de4aa4e78b4aff44747c0926d2ab7a24acd18598fb6573de0d9b1b3053c1b2b
 MISC metadata.xml 447 BLAKE2B 78d0b6e0a34f19d0f90f568fb84fcddbc995eb2c64f9c4feef2545d49322311fc6825b3b208dc03718bd75d550581efbdc9ee26e7f7a6f856902e640f90bf0f5 SHA512 73cb18db3a677767a78d5cab44ca721083ef17b4a158c10a66a186835b57a3d763b6f6753c836620b32ec912834ae8da2148c8fa0e4932170956b92c75169a9d
diff --git a/sys-devel/binutils/binutils-2.28.1.ebuild b/sys-devel/binutils/binutils-2.28.1.ebuild
index d57f8f8e717e..63894d4eb470 100644
--- a/sys-devel/binutils/binutils-2.28.1.ebuild
+++ b/sys-devel/binutils/binutils-2.28.1.ebuild
@@ -7,4 +7,4 @@ PATCHVER="1.0"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd"
diff --git a/sys-devel/binutils/binutils-2.29.1-r1.ebuild b/sys-devel/binutils/binutils-2.29.1-r1.ebuild
index 8cac4ed2a89c..0dd92fdbd6ee 100644
--- a/sys-devel/binutils/binutils-2.29.1-r1.ebuild
+++ b/sys-devel/binutils/binutils-2.29.1-r1.ebuild
@@ -7,6 +7,6 @@ PATCHVER="3"
 ELF2FLT_VER=""
 inherit toolchain-binutils
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh ~sparc x86 ~amd64-fbsd -sparc-fbsd ~x86-fbsd"
 
 PATCHES=( "${FILESDIR}/${P}-nogoldtest.patch" )
diff --git a/sys-devel/gcc-apple/Manifest b/sys-devel/gcc-apple/Manifest
index d46fba0b8309..765fe4a3cbd7 100644
--- a/sys-devel/gcc-apple/Manifest
+++ b/sys-devel/gcc-apple/Manifest
@@ -12,5 +12,5 @@ DIST gcc-apple-4.2.1_p5646-gfortran.patch 38284 BLAKE2B 83934d5e52a27a0db750f725
 DIST gcc-fortran-4.2.4.tar.bz2 905688 BLAKE2B 6a7e030e3261b147f5add7c8b936ecb7a7a20b99db96e957fa94591560a2e303f2cdf931ca8d73b7c29464d288d1db52c2619bbf1cce30d7326a668aab303dad SHA512 1a36587a3691b8d7ecd23938efcdfca42642b6b260a1c830f6d791bb1b8ac32953998c45d77eee2d557861d631431569503c796b61aeaea9ac5fffbce1982faa
 DIST libstdcxx-16.tar.gz 64695692 BLAKE2B 3660778be1f28761fdf93d6db77eba54836f3ed45af756786f94abc3556f2013a84af8a2585ffee16925cd84634c96196c4392a80ed7e34db6dcb8f96f979d60 SHA512 2f0e8d694aaaf94fc2a0463ebd4a5775865421dedb431a6f6f701a8d33078e768bef232f72e2cf1f8e2d278eb60ff54030f5ad22b43eb0643d49bc4717e96b05
 DIST libstdcxx-39.tar.gz 117081330 BLAKE2B 03df012edd588e27bb1e17439e1b213bbf08a9656579f4a938c3026b993158962a44660d0dd2027ad6f12aa2b0cfaa7880a0ecfbd27b2e976bba3260e56bb377 SHA512 c640292c0f371069fbb635ed0385627c8abab869db93513922e19b25886864d093eef3684c49bf1ba82325f2d1d3cd1eb382ef6ea9dee039208fe99fe8653db6
-EBUILD gcc-apple-4.2.1_p5666-r2.ebuild 13260 BLAKE2B bf4d2cb919ea56baa32dfc78595703c068dbee42e19b1254e57683391e5f13af0fe49540e428273547dd7b92e560973c7776455530b48638207ee7bfe651ff48 SHA512 4cbef8da34ac6d9df2724dee29057e48288e8e70600240cdff516b585fd60f2a8e74b5a9e32f46eccd4c11e6f2f60f007bf19cc97e8f0478001f06d84bea70b9
+EBUILD gcc-apple-4.2.1_p5666-r2.ebuild 12904 BLAKE2B e7f7058e7e619ebf24aca1af4f1458baab16b2aac30348962a1a57f9fcab932de4dc30368efc30056b1f81232e4c8d764def5750fcda04d270aea10daff4e189 SHA512 83c6efeb6621876710b0af568081fa876fcaec1f0e1a6c30754280cb845ef8c122d832f7bd4dcb9a43b47372bededdf88776cec056f74e04333e4a51cd644bf1
 MISC metadata.xml 530 BLAKE2B 9cbe53672ff6d681bda4893ac4630e70e80129fcfbd0abe5862eddb51008b60220b5c3bffa15177c9d5c0308d0569dfcec7eeaf2ea87042b28a32714efb83530 SHA512 29922e179098de072d1a5bd869ba4505a88ee1340ceb66b0898b58446ddd74b6a6dcc961b4a1445d2db3b95259c6cb31030b9c0b7ea036a92b303b7f7ac3b371
diff --git a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
index 12f3d99760d9..c46edae451a5 100644
--- a/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
+++ b/sys-devel/gcc-apple/gcc-apple-4.2.1_p5666-r2.ebuild
@@ -338,13 +338,6 @@ src_install() {
 		rm -r "${D}"${LIBPATH}/include/libffi || die
 	fi
 
-	# Now do the fun stripping stuff
-	env RESTRICT="" CHOST=${CHOST} prepstrip "${D}${BINPATH}"
-	env RESTRICT="" CHOST=${CTARGET} prepstrip "${D}${LIBPATH}"
-	# gcc used to install helper binaries in lib/ but then moved to libexec/
-	[[ -d ${ED}/usr/libexec/gcc ]] && \
-		env RESTRICT="" CHOST=${CHOST} prepstrip "${ED}/usr/libexec/gcc/${CTARGET}/${GCC_VERS}"
-
 	# prune empty dirs left behind
 	find "${ED}" -type d | xargs rmdir >& /dev/null
 
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index bc4bec8b1b06..f0ce366fec86 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -2,7 +2,7 @@ AUX gcc-config-1.8-dont_source_functions_sh_from_etc_initd.patch 1427 BLAKE2B 7b
 DIST gcc-config-1.8.tar.xz 15020 BLAKE2B 97debbef946b0c14b4ecc0bc5b2217566b43f21318970b235b2919bd1e1ea41aff66aebb0ed73db2382f8312268327eb6844139bdeae7aba75771c699a5043df SHA512 3b84af2d961a0527834759e047330dbab7bac0ff3d6aae103f14fca2d44bd612bd4a1005649e8b4198036231ed8a8319fb13326b4d2c40474826cf53f7bc0826
 DIST gcc-config-1.9.0.tar.xz 17468 BLAKE2B 3e0b6faff3ac582fc0fed921958ff849ba8b1be5b0c25609790cd56400c05371e47ecd955b7bc79362179a559def94463a3667858a70d6edd283d2c064ff0734 SHA512 658c8ce26fdddd6f3e519310001cdf0f8fb01226df2d575fec81b39c083613ef0675024b79b285fab89a930c4ada7a1aef04433eb21947b4e9c0a9cb12f8fabc
 DIST gcc-config-1.9.1.tar.xz 17628 BLAKE2B 8fce87038d9aed625d833327a7e335c311aeb04d44a07a7738def235333a9428664314ddd4da3a1d59d030136734377a838f25ff411b249aba25ea22a88460ee SHA512 6c518c266698277a1ad00a1624fc1ada15ed7096d05a520700c60a27180885169bd2051fb6869e6a958503c8eebc1cd6c211098501c5fe258ee11d96c6a0b069
-EBUILD gcc-config-1.8-r1.ebuild 1177 BLAKE2B 8e9bdab1960836eb2c95b042f5bbdf208103ddd2c9aac57dcd678f90ec47a843ea1b93e2f6e4f1fc011e240260481eda71509bb0041c68b00cf8a68f110bac77 SHA512 25f6f54b47ca456598c5617b5374ef180ba40875e9041547aab412430c943cc2befe714f5597eaca0ca460287a17943b0b71c4e7e4fd82813eba4afdd9ec5a25
+EBUILD gcc-config-1.8-r1.ebuild 1173 BLAKE2B 28e6aff88a2d226e3b3ca590e6d96cd35bad57ea4194709652c13c5b7074588513ae4180ccd976c02ac20afec67df2be5195cc028cad231a3c58d165b75c83c3 SHA512 c3abe5e7c37d51c04f40462d3a7fc22b217655cec8d445c31f3ac2f4fb803851fad53eedcb30e17bfeba19eb8911a01324ba0595b3ae50e19ec9d60abc7bcc0c
 EBUILD gcc-config-1.9.0-r1.ebuild 1124 BLAKE2B 51ab9edd92f0408094a195dbfc289b13f3e81faa2b33731b7686a115f9a69b1680b62ec36b8e742c7312b089be0c1771919b8dc4cc9bcde244465e30b7768991 SHA512 9a53fc5a2fd3cd87d9231ebd686b4cc0215714952820ac0857358d69e694bc0482fd10fa951e8e787fdb2a2a2b1b61eb39baec9a6b70979a3a772a6751adb1e2
 EBUILD gcc-config-1.9.1.ebuild 1232 BLAKE2B cb6a7e074c3a96e08efc4215532daa923144903bee6074d0e6b2fb3c7c407284336af4725a8ac58f9e46f48488645d5044671cef0cd449361f55be3725ec1f9a SHA512 57b7be7ee7d74eea7d49a0676b34957067c7572949391092265614804f302b945ab766780286537e7697ba772a8bd72c114c383745152004f7253a42e40fe0fc
 EBUILD gcc-config-9999.ebuild 1232 BLAKE2B cb6a7e074c3a96e08efc4215532daa923144903bee6074d0e6b2fb3c7c407284336af4725a8ac58f9e46f48488645d5044671cef0cd449361f55be3725ec1f9a SHA512 57b7be7ee7d74eea7d49a0676b34957067c7572949391092265614804f302b945ab766780286537e7697ba772a8bd72c114c383745152004f7253a42e40fe0fc
diff --git a/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild b/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
index 1edd784b8df6..b227c4731030 100644
--- a/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
+++ b/sys-devel/gcc-config/gcc-config-1.8-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
 IUSE=""
 
 RDEPEND=">=sys-apps/gentoo-functions-0.10"
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 0820b4d6133c..0508080e40a3 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest
index 5993cf89fdd9..159f00c2385e 100644
--- a/sys-fs/udev/Manifest
+++ b/sys-fs/udev/Manifest
@@ -11,9 +11,9 @@ DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c
 DIST udev-216-patches-2.tar.xz 1264 BLAKE2B b1bbb6b1b7734edc3352b4352a45b4b5df4715b0fc92c4936798aa93fb078755b7795f475d7bc42392ad8ef57853e9ce2507c66cc9bfbd37e6fe22ada4c156cc SHA512 1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4
 EBUILD udev-216.ebuild 15211 BLAKE2B 81f928e1ba8897fbe5dc97efbd6e33b6d4c77065741732969f4ca50f32c7458a914e6786175d560bbd3eba183ad023cfe41217d967029cdf18fdd185d6764eed SHA512 bf4e3c887eaca0ab747b5ffbcceeba94ed6662a27838cc9f5c09bb248483ececbe37cc9db17a3fd246f789874cc62b2ed831e7f452f9c5163e735da33c924b68
 EBUILD udev-225-r1.ebuild 13566 BLAKE2B 9aba88a7a7edcd0b2f63f590f84af713df2b2bbb3ddf979655ecad6eafd4f77442928e1ecc7587afc2ad976b8068878dd11714633b159d84591d743c5b6d5640 SHA512 ea3955b5cee2d1a1adfe21cc00eda4e6378a344f5862e1825fdb4bf313077b6e2b5fbb8ee80e786ab4809644d1b3c39dcdcbe14bd01e17e94ca2726d1f3de33d
-EBUILD udev-233.ebuild 13038 BLAKE2B 1361e9be77672f5865f56cfe2a04a4611bb8878f65cc3a0af79ac24d80cda1eb770a9cf5fe7817d5ca6a24b86e3490f3038cfeca69966ceba15b9b8f6ad75124 SHA512 8c032562738205f6676dda630b6908c3c684c6a73b0c5edc7a9060986f750a3b4e8df32ffee33c65d648e5a59df7ab9b62b4bea64ee269209a7f5e228b493bad
-EBUILD udev-234-r1.ebuild 9974 BLAKE2B caaf6515a522c42a8daea3d39f197004338a7edff22a17b0027affd53f672dc7773800a1534a4b8c6d793804b29cf958b60ad400e68c734b831f6d44f9f05f04 SHA512 9ef6102a04e87774bb8f22618f9a4bca062c215cfa6adc3a23033f72c7d3720315717d301ff6cdac99dfccfd25cb7285408a54c0bf6578e0b9c5a28c2ddc762a
-EBUILD udev-235.ebuild 9972 BLAKE2B 1de48390b65a4f968757d7fe7d91be88937d052b0cd2f0d63bdf2e87886eebeda169bd7f2435eaaa34d45663b1d09670c4c6c30ba2b187052f940013331021f9 SHA512 2facc8ddb8c4286201efd1b06c842babd249b9a42f8e00c056aa3f795780a0ea6146dea61360964571b6e683e50993ad01fa0923479f7f23f8a636dc5e3aed0e
-EBUILD udev-236.ebuild 9972 BLAKE2B 6537664039b6cbe972ba16e8413f87a57e0837002d423ed1ea904cb86f099ed6111083e9a8d638312fdbfa793039fefa80bf6b20ff0a41f23bd5fcd08037baaf SHA512 980f1fdd1fb802d87aeba23ce1d66d13c39bc87f3a0648e2e433c76d8853af2e9e20d2fe7d931d80dbb286594e5545aa24bfa94db1782fb8f5ec8e52a650d280
-EBUILD udev-9999.ebuild 9959 BLAKE2B 3bc8faf9d9b5bced7d86dfbe5f81cddde4300f5efcc2edcb5533aad7004f12500bd97400ae2e623a5289ce7edf408d3c1dc941c8f28af504a949a7ae41a82077 SHA512 b8ee79b50bcd0cb5867f965b8eff6f908260edc83a06192465eb3ded8fc2086948c605460db623f39114863fbfa87dfc097b3a3750fafdcbbabfe53b033cd7c6
+EBUILD udev-233.ebuild 13034 BLAKE2B ab219baa2baa309e5b0598bbc1fc9a11d8dfb110e100dc8bf9e63c894df62c217a4ebaf9c2a28d67ce0f61d90c64fe476c3c5c4ba25b52decef9d47d4d72001a SHA512 6382221804b758022770ef3643720bd6780722790d408506fc4357132dc052e2061180ccef904da59302c464d9383de305b01f47835fef33dea5869f75a54d8a
+EBUILD udev-234-r1.ebuild 9990 BLAKE2B 8759bf272f1f7d2e03692049c11d9cbf106e0169c36b5125f8bf342af00133c70c5ecf88bf10bd1edfecddbc3c5075c7149903d5211c956277d7920191275688 SHA512 347f2941145237bc9732ad94074e5a6be432b15466ef2af4f82110a9314dbd9c6d69d391d8181ca66e9b13998466d9a609d03886e5afb5e250ad0323aaa65ec9
+EBUILD udev-235.ebuild 9988 BLAKE2B 275ed1ba897951832d3bcd566aed8c3762002736444fcd808b71c11cdadb194ab59da7df31af42092f474eeba2ae47f87cf8d68ed1c09117990c0bdfeda7fbaf SHA512 8a6fc0f42ccba3f0cbf808d1bf4c2d725347781f156fb36fe39057573f35e8d2a5c01fc091e2a5fc2a9a49ba78b4c86f6fec164ffd4d9d153092c3dfdc46c76f
+EBUILD udev-236.ebuild 9988 BLAKE2B 1e5bd0e56d880773cf8737a7fb10601daaa49b32d22d4471d135e3048231d976dffb6e8eeb2e6a50ce26c7f5888b3f22e20b388168845e115226a766f57a7852 SHA512 0e2378f4f690be31c6091ec74b015269b32a42191d06a28d4b664bc08686e057089dc786a6bee5bd0779374cb0caf326527bcd5f95bfd951df72c3c3296ebb32
+EBUILD udev-9999.ebuild 9988 BLAKE2B 1e5bd0e56d880773cf8737a7fb10601daaa49b32d22d4471d135e3048231d976dffb6e8eeb2e6a50ce26c7f5888b3f22e20b388168845e115226a766f57a7852 SHA512 0e2378f4f690be31c6091ec74b015269b32a42191d06a28d4b664bc08686e057089dc786a6bee5bd0779374cb0caf326527bcd5f95bfd951df72c3c3296ebb32
 MISC metadata.xml 680 BLAKE2B 3f6b21eff391977d69921da6eeb7f48ae6c706dd856e12c4b0126f0db4ced358925374bed23d950d957a58b5447e087ad98301aa1f75dd140a1cd816ef1d2426 SHA512 2e90cdfb013904211fba8404c6b96ad940dfaea05eebe7592e3fa185dec9b16b738cc7661fd466990788accf8c261a596bcb08477e879e0e18fcc91cdce65c5e
diff --git a/sys-fs/udev/udev-233.ebuild b/sys-fs/udev/udev-233.ebuild
index e999f9e4e9c7..0b8e3832c2d7 100644
--- a/sys-fs/udev/udev-233.ebuild
+++ b/sys-fs/udev/udev-233.ebuild
@@ -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-234-r1.ebuild b/sys-fs/udev/udev-234-r1.ebuild
index daf5051c09d4..dba9ae2424cb 100644
--- a/sys-fs/udev/udev-234-r1.ebuild
+++ b/sys-fs/udev/udev-234-r1.ebuild
@@ -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 ~mips ~ppc ~ppc64 ~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-235.ebuild b/sys-fs/udev/udev-235.ebuild
index a18da82137a2..6c88b45642fe 100644
--- a/sys-fs/udev/udev-235.ebuild
+++ b/sys-fs/udev/udev-235.ebuild
@@ -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 ~mips ~ppc ~ppc64 ~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-236.ebuild b/sys-fs/udev/udev-236.ebuild
index 325b71cc067a..ec6201a5a68d 100644
--- a/sys-fs/udev/udev-236.ebuild
+++ b/sys-fs/udev/udev-236.ebuild
@@ -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 ~mips ~ppc ~ppc64 ~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-9999.ebuild b/sys-fs/udev/udev-9999.ebuild
index bab6000491a1..ec6201a5a68d 100644
--- a/sys-fs/udev/udev-9999.ebuild
+++ b/sys-fs/udev/udev-9999.ebuild
@@ -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 ~ia64 ~mips ~ppc ~ppc64 ~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-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index 78f13eac8dca..105405356a78 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/ck-sources/Manifest b/sys-kernel/ck-sources/Manifest
index ede75d358912..0a2bf8f42c2b 100644
--- a/sys-kernel/ck-sources/Manifest
+++ b/sys-kernel/ck-sources/Manifest
@@ -60,6 +60,9 @@ DIST genpatches-4.9-77.extras.tar.xz 17364 BLAKE2B c666be38c1f3dc02cc87324a60359
 DIST genpatches-4.9-78.base.tar.xz 1439100 BLAKE2B 83246625ab36915073ebfadc2f65fc8342c26a6cc63e4bb747d89d7effec7ffbdf732b306164365416c19d199e46d1f46d40325ece781150cfa71b3b1afa9d9a SHA512 51e9a9bab5ee92ebc5d3cd3028e2110b6e7a74b337d82c12dd8e0da06775cc0f986f1e6d49738dae5e1d9add374017b19c040ddd8298d281714a6544782001d6
 DIST genpatches-4.9-78.experimental.tar.xz 106396 BLAKE2B 64171f3f73be138e3e3270d90cfec2b59312868ff67f81db06d45456307d5efa72aa0e81d0908fe66f32ccc53de8f09b330fdba1f8790a4cdc7132f3ceeba40a SHA512 6f2d60ef1055036ccfdf2caff3eff3c0abd5d6481ef44ee6ff369748546b88cd849ad46ec8b33503e756ff2782829221dfb3abe7ac1dc56f44742cc0c0a90489
 DIST genpatches-4.9-78.extras.tar.xz 17344 BLAKE2B 846c60bc299c4617ce28b4e6b122d42f55d1ac0b73a692902453c0fb6149cda70fd5d62516a2c422cf6415f6c82ff2bb47e1abbb18bcf933132f37657498bdf8 SHA512 ad46777bee10b787100cfa5a66beff302832828db2e8cc144d9d544485e0f4e3ff66827d8ee7541d96b8b7499a508f14e62824c868033b986a641e3f414bfd3b
+DIST genpatches-4.9-79.base.tar.xz 1439664 BLAKE2B 2b4b32c798e2080e0e730c408cbae7fde31a89e59ae9291ade87d797da28173ca563fbf9306b3d4b575db11bc5eef26ab8590275802f6c925141c92a377f331b SHA512 359f6bb0e079d3ac905b682ebef7991e446c6fa0b6a88ef8422d950525a791c4055b529d154c16409cae484209a4d71283c93810f1afd01d2ac06fc20199067f
+DIST genpatches-4.9-79.experimental.tar.xz 106344 BLAKE2B e7e874e9a738f4cc1ad68c81a201e77fd8658db65788037bfbb8bb097f2f96434fc6d49b694ba607173457d3c865a212118eeb16c5188c26e31ef9c10043b20b SHA512 0d0b5da7c66a0bbf997940f91c87b7d033b8a88621d3448dfe39c7c2cf6c8483d6178b1cff499463f803e53391eb53e8dd3ee3f3008b9509e3d8f3643ab400b4
+DIST genpatches-4.9-79.extras.tar.xz 17352 BLAKE2B c194973419a011d035ccd6c5d98a90d04c2c2242f18dc950536a7dc9f505de7416047fb0893787f17023951aea59f21062d3f5a3a0d2ad3eab5127dbfb46df9c SHA512 27ff88dae9a66784d842410b0e3f02c66d748dab63fe391701624d4ca398c824819c7a9fa2dd474e62fd29bf7d8576ae4162c53b3127bccbe30a1657a2760ad2
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.9.tar.xz 93192404 BLAKE2B 83ae310b17d47f1f18d6d28537c31e10f3e60458c5954c4611158ca99e71cc0da2e051272eabf27d5887df4a7cb4a5dd66ff993077c11d2221e92d300a0b48d7 SHA512 bf67ff812cc3cb7e5059e82cc5db0d9a7c5637f7ed9a42e4730c715bf7047c81ed3a571225f92a33ef0b6d65f35595bc32d773356646df2627da55e9bc7f1f1a
 DIST patch-4.14-ck1.xz 84904 BLAKE2B 6f9510643382d44ab79cbf8c4e8210ae7d30c37c78a9eaacde1296532751b5c881b8cc649266c29d73c1f663e60ca92856f6bf589fc449ff5cb781dc8b5ad8f1 SHA512 5e81d6a8319d030572ad5b6379bc43f2f5f98b6e4f050b1285bd6004516d1bf2e8eee8d3425a09317e15309cf030da2534417265b474aaab80e72e22c04741a2
@@ -82,5 +85,6 @@ EBUILD ck-sources-4.9.71.ebuild 1891 BLAKE2B 9ca9222751905ec24b80423f30db4954ca9
 EBUILD ck-sources-4.9.72.ebuild 1891 BLAKE2B cf5cb2b70502eab635628943c13ae99bebf23209d1153c039820b98215d059b3836f819e56ec7259c3f2a6b02dba3831f471704957cf258ee03d38a9c38a7d33 SHA512 37177518ef76b18d9fc2c3ad7cd5c989168de4c1bd993ba141fa245ec41d09bc9fe0529ef97898fdef4ea699e428ddc7b06f1d82bc6634937d7520811bceb543
 EBUILD ck-sources-4.9.74.ebuild 1891 BLAKE2B b18dd7a4bf6c57accb45628a5cb24870b1f6472ecddf14530bb559e4aae3e5a49b609261e5249a8c0d745fce7ea1210d4e4ed364f375c6833663b018c4564904 SHA512 e3f126d815b0d8eb54e4b9655f75a85671fce367fa1b137a855163988a2c681b88d138b58db3b4734ba89a8402d7e96b566643116c0ea36f4e0482adb06a6752
 EBUILD ck-sources-4.9.75.ebuild 1891 BLAKE2B ae3ce70a8100018a8eccf764634af2b9e1cd8a7a9193fed6d9aafd7db2de0d730e602599949c4744d499d7355b55a147b4ccd7cee57f4b45669d7ef57d33b85a SHA512 a155fe884801789daae09c8869e6b5bc20439bbabb5587ff095266f219aae6089b01472cea4a59e04b443c5914e3542d1f1628cd7263a0ced6833e5aab2a2201
+EBUILD ck-sources-4.9.76-r1.ebuild 1891 BLAKE2B ce8174e6bc6e4f150a18fb1711926e2bac42540992b436ce614db9a58257bbd862b3443949500a03da9fed96f7f6f1355f6b847af00c4c9745f91d86331220c1 SHA512 a031654303a9ee5d5bdd40de1138e7cb482301e2593b80ae2498564d5beea266821a13bb3fb059d3d16068fa0aadea8485c60eda4f5493299e160ec9461eb344
 EBUILD ck-sources-4.9.76.ebuild 1891 BLAKE2B 43c7521bf469daf6f9d39ba7f38894054dac69853e4c4c67a173e941b7596937077a8593cb0780370d3a40174c98b02872cdce533e5866efd27c563db65f3624 SHA512 4948f434acf1908442a7fb23635be2bc974bb2b8b32d0247dd2296a8f60fba5ff29f26ced0250b84d541f7374a2b4807dbc59a21f82cad4589120b32689ecd6b
 MISC metadata.xml 921 BLAKE2B a4b785a7d542fd5b1899749a5b83eba87ab3ab3e6dd30cee33f7f762e6b433ce4fb47a119b2162ec088b483f0469ff526093c9775b1e92291c5330c64cf2d10e SHA512 611c76b0b27282067a51869db434ca837f604ef75fe54bba2f18f12c41dbd4a62d5c9e2a53bf5db7ee824bbf4d663db6b5292316bde93aec771356e34751496e
diff --git a/sys-kernel/ck-sources/ck-sources-4.9.76-r1.ebuild b/sys-kernel/ck-sources/ck-sources-4.9.76-r1.ebuild
new file mode 100644
index 000000000000..29a0f43e22ad
--- /dev/null
+++ b/sys-kernel/ck-sources/ck-sources-4.9.76-r1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+KEYWORDS="~amd64 ~x86"
+
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches/
+	http://kernel.kolivas.org/"
+
+K_WANT_GENPATCHES="base extras experimental"
+K_EXP_GENPATCHES_PULL="1"
+K_EXP_GENPATCHES_NOUSE="1"
+K_GENPATCHES_VER="79"
+K_SECURITY_UNSUPPORTED="1"
+K_DEBLOB_AVAILABLE="1"
+
+PYTHON_COMPAT=( python2_7 )
+inherit python-any-r1 kernel-2
+detect_version
+detect_arch
+
+DEPEND="deblob? ( ${PYTHON_DEPS} )"
+
+K_BRANCH_ID="${KV_MAJOR}.${KV_MINOR}"
+
+DESCRIPTION="Con Kolivas' high performance patchset and Gentoo's genpatches for Linux ${K_BRANCH_ID}"
+
+CK_VERSION="1"
+
+CK_FILE="patch-${K_BRANCH_ID}-ck${CK_VERSION}.xz"
+
+CK_BASE_URL="http://ck.kolivas.org/patches/4.0"
+CK_LVER_URL="${CK_BASE_URL}/${K_BRANCH_ID}/${K_BRANCH_ID}-ck${CK_VERSION}"
+CK_URI="${CK_LVER_URL}/${CK_FILE}"
+
+# solves bug #606866 (Fix build for CONFIG_FREEZER disabled.x)
+FRZR_HASH="7de569950716147ed436b27936628ee3ab5b45cc"
+FRZR_FILE="${PN}-4.9-freezer-fix.patch"
+FRZR_URI="https://github.com/ckolivas/linux/commit/${FRZR_HASH}.patch -> ${FRZR_FILE}"
+
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI} ${CK_URI} ${FRZR_URI}"
+
+UNIPATCH_LIST="${DISTDIR}/${CK_FILE} ${DISTDIR}/${FRZR_FILE}"
+UNIPATCH_STRICTORDER="yes"
+
+# ck-patches already includes BFQ (similar version as genpatches "experimental" USE flag)
+# what's not included is: "additional cpu optimizations" (5010) from genpatches experimental
+
+K_EXP_GENPATCHES_LIST="5010_*.patch*"
+
+pkg_setup() {
+	use deblob && python-any-r1_pkg_setup
+	kernel-2_pkg_setup
+}
+
+src_prepare() {
+
+#-- Comment out CK's EXTRAVERSION in Makefile ---------------------------------
+
+	# linux-info eclass cannot handle recursively expanded variables in Makefile #490328
+	sed -i -e 's/\(^EXTRAVERSION :=.*$\)/# \1/' "${S}/Makefile" || die
+
+	kernel-2_src_prepare
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index aa7b6c9e8525..0cf58da1756e 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -64,6 +64,9 @@ DIST genpatches-4.4-113.extras.tar.xz 16452 BLAKE2B 62ece17a3e3379c9e05747bb2e8e
 DIST genpatches-4.4-114.base.tar.xz 1691888 BLAKE2B e7529003017105d3cda92a43feb7b4b268a2c64b32897726301f7e4ade81a2e697aab026fc6bf6d180da275e56dbe2af892d4794fad57bc5fb97e5cba0bceb6d SHA512 1352f96e9312fbadce7f3812a7b0040971d332db3d00fcd71d779b354e912009916841dd5cf6fbf594b666d3bf91603d6bbfc7f6736d10ee8b5da4e6565b30e3
 DIST genpatches-4.4-114.experimental.tar.xz 87792 BLAKE2B 13ad2e5a81d258ba0f84ce63318f8fa5ad2f02d5a2cc5ef47297a0e972e7a8b16546a82fc439cec1ce2308339c7be74db3b77bc1a77ec04ec6b44a3aef113009 SHA512 1255439ece64b36fd43a2e3d2539fd0d1e00ae3b409c9a8c970ae93d3d9e5783472f36ce637a122c0f2934255ad1cba2a22d0ff7ce6d5e5ca09d49762b5c0adc
 DIST genpatches-4.4-114.extras.tar.xz 16452 BLAKE2B d5afae8366b23a9c55db13e6e266184c3dd72c73c51d536e19fa317a1c613f03b371769579f7a0774bf484093c4ebf4907d6feb8404efe09919b5a6c9dae54d1 SHA512 a1c96aa2eebcba9d657de90abdce15a438d3584ddc4a55a27e39fcef1f19f89bfba59b6653ccb7d3c8607269494ffea9cbc383c7c40a7c4937a7db560b82ace5
+DIST genpatches-4.4-115.base.tar.xz 1692684 BLAKE2B 8595bbb40d0f0172e5b6f5266d89b3aa67fad3889375c3925a39e01ccccf9dd03e86f934d8d3c0bd93bab58ceee274277aaac4051d09f2edf665c106f2c0e29d SHA512 43dac11a37c6cbef7a4070336bda44beb2d5a9a649188d188e37c4654ce94a71244a7e87652368da5a0f88dc53ad5c8d6194ad614c4033d08295debab0c90eca
+DIST genpatches-4.4-115.experimental.tar.xz 87744 BLAKE2B dc8a9f9ae6e6789e7c072e5c6dfa0e875765d77ffb746060f65cd708124f81f8a269a54ec6bd6f9bd159d0cd5d0d9dabd6ad9489ff5453e01c264b0f34153300 SHA512 e82343f1d4220ecab61503c7cefae9d5d9cd605187f4861eac21f330c39af77e90950badf1896a8fefee57133496f706e2b1905eee1d8c6cf945e77ed3b36094
+DIST genpatches-4.4-115.extras.tar.xz 16456 BLAKE2B 3c854f5619d349eb7b20b8f92787564019769884c28cf8bd3191686e3fc8f5c764ebc3a3c99d3ea7290aab316b8a0a0728a4f679196b80b524943c503fef6705 SHA512 84d76421f1e3d3041ab18a2a6a019b571c1a6f27d2fc880da64ae11398c43e5eab79c538940df82aa02d697983a97145197b127613bb7f4765a26813cc36eacf
 DIST genpatches-4.4-91.base.tar.xz 1428436 BLAKE2B 4b706e9682e883dd1954632efe5ec161347432a6260c353e160b8591f8377e6d1e1768acd2e3e72237e3ea6b7104137e3504e3f290fb12b0dabf662b0fb034c1 SHA512 cdddd25be04b33558f7ebcee66df992aae38f29181474ebed82958d4d50639097b4a82eaf256d7b3576bfcd0cd3fe7682956e1d2cdbdb912d47fe86205d9b554
 DIST genpatches-4.4-91.experimental.tar.xz 87760 BLAKE2B d8a165fb3708192a12e826a713e896ca83785da084c9a9aeaae909473c598669867fa303636d762facd2d7bc1a857da3ba0d994ee62d008dc17955dd84181942 SHA512 0bbc83e076d45da1d0258bfd7f6acf6170e99891a9a857b2552f3a0fcefff4f318a8c5c8779591b0bb654760f905530de18723f2ba960618eae59a1b7219c28f
 DIST genpatches-4.4-91.extras.tar.xz 16468 BLAKE2B b99298cd9e57a2b8a0619495df0450373c9f5c14ff2398d76534c7167f3a563c05e67f9aff80ff97a474ae7a8cb298a4ffbc5eab25d79075aac5cc01964c3e9d SHA512 229922945fcb882a0cb7dcba8bac9de51683690462a8df59e181a03d702fcb1c9b54078c5434624b4a197c481f0bb9b73dca58456ef5a5884a30bfd3644dfd6d
@@ -100,6 +103,9 @@ DIST genpatches-4.9-77.extras.tar.xz 17364 BLAKE2B c666be38c1f3dc02cc87324a60359
 DIST genpatches-4.9-78.base.tar.xz 1439100 BLAKE2B 83246625ab36915073ebfadc2f65fc8342c26a6cc63e4bb747d89d7effec7ffbdf732b306164365416c19d199e46d1f46d40325ece781150cfa71b3b1afa9d9a SHA512 51e9a9bab5ee92ebc5d3cd3028e2110b6e7a74b337d82c12dd8e0da06775cc0f986f1e6d49738dae5e1d9add374017b19c040ddd8298d281714a6544782001d6
 DIST genpatches-4.9-78.experimental.tar.xz 106396 BLAKE2B 64171f3f73be138e3e3270d90cfec2b59312868ff67f81db06d45456307d5efa72aa0e81d0908fe66f32ccc53de8f09b330fdba1f8790a4cdc7132f3ceeba40a SHA512 6f2d60ef1055036ccfdf2caff3eff3c0abd5d6481ef44ee6ff369748546b88cd849ad46ec8b33503e756ff2782829221dfb3abe7ac1dc56f44742cc0c0a90489
 DIST genpatches-4.9-78.extras.tar.xz 17344 BLAKE2B 846c60bc299c4617ce28b4e6b122d42f55d1ac0b73a692902453c0fb6149cda70fd5d62516a2c422cf6415f6c82ff2bb47e1abbb18bcf933132f37657498bdf8 SHA512 ad46777bee10b787100cfa5a66beff302832828db2e8cc144d9d544485e0f4e3ff66827d8ee7541d96b8b7499a508f14e62824c868033b986a641e3f414bfd3b
+DIST genpatches-4.9-79.base.tar.xz 1439664 BLAKE2B 2b4b32c798e2080e0e730c408cbae7fde31a89e59ae9291ade87d797da28173ca563fbf9306b3d4b575db11bc5eef26ab8590275802f6c925141c92a377f331b SHA512 359f6bb0e079d3ac905b682ebef7991e446c6fa0b6a88ef8422d950525a791c4055b529d154c16409cae484209a4d71283c93810f1afd01d2ac06fc20199067f
+DIST genpatches-4.9-79.experimental.tar.xz 106344 BLAKE2B e7e874e9a738f4cc1ad68c81a201e77fd8658db65788037bfbb8bb097f2f96434fc6d49b694ba607173457d3c865a212118eeb16c5188c26e31ef9c10043b20b SHA512 0d0b5da7c66a0bbf997940f91c87b7d033b8a88621d3448dfe39c7c2cf6c8483d6178b1cff499463f803e53391eb53e8dd3ee3f3008b9509e3d8f3643ab400b4
+DIST genpatches-4.9-79.extras.tar.xz 17352 BLAKE2B c194973419a011d035ccd6c5d98a90d04c2c2242f18dc950536a7dc9f505de7416047fb0893787f17023951aea59f21062d3f5a3a0d2ad3eab5127dbfb46df9c SHA512 27ff88dae9a66784d842410b0e3f02c66d748dab63fe391701624d4ca398c824819c7a9fa2dd474e62fd29bf7d8576ae4162c53b3127bccbe30a1657a2760ad2
 DIST linux-4.1.tar.xz 83017828 BLAKE2B d1dc4e458db191f16306b3d2d7eb60ef5e04307406c769cccdd88beb407f8de228ab1f095a44d6e992b06d01cd896fda31dec1cdf16667f4ca0b628da594aee3 SHA512 168ef84a4e67619f9f53f3574e438542a5747f9b43443363cb83597fcdac9f40d201625c66e375a23226745eaada9176eb006ca023613cec089349e91751f3c0
 DIST linux-4.12.tar.xz 99186576 BLAKE2B 02d031c7f2f29849c06a6b5b589af78bc486a05a758267e47f2ff16844ae8ca701fff53cb859fcc105f7ea92c0769acf8d7f7cc116444c15235ef4d63cadc8c0 SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
@@ -126,7 +132,8 @@ EBUILD gentoo-sources-4.4.107.ebuild 743 BLAKE2B d5de9edda701d053218c7202e483e4c
 EBUILD gentoo-sources-4.4.108.ebuild 743 BLAKE2B d06c6fd0fc9e50f43b57167fd00357e32a09ee1ce95ef1b97bff746254e6c8abd9b859b13eea3f6721cb2844aeb7a62e6e2fc942d38a415ded3670316b0f9ee5 SHA512 08fef932fa8cadfc2200cd9c9470946c50b60f6074880d9c7ab7bfe51c34d51598128b32cec3db5ba867d34c668993758e7f2324f727328aa110be205480d2b1
 EBUILD gentoo-sources-4.4.109.ebuild 743 BLAKE2B d2f07b1daf99971fa57fa83274bcc489ce838fbab5363f270561cfbaa7847e0eadad8f8d964620c478135d2017e1abff4893575e0843d2dcd03594a5c4a130cc SHA512 3dff599c48976414d3a916b52dd892c3e6271d990a04432a442aadb70b8f6466e109bcedc3d3d14107115d8c4ede40758787403406d9f8fd82496d427d78f363
 EBUILD gentoo-sources-4.4.110.ebuild 743 BLAKE2B b97cdb80532d857229893737c3897de72b7d480826c5b2e5ac8d0f71879d15ebdf38d2bf99c0eba90f69200bd9087482a423fe0220600df1ac87f4b06b2fee74 SHA512 d8f68277462fb19f98da7a5185d4617c72a531727ed014bf08c7b2bb36252561f2eef85fa94024d10c6d0c151fd74414ac0d68da80406ba25a018fa501b566a2
-EBUILD gentoo-sources-4.4.111.ebuild 742 BLAKE2B c8af00e4daf6fd242b8faa175ec6741aa966ac1a62cb7a4fe511fc758ce8aff1891946af78b735b7e092aeaa9348f86c1c61b7e7d1c39d792c5fd357c04b8396 SHA512 d05b48ebb4543bd89a09c528840ba1925cc40bf0ad10d762a1ffc65b71028e1c04a66a7af8203bbecfe2943c4d3f997e70b423fcf47d3e0f31d4c742ce37e561
+EBUILD gentoo-sources-4.4.111-r1.ebuild 741 BLAKE2B ef9e0b8dff1bc25816738daa46384d650db7564554cca447f1004e1441bd73e38d9ce0626b9152987931b20a385c0053e6bde4f6331b0ae4b938189e344356fa SHA512 8b1c8938115823351d7514f2eaf6fef2397632bdd0198d68d366affaf3d1512be05e91d526c11da7e5da61a4985ef24282d4019412555bae676b783254b62241
+EBUILD gentoo-sources-4.4.111.ebuild 741 BLAKE2B 028cce31f7f50089d7db9cb7dca2bebce722561ebdf66db4bd6ac30ab45003ff69cd15cb8fc2f7dc88ba727de627a3806ab995463888ad9fb415a51756152bd7 SHA512 3224d48de5ca7c51e339496d642271980cf1c994ddcf76f71e688ecc795aa5a5bb16b133cf3146df5b0828ad7682bd905dc6ea9d70c4fa678b8c9cac272fdfea
 EBUILD gentoo-sources-4.4.87-r1.ebuild 734 BLAKE2B 1f1cb7f7355792bcb664b74c7476e9f8d0e90ca648b819ad44e0a4339210867658584a206beb21842633b7537b2b7f58d43b391d4c4f98fd700280a72662423b SHA512 3a59950c522313a2f9722ae6d4801cd03ddb9430b58f17ab9e8a500fb9a083dc59369de7ad59de1064412f82bdc21396c7280a6af6fcb0a4524ac93f758d85ff
 EBUILD gentoo-sources-4.9.49-r1.ebuild 734 BLAKE2B 169d43bf5276e6d398a72a22b968f571d6122d6b88f61e757f27ccc3d732b171bcdffc27d502c440818e93da732495c258844f047f2f64672fca5b595d15b906 SHA512 8a42455eb119e89f3df16a675486efc5ba208a94ac255b0f4033cb699dea75b9ad7fe28acb1df044b73f16f1bb50c08bbc09bb59e541286893048190c5a74a8e
 EBUILD gentoo-sources-4.9.67.ebuild 742 BLAKE2B 86d65f90024085652859b5e3091f097e556be4a69fa24045fcf98f54000e7d48da3a822a9fc294417665b48f6b49a4e0cc9c3f746c1ea9330725b37529f75b07 SHA512 d444a40a62974d90dccb589d0098e8066615f6e32088fdf5a24bf7063df96d9b720d704ba805291160a030e5e240fd915e442c680f11feb7838e1dee9f9bb439
@@ -138,5 +145,6 @@ EBUILD gentoo-sources-4.9.72.ebuild 738 BLAKE2B 1c88296bca01b95ece33afc5dbc5fe7e
 EBUILD gentoo-sources-4.9.73.ebuild 742 BLAKE2B 325a44a3bb59e8ccc3d02c6d18b6933bf3c3a980a922a4b49a13b7f4d9121a2dda03c73f9c82d0bfc1c447c06109f7dc5d30cb0e454710ec011aa100ca0891f3 SHA512 5ad5e8d5dc84ca2cabbb90767788a5b0698a21909cbd51161fdc8cd74ad7271aa16f9681444d4284939c5018f5001543a628da2067e5a0c16bcea2ced809f968
 EBUILD gentoo-sources-4.9.74.ebuild 742 BLAKE2B 54bcedfef6d735e75840d4c1934fa90fc9e496eb05cb2c7c6c3606e635f724494f9c228abe0a45e81328178c32eed3e70e4934e6476ea5825a8ef337c93972d6 SHA512 8df27d6463d6062623bea09d9a74e8ffbc593bcb40094806f01e00acc88b3d7da8c87d022d9d233986fd20f8edbf1d7566fa193ef6523823e61c6b4606579ce0
 EBUILD gentoo-sources-4.9.75.ebuild 742 BLAKE2B bc74daa96072fba3bdc880132b8c3ee089b922a783b83f5a05c88e5f34d5d0afc5c0e28509e97d93ed5109d4ce33d9af0cd5d8ca581688e4c2636b03387a3f11 SHA512 39b5b4306ecb1f4add091640cac1329b3c0b1e2794f980e09ef2a6c9dce664db655efe8af4465a6958f3113c7fa653b6811ba31a9ce1f99cb283f6dcec8f421b
+EBUILD gentoo-sources-4.9.76-r1.ebuild 740 BLAKE2B 924653ae290be33174337a98dbe5c9380096394527c47481c9d5ac3a9ee903d8a1833d33535e276916e7c86aae335f8e96d792d402b098007e9423dea3ce468a SHA512 80a73da8a38bcc4e223591fa522e21062af9fdf9e5ac0d0dc854e38c60ada8fd232aa688ec3d47a90b498cd654612d5cd10f9481a173ea1180e422ad9edebb71
 EBUILD gentoo-sources-4.9.76.ebuild 741 BLAKE2B 4ceda6a592c887c09173d606b2af6abd55a4a12971f5c0492ebf69956e9f9c7efb8f58c7621adc2f9860a04ed238703a634f2d571ec15348c7bbdfbfe5f0c143 SHA512 4104af66eff2c6142fd3316803fc51fd7b736ac1f2de5ef6fe158c946ea3bab5b8030739e332670c53dc8b47ebb0478d020c69070d8acf88de7f46969fe0b28e
 MISC metadata.xml 500 BLAKE2B 0876bc03bc9d32afee87523a55415ba549942acc4e9a1b65511ced2aa4038557854fd9f570dd1afb6d94ecd899d9cc48034911f547eb88ef76457cdfa62845e4 SHA512 c01d2263a3faff75c3b1f01eef806a9b0c0950c904c28c11b057cfdf2f5c302b95b20f45e649a3749c4ffafa6dafd759e7738bd8e807f23e49d2febaa212ec6b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.111-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.111-r1.ebuild
new file mode 100644
index 000000000000..a272d6bc0f60
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.111-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="115"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.4.111.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.4.111.ebuild
index 02f091d6949c..4fd2a09410e8 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.4.111.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.4.111.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.76-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.76-r1.ebuild
new file mode 100644
index 000000000000..2ec33f267c32
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.76-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="79"
+
+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 9444dca2f15b..5ace3dc5eb2b 100644
--- a/sys-kernel/git-sources/Manifest
+++ b/sys-kernel/git-sources/Manifest
@@ -6,6 +6,7 @@ DIST patch-4.15-rc4.patch 45578434 BLAKE2B cddb2beb403d3cbd0d0d98218dad90078fba9
 DIST patch-4.15-rc5.patch 45928364 BLAKE2B 0e798993916680abae0ec40c4bc3128b4b79fd267a6c22448e2cf4bf574aed1b923681a406cf9f48ea1902df2a95f0962d8a300402cccb7dfc1fb9932c9fb6fa SHA512 90d19f5d373e9368d6346c047754a0cdc6e53072da63a533a49cadc8a7ed14e6eebfe109d8be6642f820398626a25d6e75577fcf59e9a9902c4e959fcc470604
 DIST patch-4.15-rc6.patch 46146258 BLAKE2B 7a71a6e995aaa104012bb8f2a6e728658a2961d511d5302e7c3de182ae104ea8eafbce2a7b3c7a342ae84cbdee26cf9306fe231b9b92268cc8ed3d7cf562f3f6 SHA512 b68965ef7b78ed9a0547d3a00432b0afaa8441a77412026c84d9b91b751f62d54cb263ec0ffc3547196038f0fe39bdcdfd1e7535776dc8f7a139528ea8ce3dcc
 DIST patch-4.15-rc7.patch 46244792 BLAKE2B 80731383db15ebc6aac897b97fe1602ab161f04ca1f3811b47e699d5d50c5e96281672261770c0e8a80f3c0111f6b210104bc67478ccc00cb658cd7d42fb396b SHA512 fae57a83355d3ee0d1b3f07c1af89036f97cb22ab2135a5b57299efb451f3ef91dd8e3822928fb3ad44271508a1ea355771b0e9416d41d25c3888a5074281ade
+DIST patch-4.15-rc8.patch 46486932 BLAKE2B 783cc4fa216d7591a7cf0713cb1aa285017f382c1f6f8c5ebb5a98a5627080854b0f081f7a4417d650c0591ef1878047ebc54cc8ce04763214e861abb74c343d SHA512 30fdd6ad1174f8e3e2b58b80c2796cda502a24153fbdd8852defac552800b4f7baf66c840ec5c3ef4095391b89e6a700e9e5f88e67a2663db4544ac986c2142c
 EBUILD git-sources-4.15_rc1.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
 EBUILD git-sources-4.15_rc2.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
 EBUILD git-sources-4.15_rc3.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
@@ -13,4 +14,5 @@ EBUILD git-sources-4.15_rc4.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948
 EBUILD git-sources-4.15_rc5.ebuild 1179 BLAKE2B d39c295f0236a43b21562e0ae3cf4948c4600e92597847fb4d5e7b3bd85812f521a9e03b8fdcd9f289ae290317e6f282bfd744c6ec0838dc75a6a2f3a13a8706 SHA512 3508bb056d2eff50de33dab587fd4a17f251e0655d947c369dcdf55a1d6ebf438bb64e44beb99a4dd1c6e6d4f80db1b4072f208da4836906aea3e4a3d5208f17
 EBUILD git-sources-4.15_rc6.ebuild 1179 BLAKE2B d31c2ab6b06a8614db22e3439749e16e11476d42f03b8a6518fbd2ab3c509aa5fbb2803ba767c23b79d73d6e3e7732a8b47da67760fd6710d7f2fae807946868 SHA512 001b2f37a0238bb1d49a5f41be5c83ccc59a17065122c97ef00db5523fb0a6365eb02202d2a163cab1c41a7d7806eebc37de578b5dee09b79ab1fd560f8dd04d
 EBUILD git-sources-4.15_rc7.ebuild 1179 BLAKE2B d31c2ab6b06a8614db22e3439749e16e11476d42f03b8a6518fbd2ab3c509aa5fbb2803ba767c23b79d73d6e3e7732a8b47da67760fd6710d7f2fae807946868 SHA512 001b2f37a0238bb1d49a5f41be5c83ccc59a17065122c97ef00db5523fb0a6365eb02202d2a163cab1c41a7d7806eebc37de578b5dee09b79ab1fd560f8dd04d
+EBUILD git-sources-4.15_rc8.ebuild 1179 BLAKE2B d31c2ab6b06a8614db22e3439749e16e11476d42f03b8a6518fbd2ab3c509aa5fbb2803ba767c23b79d73d6e3e7732a8b47da67760fd6710d7f2fae807946868 SHA512 001b2f37a0238bb1d49a5f41be5c83ccc59a17065122c97ef00db5523fb0a6365eb02202d2a163cab1c41a7d7806eebc37de578b5dee09b79ab1fd560f8dd04d
 MISC metadata.xml 647 BLAKE2B 49e79ab62f697fd3e7dcdc63376cc3412f8d91afe7a6219a2402551ce48b67ca5b707a501ee4401437d44dd3b7ee77b861fb3a5d0d55d766e2b9734697f3cff0 SHA512 4a673cd7f8ca3ee46bbf065d87337efa6ee77218781f25ce8b3924b9a90ca3cf10435b6f667d49ad16ba50662f82d107696622b3e55c707d56689ae0c5d2eda9
diff --git a/sys-kernel/git-sources/git-sources-4.15_rc8.ebuild b/sys-kernel/git-sources/git-sources-4.15_rc8.ebuild
new file mode 100644
index 000000000000..b525f064fb5d
--- /dev/null
+++ b/sys-kernel/git-sources/git-sources-4.15_rc8.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+UNIPATCH_STRICTORDER="yes"
+K_NOUSENAME="yes"
+K_NOSETEXTRAVERSION="yes"
+K_NOUSEPR="yes"
+K_SECURITY_UNSUPPORTED="1"
+K_BASE_VER="4.14"
+K_EXP_GENPATCHES_NOUSE="1"
+K_FROM_GIT="yes"
+ETYPE="sources"
+CKV="${PVR/-r/-git}"
+
+# only use this if it's not an _rc/_pre release
+[ "${PV/_pre}" == "${PV}" ] && [ "${PV/_rc}" == "${PV}" ] && OKV="${PV}"
+inherit kernel-2
+detect_version
+
+DESCRIPTION="The very latest -git version of the Linux kernel"
+HOMEPAGE="https://www.kernel.org"
+SRC_URI="${KERNEL_URI}"
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE=""
+
+K_EXTRAEINFO="This kernel is not supported by Gentoo due to its unstable and
+experimental nature. If you have any issues, try a matching vanilla-sources
+ebuild -- if the problem is not there, please contact the upstream kernel
+developers at https://bugzilla.kernel.org and on the linux-kernel mailing list to
+report the problem so it can be fixed in time for the next kernel release."
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	>=sys-devel/patch-2.7.5"
+
+pkg_postinst() {
+	postinst_sources
+}
diff --git a/sys-kernel/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index 4541f76d520d..d2ed59d1ce6a 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -4,7 +4,7 @@ DIST linux-firmware-20180103.tar.gz 138263360 BLAKE2B b7af0f94bf7111a1f4a10c7403
 DIST microcode_amd_fam17h.tar.gz 2204 BLAKE2B 20f3b006587f49fced335fd38711da2384a1f5cd0b93a483d7022d8aa211dc855427a637583dd2eae9f108120f2fda4b80db081d48d3332da906de8e10b94464 SHA512 d3b52797a5968f8da76d39322780e61d04bab5d810b0b07d64e469fcd67998e4191b0e0a9ab7e4c27189941369ef1b2850bbbb1458fd9bbeb958c98f6e378510
 EBUILD linux-firmware-20170314.ebuild 3294 BLAKE2B 93fdec863017044fd75ad16694bc1db473607c59d5d873ef21de651078b723d3607a0b40c7955a5e9154969dbcdcedeba04b17ea9c423437b47928dad63aa157 SHA512 1f038e50a2445fcd28a7abbe3f022ebdede0a04801afe3da06fdc0ae7104773c43810fef5b9484dc266cdb1c5a15bf326b7a1424744f1bd0e326ba509af89edc
 EBUILD linux-firmware-20171206.ebuild 3292 BLAKE2B 456e5bcf89e1c7aad7db0b7db03f5c9d6fd5b70377dd4fb05a2d790e6bb16474f48500b1786f44bbab00c6144b5f251a7f72af4cdc905b14a6e0e2a9eeea921a SHA512 228744b704e482d1389bb4ff56db95c397a213eb93952032c8d504072a68adf68d8a5864381240f9ad436c29c1cac82fd177f48556682ec99b59a61016976044
-EBUILD linux-firmware-20180103-r1.ebuild 3497 BLAKE2B 47c710b7cfbad5fa16b53fd035b0dda9d065c91aa524233c6a12488872382c72a949f98be21772cd5720e632f03f19a3b693b534f23179c7b9eb078ddfd62b86 SHA512 97246ef5d119ddf8a7e769d01019cb01af9efb2314ce61927651ddce6753c5f421ceea2fd160c51376cc960c09046dd873a064ef939000c89511fc3f2a59b398
+EBUILD linux-firmware-20180103-r1.ebuild 3501 BLAKE2B f6dae34d64343fbf98ee5128ce1b1eecc29425ed74254129fa0d69f15f9b8053402811c4e0f298bf3c4a6503701261f46a7ba1575a9077f16dc92cd8b6259424 SHA512 5700810ed30e5625c0de31cc3f01fbd2a221294390799bd29acca706706cbdcfda4e73b80207c4b6726f299d59edb78da2472a6bf988b352fafebc32596cb6aa
 EBUILD linux-firmware-20180103.ebuild 3292 BLAKE2B fdc9d0a0dbeeb9a5b22c69d1bce7bef97af6eaa012430afdb9ddfc8e491cd520bb8d7ab542f97bc1dff5ec0237a47568eb6225e1f876ec8d768a0a569f0f66f8 SHA512 b2f6fa573c116e0f9514fecff7acc2ad95ca7e81bcbb1ccc6bb8f08ebaae34ad5aba8c264300e65444f6c3d9e3d93e4febc2d9b3585b70565fcb7c2c4a23ce7e
 EBUILD linux-firmware-99999999.ebuild 3252 BLAKE2B e676dc8c270f045b62137a1874b3c1560b07961b0b77a17693f28faa154db8b681706ee4d813311001b66b5bc46b166b245166bb5361d6b1e7c7f652350de84e SHA512 fa883958bd1ea0c24641b6ed48895306e5352a4e9baa5932b82d74f54aed7577ceeb7441488123c85a048a37b60ef7e6744f078be2f329cd6e94a2c404269154
 MISC metadata.xml 570 BLAKE2B 16be542cd3a809097b54d505c5a4d93d5728e326d025f6c303404919832014868afb7cbb19e51052083d01d212ebb39f4a3d400bd1d2bd1bc676a5de9a9ddda8 SHA512 55b3274fb2d43a015620bdfa759c554a2e966b8a83b8fd72a6ef1c08dd0f3b8b0b6afba00fc846fa39b631e100d4df059aed44c98111a6a260d1a3f5048916c9
diff --git a/sys-kernel/linux-firmware/linux-firmware-20180103-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20180103-r1.ebuild
index a0da2d99cd2f..c1476a3e5fab 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20180103-r1.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20180103-r1.ebuild
@@ -8,13 +8,13 @@ if [[ ${PV} == 99999999* ]]; then
 	inherit git-r3
 	SRC_URI=""
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/firmware/${PN}.git"
-	KEYWORDS="amd64 ia64 ppc ppc64 x86"
+	KEYWORDS="amd64 hppa ia64 ppc ppc64 x86"
 else
 	GIT_COMMIT="2eefafb2e9dcbafdf4b83d8c43fcd6b75fd4ac78"
 	SRC_URI="https://git.kernel.org/cgit/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${GIT_COMMIT}.tar.gz -> ${P}.tar.gz
 		mirror://gentoo/microcode_amd_fam17h.tar.gz
 		https://dev.gentoo.org/~whissi/dist/${PN}/microcode_amd_fam17h.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-libs/Manifest.gz b/sys-libs/Manifest.gz
index 63992db567d7..cd93084734c3 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/gdbm/Manifest b/sys-libs/gdbm/Manifest
index 7026e599844a..18fb1a9f5259 100644
--- a/sys-libs/gdbm/Manifest
+++ b/sys-libs/gdbm/Manifest
@@ -5,6 +5,6 @@ DIST gdbm-1.13.tar.gz 891987 BLAKE2B f73cb89aeed140a584c5a8bce9c2324cc39a7647ee2
 DIST gdbm-1.14.1.tar.gz 894412 BLAKE2B e519af45d670ec4285ece01edc17770dcb0d77f12edcf2d3d4cb9580c6d2bb6d6dddb57d4f33490e11dc9df7cd08fd44ab7737b62271c5cfdc9485b90d0d4888 SHA512 a15d7acb0ebf459f4f7d262e5a05393a9a7c8e9ae906d12ccb3b38715de15a41c9254e7814555e2f9af306ef63b2dc68b5f9f6c7b75dd0db77e07a58831ff603
 DIST gdbm-1.8.3.tar.gz 228695 BLAKE2B 21b5833facb97fe937020d80b038c7b09e55eea6bdb9ec323d185a0980f235ff6a225d180d86d984469ce04a3f0266d20881f317f4339915bc6f61ab150ac2ac SHA512 2a01751ee8f730db563b4f52185c72f1c7a4f66530d6736f05f7446153be685ea0bb6ea1d2bad16ce31547fea879dc48507ff65ad35b0973df9aa385713b10d7
 EBUILD gdbm-1.11.ebuild 1887 BLAKE2B 1f6680d070bc540e8e476e0f8abcd46c09b98f4334465b544b4c9ee1e92da3855e792cbc78ddb7f54d1cc2e1c7bf0d619289252647a895b9bb6f7c7d017aa30d SHA512 fb5768d73a8a25cad8e6defeba0dd4ba788a2f339e697054da879b0aa600cfafa18ec5793a255bc5cc3066019c189bdcb43842710588590c2bab1c28c172d5d5
-EBUILD gdbm-1.13-r2.ebuild 1897 BLAKE2B dbd9a0cb88a68910ad4e8a9493899fdd1d0d59067976abec768b28f7c6f183a269439ee7ea8af11e812ae0c459d0a2ab0e25ff7018031a02fe12d738ea3b885d SHA512 6caac37ee7a0bb5d8b32e44fb43e9e0ba657c87261a74ba988f1c80d5050d31e004d6107cff2fdf95e8647a52d00e5230839aba9c8171f0968294e02def1676e
+EBUILD gdbm-1.13-r2.ebuild 1893 BLAKE2B 4778219725556d62498cab0fe422a65551e7881b6f9447937973f21d768539a12aefa3486db4535ff0b3c92b0db0f285ad15fded8b321bd6a553a29b9a168ac7 SHA512 7d516305b43e5cb8fa17724bb74b0cf48d02802eeb3cd006ecb325e6869c831b335ccdd0d9be08da48dc480c1c13204329b127282f9dea972d991efef06daf60
 EBUILD gdbm-1.14.1.ebuild 1814 BLAKE2B 339557b78ab19986e57618be547699e248ab20c0cd91abd1242f974798c364d396a63ac2889fee4d11090bd710aea395a8b40a5dc9e3b96f36575fff25d5947b SHA512 19037ca081722f22445d29cb704143296b17ef0d66f8b9af016f377f497892af04f2173534e0416cae7ba31dfd8211a7fd2ed688b89cd402ff86922d61ff04b5
 MISC metadata.xml 471 BLAKE2B d73a0a1493a17d9990451e721b5bccddbdc3cfb59af544b1cdd927e31c65795888b13c7e42274a454d7dd8762ba92c5ab94dae5af7389a67688e6b06840ebad5 SHA512 05f989aa1f1d2ca29d4084741af8465c3daa0713881130aeb8ba8ac65f89a8874d668a0ea32184ec404e19777aa1df9e8d2526fe2ce9a22cae8c08c608501d41
diff --git a/sys-libs/gdbm/gdbm-1.13-r2.ebuild b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
index f96e356b60db..dc4de68e2def 100644
--- a/sys-libs/gdbm/gdbm-1.13-r2.ebuild
+++ b/sys-libs/gdbm/gdbm-1.13-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://gnu/gdbm/${P}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/1.13"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="+berkdb exporter nls +readline static-libs"
 
 DEPEND="
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index ca4184a53804..244bd2859bae 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -34,7 +34,7 @@ DIST glibc-2.25.tar.xz 13873900 BLAKE2B 73ef792fff059f6ad154c9af2155ea15b7869ec1
 DIST glibc-2.26-patches-4.tar.bz2 315447 BLAKE2B 038926c8c187cfea5c00a7017a486356adf0f0959dc8868847f26877b4b441bd76629f20d52967f9da878f69a1ac2859332ed3984b4ebb5cb528d50e0b012736 SHA512 04d229e5f9342d62f2fce039c70489609886782d8aabd49403863a1a679e3b0890ca26c129088738a4af7ef6d95c74f24fb3c4d03695bf7ba6e45eca4de1a5f0
 DIST glibc-2.26-patches-5.tar.bz2 357699 BLAKE2B 98a0cb231bf35a132747f1fa6e654a9ad2eff8b445f002a0239c9a45f5a896ad490570aedee2b43e6cfa94794ae5c8b5e312e369838c3770823f28b61b51b592 SHA512 0040469e4a85f5c2aac972e42aeb06b0adfc3a132b32b19306be9f1877339fe6651a2fbd4d90d502b07ae4460f74efbd1cd103d38a2038df9402b0a380f03c2a
 DIST glibc-2.26.tar.xz 14682748 BLAKE2B c1c9dbec110dd4e25b2f463a96d8afc43b8e3ebfe3c958107032beaa879710252be3bc4122bb62166408725d43785f233544df6159d29cce0fc5b2c08f45adbe SHA512 6ed368523bc55f00976f96c5177f114e3f714b27273d7bffc252812c8b98fb81970403c1f5b5f0a61da678811532fb446530745492d2b49bfefc0d5bd71ce8c0
-DIST glibc-9999-patches-3.tar.bz2 19892 BLAKE2B e0a51f376e7142f56ae2a0862a7723343ee378275c1a0c6c3a69607b5bb7f9bd655f0a68f8f9cfc32008e06852d0eb0a9e16c85ea9a395dc36b428f1ea6100d8 SHA512 75084b86a83d447d3a4b3959fa2a93d849e304ba9473ebec5570ca4fb5e2f8dfb38548faf3abc9fbd29b529f2c608b52eb2ef2e6e9a2ad5bea9a9298a19ef596
+DIST glibc-9999-patches-4.tar.bz2 15159 BLAKE2B e17e9efa196a1acf27dd1535bb43a8999eb4f76e7aecb47ee7fb1fb5258870ddc024a4a5d3fb514d3d37ce28326d3bae93f3c6f534c048b57a6369a1a135e0af SHA512 6e0f8ff9ee125e936a0e43f830423b13ac5350c9a8a83f1c4bb367084e9f2c81cf740f3d97e8bd451890ade46fadfe21154afecca739d00cf6ce1127dba4bb7b
 EBUILD glibc-2.18-r1.ebuild 5514 BLAKE2B 2b007c0f935df77d35d74adceab874eeab55306c1fc69eee3c0f45a5d9cd02e6b4dcf7ab25d2bb450fd07fe7f20a827a774a6e15322f7b8a447726acdf31a3f7 SHA512 b306c31227f15cbf0dbf518195736856f30949544dac12fb4b5b0aabd3e421f040663aacea159181b61f92777a19519241f5c05f6e65576b26f6406df85ef83b
 EBUILD glibc-2.19-r1.ebuild 5471 BLAKE2B 8531139c723de6358daa971e96f98db628eec14c696b004a4e8a4a7efc8a0c610d713625655c55293c94898d13ac9aea5ae1a58134aedb30b1b695859748a964 SHA512 aae5bcdaa10cf6a3026e28b406046bd7297fdacfa8d0ace60f76177aa2efed6b0f82b639f5e6db6bd42d99440d12644d62e9b14cf49ced7284f011cb3c406775
 EBUILD glibc-2.20-r2.ebuild 4947 BLAKE2B 24062f002678df912ced724a3d919bc2f07476c98000092cb3fa3f2be1836db57348c88b6fc1da7a9364103136eecbe687fe365d131f10c82de3cb0edd3eb8c5 SHA512 ff76e9173ab6bfccb1c659f79cefb93f6fa6266adab40a3816f56acddb7866cee67ba6bfa8d1b9988eff755e9d1a879e62973fc332566c185f019af5e17a9f1d
@@ -46,5 +46,5 @@ EBUILD glibc-2.25-r10.ebuild 5012 BLAKE2B 86753e126c049ba2407529668b82094650a718
 EBUILD glibc-2.25-r9.ebuild 4999 BLAKE2B 6c0784aa614374954c0747deb7a33fdba0f8b1935cc28c62af29880d64991cc93740eddefe8dca971d6c1bbba14161e10db75e00a91d73282e0c0bf094004b94 SHA512 3b5dc2073ae44e6cf5a4f8f64a3c3fd837ebaa222009ee617105259765ff4222fb3960be1c537d4fde6c7e928bd85325d9070cb668b31cb6afb03368c079141f
 EBUILD glibc-2.26-r3.ebuild 25337 BLAKE2B 7d35bc98ff62279aaf8221a5366d6624c9c51344d3550a827739d700f32de23ac2a8f9b08f7a8d6437d61a200aeedfa041f68425675881c676642cc5499ac822 SHA512 71a2d63ec8772548d8b88576f6088f394dc364a864aab4e803c6d02600c296c629408fab94ca1b5402d1cfa5503c5a8409f2aed7e5d6afc5e16b98a0eb715765
 EBUILD glibc-2.26-r5.ebuild 25543 BLAKE2B d6f427a7c876a264fc7b14516c7e36adf97a594d291ff34b90f69397fa097968a38db2fbfd19854fedf55d59e7d1b8ff757b525cf6f33182cd3633f0044ef254 SHA512 364a561a54f81d4e40298310acec3c7bd976276abae24549d891de58146739964bb73e91b53c193fae8e6328dccbda0b57fbfca2b7e27912d1654c18ab62e13c
-EBUILD glibc-9999.ebuild 25767 BLAKE2B 0c5ddf6b25ca3bb5303fc3bfc977f70273a98e533380d770df3dfbd683a06a37ebb335d138bc49831b92eee416e63227b609e8c621ac9f81e26e52cd71091b51 SHA512 94dd656d151ebbe0a8eeecd4a2470a7f758279751aa6de9a55631112152829136674ad40e77d57ba5dac24204f4d4c2f0ddb9b5dfa334e68460fb5db61c2eb82
+EBUILD glibc-9999.ebuild 39783 BLAKE2B efacbc5c74f742ac63485a880228781b5f09f1613fc9b760a6072421dc17493ec9726e8a0987a0a4eed971822663fdef9b8f4d3e78c157ca75ad828dc8bb28aa SHA512 8619067d0ffbdd3f5180b1cab7f7f23b75af73ac442ad66d35c5413ebaaaaea9ca6b4d2c803114e9a612af5711b23d86644609efe7337a798cacf016a3f5b88f
 MISC metadata.xml 1054 BLAKE2B dbc091e54130729385bc02aaa1025885f101caa88d601b1f7670974d89e7e24aae5d37fd6699278a37c0064e1f3232c04954dc127869427317b5d80b499f3813 SHA512 65474b7d32ceb6bafe8ae0e18aa0b46b68cefecce5570a0e8d4a0117019e6540f2feae35cecbebad382b4f06d6e5ae1dfa9b8a61889881e8534956dd42df8e4b
diff --git a/sys-libs/glibc/glibc-9999.ebuild b/sys-libs/glibc/glibc-9999.ebuild
index 5d7f3a9fbe9d..0b6f444f7711 100644
--- a/sys-libs/glibc/glibc-9999.ebuild
+++ b/sys-libs/glibc/glibc-9999.ebuild
@@ -3,16 +3,14 @@
 
 EAPI=6
 
-inherit prefix toolchain-glibc
+inherit prefix eutils versionator 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
-EMULTILIB_PKG="true"
-
-# Configuration variables
+SLOT="2.2"
 
 if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://sourceware.org/git/glibc.git"
@@ -28,15 +26,15 @@ RELEASE_VER=${PV}
 GCC_BOOTSTRAP_VER="4.7.3-r1"
 
 # Gentoo patchset
-PATCH_VER="3"
+PATCH_VER=4
 
 SRC_URI+=" https://dev.gentoo.org/~dilfridge/distfiles/${P}-patches-${PATCH_VER}.tar.bz2"
 SRC_URI+=" multilib? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-${GCC_BOOTSTRAP_VER}-multilib-bootstrap.tar.bz2 )"
 
 IUSE="audit caps compile-locales debug doc gd hardened multilib nscd selinux systemtap profile suid vanilla headers-only"
 
-# Min kernel version glibc requires
-: ${NPTL_KERN_VER:="3.2.0"}
+# 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
@@ -51,7 +49,7 @@ IUSE="audit caps compile-locales debug doc gd hardened multilib nscd selinux sys
 # 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
@@ -60,18 +58,8 @@ if [[ ${CTARGET} == ${CHOST} ]] ; then
 	fi
 fi
 
-is_crosscompile() {
-	[[ ${CHOST} != ${CTARGET} ]]
-}
-
-just_headers() {
-	is_crosscompile && use headers-only
-}
-
-SLOT="2.2"
-
-# General: We need a new-enough binutils/gcc to match upstream baseline.
-# arch: we need to make sure our binutils/gcc supports TLS.
+# We need a new-enough binutils/gcc to match upstream baseline.
+# Also we need to make sure our binutils/gcc supports TLS.
 COMMON_DEPEND="
 	nscd? ( selinux? (
 		audit? ( sys-process/audit )
@@ -88,8 +76,8 @@ DEPEND="${COMMON_DEPEND}
 	doc? ( sys-apps/texinfo )
 "
 RDEPEND="${COMMON_DEPEND}
-	!sys-kernel/ps3-sources
 	sys-apps/gentoo-functions
+	!sys-kernel/ps3-sources
 	!sys-libs/nss-db
 "
 
@@ -110,6 +98,475 @@ else
 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 version_is_at_least 2.8 ; then
+						cpu="sparc64v2"
+					elif version_is_at_least 2.4 ; then
+						cpu="sparc64v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparc64b"
+					fi
+					;;
+				niagara)
+					if version_is_at_least 2.4 ; then
+						cpu="sparc64v"
+					elif version_is_at_least 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 version_is_at_least 2.8 ; then
+						cpu="sparcv9v2"
+					elif version_is_at_least 2.4 ; then
+						cpu="sparcv9v"
+					elif version_is_at_least 2.2.3 ; then
+						cpu="sparcv9b"
+					else
+						cpu="sparcv9"
+					fi
+					;;
+				niagara)
+					if version_is_at_least 2.4 ; then
+						cpu="sparcv9v"
+					elif version_is_at_least 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*'
+
+	# Starting with gcc-6 (and fully upstreamed pie patches) we control
+	# default enabled/disabled pie via use flags. So nothing to do
+	# here then. #618160
+	if [[ $(gcc-major-version) -lt 6 ]]; then
+		if use hardened && tc-enables-pie ; then
+			# Force PIC macro definition for all compilations since they're all
+			# either -fPIC or -fPIE with the default-PIE compiler.
+			append-cppflags -DPIC
+		else
+			# Don't build -fPIE without the default-PIE compiler and the
+			# hardened-pie patch
+			filter-flags -fPIE
+		fi
+	fi
+}
+
+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() {
+	# 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
+	version_is_at_least ${nver} ${bver}
+}
+
+# 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}}
+	fi
+
+	setup_flags
+
+	export ABI=${ABI:-${DEFAULT_ABI:-default}}
+
+	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}"
+}
+
+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
+}
+
+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() {
+	[[ $(KV_to_int $1) -ge $(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
+}
+
+check_nptl_support() {
+	# We don't care about the compiler here as we aren't using it
+	just_headers && return
+
+	local run_kv build_kv want_kv
+
+	# TODO: this needs to be replaced somehow
+	run_kv=$(int_to_KV $(get_KV))
+
+	build_kv=$(int_to_KV $(get_kheader_version))
+	want_kv=${MIN_KERN_VER}
+
+	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 ! is_crosscompile && ! tc-is-cross-compiler ; then
+		# Building fails on an non-supporting kernel
+		ebegin "Checking 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
+}
+
+#
 # the phases
 #
 
@@ -124,31 +581,19 @@ pkg_pretend() {
 	   [[ ${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.
+
+		# 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 ! glibc_run_test '#include <pwd.h>\nint main(){return getpwuid(0)==0;}\n'
-		then
-			eerror "Your patched vendor kernel is broken.  You need to get an"
-			eerror "update from whoever is providing the kernel to you."
-			eerror "https://sourceware.org/bugzilla/show_bug.cgi?id=5227"
-			eerror "https://bugs.gentoo.org/262698"
-			die "Keeping your system alive, say thank you"
+			eerror " Downgrading glibc is not supported and a sure way to destruction."
+			die "Aborting to save your system."
 		fi
 
-		if ! glibc_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"
-			eerror "a newer version as syscall(<bignum>) will break."
-			eerror "https://bugs.gentoo.org/279260"
-			die "Keeping your system alive, say thank you"
-		fi
+		# removed check for #262698 since it's about kernel 2.6.18 ...
+		# removed check for #279260 since it's about kernel <2.6.28 ...
 	fi
 
 	# Users have had a chance to phase themselves, time to give em the boot
@@ -355,7 +800,7 @@ glibc_do_configure() {
 
 	[[ $(tc-is-softfloat) == "yes" ]] && myconf+=( --without-fp )
 
-	myconf+=( --enable-kernel=${NPTL_KERN_VER} )
+	myconf+=( --enable-kernel=${MIN_KERN_VER} )
 
 	# Since SELinux support is only required for nscd, only enable it if:
 	# 1. USE selinux
@@ -789,6 +1234,23 @@ glibc_headers_install() {
 	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}"/*/libpthread-*.so
+	fi
+}
+
 src_install() {
 	if just_headers ; then
 		export ABI=default
@@ -800,6 +1262,43 @@ 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
diff --git a/sys-libs/ldb/Manifest b/sys-libs/ldb/Manifest
index b7556dc2db65..f0340f7a5960 100644
--- a/sys-libs/ldb/Manifest
+++ b/sys-libs/ldb/Manifest
@@ -9,9 +9,11 @@ DIST ldb-1.1.29.tar.gz 1277551 BLAKE2B 449333d40073fd63d6d013ba0ae43fc3a0b820194
 DIST ldb-1.1.31.tar.gz 1337586 BLAKE2B 9454f91a621368cfc7cfdb709781653e947d63b275bb3b288049acb43ee3c02ae4f0be820ccf9e3bb32938d12598a91b7a6292b08c638ccfd59bd1be182f09c0 SHA512 49ccd57000cbcc6d828160f4457236b28853d766d641841471f61226156b6103fe563c43c950577b038ea3c0a54506bca94c640d3d5f912a3b8af95eb9ef2824
 DIST ldb-1.2.2.tar.gz 1348041 BLAKE2B 14521bbe1826af003a98d11d6fcaff115e27f81b98aba0369ddd1224e1d1c996a4d4662e816ac4384ddc8b63cd63ce0a0aef95e0f3fe6187e557e2488dbe39e3 SHA512 7d9bd88c6a654967f092758146a8115ab6c66db69a8be269a1f536f0aa3b27fb0d2ea3848cd952ef0f1885c9c4d8b76940f9902b835fe3f79f86b22a4350129b
 DIST ldb-1.3.0.tar.gz 1359144 BLAKE2B 2c959fcf941a43a35b241c49ddcd9fbb853cb64b316741345df168a0118da89d2eb15015c2b85cf4b56814effbe65db55876153e4fb04807c67f78b1a4083710 SHA512 c5afe3c5229cbc35a5715e6ed1faa070dfa3d6b3c0902cc53770373bbc1761ff4ff93aa9b88d5573b9af9925332bb5cebf4a7a129852231f13be33d5cee3a9f8
+DIST ldb-1.3.1.tar.gz 1361723 BLAKE2B 9c33c14fb0aa3677a2f78c3701b5326aee24058a126d65a3549ba7795df3d86b10200913a7224d74798196bfaa86a9e033a2d39ef5cc5244f96fd1f5bc32d452 SHA512 74b7fe82b4b717bcbd75eca6eb11c0ce375ad306788ec0699615dfcd3c0f5978c9ca9b268e59eae8b4557b9bc7b91728b9fdb754fa566b11879b546fdb0ea277
 EBUILD ldb-1.1.26.ebuild 2354 BLAKE2B d2842c0d9fab64092bdba589836f0e488ba3544bb4b74946c6aa881036dbcfba82ac94184ec04f3a12e752d065da61f3c1b2898b053dd260afec6cde14d2112d SHA512 195f61f5c6e120d159ec222105d2652b160a7a6c0aae1c6c97967a65cfca59acff8e895d121f375d3eefa7604e5b26fe84abc6136bf882ab6b100a838b44ee67
 EBUILD ldb-1.1.29-r1.ebuild 2558 BLAKE2B 73c8b40a36a567b8af03c2c374ce8706a1e1087ebf39e23164ce6360cf388d2de890cd07fcfe1b8359b84eae5b8c29bdac07f46aab7bd7a81a2a6961352af5bc SHA512 773205e5f39ad687842bf7dc8f6b16f8c5632c602ccbc97cd53d5593bde32b24ad743587d2e91c34d7be407c9e8839e7875084e1526052ac2fd6ceaef93fa005
 EBUILD ldb-1.1.31.ebuild 2691 BLAKE2B 240d2ccb3f152cbd134b3611d6db02185d6bddf7980b2a816d822fbb924817b798860edd08373d7eb452e451454591a7ce9db24a4475daa210b9e1ce014c14ae SHA512 368998dad5aa47bb8b971936aa5104d1ea5e7a594cd80af79f55e56cb49c2b28aa0322c15781f121bc4aef15d43e56690df324bb0900a7a15eac522b821d5872
 EBUILD ldb-1.2.2.ebuild 2571 BLAKE2B 5e34ccdf8a2385f162e6c578f6c18a8451360e2982201bef211bbcd2c24ec6db80428031e86627a15a71ca4aa352b47e8d3a6429ba48bd56ae9855d12feb9e83 SHA512 197618e4c8f19de77d2c9010ce3be8a87b39cff901e9ac1c13eb31e8f8f1b57854e7bee1f6096fdef46c85c4010ae55920a6c97f22bb0b558c598e2eab904b0f
 EBUILD ldb-1.3.0.ebuild 2568 BLAKE2B 9d06b82e3948f0131a0743439d11d2dda1309d9ce5cdb501b3703f3cd8050ca83095f83d491acc1f23e68c82877821a2d227c3773ba4f527ea83d5b7e3bcbebd SHA512 8eee170a9b6381b148d70fc20c3922daab38d98ba6305a734992303b833750e0c56b9c7edf0505bdee76062e721cc2b1212f389d3300edd61d746be50f4da87e
+EBUILD ldb-1.3.1.ebuild 2570 BLAKE2B 694fcdae05e960dc8d11f6749851e465c461c51a0196ccb865e0c2bb22331fdf9361a704ad416501ba900b1876e71de3c49c69158c4b7d10f907fa30b9908011 SHA512 1588ace714e99cef6479f5e1c1ac6330f27ea346b74af2e67d20dbc07d7c8070478c262a7bd19166fccfe2a47722ca589cc3217e3edaa322af34e8b7a4b4a384
 MISC metadata.xml 234 BLAKE2B 6b406d8363d7982ccf4c836f444d6beb1daade6a4395c707e627a54113eef0f70c4fdd2d96f00ed8e58f8f7936ef5247f16b2ee02a99100f404dccaab358cca0 SHA512 31c30a4b01e860c3bcf28264630d9fb75feb1caa584c6877bc3e6b3d6a52aa2d986d0ffcf4214664dd887b51c5319d7163a7ed6734cfbc8f184b53bf92fd852d
diff --git a/sys-libs/ldb/ldb-1.3.1.ebuild b/sys-libs/ldb/ldb-1.3.1.ebuild
new file mode 100644
index 000000000000..380dbb9cbe1d
--- /dev/null
+++ b/sys-libs/ldb/ldb-1.3.1.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit python-single-r1 waf-utils multilib-minimal eutils
+
+DESCRIPTION="An LDAP-like embedded database"
+HOMEPAGE="http://ldb.samba.org"
+SRC_URI="http://www.samba.org/ftp/pub/${PN}/${P}.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0/${PV}"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="doc +ldap +python"
+
+RDEPEND="
+	!elibc_FreeBSD? ( dev-libs/libbsd[${MULTILIB_USEDEP}] )
+	dev-libs/popt[${MULTILIB_USEDEP}]
+	>=dev-util/cmocka-1.1.1[${MULTILIB_USEDEP}]
+	>=sys-libs/talloc-2.1.11[python?,${MULTILIB_USEDEP}]
+	>=sys-libs/tevent-0.9.35[python(+)?,${MULTILIB_USEDEP}]
+	>=sys-libs/tdb-1.3.15[python?,${MULTILIB_USEDEP}]
+	ldap? ( net-nds/openldap )
+	python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="dev-libs/libxslt
+	doc? ( app-doc/doxygen )
+	virtual/pkgconfig
+	${PYTHON_DEPS}
+	${RDEPEND}
+"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+MULTILIB_WRAPPED_HEADERS=( /usr/include/pyldb.h )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.31-optional_packages.patch
+	"${FILESDIR}"/${PN}-1.1.31-fix_PKGCONFIGDIR-when-python-disabled.patch
+)
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		$(usex ldap '' --disable-ldap)
+		--disable-rpath
+		--disable-rpath-install --bundled-libraries=NONE
+		--with-modulesdir="${EPREFIX}"/usr/$(get_libdir)/samba
+		--builtin-libraries=NONE
+	)
+	if ! multilib_is_native_abi; then
+		myconf+=( --disable-python )
+	else
+		use python || myconf+=( --disable-python )
+	fi
+	waf-utils_src_configure "${myconf[@]}"
+}
+
+multilib_src_compile(){
+	waf-utils_src_compile
+	multilib_is_native_abi && use doc && doxygen Doxyfile
+}
+
+multilib_src_test() {
+	if multilib_is_native_abi; then
+		WAF_MAKE=1 \
+		PATH=buildtools/bin:../../../buildtools/bin:$PATH:"${BUILD_DIR}"/bin/shared/private/ \
+		LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"${BUILD_DIR}"/bin/shared/private/:"${BUILD_DIR}"/bin/shared \
+		waf test || die
+	fi
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	if multilib_is_native_abi && use doc; then
+		doman  apidocs/man/man3/*.3
+		docinto html
+		dodoc -r apidocs/html/*
+	fi
+}
+
+pkg_postinst() {
+	if has_version sys-auth/sssd; then
+		ewarn "You have sssd installed. It is known to break after ldb upgrades,"
+		ewarn "so please try to rebuild it before reporting bugs."
+		ewarn "See https://bugs.gentoo.org/404281"
+	fi
+}
diff --git a/sys-libs/libunwind/Manifest b/sys-libs/libunwind/Manifest
index 6412e7665979..1ae8e06d5c5d 100644
--- a/sys-libs/libunwind/Manifest
+++ b/sys-libs/libunwind/Manifest
@@ -8,6 +8,6 @@ DIST libunwind-1.1.tar.gz 1098603 BLAKE2B c1ef0916c45786dcf820bef164f03e27af29f8
 DIST libunwind-1.2.1.tar.gz 780774 BLAKE2B a5be4142e1e4932231023bdec2ab3ecd6b707faf2d32d2b571239252a1d0fb6a273a6a46c4a107db63f74f7b54c0c54cf252b8b79ad53216333ba7bcf63147a1 SHA512 af7c280d2a963779a4a2711887618bc96383011e4e5d52e4085aa7fb351e55e357468f6ff85e66a216f1c6826538f498335a917a5970575c93be74c96316319b
 DIST libunwind-1.2.tar.gz 747369 BLAKE2B e1f0d8361d9518cafc590bffb0056157a81928a1ae7d29a1f6f78f917cd73e922b24a42b03cdd6e2eb6f6dd6e4e51116f6d83d16a5d51046104204df45ab66a6 SHA512 985d0817944e3cafd99aaa5642862d878972e0851f7954289247e808c9319f399ca29342395f0571cb6568a1104a82bd92d585936f2ca888dda37ac796fde0d4
 EBUILD libunwind-1.1-r1.ebuild 2444 BLAKE2B ac2eb3bc33f80cfd82cb1600c1f9fff80d7ef7a824ecbd618c1d2e4416a5144b5beb47020e825a778d85ffb0e7f3de9b0909d07162b49ce7ec6e128247639b9d SHA512 d6c4099defbbe27c2a0c7df12299a21be655345b6480a61d3a67dea4dd3f732088b734f28eba4a5ee43ac7323ca6cef45fdba05e9c79d2d8e8b41ef5667299eb
-EBUILD libunwind-1.2.1.ebuild 2980 BLAKE2B 576fdb7eb4a2090f6433ba18142d4b9398ea681a80f1b26112cc33cb61f23a7cd86d27333f01427ceb3f73d8175bdcc44fd1dafdd0a144e87d2a8b9eee349bd5 SHA512 58086bec2363af36bb29d6f668434142d035ccb80453189b6223836b69f6cd189899743d90b569633c75539359c965ec5e76942819f1aef0f34eff45f2c32c7d
+EBUILD libunwind-1.2.1.ebuild 2979 BLAKE2B b85de4768d6e4a09e27be73214f7b9ce4552368af11b232262faa6fd334776f3e3b293c1440e379a16a20941221234415d51192f1f09b34c08ba46fa9bf34fa6 SHA512 8ecc2c541ea348174df795f96c2fe0d2d906e7b32988c264aea50fa81b68a091a8c9ea4488c4b6d983e1f4390df4d494d8af826ef5a757da0902a0e187595a4c
 EBUILD libunwind-1.2.ebuild 3178 BLAKE2B 4e9ac515209f47bdf13f35ebf0867a57adbf39695da595bd5775b852e6673e5962b6f836265d8a6ebb5ab42900ceb33f5b013587dc9a71950575122578ac6298 SHA512 8c2cf271f613eb43552631444d262ed3bc163d943d9913fb2c130ef2ef2c45012059ff8db0a1564ba40f50408f7c97e5004c69f9625a60f07bd9ff835aaa2bd6
 MISC metadata.xml 489 BLAKE2B c0a884e7161b62e8548fdf3c8c1d34b24936c71a99fef37713b7c36e0ef3423563e5c98eae8e9748db059645ce85cf972448e0584b1ed92e51c228794e5ed10d SHA512 d7586420e24a7b841cb090ce8dc7bb1c1260a3e2afbc6606d0a974243ca20c0586b4aa3e770b5b98787f8d34b8255846d87550c16f68da6e9d3f55f8b57bde40
diff --git a/sys-libs/libunwind/libunwind-1.2.1.ebuild b/sys-libs/libunwind/libunwind-1.2.1.ebuild
index 7f93b824a1db..b03e4212353e 100644
--- a/sys-libs/libunwind/libunwind-1.2.1.ebuild
+++ b/sys-libs/libunwind/libunwind-1.2.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://nongnu/libunwind/${MY_P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="7"
-KEYWORDS="amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm arm64 hppa ia64 ~mips ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
 IUSE="debug debug-frame doc libatomic lzma +static-libs"
 
 RESTRICT="test" # half of tests are broken (toolchain version dependent)
diff --git a/sys-libs/talloc/Manifest b/sys-libs/talloc/Manifest
index f4f6d6fb3b43..bbc369d6f4d2 100644
--- a/sys-libs/talloc/Manifest
+++ b/sys-libs/talloc/Manifest
@@ -1,7 +1,9 @@
 DIST talloc-2.1.10.tar.gz 441645 BLAKE2B fdc1f6b4ab6c95b461652ac5138e8f4e0db7161792b4cd7af8d80178b99404f844dd8352fb8820dcaedd0d96251025a8ebefc6bd1cff451e6bdf559617c964e3 SHA512 215e70056f37ade8f67c20ab2b79dcb40f071989ec908de81144f8a0160637bbdec9a94123dea73475ba42425415df4c1eb8c1986485a00e2e03323719a03ce3
+DIST talloc-2.1.11.tar.gz 443320 BLAKE2B 6234808d3a37dd1b9cd29121c20e003637da460d652769f9e85356b66aee285f3706377de4f507adfaaf91243a452a27bdab2377749d43937e140c3f8c69c417 SHA512 e0c7e44f21b0b6510e04e09ce325d50323a0c6466acb6f301676e82f8812c61ed7f6faadac62380aa6338d54679fdf7afba7fb9ac774d0def96efbcf49d00523
 DIST talloc-2.1.5.tar.gz 436193 BLAKE2B 88a9ca32b6c6ae869e1761cb027847797e4ef3bb58dc618bae4b00f95637a0a8511f8704fa03ca1ca935127413a10d5297ba3843f0ea6992a97ce586f66cb705 SHA512 b938d67fcf4c6618f1149b4ec665957a604e3b07ee26e96ed36d94312db8f56b50498f69f9a07782f7f10a25047604e32b0d1786e1051d5f36b696c2755f8741
 DIST talloc-2.1.9.tar.gz 440335 BLAKE2B dde37d99b3cfb63209cdb832444f0416b7c05151cec537e220e13b1148d59b89fb712b4211e078b23f1c6608c8be6df6055d5f394b091ccdea3966c04cbb73be SHA512 a8f051bb15aba769ca286acad0946605d0053b0d149b4da2e6ecc333345f3e603d13a7f062452ae0f165615a4170ebdd7f41fc1b46c7a360000d5308bc304cbb
 EBUILD talloc-2.1.10.ebuild 2443 BLAKE2B 39e7c6e9cf12095d28a79bd8bf1feb3496a654a717de88f0b452c779384cc11295ee7e4804fe998876200aae3c85eff1e8f799581ee0551ab5be28a4565ddcd7 SHA512 9b2505168c051eb44e4c9e628800859f729ea9bac24b0e4a6daa80cd5d5036e8ac0733c5ec47b070f59b9791d1e822e53ae6df8d3a91c99176b1cb01e670e1ff
+EBUILD talloc-2.1.11.ebuild 2443 BLAKE2B 723f4a38dc2f2b83abfeb2ec98751bf2fffb5e82083c69296a9c2a6d794172dcfb0b59e7de974746f8e0542e63db1bf3deb8d882743113222869326b9a64b026 SHA512 2a1d66cba8c387c9c5dda890b646fcc1bdf50eb84d199990ccc5a28efc0d3cbd63540809579a3036f1af43441b0655bd7ff94ae5b3e71008c7b3cee9536a093b
 EBUILD talloc-2.1.5.ebuild 2239 BLAKE2B e396e068f44c250ac72178473fd281541a903979c489d10ea66e997f5bee0bbdedc4d5b6e7c4bccdb799e7714190da85923702f27868a0f77dfff771b02c27f8 SHA512 ed9f0f10bd331f589b560c0563f1ca2b5e16fdf12121fca83a34cd2965b48f9d0f0374b12db9b655b5742839260d2fa794b70e6792402b4e0aac0e3ee0d72ed2
 EBUILD talloc-2.1.9.ebuild 2423 BLAKE2B edb6f719ae8b613e129a0167e3dd6f6704bafb1ae4be6ae5811d289b4284903c619f1b0dc0e284ef2e1f0f12a0a979f0182550db9b80a922ba91aa6ca9c51499 SHA512 dcbd5d567eba7abc8b3d1191f5fff75455a5a9bdd58fb8035542dddf47e5cbe296e8fe8ffff95dd76163678efe8b7e81f4774dbe39a048d909e190474ff329a4
 MISC metadata.xml 439 BLAKE2B 06eae26083fdab237958e15ac7e59ae728e1741eef080e2dbd47a9725a88f9120bfd03bcd98ec32a84bf8ee69d5721c7f3978c2c11d018136647d8f1778a1ab8 SHA512 e583aa7aa9a641067b3b38bf398ad6266980ee961e11d81b5d7c6d32cb8948879e27777a33a72376f79beca6f71aa79613db65049e6a1221922869239de9ccf3
diff --git a/sys-libs/talloc/talloc-2.1.11.ebuild b/sys-libs/talloc/talloc-2.1.11.ebuild
new file mode 100644
index 000000000000..e0ced08be51f
--- /dev/null
+++ b/sys-libs/talloc/talloc-2.1.11.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads"
+
+inherit waf-utils python-single-r1 multilib multilib-minimal
+
+DESCRIPTION="Samba talloc library"
+HOMEPAGE="https://talloc.samba.org/"
+SRC_URI="https://www.samba.org/ftp/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3 LGPL-3+ LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~sparc-solaris ~x64-solaris"
+IUSE="compat +python"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="python? ( ${PYTHON_DEPS} )
+	!!<sys-libs/talloc-2.0.5"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	dev-libs/libxslt
+	${PYTHON_DEPS}"
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+RESTRICT="test"
+
+MULTILIB_WRAPPED_HEADERS=(
+	# python goes only for native
+	/usr/include/pytalloc.h
+)
+
+pkg_setup() {
+	# try to turn off distcc and ccache for people that have a problem with it
+	export DISTCC_DISABLE=1
+	export CCACHE_DISABLE=1
+
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	# what would you expect of waf? i won't even waste time trying.
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local extra_opts=()
+
+	use compat && extra_opts+=( --enable-talloc-compat1 )
+	if ! multilib_is_native_abi || ! use python; then
+		extra_opts+=( --disable-python )
+	fi
+
+	waf-utils_src_configure \
+		"${extra_opts[@]}"
+}
+
+multilib_src_compile() {
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	# waf is stupid, and no, we can't fix the build-system, since it's provided
+	# as a brilliant binary blob thats decompressed on the fly
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		install_name_tool \
+			-id "${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+			"${ED}"/usr/$(get_libdir)/libtalloc.2.0.5.dylib || die
+		if use python ; then
+			install_name_tool \
+				-id "${EPREFIX}"/usr/$(get_libdir)/libpytalloc-util.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+			install_name_tool \
+				-change "${S}/bin/default/libtalloc.dylib" \
+					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${ED}"/usr/$(get_libdir)/libpytalloc-util.2.0.5.dylib || die
+			install_name_tool \
+				-change "${S}/bin/default/libtalloc.dylib" \
+					"${EPREFIX}"/usr/$(get_libdir)/libtalloc.2.dylib \
+				"${D}"$(python_get_sitedir)/talloc.bundle || die
+		fi
+	fi
+}
diff --git a/sys-libs/tevent/Manifest b/sys-libs/tevent/Manifest
index 90a5461c81e6..3aa22988e4d8 100644
--- a/sys-libs/tevent/Manifest
+++ b/sys-libs/tevent/Manifest
@@ -4,9 +4,11 @@ DIST tevent-0.9.31.tar.gz 587784 BLAKE2B 0e562600ae8ba4dae194b1a28a020f5618b1566
 DIST tevent-0.9.32.tar.gz 590314 BLAKE2B 6159d2eac6ea49814fa83b982176db58fad6a9b619a28145bcee3eaff6b294559bcd863f2a3c8336cb218b8978145457d6dcf9e1af2239298d3811413f2bee69 SHA512 9bd256c245d9f82dcd5b31787c8b11780b958bef96426de231f54eaea6df680a5cf3eb8c8d066d05f271e81f303404fc4191a23a6bc2533b7d1b732b2c206fbd
 DIST tevent-0.9.33.tar.gz 590611 BLAKE2B 087cd196b5cd0ca675280ce35d2a3f51a69d3e36f3ca99be0860873b0078fa4b94092731e2d23c15e8ad0db9703735ee07b90a1900e27245295f11edb3798e6d SHA512 3a437957859a556e06f24334301c41a3db1433c1e90d651fa74585a638a36d71369f235a8ab51aa0dd8f9d9bb88ad42f2c3ddeba0b99c4234c63866a8c922b91
 DIST tevent-0.9.34.tar.gz 590260 BLAKE2B 7acd5b5ec540ab97641729e2b6300335a581d70ae2a76d0a93959c47cf84109cb1f52234b7189ecdd28390205b828296bbbde0820e9ba23a7bb33677b347a584 SHA512 29ff88cedc05d9345749ee241f8ab083fc6f98d3975b2739629a3a75a766db6ec42133eeb6c9297315ee0c68ab512c70b8b927d2df5ea61880c673ef33b44183
+DIST tevent-0.9.35.tar.gz 591546 BLAKE2B d0df81dc1998ae5806f3f8b613c5640af56d52c0e6fdea8f57c95cf4ef5d8bf349992582b97da94cbcc048bc3f758ecb03e836847467588e7dbfbb1aef87b906 SHA512 935719382469a0f39764a7ebdbc0ee977ccca2fc55ff1e896ddd95ba2d065d989f0c366cb98be95ce87475e628b0de38b7138261717a5c2cee870e98339ed5fd
 EBUILD tevent-0.9.28.ebuild 1308 BLAKE2B 28b6ae3555c61e3297fbdfd544c86e573f494060d7f0634b28a5de2e559115fe5792473d757c79c37ce1a0be59fff5db68dc1cc14348192ba0385a58856866c9 SHA512 9bdc7903d5a99d3e82455598e9ad915fb1a48b0de0fb1e93b8188460f1ec432d451b9c9f7536a9917867939b49e4fa78e3bfdc4269eaa0736f488094e314b6de
 EBUILD tevent-0.9.31-r1.ebuild 1389 BLAKE2B 216aa5ce0e0541cf8a7b6494d58acd25acbb982d035018b85c0cc2450c4958e10a11e75d19dacb2bc73d6ec9525c94b75952d63c578ccba2ae776263422287fd SHA512 ae95c8849b5b34814da9af6c1cc356359da9f9c9132e5fe3e55c82fa60d63ba78f7598b27705b135aa76de243532ad7474b7ab085522cc2d5e70bf5e4ea06518
 EBUILD tevent-0.9.32.ebuild 1396 BLAKE2B eab06a3aeaa5af4d422403779582200475e759930186d55fc5598e8eedb56c644f5515248c1faa18046a5dcd18db381ab05c603d7d5778b83254c5f1892868d3 SHA512 5626a0a26e3eade2fb441c3b1f3ec347559858bc9266aa8f4e0dc674c5fa640a6f3cae42d753bdddc211f16ee59a1ab25248d3c7ac3accdf65d82d4a1d2cde9a
 EBUILD tevent-0.9.33.ebuild 1511 BLAKE2B e82e0cae6c70b391f3952384d94bab545bf0ad35d8e5aaf3b16d9020bfbb26d8b1c01af0d32078fd033cd5365976503e2508a5b96b2ac6273edb2b08d249f6da SHA512 4cbd0b0b8bb35fc424daf11f2d75ded7a68ba27296acd34bb11e625aa6f75ca5ac658aec6b8e9a729a6ba595c03f17f963bede55e713296e3508cf6d4acae01b
 EBUILD tevent-0.9.34.ebuild 1514 BLAKE2B 7ec15890fbc1d7ae8a3cde90edccf6483a1fe688c7518e68d7326a111b98be14a6e7f843d2765b0b8ff4ae404f1979f0d2003249485945d296291edd0aa2b42e SHA512 c1c0575beb69404daf63e85a28b2da7795381b85deefae12ef2e6bc6d7a0420c319fc2c81c107ce56bf8fa01c36265339c8bc00422789279963cdc7200823cb3
+EBUILD tevent-0.9.35.ebuild 1514 BLAKE2B 0ccb5903534c6feee6fe1acf70039e4355605c4ba4acbb8f7b345c0dc189f410c1685ba9d644e80891c3f250d063d56b3343b072ce7478ed0d51a02549b50685 SHA512 4b09900c94d3473dcc2a7d3344933a4cc8745d953a4ff8ac79d11f8d14fd42f18a9e72312f84c7bdc2daf8a2b9b328d35613ecf8f55f18a03c253712b5bff0c3
 MISC metadata.xml 345 BLAKE2B 2b19478c92e6a2e49d4421494986bf139e3e130ee9486f8ee2a208ac91db84662fee1b5ced560b29c926e6ab1c07752a4d6679582f220c50713c3b1dc2aa2e6b SHA512 35515a1369eeb1e4949415f8571fc54e7546ac83a59b506e04dc795f0a9b4cb06d7c8e1785577c20ca398fd87543f1742d9d4267fc09320503835bad1fc36cf5
diff --git a/sys-libs/tevent/tevent-0.9.35.ebuild b/sys-libs/tevent/tevent-0.9.35.ebuild
new file mode 100644
index 000000000000..c2a8eb8ad787
--- /dev/null
+++ b/sys-libs/tevent/tevent-0.9.35.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit waf-utils multilib-minimal python-single-r1
+
+DESCRIPTION="Samba tevent library"
+HOMEPAGE="https://tevent.samba.org/"
+SRC_URI="https://www.samba.org/ftp/tevent/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
+IUSE="python"
+
+RDEPEND=">=sys-libs/talloc-2.1.11[${MULTILIB_USEDEP}]
+	python? ( ${PYTHON_DEPS} )"
+
+DEPEND="${RDEPEND}
+	>=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+	${PYTHON_DEPS}
+"
+# build system does not work with python3
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+#PATCHES=(
+#	"${FILESDIR}"/talloc-disable-python.patch
+#)
+
+WAF_BINARY="${S}/buildtools/bin/waf"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	waf-utils_src_configure \
+		--bundled-libraries=NONE \
+		--builtin-libraries=NONE \
+		$(multilib_native_usex python '' '--disable-python')
+}
+
+multilib_src_compile() {
+	# need to avoid parallel building, this looks like the sanest way with waf-utils/multiprocessing eclasses
+	unset MAKEOPTS
+	waf-utils_src_compile
+}
+
+multilib_src_install() {
+	waf-utils_src_install
+
+	multilib_is_native_abi && use python && python_domodule tevent.py
+}
+
+multilib_src_install_all() {
+	insinto /usr/include
+	doins tevent_internal.h
+}
diff --git a/sys-power/Manifest.gz b/sys-power/Manifest.gz
index b7724f16bf27..a7d69275199f 100644
--- a/sys-power/Manifest.gz
+++ b/sys-power/Manifest.gz
diff --git a/sys-power/nut/Manifest b/sys-power/nut/Manifest
index bda21fef2d0d..5c4cb36a5a0f 100644
--- a/sys-power/nut/Manifest
+++ b/sys-power/nut/Manifest
@@ -18,6 +18,6 @@ DIST nut-2.7.4.tar.gz 2509831 BLAKE2B 367c687efd739150898a14c700d5fddbe22bf92652
 EBUILD nut-2.6.5-r1.ebuild 7233 BLAKE2B 6f3faa9fbdebcd82f778c4f025566b36cb400ca5b3b4fa8e567bd9280fe11d44e08057987264fbbd72eea68f306dd41063deb8b3374187a9397d32ac29d29518 SHA512 fc7ef6a8c701374a1e98fb61b2064bddbfb0b9195d7d54ba9a408d76c862b207d0f72f03fd1775e84c3a41ac513a780e0a97420c813b98e541842e55712203ef
 EBUILD nut-2.7.2-r2.ebuild 9349 BLAKE2B 08ce8ef7adca39dab86e2f75e21a408700dab50719d6749f8dd06ec4424ad2f3686fe4f1e248c41cd2e3fd9a70037b145b67fe63bf8882b33f81b205cd991caf SHA512 143239b51ff5db0c74b6ee7bb619c9c5c96b9c5bfa2a7883e8d004dbc5fb302462c9304f3131650b7d06fa7a10317881feba15f6279299f963a6e99d6ec81d10
 EBUILD nut-2.7.3.ebuild 9138 BLAKE2B 12c7ff977c3d28b42b42071efbf5f452a25033ce0b246564cd9ca58fae88c115bfdc6690fe1d05a8ac2487e5635cf7dcf80371b7ad6351e234a3768ca34d30cf SHA512 3123230597b9fd6ddaf25094409a20628adfb7c2ce704e32a7f082e137c3da37e28009f81d90983f759ea741eadd5672166dff7661cb432ad6ecf26303a3c4ea
-EBUILD nut-2.7.4-r1.ebuild 9159 BLAKE2B 1ae7017ba5a53e34e8f7db5fdb0ac0daa448be4129c5dab2406a7e68604ab6415a6a0727734e88c178b051d937e2f19a11019a59a311f3197619bf8ef2050386 SHA512 2403374a1c6ccef22e71003d999d20b88097e2e1f4425a0e28a0c1b90e42dcebea182a8d6d3eb74ced8d22896b70d00361e3fb92c8420d8fa4f06a359dc524cd
+EBUILD nut-2.7.4-r1.ebuild 9158 BLAKE2B edca5d3a657ffbaa17e4bfd3929c088a2d97bce6812204e28bb624ee5a625ca3ffeee0c3ff76372c5dc028f92c239ea9d3840fa8a4f1bdb6775728cd9a90a7c6 SHA512 301a85edceea806095f47270530764535dd09246e6a58901ee96e0964561959b8486f3944f4fb778f668171174e2865d05e177220715e19eec1b617582a2580e
 EBUILD nut-2.7.4.ebuild 9144 BLAKE2B 844ee3f8c0e8195a0f7b376c7d4df34de6afdcef910bca724ec0859e8586a913750cd2cf329a78b0daed1886bd5c6881a97d33ef2e0c3827cee91b84f0d44474 SHA512 21c6738218cf0160693a3459b9ae62becc6119a9b0cb87bd21eb46094b2feb135bda479acefe250abd6dfc79faa2508101e1113c86fa6ef66ce8d522d26ee924
 MISC metadata.xml 5121 BLAKE2B 480860ed22af0a86686b53a9a901e19564a6dfcb0f7f600fede42366fb10de29a53a13a5b57d70acd7f2d2af6d9887f76bb89bdbf85a54ca00075556aecce926 SHA512 3cbce8da4c3117afd38fe28f7050a82552222a120e69a22b3ed1754bd6e71091b4bb45c6232fb2767f884afc24f5cdfcd9b0c59a8d8bccaf68b12e7fb08aee80
diff --git a/sys-power/nut/nut-2.7.4-r1.ebuild b/sys-power/nut/nut-2.7.4-r1.ebuild
index 5ddcd060d4a5..c461475fce6e 100644
--- a/sys-power/nut/nut-2.7.4-r1.ebuild
+++ b/sys-power/nut/nut-2.7.4-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://random.networkupstools.org/source/${PV%.*}/${MY_P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
+KEYWORDS="amd64 ~arm ppc ppc64 x86 ~x86-fbsd"
 
 IUSE="cgi ipmi snmp +usb selinux ssl tcpd xml zeroconf"
 CDEPEND="
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index 6144a764f990..caa7dcdef185 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/systemd-cron/Manifest b/sys-process/systemd-cron/Manifest
index e33225853802..e0275838dc07 100644
--- a/sys-process/systemd-cron/Manifest
+++ b/sys-process/systemd-cron/Manifest
@@ -1,9 +1,10 @@
+AUX 1.5.12-generatordir.patch 2452 BLAKE2B 43b6dacabd148b3aebc41bcf4f9430b72632fa7ff50f8f1e713a020b1050060f07a762640e050419294d0cd28b5947a27fce6b425e45a9924e4a33720040f478 SHA512 9b0bffdae0eb7958f6a5deabd1f60063a8571e16f715f82296e4776106f5f15d65be10a4b67de723b41e0dc92ad8b0e585ab477cde3d81422e0548db11ee9f2f
 DIST systemd-cron-1.5.10.tar.gz 31191 BLAKE2B c58a0cfec82534baf3daba6f706d054347f3bc5a2d272eb003228b48fc58c9df61ed2045526403295aed3edc9a0c84eaa589c5aea66562bf35d531b4f5ffacd7 SHA512 9a4bbf78c81adf74e589cd9431b5742d5dab63b0346a2330403a7e24bdab62833096445d9fd3e5f6a91f722b3f8176e52734dcc5e2ee0ec23b555e6d01805094
 DIST systemd-cron-1.5.12.tar.gz 31417 BLAKE2B d0776d2c4aa2d86289dd8ab5dade47f083ee7abc16f54c9527130f587049064d6100eaccd4a3a0a461d21ac8286910d3cb0590db14ea1d3a32e591b7ede0a59e SHA512 6f85cef0870cde5ff6b397fb640a30a8a567e09e3cac48456498f1f102395f12f174731ca9cc8e826bb6c49a0d3a6dd49a9aec63e7b75648b7dccfaa499dcea4
 DIST systemd-cron-1.5.3.tar.gz 29105 BLAKE2B c7c95df9be0383aa39a8525d3a5179a04ef1edc77d6c0e34095eb0fe26045c139e4d0c340d6999405baa99d00181cc6c2fb14d87ad401a685aaf3ad7adb5e006 SHA512 ea0241f93b8d92497fa020d84630ee153dc299d9b16b17567784a4dcb5ddf0a4589e7e033428562a862218ef79b192245178df2d7dcc69f779ef9156921674c7
 DIST systemd-cron-1.5.4.tar.gz 30436 BLAKE2B 5ce72e30e68cafbf812690704de4841d0436a97e6a9df12802374a0ef7fe2af4294310e4c14c68d5aa2508c9664402c17dcacb7b6a637f7b83853d97c78c557f SHA512 e6fe60de9d6cbc223b8358bd6b1a060e11f1ea16a8f0b24662914ddb18d827f7b4c62fd40dbefed3d0ac38b1e748998ec5e0430d4ea751e8a20b94b9803bcb89
 EBUILD systemd-cron-1.5.10.ebuild 1934 BLAKE2B 89898ee41545514cd1bab1000aec1ed90073a913aea45bad41dfb9e7f05a4f1bac2b744613d1b3b808a1ea7796118ae35c15264f60c18796934039861df27235 SHA512 08ad3edca36f7402aca3e40ef4ce048f6dd4d238fa6cccb4e8fc287c1dbc885321275a8364d9e0a34f0af29dba8c654735622dda62df6e24a10d6cd40e9a4112
-EBUILD systemd-cron-1.5.12.ebuild 1989 BLAKE2B 52f3aac5841c24d227c9c61ce74949b9404036449937738acbebdf994bc653478732e9d26d1ac21026e8f9e6b747e0d0d0fa785b4b035959eddf08a72f5a13ba SHA512 261afa0863dfde45a83aa1f66f3e0a18d0f2064eebb044196a9dc67c880589fd8655588472fb755c7548eb575702d720a69651e5dc9413faea4d0bae0d1424e3
+EBUILD systemd-cron-1.5.12-r1.ebuild 2038 BLAKE2B 1da19673c997792ac515cc297d4924f08eb6ba05ac2797c8809435ec788bb753296afdd9d67904d86e2bc3d1c40b1d8ec6f3e456bd2df41524e491180c3072d1 SHA512 274ac736b4f10ae2b59aa038456eb85b0d7f78ff3d24d3c94407262ca0d07faaa14539f0dd2dec1d6e5a7b4b4d1a41bc1da137eb8d5a4bb0be1985ec919df933
 EBUILD systemd-cron-1.5.3.ebuild 1928 BLAKE2B d62cf3310fa4af92735f0d4552420e07319c87377488e788bf23fd2db7d78d93c41dc3f15b0c4f9f23ea6245092155fb2101bbc3ee67a0fbd28fb862d17387d4 SHA512 5e370da06605db4f6d2366628ecbd498894302278795b530e78c16ef941b79f1aca94b2ae115c76544f53023429990708215b649cee30c18ef46dec45dd397e9
 EBUILD systemd-cron-1.5.4.ebuild 1932 BLAKE2B ffd5b09ab515b37252a43060a9a936a8461c3649699088d94e927cef81189acbd72a75d020809cee93fb78386ceb87a637d8026f0f5d364e8823b7e501135cb8 SHA512 d021886a0c23a7096097467b0794b0cf2756ce09af31a2f510fdefd3a8631c79e79383d153d60cba168d90e602c59d848a884722f44afc76f058af3d3205f519
 MISC metadata.xml 696 BLAKE2B 9487789802e271bb95d8c44c5f279f8c850b928e8a2547ce7a1b47e2db3aef119265c0d8e36b8dfba3c62e3b7d4ccc040ba7983dec6c6328fc11e10e7ffd4ecc SHA512 54efb7e34c7e83c0ac3e964e300705b3b33c2dd93dc711c6e71b9d93d83a627f0318ce757b01feb6d6e1edd228f94ab180394617803dcc23c5e73aece9c9f7c1
diff --git a/sys-process/systemd-cron/files/1.5.12-generatordir.patch b/sys-process/systemd-cron/files/1.5.12-generatordir.patch
new file mode 100644
index 000000000000..71c0abd4d804
--- /dev/null
+++ b/sys-process/systemd-cron/files/1.5.12-generatordir.patch
@@ -0,0 +1,67 @@
+From e9c1dcd5e1a475a1974f0a6464637c4ab731bfae Mon Sep 17 00:00:00 2001
+From: Mike Gilbert <floppym@gentoo.org>
+Date: Sat, 13 Jan 2018 11:42:05 -0500
+Subject: [PATCH] Replace remaining references to
+ @libdir@/systemd/system-generators
+
+---
+ Makefile.in                            | 1 +
+ src/bin/crontab.py                     | 2 +-
+ src/man/systemd-crontab-generator.8.in | 6 +++---
+ 3 files changed, 5 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.in b/Makefile.in
+index b9a9b02..e5a2df8 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -60,6 +60,7 @@ define in2out
+ 		-e "s|\@bindir\@|$(bindir)|g" \
+ 		-e "s|\@libdir\@|$(libdir)|g" \
+ 		-e "s|\@unitdir\@|$(unitdir)|g" \
++		-e "s|\@generatordir\@|$(generatordir)|g" \
+ 		-e "s|\@runparts\@|$(runparts)|g" \
+ 		-e "s|\@version\@|$(version)|g" \
+ 		-e "s|\@persistent\@|$(persistent)|g" \
+diff --git a/src/bin/crontab.py b/src/bin/crontab.py
+index d95b31e..921db1a 100755
+--- a/src/bin/crontab.py
++++ b/src/bin/crontab.py
+@@ -333,7 +333,7 @@ if __name__ == '__main__':
+             'show': show,
+             }.get(args.action, replace)
+ 
+-    loader = importlib.machinery.SourceFileLoader('name', '@libdir@/systemd/system-generators/systemd-crontab-generator')
++    loader = importlib.machinery.SourceFileLoader('name', '@generatordir@/systemd-crontab-generator')
+     parser = loader.load_module()
+ 
+     action(cron_file, args)
+diff --git a/src/man/systemd-crontab-generator.8.in b/src/man/systemd-crontab-generator.8.in
+index ea69688..dedf1d2 100644
+--- a/src/man/systemd-crontab-generator.8.in
++++ b/src/man/systemd-crontab-generator.8.in
+@@ -4,7 +4,7 @@
+ systemd-crontab-generator - translate cron schedules in systemd Units
+ 
+ .SH SYNOPSIS
+-@libdir@/systemd/system-generators/systemd-crontab-generator output_folder
++@generatordir@/systemd-crontab-generator output_folder
+ 
+ .SH DESCRIPTION
+ systemd-crontab-generator is a generator that translates the legacy cron files (see FILES)
+@@ -77,11 +77,11 @@ to have a overview of timers and know when they will elapse.
+ 
+ If you get errors like
+ .br
+-.B @libdir@/systemd/system-generators/systemd-crontab-generator failed with error code 1.
++.B @generatordir@/systemd-crontab-generator failed with error code 1.
+ .br
+ in the journal, you can manually run
+ .br
+-.B "@libdir@/systemd/system-generators/systemd-crontab-generator /tmp"
++.B "@generatordir@/systemd-crontab-generator /tmp"
+ .br
+ to get a more verbose error message.
+ 
+-- 
+2.16.0.rc0
+
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild
new file mode 100644
index 000000000000..44cfac6b53b7
--- /dev/null
+++ b/sys-process/systemd-cron/systemd-cron-1.5.12-r1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+PYTHON_COMPAT=( pypy3 python3_{4,5,6} )
+inherit eutils python-single-r1 systemd
+
+DESCRIPTION="systemd units to create timers for cron directories and crontab"
+HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"
+SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-cron-${PV}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cron-boot etc-crontab-systemd minutely setgid test yearly"
+
+RDEPEND=">=sys-apps/systemd-217
+	     sys-apps/debianutils
+	     !etc-crontab-systemd? ( !sys-process/dcron )
+	     ${PYTHON_DEPS}
+		 sys-process/cronbase"
+
+DEPEND="sys-process/cronbase
+	test? ( sys-apps/man-db dev-python/pyflakes )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+src_prepare() {
+	epatch "${FILESDIR}/1.5.12-generatordir.patch"
+
+	python_fix_shebang --force "${S}/src/bin"
+
+	sed -i \
+		-e 's/^crontab/crontab-systemd/' \
+		-e 's/^CRONTAB/CRONTAB-SYSTEMD/' \
+		-- "${S}/src/man/crontab."{1,5}".in" || die
+
+	sed -i \
+		-e 's!/crontab$!/crontab-systemd!' \
+		-e 's!/crontab\(\.[15]\)$!/crontab-systemd\1!' \
+		-e 's/pyflakes3/pyflakes/' \
+		-- "${S}/Makefile.in" || die
+
+	if use etc-crontab-systemd
+	then	sed -i \
+			-e "s!/etc/crontab!/etc/crontab-systemd!" \
+			-- "${S}/src/man/crontab."{1,5}".in" \
+			"${S}/src/bin/systemd-crontab-generator.py" || die
+	fi
+
+	epatch_user
+}
+
+my_use_enable() {
+	if use ${1}; then
+		echo --enable-${2:-${1}}=yes
+	else
+		echo --enable-${2:-${1}}=no
+	fi
+}
+
+src_configure() {
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--confdir="${EPREFIX}/etc" \
+		--runparts="${EPREFIX}/bin/run-parts" \
+		--mandir="${EPREFIX}/usr/share/man" \
+		--unitdir="$(systemd_get_unitdir)" \
+		--generatordir="$(systemd_get_systemgeneratordir)" \
+		$(my_use_enable cron-boot boot) \
+		$(my_use_enable minutely) \
+		$(my_use_enable yearly) \
+		$(my_use_enable yearly quarterly) \
+		$(my_use_enable yearly semi_annually) \
+		$(my_use_enable setgid) \
+		--enable-persistent=yes
+}
diff --git a/sys-process/systemd-cron/systemd-cron-1.5.12.ebuild b/sys-process/systemd-cron/systemd-cron-1.5.12.ebuild
deleted file mode 100644
index f3b6cfa0938a..000000000000
--- a/sys-process/systemd-cron/systemd-cron-1.5.12.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( pypy3 python3_{4,5,6} )
-inherit eutils python-single-r1 systemd
-
-DESCRIPTION="systemd units to create timers for cron directories and crontab"
-HOMEPAGE="https://github.com/systemd-cron/systemd-cron/"
-SRC_URI="https://github.com/systemd-cron/${PN}/archive/v${PV}.tar.gz -> systemd-cron-${PV}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cron-boot etc-crontab-systemd minutely setgid test yearly"
-
-RDEPEND=">=sys-apps/systemd-217
-	     sys-apps/debianutils
-	     !etc-crontab-systemd? ( !sys-process/dcron )
-	     ${PYTHON_DEPS}
-		 sys-process/cronbase"
-
-DEPEND="sys-process/cronbase
-	test? ( sys-apps/man-db dev-python/pyflakes )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_prepare() {
-	python_fix_shebang --force "${S}/src/bin"
-
-	sed -i \
-		-e 's/^crontab/crontab-systemd/' \
-		-e 's/^CRONTAB/CRONTAB-SYSTEMD/' \
-		-- "${S}/src/man/crontab."{1,5}".in" || die
-
-	sed -i \
-		-e 's!/crontab$!/crontab-systemd!' \
-		-e 's!/crontab\(\.[15]\)$!/crontab-systemd\1!' \
-		-e 's/pyflakes3/pyflakes/' \
-		-- "${S}/Makefile.in" || die
-
-	if use etc-crontab-systemd
-	then	sed -i \
-			-e "s!/etc/crontab!/etc/crontab-systemd!" \
-			-- "${S}/src/man/crontab."{1,5}".in" \
-			"${S}/src/bin/systemd-crontab-generator.py" || die
-	fi
-
-	epatch_user
-}
-
-my_use_enable() {
-	if use ${1}; then
-		echo --enable-${2:-${1}}=yes
-	else
-		echo --enable-${2:-${1}}=no
-	fi
-}
-
-src_configure() {
-	./configure \
-		--prefix="${EPREFIX}/usr" \
-		--confdir="${EPREFIX}/etc" \
-		--runparts="${EPREFIX}/bin/run-parts" \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--unitdir="$(systemd_get_unitdir)" \
-		--generatordir="$(systemd_get_systemgeneratordir)" \
-		$(my_use_enable cron-boot boot) \
-		$(my_use_enable minutely) \
-		$(my_use_enable yearly) \
-		$(my_use_enable yearly quarterly) \
-		$(my_use_enable yearly semi_annually) \
-		$(my_use_enable setgid) \
-		--enable-persistent=yes
-}
diff --git a/sys-process/time/Manifest b/sys-process/time/Manifest
index f48dc4128d34..6c02c45e0379 100644
--- a/sys-process/time/Manifest
+++ b/sys-process/time/Manifest
@@ -6,5 +6,5 @@ DIST time-1.7.2.tar.gz 108371 BLAKE2B 17d83faa24974fdd5853d83b0524a9f97780db19c4
 DIST time-1.7.tar.gz 103066 BLAKE2B 900df9031f90fbdab5b778c8ec61b3fe5efb2cb6a21834a31e3eefe845e05977b7c3206579e0bd7959f4dd5a34a909b16cc96f743aaf81cc1edb182a5669c68c SHA512 d759b651e343beddc0b3bd06af85881486b72319c979a2e7f752d5a34edd8b7c1c19391c5c7a2e8f6685746cc7a046bf2c8e082b31458a1dd043ed90a4cebcd1
 EBUILD time-1.7-r1.ebuild 557 BLAKE2B 8d590bfbc57301a251d16908277f659d974eb83a4f121903782626b61b8fd852ccd8b38e641eb0c82489fc555a1450e03a5deffa1ff7fe2ffe7c832060d312b3 SHA512 5b627020ad01ba84c38cd154eede8bd1e9cdd8ff26ddb43be298bf1dc06720111d12d583e90997c8fdb582805cef40bd20ad5d54deb26b15c30e801efdc1fd69
 EBUILD time-1.7-r3.ebuild 643 BLAKE2B dd0f80a88ce6217c1e14248ebc51629f745dedb882f7853e249df18424ebda5638775e00233a7299282c5d3173dcdf0c7d6b55172cb336e480f250c1ee246dd3 SHA512 385137702371965342aa1178b21ed070f8bcc26a771d6c3d42e80de0bb2ce71ddebedb0e47fb833edf37aa148acbb06b690200fd3ac2f900ee46326466c2149f
-EBUILD time-1.7.2.ebuild 688 BLAKE2B 86febf3ac3937a78d074d922bec1a48551fc8977db34f542c347644fe78794c2cb9d2b5f4f1618fce528aeba908021a0d9a718442afdb5b8c235e50e905b0298 SHA512 953d0fc78115d4b47649b80e7e5abafe48f0e94459ce23a6dfd2c6e9b98fe502a9b080a65420c9c2f0ec48d6cf53813b72de51cb461503608dad963e13132b53
+EBUILD time-1.7.2.ebuild 686 BLAKE2B 5fc59a26e7d20dfd1facba68f3d3f594d2556849ec04b4bae49ff9f4eca6b7c7b6acd945782a514873cc10a7a5d212faafbfcafd9bd9520818401953fced01c5 SHA512 4b88a0e8c681014c8ec888fc52033bf996cff11fcd67bf0b40f11ce7ad0c37c76e621e8ae21158d2f9c2a7ab8247594e59ca7e80b1740470a8db7a6efe13b035
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-process/time/time-1.7.2.ebuild b/sys-process/time/time-1.7.2.ebuild
index ed96169755c3..f0fed0f7db1d 100644
--- a/sys-process/time/time-1.7.2.ebuild
+++ b/sys-process/time/time-1.7.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="http://git.savannah.gnu.org/cgit/time.git/snapshot/${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"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-linux ~x86-linux"
 IUSE=""
 
 DEPEND="sys-apps/texinfo"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index 2e5a16b99660..751748826b5c 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/httpd-php/Manifest b/virtual/httpd-php/Manifest
index 87f215dd6901..91a32ebe431f 100644
--- a/virtual/httpd-php/Manifest
+++ b/virtual/httpd-php/Manifest
@@ -1,5 +1,5 @@
-EBUILD httpd-php-5.6.ebuild 434 BLAKE2B 500eb869e1338dd23c85279644d5b7002e30f3678ab969c74b25460731cfa87bc2f2e4e163b2b7c5503ed54ead57007a718821ae5a26c334c2fa4901d868bf23 SHA512 07ac67fc9dfe2a737216fcc29313211df5c6949c4a53229465cbcd70b50488f13f335d76a56115a1a52f6594ac6e42a4542cf516fa8a906fb3daf51b9aa09ae1
-EBUILD httpd-php-7.0.ebuild 434 BLAKE2B 500eb869e1338dd23c85279644d5b7002e30f3678ab969c74b25460731cfa87bc2f2e4e163b2b7c5503ed54ead57007a718821ae5a26c334c2fa4901d868bf23 SHA512 07ac67fc9dfe2a737216fcc29313211df5c6949c4a53229465cbcd70b50488f13f335d76a56115a1a52f6594ac6e42a4542cf516fa8a906fb3daf51b9aa09ae1
-EBUILD httpd-php-7.1.ebuild 437 BLAKE2B a656c910a37a0b792538722b0210a2714f259e50efd2e9da7b9df61f247c1f532001337a43ef9cccc524d08a6a9409e4f52f0e47c920b53c13efa8ad56e472b9 SHA512 a2bbfeab0dc6a0910520abac88b819b7e84a81bf5ead7aebd355854f30b672408681269996302197732bf2dcecb0b13efe1765bb20fd8ba2c11bc32fb4969f5b
-EBUILD httpd-php-7.2.ebuild 443 BLAKE2B d3edbaf77b8f733bd7e3368e8533d1ac9d91dade0e4a8230b697d168c4e25fbbcedb01522cdd071ff8da964eaed2b174f383ac6403b0f2bce9f11d42d1ebff50 SHA512 ccd38a1175064d755f1d8d6b428cdaad92b7fdaca1cd7f516496613d8f2222726212461881614f67ad6712bad9f5c294b380eb741b313e8804d680995ae338be
+EBUILD httpd-php-5.6.ebuild 456 BLAKE2B 86ecf7aa3a4ea648a54ab3bd7ae24575fbd7037505484c2c3654818d0417619140259a8d5b279c895bc6cf386b82aab1e235ab667d2e59c12d389f18d6a041fc SHA512 b5df88abfb2639c9aae271822b66749cfa5e5a6ba2307303875eb6c12dd2578d85686d277f1bb986a3c5dc6484734e06ca60d0b2be702f4f1cbb3c835cf6b086
+EBUILD httpd-php-7.0.ebuild 456 BLAKE2B 86ecf7aa3a4ea648a54ab3bd7ae24575fbd7037505484c2c3654818d0417619140259a8d5b279c895bc6cf386b82aab1e235ab667d2e59c12d389f18d6a041fc SHA512 b5df88abfb2639c9aae271822b66749cfa5e5a6ba2307303875eb6c12dd2578d85686d277f1bb986a3c5dc6484734e06ca60d0b2be702f4f1cbb3c835cf6b086
+EBUILD httpd-php-7.1.ebuild 459 BLAKE2B 497c7f556ca699f8dbe0c562b9a06119338f401c6afc2d23e4766c1e98a1cda19ddf4eaa94868e866508a31b26b23f6a43465b2c414e9a1a6ce5c12d11e86c42 SHA512 61a5c28dd01c09c364b5bbba3039af39cf280f983f5ead734ce0dd459e26352cd57cb83a49cbc0fe721ed34bd25c0edeba50252bc915a5859f881edc18260950
+EBUILD httpd-php-7.2.ebuild 465 BLAKE2B 80b73f8ff858c7a50ad928775ed37d8adec651fe927c12ae5bdaac35d4fbbf7c02fdc8a18b9cf1a78c94ac64dd90ab94ecd3ca2dfbe45cb6bca89932ca2c6b54 SHA512 c21a81bab0a76b70e071281ebb4eae8f45d6700bbf74546151e6b2fbdec869e809908d6b40d59fac6d5b08e8bc12a24cdbbbc0d894ea3e5a65e093183f7a5088
 MISC metadata.xml 235 BLAKE2B 5b10304feea18aae1822be7d29bcce06c8715193b14a3dd2c4d79eb75e2767670352e2ca11e06b9a10ec04b63020a18254cd167e6d6be9072f4a200ca5d11ec4 SHA512 0b3e95bbf68eddf74289dad50f8828cffce2d904ff6f9bd5468177de979677cac11da84d1e0302c52b72085915b9d1b3496107172e5726520d51dad1981daf64
diff --git a/virtual/httpd-php/httpd-php-5.6.ebuild b/virtual/httpd-php/httpd-php-5.6.ebuild
index 0405d039bdbd..1b9875e39579 100644
--- a/virtual/httpd-php/httpd-php-5.6.ebuild
+++ b/virtual/httpd-php/httpd-php-5.6.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/httpd-php/httpd-php-7.0.ebuild b/virtual/httpd-php/httpd-php-7.0.ebuild
index 0405d039bdbd..1b9875e39579 100644
--- a/virtual/httpd-php/httpd-php-7.0.ebuild
+++ b/virtual/httpd-php/httpd-php-7.0.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="5"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/httpd-php/httpd-php-7.1.ebuild b/virtual/httpd-php/httpd-php-7.1.ebuild
index 10f0d4fbf721..b63cd1c7e09f 100644
--- a/virtual/httpd-php/httpd-php-7.1.ebuild
+++ b/virtual/httpd-php/httpd-php-7.1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/httpd-php/httpd-php-7.2.ebuild b/virtual/httpd-php/httpd-php-7.2.ebuild
index 9cc4e184dc76..54570dd58a01 100644
--- a/virtual/httpd-php/httpd-php-7.2.ebuild
+++ b/virtual/httpd-php/httpd-php-7.2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
 
 DESCRIPTION="Virtual to provide PHP-enabled webservers"
 SLOT="${PV}"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
 
 RDEPEND="|| ( dev-lang/php:${SLOT}[fpm]
 			  dev-lang/php:${SLOT}[apache2]
diff --git a/virtual/libelf/Manifest b/virtual/libelf/Manifest
index b6dab8208397..31cb7a6c87c2 100644
--- a/virtual/libelf/Manifest
+++ b/virtual/libelf/Manifest
@@ -1,3 +1,3 @@
-EBUILD libelf-2.ebuild 427 BLAKE2B d94e156071f487e1caf41c9146092556000f781dd144b1fbd914c715f68430ca58ed90ec53b23ddfb1d98defc27550135f2e586852d4a343c1b4a633f27e6fb7 SHA512 598a6892eee1ab9465032a6aa3a582e5a69e320eb160cbcef647d36b8661f0aa6f30e147682eb4b1917db84a07f5d5eeb25cb060be60fc8d377d166f69d1bc72
-EBUILD libelf-3.ebuild 502 BLAKE2B 53413b2fcf08de56d8cce6282debbc7ef878062613b19ba06468f18866f13893f4343503d1c55aec5c29575390d1a52ec1c879a278556c7a3108700e6b62ce4c SHA512 c3011f21adc82e8e8276bdf144b8a6b61f56af4fd5a73556189e0ff47637ba7e0871f7688a4d8a0e0685ee9696afbc4f5cf5ebad38d6aa4b284e21a80f4c240d
+EBUILD libelf-2.ebuild 427 BLAKE2B 0d88f78103cb6b4b5484a441aec6aa6406ef8ba5b4e7c49e4c75cd330c21e5b604bc7cc9f9609e3b4a49834a0f0aa9fbf21f71ced9bc2afd27583b99f1e3b4d9 SHA512 422c6502d6799ad61f27977d730eab981ed029dbd85d46114d5df064093aa598c92672888e1d69d5b676a9175e7ef7261b706128ae1f4affa0ee87885182c67c
+EBUILD libelf-3.ebuild 499 BLAKE2B 35447349d5fe033918867a5b19ad2caaebd379f9a2dddddc186d17bf5096bc497a1d0772549c057f2dc8118f7eb5fc83a21d1e5c2a023ee766fa775ac4d3f955 SHA512 471047197f483cc41d166a32ac898c1b656d726e908a981b8090881c3a5e4527d80b634b15601e606f52adee3b2f28f0fa184568f557f0532b9ad07480fc378b
 MISC metadata.xml 252 BLAKE2B f6282e2a99df668246ea8570c72345463f06d282b6adc6d9de2a08ef0827cf4572332c580caa594aad5ba8e200870d8d25494549ee4413798025f0d885b61a68 SHA512 cbda7bf9832872764ae776ce16b2966c37a2ba3a1982d9817006fd6b82d7b17146434cde428bf114062a483e9053d2acdcdd004695e6ebf428d19cdc09937c65
diff --git a/virtual/libelf/libelf-2.ebuild b/virtual/libelf/libelf-2.ebuild
index 1dfdf24937de..e26bf68fad8e 100644
--- a/virtual/libelf/libelf-2.ebuild
+++ b/virtual/libelf/libelf-2.ebuild
@@ -7,6 +7,6 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libelf.so.0 provider dev-libs/libelf"
 SLOT="0/0"
-KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm hppa ~mips ppc ppc64 sparc x86 -amd64-fbsd -sparc-fbsd -x86-fbsd ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND=">=dev-libs/libelf-0.8.13-r2:0/0[${MULTILIB_USEDEP}]"
diff --git a/virtual/libelf/libelf-3.ebuild b/virtual/libelf/libelf-3.ebuild
index bb6602699907..865575c7ece3 100644
--- a/virtual/libelf/libelf-3.ebuild
+++ b/virtual/libelf/libelf-3.ebuild
@@ -7,7 +7,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libelf.so.1 provider dev-libs/elfutils"
 SLOT="0/1"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux"
 
 RDEPEND="
 	|| (
diff --git a/virtual/libgudev/Manifest b/virtual/libgudev/Manifest
index fee8300d178e..7c05010ea9be 100644
--- a/virtual/libgudev/Manifest
+++ b/virtual/libgudev/Manifest
@@ -1,4 +1,4 @@
 EBUILD libgudev-215-r3.ebuild 751 BLAKE2B b0f4f40f27b42761143e6902b37792e44aea3847c99ac68546720671be0761e4f3c7066ce8fe9406a8ae4c00816c74871456d3805ad45f7a397d9d1564c67c4b SHA512 78133167bb7bc75752945273a89cda970219707f34a06c8d0bf569a497463135469078019329bbab24d85b1b4d82a065cfc1f5c5899d7396366fc58701f2a8c0
 EBUILD libgudev-230.ebuild 396 BLAKE2B 38ed14c2feeab8dd49f26473727739e7725fa1e728fc009596ad46a2b075a58e2ba56867116329ebf7945f8d032528adc35c905d4e549abdf3652a2676e2736d SHA512 d23ba1b095a43089554ffc8c098abe3e10384e4103a233f3686f49da9490d8286ac0c92f9784dadd0e2588ef8a06a7f24da1d89c03b92a4ed0083e533137c3f3
-EBUILD libgudev-232.ebuild 410 BLAKE2B cad4d76174280eefd9a3f248804c0c8e5a78f0768d0220e107cef41f95f239ff5042b20c63efdd2d95b75ac4dc063c173570d90d9f94092e02e41d2bd3e2eab4 SHA512 5a778d059309ca9a1c26e309d3e10be5c63d09ee8908e0f1ea7b42009c358696185bc420c1a0ad70a9aeb70794d2b38bfc886aacdd2aef658e7258c44a75e9d9
+EBUILD libgudev-232.ebuild 409 BLAKE2B 18bcee5679427fffe49abc4ef91c4d2fbae10eb355255a05b9498fe7a47ccdbc055017ecfdecb7a85d5fd6a974201775e1c7daf611b8547c8fee0507c339fec1 SHA512 3d6a86316dd31518c842eaf1c48da8165f10f8a8010188dfd31f9e206c129ab2ef0faac9c7f9fbe82a5aaa6c30dd566fcc27e6ca00f9fe5c7921a5a2e9639e27
 MISC metadata.xml 379 BLAKE2B 5b6f06cda07bf27984ccc9d28751ffffab6debce45c8d883d963334f4295e6fdece7de2175290b4ba807aa417c0e0f3ca4c21f262185968f66c76d3f8ac8d0c8 SHA512 8353b418ec271a0ae9ae0d0a6bad81eb941610a989a5497c940929f14c622bf8199ffbc5061bc723977aa3c01aacf66a37f72311cf1f69082982f27503b17013
diff --git a/virtual/libgudev/libgudev-232.ebuild b/virtual/libgudev/libgudev-232.ebuild
index 06c670850c0d..531697e5f53d 100644
--- a/virtual/libgudev/libgudev-232.ebuild
+++ b/virtual/libgudev/libgudev-232.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -6,7 +6,7 @@ inherit multilib-build
 
 DESCRIPTION="Virtual for libgudev providers"
 SLOT="0/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="introspection static-libs"
 
 RDEPEND=">=dev-libs/libgudev-232:0/0[${MULTILIB_USEDEP},introspection?,static-libs?]"
diff --git a/virtual/pypy3/Manifest b/virtual/pypy3/Manifest
index b0bc70d04e00..df315d43c133 100644
--- a/virtual/pypy3/Manifest
+++ b/virtual/pypy3/Manifest
@@ -1,3 +1,4 @@
 EBUILD pypy3-5.10.0.ebuild 495 BLAKE2B d75ae5f9d639de048b3af0068dda0cc764b6b93962ed911e5112df95cdda305f76d87227bf66f2a08c49f8cea864957a8cd7dfc74b028b8a346dc27d4045fef6 SHA512 570ac3a88eafe430dd2851359f0f19b3209913e19215dadcc1d960f49c80c14697928fb2b703ab5e319741ecbcb8bc56f71e7779d8cc187aa625aeff00a88cde
+EBUILD pypy3-5.10.1.ebuild 495 BLAKE2B 2008e6d65d72803e893c9f0ef93c83d8ab876e012951dd510e03be2f815f6d56a5d70da382ddd9e73deb34e73e330185f64802d4761ee076878d404684293697 SHA512 3fa5dc4098b4145ca18312ffefb02ba29f08339561abf074c369b489b23e0ec06c9fd493e5de5449c84ed2aec441165e678b085c7773f0b0b8e916e4ef0f61dd
 EBUILD pypy3-5.9.0.ebuild 494 BLAKE2B 3396920e27a9740c5f6e7bb558461acd4be89504d1fdc31d9f8d7a6d9562181500606469e09d8fafd8b485790562cfb1a97a8bd6bb55e362fc9eb0bf096fd177 SHA512 7416b9fbba3f57238f84d7ab4634d78176d067c48c0d27f82e5df0e462b7acfc48a7d4a7885c491e767489680e2eeac5ecd4118a6d2d6efc9a209ca466ef023f
 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
new file mode 100644
index 000000000000..44ef145f61b8
--- /dev/null
+++ b/virtual/pypy3/pypy3-5.10.1.ebuild
@@ -0,0 +1,16 @@
+# 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/udev/Manifest b/virtual/udev/Manifest
index 2b254cc1fa5c..9a71d88756e4 100644
--- a/virtual/udev/Manifest
+++ b/virtual/udev/Manifest
@@ -1,3 +1,3 @@
 EBUILD udev-215.ebuild 407 BLAKE2B 6d2b6d70a5a4881cc52055bacb79a8c27ad29639caf692350bedde2e68e17baf457c0b22e1a1a8052a2a18c406274308d7cb69ca64212958d059617f1ce68c8f SHA512 566ea2febc04863ae41568b4cb2dd5d4177a1fb24795f99b2ebf9affa4fbe18f98184b169e1898d9e87fd3c0b33255c67b3e6463ef10d9434ebb9bbf4edde6f7
-EBUILD udev-217.ebuild 410 BLAKE2B 675bfe22a8978f4e7051950c8a53a57ad1cb89005a982cb263067cb86e7e01466ea75bb7c36a02f99ba8f420e1cc3abe95820ea7c72aa80c7c398976def19fc7 SHA512 66a1da04bbc0a7d236fe7fc2d269a5ae107d435b059429857a1d69f940dd83fbe4282189fbbb9c645e6aa09706a6dd6aa870e522e84f8dc33de673d56482b12c
+EBUILD udev-217.ebuild 406 BLAKE2B d3b7a7ac1246e55a4933a3da65f4566e08a0fe1da640a937acb29e837f4a217658162a164420668ee7cbe5d9a1356b31289af5d984e7d91fbafe334808a9eca3 SHA512 7a3f5fe7054aae3417dfe493f58adf06eac42c9b2099d0acfb5332ecce627ecf64387e9928b31d42c54e80990a36f5dc933e1741768f1a319b4fb70adeed788b
 MISC metadata.xml 379 BLAKE2B 5b6f06cda07bf27984ccc9d28751ffffab6debce45c8d883d963334f4295e6fdece7de2175290b4ba807aa417c0e0f3ca4c21f262185968f66c76d3f8ac8d0c8 SHA512 8353b418ec271a0ae9ae0d0a6bad81eb941610a989a5497c940929f14c622bf8199ffbc5061bc723977aa3c01aacf66a37f72311cf1f69082982f27503b17013
diff --git a/virtual/udev/udev-217.ebuild b/virtual/udev/udev-217.ebuild
index 4f07aba71466..00a5536ce75c 100644
--- a/virtual/udev/udev-217.ebuild
+++ b/virtual/udev/udev-217.ebuild
@@ -5,7 +5,7 @@ EAPI=5
 
 DESCRIPTION="Virtual to select between different udev daemon providers"
 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="systemd"
 
 RDEPEND="
diff --git a/www-apache/Manifest.gz b/www-apache/Manifest.gz
index 9e465008bd90..07c81eba108f 100644
--- a/www-apache/Manifest.gz
+++ b/www-apache/Manifest.gz
diff --git a/www-apache/mod_gnutls/Manifest b/www-apache/mod_gnutls/Manifest
index 630c6259e261..5b866f83103b 100644
--- a/www-apache/mod_gnutls/Manifest
+++ b/www-apache/mod_gnutls/Manifest
@@ -2,5 +2,5 @@ AUX 47_mod_gnutls.conf 1125 BLAKE2B f4e9a48be5abda5f9ac0af5ae6621e1d35f4b52c4d00
 DIST mod_gnutls-0.8.2.tar.bz2 415903 BLAKE2B 98c96479e2419ee511ba802c99823ddaae89ddeb7a2f0660b91e2a371f8249ec4f98b2c0443389168a22dbe133b0bcc6020bfa597447507a8e4f91827b6d1d24 SHA512 b1690aeee4f6d104e4b6a7bd443e289204630b33e00b7b145b11291d8819b5c3d5bd52b535746b8ebdfee7a5f34df527243b743b8c5d716b1d0617e319d43f4d
 DIST mod_gnutls-0.8.3.tar.bz2 420257 BLAKE2B a183d11c320e536caef897023d1873bb89f72f7e8e078a5c71f9bdae06ca2c33a03ab68af809ef212757002d91275a537f309eb67fc9cfae8b8880edd75b44a0 SHA512 a0c5babeef5b76e9a10642b3825832290dce3b094d236dd06f76228ba7523ba14c2ada4d97d9c47bf9da0cb0808a9c8fb1080122d27399f6a9267ee0f3ce4656
 EBUILD mod_gnutls-0.8.2-r1.ebuild 993 BLAKE2B 8fa3ad55f2349ab8c3d0eefe011b1f1701e05217a16bb9348395f653f3952438e88b9b61b9ed98e0aaa20b4a28b53dffac2cbf9df22970a205cb4ac9afd73766 SHA512 c9b1a3fc316997fe25aa37317b367ed2bb1a055a8234eb9cfb299f2ea071ccca69e91fcd31fbda21dc097d4dffa2ff4d769186bc6ff76cc14c9054ccd0486b6c
-EBUILD mod_gnutls-0.8.3.ebuild 1029 BLAKE2B cbba6b7f50373305ff0a7fa71bf9dcf66b648a71f521df9f96bda55232c9622fca7866e4c7a50d73945f25193b616ffb7a0c44afc70b964d7b5c0f7dd32d01e9 SHA512 55ccb5cb7f826586be8917b3d879d03b4f482bbfa5415e0954618b523426e710a23bff1bcdc3b0692dc9ffe4dd723560a3a5aff68f21bdf6da90ce93241173a0
+EBUILD mod_gnutls-0.8.3-r1.ebuild 1158 BLAKE2B c907ed1f80155544368f43ff75381e391d8933747bba791401b2e5ef36df299e87144779df8060d019f5fbf0458d7483b489110949c6d5ead942692a4265f378 SHA512 c17fc27b2413c46cf8e7199e1aa6ef98ea61313302a08f08a2fe351b405bc811fc3a175ddf81f55071f9f7000dbef31d58428a8fd8334cebd6ba61178a6a6a3a
 MISC metadata.xml 251 BLAKE2B 2e2f0363feb3f8ad15ed8d2ef5130493f501acf64faf4fe567079d18a6066c0a1136f6c0cf53ba4ec854a38b5d4211e48e0a2ddac6677ca02266a3f993e36965 SHA512 0ccc4891c6c5de39cbe83d8391b0345611be252a2b1fedea6644ba1cfb283140a8250f32cd26b701db9c60d42782b214d03574592ef3b585bb15d2ffcb5f016e
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.8.3-r1.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.8.3-r1.ebuild
new file mode 100644
index 000000000000..1d6985d4f075
--- /dev/null
+++ b/www-apache/mod_gnutls/mod_gnutls-0.8.3-r1.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+# WARNING! Don't switch to EAPI-6 without checking paths of installed files
+# carefully. The .so file might get installed into /
+EAPI=5
+inherit autotools apache-module
+
+DESCRIPTION="mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)"
+HOMEPAGE="https://mod.gnutls.org/"
+SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+CDEPEND=">=net-libs/gnutls-3.3.0:="
+DEPEND="${CDEPEND}
+	test? ( app-crypt/monkeysphere )"
+RDEPEND="${CDEPEND}"
+
+# Fails because gpg-agent cannot be accessed
+RESTRICT="test"
+
+APACHE2_MOD_CONF="47_${PN}"
+APACHE2_MOD_DEFINE="GNUTLS"
+
+DOCFILES="CHANGELOG NOTICE README"
+
+need_apache2_4
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--with-apxs="${APXS}"
+		--disable-strict
+		--disable-doxygen-dot
+		--disable-doxygen-doc
+		--disable-doxygen-html
+		--disable-doxygen-pdf
+		ac_cv_path_UNSHARE=no
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake
+}
+
+src_install() {
+	apache-module_src_install
+}
diff --git a/www-apache/mod_gnutls/mod_gnutls-0.8.3.ebuild b/www-apache/mod_gnutls/mod_gnutls-0.8.3.ebuild
deleted file mode 100644
index e92da3628303..000000000000
--- a/www-apache/mod_gnutls/mod_gnutls-0.8.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools apache-module
-
-DESCRIPTION="mod_gnutls uses GnuTLS for SSL/TLS encryption in Apache2 (compare to mod_ssl)"
-HOMEPAGE="https://mod.gnutls.org/"
-SRC_URI="https://mod.gnutls.org/downloads/${P}.tar.bz2"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-CDEPEND=">=net-libs/gnutls-3.3.0:="
-DEPEND="${CDEPEND}
-	test? ( app-crypt/monkeysphere )"
-RDEPEND="${CDEPEND}"
-
-# Fails because gpg-agent cannot be accessed
-RESTRICT="test"
-
-APACHE2_MOD_CONF="47_${PN}"
-APACHE2_MOD_DEFINE="GNUTLS"
-
-DOCFILES="CHANGELOG NOTICE README"
-
-need_apache2_4
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--with-apxs="${APXS}"
-		--disable-strict
-		--disable-doxygen-dot
-		--disable-doxygen-doc
-		--disable-doxygen-html
-		--disable-doxygen-pdf
-		ac_cv_path_UNSHARE=no
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake
-}
-
-src_install() {
-	apache-module_src_install
-}
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 85191d06c790..a74c0aaac978 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/moodle/Manifest b/www-apps/moodle/Manifest
index ff2b1c974945..01dd0d38d096 100644
--- a/www-apps/moodle/Manifest
+++ b/www-apps/moodle/Manifest
@@ -2,12 +2,12 @@ AUX config-r1.php 1780 BLAKE2B 1d80339f97771f5f4cce03f49d055598269fd50832d6f98d5
 AUX config.php 718 BLAKE2B b12392f83a9feaaad4ad5ac7c7e3ff27670b9aad959db5528900472cc6cd10f19c9a371c17f0412b7c0c985f4ba1bcf39ecea8c7ef9e0a8ed50012cc64f4b72b SHA512 38347d3a275397074abe3cc8cd1521c7fe2deb45f4702d7a8a3e3c30ab6e2c1c51fa2c1f58d7fc99f0b72f2dcd243b8dcfdd7b3641c22c41399705aab6b59479
 AUX postinstall-en.txt 6524 BLAKE2B 68262eaf6318780a468d9e6f98c3b2cce43164964de6ea6626da43b1ac481b6edea6d0314cc4038adb511c4354a8f18dfd9da9145901d26665f84e746ab14e9b SHA512 bb3e5187db6be49707801cfde15ebced065f2d4b8c1a04fef2f4ced0a67dab2440b8e79d110685056cad84647f8ebb587c697452df8e2b0eab07b015d01b92cf
 AUX postinstall-nodb-en.txt 171 BLAKE2B ee2aa857cf365815b705b5e60c5b2fef0cdb0bcd8acef0375e0173f13c004e336df9b2dbc6cac376bea939e8fe73a72f06d52961500d05ee2137a8fea82286b1 SHA512 b0cf4787351f904caf06573c5bc50275b6a11361170b4006acc24224f44efde69cfe3a9b6340d6787c5805c605dc89f07072bf992b0ee255c97fba90e5d5617e
-DIST moodle-3.1.9.tgz 38020777 BLAKE2B 4d22ca0cfe390576c9e0f179565f7ad61c25e79090f43eca57c768e71edace6ac9e26f25a66b26ce51d187aa4a6c1f1f3899b3a63c2331daa4d2e0fbbd371fcd SHA512 c65e7373db49f98fe4493b9f6aa39bee46c2d49dd3b4cf1bad82e28a71a9932fff2ac24e9a1b9562d66deca28e354da41cd7c282ffba942f50c2b849ef003aef
-DIST moodle-3.2.6.tgz 40314104 BLAKE2B ed9cdf4a9a350f8940a4e0d39491d401c7565a47f50b1b38dc458b2cc088070348cc62eab90ae6cc0da12a16db8038e9f65e145ee085993c11a520768f09c838 SHA512 afeacaf965ca6d80c7c4121ba4a74c15f1255175d0a4b056bd59e738180ff80dc431587ed98897602527a39f1f9a32a76a2dbd868445ba901fb8b7c0c3c48096
-DIST moodle-3.3.3.tgz 44238027 BLAKE2B 4c2358d39df0c0d6131b87a71de1570490c747e18f7a97c837790b5a5417136e9ab1add318904c37e0832c5753f6e54c0d9a48ed23e15d4d086f69addea40b71 SHA512 9d0097b081b4f6ad4e5d4951696d552bf097e22f807bcf9ad3112388716fcc16ca4c5bd79074739689205c8f193901874f892b29f15c1cf4545cdcc38fc7c4c7
-DIST moodle-3.4.tgz 44875575 BLAKE2B 5384a937e2d7f0f4aee31147e20b682be3b55ee8997b533d6aaa4ccc200451e63cd6c18bd3fa12250484381878e9a2d728e10a609a4edafd2e466fcebe3d02de SHA512 72cc62864c7b8020af5b48d7af47afe763ce593f96749d149c3dcfd39f9eb3f8de383bc4684c6591ad5ad157c85f0ffea54eb70489e8312b8b09c63a73f32dba
-EBUILD moodle-3.1.9.ebuild 2938 BLAKE2B 3cd9ebc92fc0cb47bd5adbf99cb2c1cbc44fd8841218057db0a216dd459b98d6c02aae50169a9f34fae52f2a5aad2b66a9e6ce83a2292632b84b5fde8cf85569 SHA512 23ecf21df367beff9762d4c5c68b405b80093c39803aeced955a0e8b57e721b1dd130bc61a79e60c684aba03ab0e93c119e1556e91aaeac68a12c48dfe82d1ab
-EBUILD moodle-3.2.6.ebuild 2938 BLAKE2B bafb186d6f2d0d31ca9e5975ef33483068d06ca6317dda1c9f291122a8b22c3ec211a17b0c8f227a7661c084ed0113ffe1fdca5b535e3bc47d732eca6c4a3f9a SHA512 3fafaef718e9069a1487643e2ba3f2274755d1463b11b13bcf35fdaebcce0eddad6267d1c097af983dec514845fcb4d924ba35fda6a824745b9c86aa83d0a3d4
-EBUILD moodle-3.3.3.ebuild 2952 BLAKE2B 807885b8ace6c038fe52eb0dec0ca33628ed7da64d02d88d0f420e7937410becbfe548864a57c50246f2fa0c4a4c46cdaa722ab56839934cf811c92aa46a3508 SHA512 21597a42153160cef4a7e5c1ae7cc59ad319a5b61afaf5f2bd372d8ef4848f0d1d57e3f729246f3f03266278c437b757255697dcbc1dad90be35203f0874aa2d
-EBUILD moodle-3.4.ebuild 2950 BLAKE2B a41e8c49f32c08935029ec4f8a64ad34dd9a0e59aad6e9a630578a89bc734605f68dcd1225a2addc4359c9ea17674ef9091f23f36d5b245e9c7db9f57f1ba32c SHA512 b9e712db50c5de3bccaac98820b08f0e72cd67d090be396b5e6d03b9b4096d635d6301d85f679dddfa9adf6605fb460e6db70ef4a55ba3ec19a369f6fa6a84c0
+DIST moodle-3.1.10.tgz 38017776 BLAKE2B 6f1903f7061973b0b6ee77c7d43eb3e0dbb5752374ca0464194712da9a26496b7c1f9027d20e6011bbb8fa77944d4a68f0d843c572033f9b17be3427d1c7e89f SHA512 261755272c370e28f2e664d72d8d8955f9f74781137e2601f23ac6630a58913f289a7133927146c0b61a67bc8ebe028c3f71f58a085fc33b6ca2981e0fd2e9d0
+DIST moodle-3.2.7.tgz 40320398 BLAKE2B 3204f0354d83af2b736e84646db57efd124c9a14a312f8dfae4336b4a1311973245e3cb50ed9500b72a62fe9f98e03340a56bec4470ba2d0e0d8793e8d9800b7 SHA512 e093534728c4142e9efb92041190a76e48b3c41447950d11a66c2f90d69beafa538eb58413b183e1aabd63bc9225ad352d0ea148a61d20c8c13317905f45a745
+DIST moodle-3.3.4.tgz 44262330 BLAKE2B 97da591f6d8f54f7274e10bd92ce902352320ce70e324b09958bfc25fcac1c014e883c90689056af55dfea8294bf91b5c2d57ba23c11c2917670817087857373 SHA512 bfb291514e7a9d84c560cff6cfe0037af55c1b350b760c575b49b0b9ba2b34aeb55012ef0cc3dcd904032f3b2450955cc01176cb834a9edb0094e8b7ca761022
+DIST moodle-3.4.1.tgz 44903594 BLAKE2B 2321916eb25df391b442b75e3dda51138888b352333c264762f2fda8421a406dd151498b590325f9670f7df55e1cc34dfba59bfad16aeac7f721f188818744cb SHA512 f831553f6a87d4de24e283a539861431e3390d300ef6d4045dadca2e603206b5da9d7bb5854755fe8870c5a1605da84f2102ec47ea7b279586b275d40bbe0de3
+EBUILD moodle-3.1.10.ebuild 2938 BLAKE2B 5dbeaca6aad385e14e4c6da830f8a19ac03e25ac6318149f33a17af7d5a60e865d453c5d36d0ecc8a6ff8e483e996431efec4abb3e1fbb3a6593b4de6b226fe4 SHA512 b9e0db83881a4c907247d2f55e838f0209146804bc47ba3773b36293f5b79fdb0efdf812415c8fb78bc271a358d55e9427dfad44ebe103e7a0c01540f2176f80
+EBUILD moodle-3.2.7.ebuild 2938 BLAKE2B 78aef184b1c1120a870772f0767f1734a24740d3b6e463809a3e88e215e40e63de53d56d3c4efb9655cbb7f8e7f01d3fb69b0d5587c4ffde349733fcf60e5870 SHA512 ee68145ff7c39196957bcffc7839c033a50ff2c91e5dac03c3dfb89259e9e1a58552b280337df4b398a31df549891734dbcf0e39e8f108c78c0e423c69641cb5
+EBUILD moodle-3.3.4.ebuild 2952 BLAKE2B 2c0c68d757178f2097180a76be837ea762c95cd7d51f3f4fed44f6451210d3276df1f57e20e400f6ee362e4bd39b6ffe3d833a43e41ba1772de7b655a5e594df SHA512 ff16e5b10bf9e8fcc821fee5e203d2a7b5dd5a010e89807b746b360b853fd61605be22ce65d605865856c3679eca7b76d0c94f17d127a2aa6c6314d83a5bf206
+EBUILD moodle-3.4.1.ebuild 2950 BLAKE2B 032431da431f265feef09ea7c3027f5689d480446861709555b7fa9246bbbb21e23f5f85aeec295969783e6bb4153777dfc61308aed18b05e50d91a9300321fd SHA512 856362435fb85781af7bed5fa1959f8f4666e7b4cfbe5a1f2f0e5c79e3b727a4536ef2423cbb0175d83cd52762b2988f082861fe8452aa06d035a9d70deb5bd3
 MISC metadata.xml 355 BLAKE2B 68d10d39dd24da3d570f13edec9c4adae89b7620bb455c1c30377c3cebe56c4961d1548360adedc96fce780067b308193fdb7560478a60ab56c364b774b1984a SHA512 f02e5404a714cb20207e494f635fb0e98870576c4b5f6affc4dc27fccfcabdd1af1c7411a83cfd4e01b51ecc24d11944d1e612757ff45ab4405f6099ed9b1278
diff --git a/www-apps/moodle/moodle-3.1.10.ebuild b/www-apps/moodle/moodle-3.1.10.ebuild
new file mode 100644
index 000000000000..f6e1da58ade9
--- /dev/null
+++ b/www-apps/moodle/moodle-3.1.10.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit versionator webapp
+
+AVC=( $(get_version_components) )
+MY_BRANCH="stable${AVC[0]}${AVC[1]}"
+
+DESCRIPTION="The Moodle Course Management System"
+HOMEPAGE="http://moodle.org"
+SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#SLOT empty due to webapp
+
+DB_FLAGS="mysqli?,mssql?,postgres?"
+DB_TYPES=${DB_FLAGS//\?/}
+DB_TYPES=${DB_TYPES//,/ }
+
+AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
+AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
+AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
+
+PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
+
+# No forced dependency on
+#  mssql? - lives on a windows server
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-9* )
+# which may live on another server.  These USE flags affect the configuration
+# file and the dependency on php.  However other dbs are possible.  See config.php
+# and the moodle documentation for other possibilities.
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-5.4.4[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	virtual/httpd-php
+	virtual/cron"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# How many dbs were selected? If one and only one, which one is it?
+	MYDB=""
+	DB_COUNT=0
+	for db in ${DB_TYPES}; do
+		if use ${db}; then
+			MYDB=${db}
+			DB_COUNT=$(($DB_COUNT+1))
+		fi
+	done
+
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror
+	#	die
+	#fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	rm COPYING.txt
+	cp "${FILESDIR}"/config-r1.php config.php
+
+	# Moodle expect pgsql, not postgres
+	MYDB=${MYDB/postgres/pgsql}
+
+	if [[ ${DB_COUNT} -eq 1 ]] ; then
+		sed -i -e "s|mydb|${MYDB}|" config.php
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
+	dodir ${MOODLEDATA}
+	webapp_serverowned -R "${MOODLEDATA}"
+
+	local MOODLEROOT="${MY_HTDOCSDIR}"
+	insinto ${MOODLEROOT}
+	doins -r *
+
+	webapp_configfile "${MOODLEROOT}"/config.php
+
+	if [[ ${DB_COUNT} -eq 1 ]]; then
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo
+	einfo
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo
+}
diff --git a/www-apps/moodle/moodle-3.1.9.ebuild b/www-apps/moodle/moodle-3.1.9.ebuild
deleted file mode 100644
index c64ab1ffbc71..000000000000
--- a/www-apps/moodle/moodle-3.1.9.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,mssql?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
-
-# No forced dependency on
-#  mssql? - lives on a windows server
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-9* )
-# which may live on another server.  These USE flags affect the configuration
-# file and the dependency on php.  However other dbs are possible.  See config.php
-# and the moodle documentation for other possibilities.
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-5.4.4[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
-	virtual/httpd-php
-	virtual/cron"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# How many dbs were selected? If one and only one, which one is it?
-	MYDB=""
-	DB_COUNT=0
-	for db in ${DB_TYPES}; do
-		if use ${db}; then
-			MYDB=${db}
-			DB_COUNT=$(($DB_COUNT+1))
-		fi
-	done
-
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#if [[ ${DB_COUNT} -eq 0 ]]; then
-	#	eerror
-	#	eerror "No database selected in your USE flags,"
-	#	eerror "You must select at least one."
-	#	eerror
-	#	die
-	#fi
-
-	if [[ ${DB_COUNT} -gt 1 ]]; then
-		MYDB=""
-		ewarn
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	rm COPYING.txt
-	cp "${FILESDIR}"/config-r1.php config.php
-
-	# Moodle expect pgsql, not postgres
-	MYDB=${MYDB/postgres/pgsql}
-
-	if [[ ${DB_COUNT} -eq 1 ]] ; then
-		sed -i -e "s|mydb|${MYDB}|" config.php
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
-	dodir ${MOODLEDATA}
-	webapp_serverowned -R "${MOODLEDATA}"
-
-	local MOODLEROOT="${MY_HTDOCSDIR}"
-	insinto ${MOODLEROOT}
-	doins -r *
-
-	webapp_configfile "${MOODLEROOT}"/config.php
-
-	if [[ ${DB_COUNT} -eq 1 ]]; then
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo
-}
diff --git a/www-apps/moodle/moodle-3.2.6.ebuild b/www-apps/moodle/moodle-3.2.6.ebuild
deleted file mode 100644
index 37b176d93c22..000000000000
--- a/www-apps/moodle/moodle-3.2.6.ebuild
+++ /dev/null
@@ -1,121 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,mssql?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
-
-# No forced dependency on
-#  mssql? - lives on a windows server
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-9* )
-# which may live on another server.  These USE flags affect the configuration
-# file and the dependency on php.  However other dbs are possible.  See config.php
-# and the moodle documentation for other possibilities.
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-5.6.5[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
-	virtual/httpd-php
-	virtual/cron"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# How many dbs were selected? If one and only one, which one is it?
-	MYDB=""
-	DB_COUNT=0
-	for db in ${DB_TYPES}; do
-		if use ${db}; then
-			MYDB=${db}
-			DB_COUNT=$(($DB_COUNT+1))
-		fi
-	done
-
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#if [[ ${DB_COUNT} -eq 0 ]]; then
-	#	eerror
-	#	eerror "No database selected in your USE flags,"
-	#	eerror "You must select at least one."
-	#	eerror
-	#	die
-	#fi
-
-	if [[ ${DB_COUNT} -gt 1 ]]; then
-		MYDB=""
-		ewarn
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	rm COPYING.txt
-	cp "${FILESDIR}"/config-r1.php config.php
-
-	# Moodle expect pgsql, not postgres
-	MYDB=${MYDB/postgres/pgsql}
-
-	if [[ ${DB_COUNT} -eq 1 ]] ; then
-		sed -i -e "s|mydb|${MYDB}|" config.php
-	fi
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
-	dodir ${MOODLEDATA}
-	webapp_serverowned -R "${MOODLEDATA}"
-
-	local MOODLEROOT="${MY_HTDOCSDIR}"
-	insinto ${MOODLEROOT}
-	doins -r *
-
-	webapp_configfile "${MOODLEROOT}"/config.php
-
-	if [[ ${DB_COUNT} -eq 1 ]]; then
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo
-}
diff --git a/www-apps/moodle/moodle-3.2.7.ebuild b/www-apps/moodle/moodle-3.2.7.ebuild
new file mode 100644
index 000000000000..24105a028d4d
--- /dev/null
+++ b/www-apps/moodle/moodle-3.2.7.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit versionator webapp
+
+AVC=( $(get_version_components) )
+MY_BRANCH="stable${AVC[0]}${AVC[1]}"
+
+DESCRIPTION="The Moodle Course Management System"
+HOMEPAGE="http://moodle.org"
+SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#SLOT empty due to webapp
+
+DB_FLAGS="mysqli?,mssql?,postgres?"
+DB_TYPES=${DB_FLAGS//\?/}
+DB_TYPES=${DB_TYPES//,/ }
+
+AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
+AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
+AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
+
+PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
+
+# No forced dependency on
+#  mssql? - lives on a windows server
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-9* )
+# which may live on another server.  These USE flags affect the configuration
+# file and the dependency on php.  However other dbs are possible.  See config.php
+# and the moodle documentation for other possibilities.
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-5.6.5[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	virtual/httpd-php
+	virtual/cron"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# How many dbs were selected? If one and only one, which one is it?
+	MYDB=""
+	DB_COUNT=0
+	for db in ${DB_TYPES}; do
+		if use ${db}; then
+			MYDB=${db}
+			DB_COUNT=$(($DB_COUNT+1))
+		fi
+	done
+
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror
+	#	die
+	#fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	rm COPYING.txt
+	cp "${FILESDIR}"/config-r1.php config.php
+
+	# Moodle expect pgsql, not postgres
+	MYDB=${MYDB/postgres/pgsql}
+
+	if [[ ${DB_COUNT} -eq 1 ]] ; then
+		sed -i -e "s|mydb|${MYDB}|" config.php
+	fi
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
+	dodir ${MOODLEDATA}
+	webapp_serverowned -R "${MOODLEDATA}"
+
+	local MOODLEROOT="${MY_HTDOCSDIR}"
+	insinto ${MOODLEROOT}
+	doins -r *
+
+	webapp_configfile "${MOODLEROOT}"/config.php
+
+	if [[ ${DB_COUNT} -eq 1 ]]; then
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo
+	einfo
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo
+}
diff --git a/www-apps/moodle/moodle-3.3.3.ebuild b/www-apps/moodle/moodle-3.3.3.ebuild
deleted file mode 100644
index 4c2d978ef8a6..000000000000
--- a/www-apps/moodle/moodle-3.3.3.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,mssql?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
-
-# No forced dependency on
-#  mssql? - lives on a windows server
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-9* )
-# which may live on another server.  These USE flags affect the configuration
-# file and the dependency on php.  However other dbs are possible.  See config.php
-# and the moodle documentation for other possibilities.
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-5.6.5[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
-	virtual/httpd-php
-	virtual/cron"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# How many dbs were selected? If one and only one, which one is it?
-	MYDB=""
-	DB_COUNT=0
-	for db in ${DB_TYPES}; do
-		if use ${db}; then
-			MYDB=${db}
-			DB_COUNT=$(($DB_COUNT+1))
-		fi
-	done
-
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#if [[ ${DB_COUNT} -eq 0 ]]; then
-	#	eerror
-	#	eerror "No database selected in your USE flags,"
-	#	eerror "You must select at least one."
-	#	eerror
-	#	die
-	#fi
-
-	if [[ ${DB_COUNT} -gt 1 ]]; then
-		MYDB=""
-		ewarn
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	rm COPYING.txt
-	cp "${FILESDIR}"/config-r1.php config.php
-
-	# Moodle expect pgsql, not postgres
-	MYDB=${MYDB/postgres/pgsql}
-
-	if [[ ${DB_COUNT} -eq 1 ]] ; then
-		sed -i -e "s|mydb|${MYDB}|" config.php
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
-	dodir ${MOODLEDATA}
-	webapp_serverowned -R "${MOODLEDATA}"
-
-	local MOODLEROOT="${MY_HTDOCSDIR}"
-	insinto ${MOODLEROOT}
-	doins -r *
-
-	webapp_configfile "${MOODLEROOT}"/config.php
-
-	if [[ ${DB_COUNT} -eq 1 ]]; then
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo
-}
diff --git a/www-apps/moodle/moodle-3.3.4.ebuild b/www-apps/moodle/moodle-3.3.4.ebuild
new file mode 100644
index 000000000000..b162247a3f8f
--- /dev/null
+++ b/www-apps/moodle/moodle-3.3.4.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit versionator webapp
+
+AVC=( $(get_version_components) )
+MY_BRANCH="stable${AVC[0]}${AVC[1]}"
+
+DESCRIPTION="The Moodle Course Management System"
+HOMEPAGE="http://moodle.org"
+SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#SLOT empty due to webapp
+
+DB_FLAGS="mysqli?,mssql?,postgres?"
+DB_TYPES=${DB_FLAGS//\?/}
+DB_TYPES=${DB_TYPES//,/ }
+
+AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
+AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
+AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
+
+PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
+
+# No forced dependency on
+#  mssql? - lives on a windows server
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-9* )
+# which may live on another server.  These USE flags affect the configuration
+# file and the dependency on php.  However other dbs are possible.  See config.php
+# and the moodle documentation for other possibilities.
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-5.6.5[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	virtual/httpd-php
+	virtual/cron"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# How many dbs were selected? If one and only one, which one is it?
+	MYDB=""
+	DB_COUNT=0
+	for db in ${DB_TYPES}; do
+		if use ${db}; then
+			MYDB=${db}
+			DB_COUNT=$(($DB_COUNT+1))
+		fi
+	done
+
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror
+	#	die
+	#fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	rm COPYING.txt
+	cp "${FILESDIR}"/config-r1.php config.php
+
+	# Moodle expect pgsql, not postgres
+	MYDB=${MYDB/postgres/pgsql}
+
+	if [[ ${DB_COUNT} -eq 1 ]] ; then
+		sed -i -e "s|mydb|${MYDB}|" config.php
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
+	dodir ${MOODLEDATA}
+	webapp_serverowned -R "${MOODLEDATA}"
+
+	local MOODLEROOT="${MY_HTDOCSDIR}"
+	insinto ${MOODLEROOT}
+	doins -r *
+
+	webapp_configfile "${MOODLEROOT}"/config.php
+
+	if [[ ${DB_COUNT} -eq 1 ]]; then
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo
+	einfo
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo
+}
diff --git a/www-apps/moodle/moodle-3.4.1.ebuild b/www-apps/moodle/moodle-3.4.1.ebuild
new file mode 100644
index 000000000000..360cbdc48627
--- /dev/null
+++ b/www-apps/moodle/moodle-3.4.1.ebuild
@@ -0,0 +1,123 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit versionator webapp
+
+AVC=( $(get_version_components) )
+MY_BRANCH="stable${AVC[0]}${AVC[1]}"
+
+DESCRIPTION="The Moodle Course Management System"
+HOMEPAGE="http://moodle.org"
+SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
+S="${WORKDIR}/${PN}"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+#SLOT empty due to webapp
+
+DB_FLAGS="mysqli?,mssql?,postgres?"
+DB_TYPES=${DB_FLAGS//\?/}
+DB_TYPES=${DB_TYPES//,/ }
+
+AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
+AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
+AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
+
+PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
+PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
+PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
+
+IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
+REQUIRED_USE="|| ( ${DB_TYPES} )"
+
+# No forced dependency on
+#  mssql? - lives on a windows server
+#  mysql? ( virtual/mysql )
+#  postgres? ( dev-db/postgresql-server-9* )
+# which may live on another server.  These USE flags affect the configuration
+# file and the dependency on php.  However other dbs are possible.  See config.php
+# and the moodle documentation for other possibilities.
+DEPEND=""
+RDEPEND="
+	>=dev-lang/php-7.0[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
+	virtual/httpd-php
+	virtual/cron"
+
+pkg_setup() {
+	webapp_pkg_setup
+
+	# How many dbs were selected? If one and only one, which one is it?
+	MYDB=""
+	DB_COUNT=0
+	for db in ${DB_TYPES}; do
+		if use ${db}; then
+			MYDB=${db}
+			DB_COUNT=$(($DB_COUNT+1))
+		fi
+	done
+
+	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
+	#if [[ ${DB_COUNT} -eq 0 ]]; then
+	#	eerror
+	#	eerror "No database selected in your USE flags,"
+	#	eerror "You must select at least one."
+	#	eerror
+	#	die
+	#fi
+
+	if [[ ${DB_COUNT} -gt 1 ]]; then
+		MYDB=""
+		ewarn
+		ewarn "Multiple databases selected in your USE flags,"
+		ewarn "You will have to choose your database manually."
+		ewarn
+	fi
+}
+
+src_prepare() {
+	rm COPYING.txt
+	cp "${FILESDIR}"/config-r1.php config.php
+
+	# Moodle expect pgsql, not postgres
+	MYDB=${MYDB/postgres/pgsql}
+
+	if [[ ${DB_COUNT} -eq 1 ]] ; then
+		sed -i -e "s|mydb|${MYDB}|" config.php
+	fi
+
+	eapply_user
+}
+
+src_install() {
+	webapp_src_preinst
+
+	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
+	dodir ${MOODLEDATA}
+	webapp_serverowned -R "${MOODLEDATA}"
+
+	local MOODLEROOT="${MY_HTDOCSDIR}"
+	insinto ${MOODLEROOT}
+	doins -r *
+
+	webapp_configfile "${MOODLEROOT}"/config.php
+
+	if [[ ${DB_COUNT} -eq 1 ]]; then
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	else
+		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
+	fi
+
+	webapp_src_install
+}
+
+pkg_postinst() {
+	einfo
+	einfo
+	einfo "To see the post install instructions, do"
+	einfo
+	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
+	einfo
+	einfo
+}
diff --git a/www-apps/moodle/moodle-3.4.ebuild b/www-apps/moodle/moodle-3.4.ebuild
deleted file mode 100644
index 01e29039a3f8..000000000000
--- a/www-apps/moodle/moodle-3.4.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit versionator webapp
-
-AVC=( $(get_version_components) )
-MY_BRANCH="stable${AVC[0]}${AVC[1]}"
-
-DESCRIPTION="The Moodle Course Management System"
-HOMEPAGE="http://moodle.org"
-SRC_URI="http://download.moodle.org/${MY_BRANCH}/${P}.tgz"
-S="${WORKDIR}/${PN}"
-
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-#SLOT empty due to webapp
-
-DB_FLAGS="mysqli?,mssql?,postgres?"
-DB_TYPES=${DB_FLAGS//\?/}
-DB_TYPES=${DB_TYPES//,/ }
-
-AUTHENTICATION_FLAGS="imap?,ldap?,odbc?"
-AUTHENTICATION_MODES=${AUTHENTICATION_FLAGS//\?/}
-AUTHENTICATION_MODES=${AUTHENTICATION_MODES//,/ }
-
-PHP_REQUIRED_FLAGS="ctype,curl,iconv,json,session,simplexml,xml,zip"
-PHP_OPTIONAL_FLAGS="gd,intl,soap,ssl,tokenizer,xmlrpc"
-PHP_FLAGS="${PHP_REQUIRED_FLAGS},${PHP_OPTIONAL_FLAGS}"
-
-IUSE="${DB_TYPES} ${AUTHENTICATION_MODES} vhosts"
-REQUIRED_USE="|| ( ${DB_TYPES} )"
-
-# No forced dependency on
-#  mssql? - lives on a windows server
-#  mysql? ( virtual/mysql )
-#  postgres? ( dev-db/postgresql-server-9* )
-# which may live on another server.  These USE flags affect the configuration
-# file and the dependency on php.  However other dbs are possible.  See config.php
-# and the moodle documentation for other possibilities.
-DEPEND=""
-RDEPEND="
-	>=dev-lang/php-7.0[${DB_FLAGS},${AUTHENTICATION_FLAGS},${PHP_FLAGS}]
-	virtual/httpd-php
-	virtual/cron"
-
-pkg_setup() {
-	webapp_pkg_setup
-
-	# How many dbs were selected? If one and only one, which one is it?
-	MYDB=""
-	DB_COUNT=0
-	for db in ${DB_TYPES}; do
-		if use ${db}; then
-			MYDB=${db}
-			DB_COUNT=$(($DB_COUNT+1))
-		fi
-	done
-
-	# REQUIRED_USE above guarantees that ${DB_COUNT} cannot be zero
-	#if [[ ${DB_COUNT} -eq 0 ]]; then
-	#	eerror
-	#	eerror "No database selected in your USE flags,"
-	#	eerror "You must select at least one."
-	#	eerror
-	#	die
-	#fi
-
-	if [[ ${DB_COUNT} -gt 1 ]]; then
-		MYDB=""
-		ewarn
-		ewarn "Multiple databases selected in your USE flags,"
-		ewarn "You will have to choose your database manually."
-		ewarn
-	fi
-}
-
-src_prepare() {
-	rm COPYING.txt
-	cp "${FILESDIR}"/config-r1.php config.php
-
-	# Moodle expect pgsql, not postgres
-	MYDB=${MYDB/postgres/pgsql}
-
-	if [[ ${DB_COUNT} -eq 1 ]] ; then
-		sed -i -e "s|mydb|${MYDB}|" config.php
-	fi
-
-	eapply_user
-}
-
-src_install() {
-	webapp_src_preinst
-
-	local MOODLEDATA="${MY_HOSTROOTDIR}"/moodle
-	dodir ${MOODLEDATA}
-	webapp_serverowned -R "${MOODLEDATA}"
-
-	local MOODLEROOT="${MY_HTDOCSDIR}"
-	insinto ${MOODLEROOT}
-	doins -r *
-
-	webapp_configfile "${MOODLEROOT}"/config.php
-
-	if [[ ${DB_COUNT} -eq 1 ]]; then
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
-	else
-		webapp_postinst_txt en "${FILESDIR}"/postinstall-nodb-en.txt
-	fi
-
-	webapp_src_install
-}
-
-pkg_postinst() {
-	einfo
-	einfo
-	einfo "To see the post install instructions, do"
-	einfo
-	einfo "    webapp-config --show-postinst ${PN} ${PVR}"
-	einfo
-	einfo
-}
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index b350f7f7bf78..a35585af549d 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index adee68d0dc4b..feda6df28003 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -4,22 +4,27 @@ AUX chromium-browser.xml 407 BLAKE2B 168d78b0855546ca559cfb51aff0bc85d5e6ae974c2
 AUX chromium-clang-r1.patch 808 BLAKE2B f3f6cfc679b65f214e6667dc29e4241ae9344be02b5cddd1c25a6410c205e3ad1cf182719b4ba795a5b065fc736c0175803fdaad66439ed2989fc27ff9a12758 SHA512 dfb81895fb78983e5adba54351d94e9174aa6a523c5a78738aad8223330cde6739dea6d82328d603f693a2d5810df890eccc4bed202d73875c9c97be506936e5
 AUX chromium-clang-r2.patch 731 BLAKE2B 6a0560107c89ab4406d62700312bb4437b49b5b1feace304c6db309460b74f630dd59c424f152ebf6a1d88025c14b7162d14a38afde6e74a87ca04d3424fd9b6 SHA512 f5edc9b573269a7a6944e17019fa858e7162c548400eceabdabe695d7e10d3179b7593415ec3eaef226defdd1628fd8c9cc66c0b46ebe6ac1afe5035a319c379
 AUX chromium-cups-r0.patch 1350 BLAKE2B 91c32a88d5a03ba4f16e54a4498cf6de121b8d6dfbb76630afc69925bfa192c456f6d1349e0ba0b9f71373608ce983910630bf2f278ca884ec8bde4d132b9201 SHA512 404aea01f732132c65fc66c60926c671daad0a1d9446422d36eb6788820f1d23a2bea9d81971f7341f4c36d157bfc9c840b58d7f5f62a913b789d00362c7d005
+AUX chromium-gcc-r0.patch 2344 BLAKE2B f7fdff3e72e57c222e02a202fffa6785eeb90408094099b8e04cd8cecfc5cd5006801ffaafaa8561a4402ee5fa4bd8b9f489ac6ac3e34c212a683f5793c21124 SHA512 0e29192c8637b050c4976455c798ce0dc078c1e92ec0ed51da71866c2d35242e720f4ca468a431e8ea696700c8ef003a71e8ec06c573bab5355b96e8388a2844
 AUX chromium-gcc-u2f.patch 1670 BLAKE2B 9d83331ec5e9d4ef3b58e9119c7c152abe61daf8b32e168662de9e734d935c24913b603c631d148ed1cb7b5364e751cbb9bcc7e58e5c34f375958898fc0cf8f5 SHA512 f10486ef46940fa740ca2d7e8225924704a4f89b709ef3dfb7ad128865982c220f8971d169515d9d1be08ee112aef1cac95281f0a5af4615256d9760966545f1
 AUX chromium-gcc5-r4.patch 3648 BLAKE2B 44ad25ba69e100f7df35a2532ad1c8e55acf9dbbdcb1c28000c755748ef62848d325c7e379e06d1a0567dbda0e3f97808755ef90e2b7a197aa74a786d0280ca0 SHA512 6b6d80c8adfbb317003712b94cfdf733af48ee5f32d10b6f6e8599cd08b7a9d8b73e6cec2902ed55eb0a962ba9c9cf14a70299e132ec7bfec29806ed23836791
 AUX chromium-gcc5-r5.patch 568 BLAKE2B 9c4979a0eb540f490844a368173d7bb6a0f101daca5ea4ab5213fbda62e0a615ee2e0d674a550ded59b7a29aa9193782664e71a614e9c7387061b3d347423994 SHA512 f1878f6960f0f6cad723e2f26ffeed7fc6c2c0e468098d5f08d7e305d644375436c5d7c1698d79bc9f3625fd5736793132d088e68f543838a073c2be68fe5882
+AUX chromium-gn-r0.patch 1233 BLAKE2B 53c0a3cd692d19eac60be0f5aa61f9cbda7d473e42adc0cd95fc78dd44c39ead9825b862347314351133b5c80f9b2fd58daacdc9568efeccefb1dd0ec6526d85 SHA512 de085e2e159ea1fb14c39d630e77459f0e67497479169ce3253bc098a06deea75020289c091e816df1ee81ccec9de695ecd59f29e9d847c20693ef2710659dcd
 AUX chromium-launcher-r3.sh 1199 BLAKE2B 85f57b380cdc25bd000cf57d3c129b67f6e55d96dd958190040b0680f8d4d358ac777e0c1ebd6a1b32dd3821a377bcf9f598e073584528d0480460978c4c1fb1 SHA512 f1909314ae74985c85740d26c9bfab694f3202de8ccc392a1c4ec5c8760db21b6cc46146c78a9abebd09e6d24f37e19466f0c4d2d61815400b48d859f8ce154d
 AUX chromium-memcpy-r0.patch 1306 BLAKE2B 585c015fbc6cfda61fb28c451da1433047c21e439c6a23e2f27844c308984a2066a70913669b3e1797233f86e25a119e494156c0b869eccc94d21c2abaeadba4 SHA512 1aeeb70929acee529dea66860b42f106afe18c0f6219eb03c9c710faf8d20a997135550e289839599ec325d8f032243fd70c07d397bd89302a192c41e8c4660a
+AUX chromium-vulkan-r0.patch 4070 BLAKE2B d4b272fce24bee6a961f58d2f4ef74ddf6a56e8f07382752d7d42b97d970b28a1422773eb297096b61988ebad1daf88a0b36cadb226ee19731e2ad56268c4692 SHA512 d16dc06dca3b52302d805589dbcc5a31de26f71b1aa0d721e53cf941e7e995b5196a8ddc93150b5f8f661f88015fd64203633b0f04cbd479272f0b45bc106b16
 AUX chromium-webrtc-r0.patch 972 BLAKE2B 1c49db0ba631c8e517a5b361e2882e7f00d9b018af2bbe7e701b878b78f1480317bfb6394b0184b49da3c4361acebf6f6eb164b12246a61a9b205e209d8e598b SHA512 325e269e6c24e9d3103ae360653e0bda764356655534be08cfe308d8c63ed8c93c80c09f58d023afbc6e141f7cbe5b86f7983c57b8f6c794b7675d332439b051
 AUX chromium-widevine-r1.patch 428 BLAKE2B 07b5ab48a2233986f60c91192557e0454eab56248cdf378ae4d6fe99f239f95e89f28fd0b2b7dc36dd85557e7a5403d9a30a8189b7f56a9bae678831dfa49d2b SHA512 fe6b912bd8b3993194f71bef229e57d4c24f9adcf697172eb3bc5ee8d38967bf5fe5b964e9d89d23960d25cd3a6e53ce7714f81f0df1881758b611a66375e32a
 AUX chromium.default 148 BLAKE2B 5ee5b582c59a6e4bef87bbb0e232e2470ad412b1fbbb3b9af6ef7153edb55c5b9080cc16a5a115b0c5b3c381aa87ce57a7b12bdd2070e67dac10a6c2995ddbaf SHA512 0d4849e03592fb58b05e62a43021eca7e61615616c8907c3b2e445402e03adaf9e8fa25b0a745d6c31eb037456215cc02b59e345a3a06d932e76cf990c92d739
 DIST chromium-63.0.3239.108.tar.xz 534294640 BLAKE2B f0f87115e91d7a2aa331cbab05475cac098f6ec37b8ca82b6a84911edcf0104a89557304467704911a3f3b3232d8a83d575bd545df1c31518e50c2563d83c095 SHA512 3cb7c8569d2d061f5abf4ad68d9ea1716a1b07bdf8dfa7b600d558d308374ff5dbda9f947e67e21186e3e716fe9524fc63e8eabd9eac1fa805f0eb7d994c32c8
-DIST chromium-64.0.3282.39.tar.xz 482357636 BLAKE2B 7e7209aa1c4584210b552e82b29c57af549492c85e96204b15c3d27d9ed3c89b7109c9bc539709ecc7221147c2cd4957b6dacf18bfa358c2568175e39eeb4a84 SHA512 16d7c16b218fb42a1371fe105b87a04fce0397df0912824fd443667a1b93ee65b1b9f7c8c3007bea8fc241e6a1b6cb4fa29a4f37c83b3fdfdd8ed6a6523e6906
+DIST chromium-63.0.3239.132.tar.xz 534286424 BLAKE2B 52658d4e8ff50bb8bdb1d397bc90a36e73407810198c4f28eea29bd0a4ad98bd4af947bdb8a5ecdbd73a248be8f375ba80c74c9a097aa57ef51eed1dc440ff95 SHA512 96e9ebdf1c3dc14a914bee50ced9547d5a94838ed602552379711ba67f00381173059ceb8a552efadd3175ceaa4cb6c15902fe582fc2eba7b7bdb8a19f47d1a0
 DIST chromium-64.0.3282.71.tar.xz 482134720 BLAKE2B 691e33c396fde798985af96168a7b7aa92e3c90bc542c6e84df1b41a74ae0f8cb7364edfcf148db48971dabd5b2af422d884a36528b5549ec2fd52f5e6d7f643 SHA512 90fff36292898e47a2c47940efadc98b7099cdfdd8df4659b5e1ba327e26230919dc1e9e21a4496207cf88f9976d048dd2f200424224f2bc25e7ee9ab2755f06
-DIST chromium-65.0.3294.5.tar.xz 484687920 BLAKE2B 2d4d30ea83bfa0d5753eecd4ea735ec5d81097867b7c32c190853adee372c5032dac549c064fb22688555ef6231a3e2e43b274735883285f91a0a2d9c7a151ec SHA512 089bcc7eba7d5a2a964b5b6e94c7735653582cd6925325b9bdb2788bd4abb4b3cbc8c71f5c77004600864106a18da3fddda0adaa53ad54a96efe21498e45f23a
+DIST chromium-64.0.3282.85.tar.xz 482224568 BLAKE2B f8650721a2a30ea7f9c651efab58c54a225d7dda177c924c2ade132d488bb4b415e6155426384a005bafbcff5affbc99e142f45c85042cc6367e17c88c806f12 SHA512 52842b4f8304b4eb4e8fb25b586e0d03af5a5d0aebe2fc9ae517f97e05ee5ece3f71fd2b48a4f148fccec859b13c98a669ccbb4183d99ebd3bcf7e617ca241d0
 DIST chromium-65.0.3298.3.tar.xz 485716108 BLAKE2B 185b3f683b2a732343fa5f98b24171f1d3cf2cf8eeb63c56efa7699f6b038d2a7eea4f9277b0b7ee2fdfa207a4f13edbaf2cc9a591a79ec4d058a131ce44366b SHA512 f1ed9a403036e87da7897f173eeb1aa71fe2650efc5ef5b98f814c7d4d9c879971597f9ded11324c86d6edc7f12f3bcf2786a6fb022e9697dbdb8eae086e18b7
+DIST chromium-65.0.3315.3.tar.xz 532475512 BLAKE2B 1a118ddd05f2b939ff0fd84f85e1c22789713351776d889bafb55ddb2b897b2921050a3df3b7d5e3224be84539d95dddce1a27a948c61b29c788ed9f8e194e02 SHA512 c7f0feda90c0df15058473d39482e9b9a9b3236dcb90ff8ba7ad53afde2fce4901b2cbd678d8470560cc0cb6e31c8d3caee9f0a9f100d82d95feacabcdb7f8ce
 EBUILD chromium-63.0.3239.108.ebuild 19852 BLAKE2B dcdf02aa189a5a184395d69a4e4d854d1860453a257b59e0393104a628c3603c1f717fab4803785b87a22bc4d9ea66c3de88cc9f5f3b1b44e08871f210b04314 SHA512 889e192997c46188590b5ede0b79c1a5abe9bff0bc7b4e1464b6cebad494d26158977d942764d143c36a475063d97aaee925d7d1155e5cfb74d654fd82fc348f
-EBUILD chromium-64.0.3282.39.ebuild 20150 BLAKE2B 52ac5f763b1d62a3fa0b22401aadd7a9988945dc2ca1b1631f56f5f82df00a66a563aa0ac2b9e7a5f186dbb7bdbb1f945749e1c8bdc74d22dd51fe1e5c112c75 SHA512 fc1fc03574c94fb0b2e2b4e4e13907fa8724f01b1cb1f11869610e417663b6867ff994ecd95e508dff8f4e95c8127f36431368aa1b28b695e175ef1c92e2257f
+EBUILD chromium-63.0.3239.132.ebuild 19998 BLAKE2B f919a386ed211971f8773d1a7310e46bc0bf5446f4fc3a2fe7e70bf7eaff46159e7892bd5510ee93a0afd9059571cfeeb2e3b8b33496c3615bfd211d4db65223 SHA512 f2149f8fd8e7930e4c1856fc0341d8e43916f1755f9a4873502b70959c2d0df35112641c6be300c39827db4d5b6123f5ee8f7738bc9e26b4c42590b19e1dceba
 EBUILD chromium-64.0.3282.71.ebuild 20343 BLAKE2B ad5d6ee182a0afd2a9a7aa6df6f304c332c069bb86d941f78bb918af46fea4a11bae161da5f04361c8ea544146dc7f3c89745af9a6c298c0594f2f7a4253c6a4 SHA512 f0662554dc694d876d9e111e19ed8609391d7f20a90925cdef473c7986229241a6b9f81994ad3b73c711708a8ba753995adda7f3ee404d32afcc4563c01a3061
-EBUILD chromium-65.0.3294.5.ebuild 20338 BLAKE2B a992c3d16e340f53ed575941b7ec48c8a254286be84f468f93e45eab707f95e13dde6c70c67296239e83defd5a7552cea527057e9733020ed575dd5aba8d7276 SHA512 f5b8fa9c52c98d601c4d0848c51789c6cfb3e18f6e0de541add26ef50a78c32fab1e6adcb483db9ad0af35734e77607f010ece461f4f88cce18e4633fae3620b
+EBUILD chromium-64.0.3282.85.ebuild 20343 BLAKE2B ad5d6ee182a0afd2a9a7aa6df6f304c332c069bb86d941f78bb918af46fea4a11bae161da5f04361c8ea544146dc7f3c89745af9a6c298c0594f2f7a4253c6a4 SHA512 f0662554dc694d876d9e111e19ed8609391d7f20a90925cdef473c7986229241a6b9f81994ad3b73c711708a8ba753995adda7f3ee404d32afcc4563c01a3061
 EBUILD chromium-65.0.3298.3.ebuild 20478 BLAKE2B 6a47301263f82cfbc260e6af2c4234ae70863b904cbdc9a069174ba8e0e195b92331662ff51f412e46a0d622bf9beb70a0900366dbcb54c24170cbdc34d85e13 SHA512 1341dbc98ae59d67db968bea7b41ef9be82e140ff17afbef9d0578cb91bcb82f74f2c411a80c50818dd77a9dd04d792c8a34edd76b485eaab96b9a9354fc6baf
+EBUILD chromium-65.0.3315.3.ebuild 20473 BLAKE2B 9f2680782bd95007807fc7e484e9637175cf9a5929a5e85ca3c2845cffbb07bdf2976c72d7c4534e78db553d8dcc1d7c5361dab2e6465abca1f988b4f6705b62 SHA512 20e4e17943324632170627e70cda0107bdd59ccec9ed7766cf984ea4782ba58f8199658fb7ac9080d31472cb78195c79f92b04345ee8715b43e3d65c3158fcb4
 MISC metadata.xml 1418 BLAKE2B 0fd718bd70dc0fa890bf7e0efa2f6a186df446617f36bb5e4689989c4766da4016b5325d8a81f8959e887fc182ff792bb10909b5724df8c4fcaade221b289d8b SHA512 1c68218f5cab5787a7524823975474065794aa18f8301e9efe066847b9a566b870a68a3768cee925a3ad6543fb182575043c1cb45e145db67382c502a535d039
diff --git a/www-client/chromium/chromium-63.0.3239.132.ebuild b/www-client/chromium/chromium-63.0.3239.132.ebuild
new file mode 100644
index 000000000000..bc4598a11c0b
--- /dev/null
+++ b/www-client/chromium/chromium-63.0.3239.132.ebuild
@@ -0,0 +1,665 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
+IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+COMMON_DEPEND="
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-59 <dev-libs/icu-60:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2016.05.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-1.5.0:=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+# sys-apps/sandbox - https://crbug.com/586444
+DEPEND="${COMMON_DEPEND}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-6.9.4
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-vcs/git
+	$(python_gen_any_dep '
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	')
+"
+
+# Keep this in sync with the python_gen_any_dep call.
+python_check_deps() {
+	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
+	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-widevine-r1.patch"
+	"${FILESDIR}/${PN}-FORTIFY_SOURCE-r2.patch"
+	"${FILESDIR}/${PN}-gcc5-r4.patch"
+	"${FILESDIR}/${PN}-clang-r1.patch"
+	"${FILESDIR}/${PN}-webrtc-r0.patch"
+	"${FILESDIR}/${PN}-gcc5-r5.patch"
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+			# bugs: #601654
+			die "At least clang 3.9.1 is required"
+		fi
+		if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+			# bugs: #535730, #525374, #518668, #600288, #627356
+			die "At least gcc 5.0 is required"
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	eshopts_pop
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	# Make sure the build system will use the right python, bug #344367.
+	python-any-r1_pkg_setup
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		third_party/WebKit
+		third_party/analytics
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/blink
+		third_party/boringssl
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/polymer
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_2
+		third_party/cld_3
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang-angle
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/modp_b64
+		third_party/mt19937ar
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/openmax_dl
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/build
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/qcms
+		third_party/sfntly
+		third_party/skia
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/spirv-tools-angle
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/vulkan-validation-layers
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/valgrind
+		v8/third_party/inspector_protocol
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+bootstrap_gn() {
+	if tc-is-cross-compiler; then
+		local -x AR=${BUILD_AR}
+		local -x CC=${BUILD_CC}
+		local -x CXX=${BUILD_CXX}
+		local -x NM=${BUILD_NM}
+		local -x CFLAGS=${BUILD_CFLAGS}
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	einfo "Building GN..."
+	set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	local myconf_gn=""
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gconf=false"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# https://bugs.gentoo.org/588596
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	bootstrap_gn
+
+	einfo "Configuring Chromium..."
+	set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Work around circular dep issue
+	# https://chromium-review.googlesource.com/c/chromium/src/+/617768
+	eninja -C out/Release gen/ui/accessibility/ax_enums.h
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	if use widevine; then
+		# These will be provided by chrome-binary-plugins
+		rm out/Release/libwidevinecdm*.so || die
+	fi
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-64.0.3282.39.ebuild b/www-client/chromium/chromium-64.0.3282.39.ebuild
deleted file mode 100644
index 176c6981bdd0..000000000000
--- a/www-client/chromium/chromium-64.0.3282.39.ebuild
+++ /dev/null
@@ -1,673 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-COMMON_DEPEND="
-	app-accessibility/at-spi2-atk:2
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/atk
-	dev-libs/expat:=
-	dev-libs/glib:2
-	system-icu? ( >=dev-libs/icu-59:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	>=dev-libs/re2-0.2016.05.01:=
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-1.5.0:=[icu(-)]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
-	>=media-libs/openh264-1.6.0:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		!=net-fs/samba-4.5.12
-		media-libs/opus:=
-	)
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-57
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-# sys-apps/sandbox - https://crbug.com/586444
-DEPEND="${COMMON_DEPEND}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-6.9.4
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-vcs/git
-	$(python_gen_any_dep '
-		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-"
-
-PATCHES=(
-	"${FILESDIR}/chromium-widevine-r1.patch"
-	"${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
-	"${FILESDIR}/chromium-webrtc-r0.patch"
-	"${FILESDIR}/chromium-memcpy-r0.patch"
-	"${FILESDIR}/chromium-cups-r0.patch"
-	"${FILESDIR}/chromium-clang-r2.patch"
-	"${FILESDIR}/chromium-angle-r0.patch"
-)
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
-			# bugs: #601654
-			die "At least clang 3.9.1 is required"
-		fi
-		if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
-			# bugs: #535730, #525374, #518668, #600288, #627356
-			die "At least gcc 5.0 is required"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	local keeplibs=(
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		third_party/WebKit
-		third_party/analytics
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/polymer
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/fips181
-		third_party/flatbuffers
-		third_party/flot
-		third_party/freetype
-		third_party/glslang-angle
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libudev
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/modp_b64
-		third_party/mt19937ar
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/openmax_dl
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/build
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/qcms
-		third_party/sfntly
-		third_party/skia
-		third_party/skia/third_party/gif
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/spirv-headers
-		third_party/spirv-tools-angle
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/subzero
-		third_party/usrsctp
-		third_party/vulkan
-		third_party/vulkan-validation-layers
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/widevine
-		third_party/woff2
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/valgrind
-		v8/third_party/inspector_protocol
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-libvpx; then
-		keeplibs+=( third_party/libvpx )
-		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-bootstrap_gn() {
-	if tc-is-cross-compiler; then
-		local -x AR=${BUILD_AR}
-		local -x CC=${BUILD_CC}
-		local -x CXX=${BUILD_CXX}
-		local -x NM=${BUILD_NM}
-		local -x CFLAGS=${BUILD_CFLAGS}
-		local -x CXXFLAGS=${BUILD_CXXFLAGS}
-		local -x LDFLAGS=${BUILD_LDFLAGS}
-	fi
-	einfo "Building GN..."
-	set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		libxml
-		libxslt
-		openh264
-		re2
-		snappy
-		yasm
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-libvpx; then
-		gn_system_libraries+=( libvpx )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=true"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gconf=false"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# https://bugs.gentoo.org/588596
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	bootstrap_gn
-
-	einfo "Configuring Chromium..."
-	set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Work around circular dep issue
-	# https://chromium-review.googlesource.com/c/chromium/src/+/617768
-	eninja -C out/Release gen/ui/accessibility/ax_enums.h
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	if use widevine; then
-		# These will be provided by chrome-binary-plugins
-		rm out/Release/libwidevinecdm*.so || die
-	fi
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	doins out/Release/*.so
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	insinto "${CHROMIUM_HOME}/swiftshader"
-	doins out/Release/swiftshader/*.so
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser \
-		"Chromium" \
-		chromium-browser \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-64.0.3282.85.ebuild b/www-client/chromium/chromium-64.0.3282.85.ebuild
new file mode 100644
index 000000000000..f9d0c892ec16
--- /dev/null
+++ b/www-client/chromium/chromium-64.0.3282.85.ebuild
@@ -0,0 +1,678 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/atk
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-59:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2016.05.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-1.5.0:=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+# sys-apps/sandbox - https://crbug.com/586444
+DEPEND="${COMMON_DEPEND}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-6.9.4
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-vcs/git
+	$(python_gen_any_dep '
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	')
+"
+
+# Keep this in sync with the python_gen_any_dep call.
+python_check_deps() {
+	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
+	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-widevine-r1.patch"
+	"${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
+	"${FILESDIR}/chromium-webrtc-r0.patch"
+	"${FILESDIR}/chromium-memcpy-r0.patch"
+	"${FILESDIR}/chromium-cups-r0.patch"
+	"${FILESDIR}/chromium-clang-r2.patch"
+	"${FILESDIR}/chromium-angle-r0.patch"
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+			# bugs: #601654
+			die "At least clang 3.9.1 is required"
+		fi
+		if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+			# bugs: #535730, #525374, #518668, #600288, #627356
+			die "At least gcc 5.0 is required"
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	eshopts_pop
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		third_party/WebKit
+		third_party/analytics
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/polymer
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang-angle
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/mt19937ar
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/openmax_dl
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/build
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/qcms
+		third_party/sfntly
+		third_party/skia
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/spirv-tools-angle
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/vulkan-validation-layers
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/valgrind
+		v8/third_party/inspector_protocol
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+bootstrap_gn() {
+	if tc-is-cross-compiler; then
+		local -x AR=${BUILD_AR}
+		local -x CC=${BUILD_CC}
+		local -x CXX=${BUILD_CXX}
+		local -x NM=${BUILD_NM}
+		local -x CFLAGS=${BUILD_CFLAGS}
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	einfo "Building GN..."
+	set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gconf=false"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# https://bugs.gentoo.org/588596
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	bootstrap_gn
+
+	einfo "Configuring Chromium..."
+	set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Work around circular dep issue
+	# https://chromium-review.googlesource.com/c/chromium/src/+/617768
+	eninja -C out/Release gen/ui/accessibility/ax_enums.h
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	if use widevine; then
+		# These will be provided by chrome-binary-plugins
+		rm out/Release/libwidevinecdm*.so || die
+	fi
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	if [[ -d out/Release/swiftshader ]]; then
+		insinto "${CHROMIUM_HOME}/swiftshader"
+		doins out/Release/swiftshader/*.so
+	fi
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/chromium-65.0.3294.5.ebuild b/www-client/chromium/chromium-65.0.3294.5.ebuild
deleted file mode 100644
index 92ee58d2d8ea..000000000000
--- a/www-client/chromium/chromium-65.0.3294.5.ebuild
+++ /dev/null
@@ -1,676 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh-CN zh-TW"
-
-inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="component-build cups gnome-keyring +hangouts kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
-RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
-
-COMMON_DEPEND="
-	app-arch/bzip2:=
-	cups? ( >=net-print/cups-1.3.11:= )
-	dev-libs/expat:=
-	dev-libs/glib:2
-	system-icu? ( >=dev-libs/icu-59:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/libxslt:=
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.14.3:=
-	>=dev-libs/re2-0.2016.05.01:=
-	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
-	>=media-libs/alsa-lib-1.0.19:=
-	media-libs/fontconfig:=
-	media-libs/freetype:=
-	>=media-libs/harfbuzz-1.5.0:=[icu(-)]
-	media-libs/libjpeg-turbo:=
-	media-libs/libpng:=
-	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
-	>=media-libs/openh264-1.6.0:=
-	pulseaudio? ( media-sound/pulseaudio:= )
-	system-ffmpeg? (
-		>=media-video/ffmpeg-3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		!=net-fs/samba-4.5.12
-		media-libs/opus:=
-	)
-	sys-apps/dbus:=
-	sys-apps/pciutils:=
-	virtual/udev
-	x11-libs/cairo:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3[X]
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXext:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXScrnSaver:=
-	x11-libs/libXtst:=
-	x11-libs/pango:=
-	app-arch/snappy:=
-	media-libs/flac:=
-	>=media-libs/libwebp-0.4.0:=
-	sys-libs/zlib:=[minizip]
-	kerberos? ( virtual/krb5 )
-"
-# For nvidia-drivers blocker, see bug #413637 .
-RDEPEND="${COMMON_DEPEND}
-	!=www-client/chromium-9999
-	!<www-plugins/chrome-binary-plugins-57
-	x11-misc/xdg-utils
-	virtual/opengl
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
-	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
-"
-# dev-vcs/git - https://bugs.gentoo.org/593476
-# sys-apps/sandbox - https://crbug.com/586444
-DEPEND="${COMMON_DEPEND}
-	>=app-arch/gzip-1.7
-	!arm? (
-		dev-lang/yasm
-	)
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	>=net-libs/nodejs-6.9.4
-	sys-apps/hwids[usb(+)]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	dev-vcs/git
-	$(python_gen_any_dep '
-		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
-		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
-		dev-python/html5lib[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
-	')
-"
-
-# Keep this in sync with the python_gen_any_dep call.
-python_check_deps() {
-	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
-	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
-	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
-}
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/bitstream-cyberbit
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-"
-
-PATCHES=(
-	"${FILESDIR}/chromium-widevine-r1.patch"
-	"${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
-	"${FILESDIR}/chromium-webrtc-r0.patch"
-	"${FILESDIR}/chromium-memcpy-r0.patch"
-	"${FILESDIR}/chromium-clang-r2.patch"
-)
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		local -x CPP="$(tc-getCXX) -E"
-		tc-is-clang || die "Build currently fails with gcc, please use clang"
-		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
-			# bugs: #601654
-			die "At least clang 3.9.1 is required"
-		fi
-		if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
-			# bugs: #535730, #525374, #518668, #600288, #627356
-			die "At least gcc 5.0 is required"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="3G"
-	CHECKREQS_DISK_BUILD="5G"
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		CHECKREQS_DISK_BUILD="25G"
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	eshopts_pop
-	check-reqs_pkg_setup
-}
-
-pkg_pretend() {
-	pre_build_checks
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	local keeplibs=(
-		base/third_party/dmg_fp
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		third_party/WebKit
-		third_party/analytics
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/third_party/compiler
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/cacheinvalidation
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/polymer
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/devscripts
-		third_party/dom_distiller_js
-		third_party/fips181
-		third_party/flatbuffers
-		third_party/flot
-		third_party/freetype
-		third_party/glslang-angle
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libXNVCtrl
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libjingle
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libudev
-		third_party/libwebm
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/modp_b64
-		third_party/mt19937ar
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/openmax_dl
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/build
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/ply
-		third_party/polymer
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/qcms
-		third_party/s2cellid
-		third_party/sfntly
-		third_party/skia
-		third_party/skia/third_party/gif
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/spirv-headers
-		third_party/spirv-tools-angle
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/subzero
-		third_party/usrsctp
-		third_party/vulkan
-		third_party/vulkan-validation-layers
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webrtc
-		third_party/widevine
-		third_party/woff2
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/adobe
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-		third_party/yasm/run_yasm.py
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-libvpx; then
-		keeplibs+=( third_party/libvpx )
-		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
-	fi
-	if use tcmalloc; then
-		keeplibs+=( third_party/tcmalloc )
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-}
-
-bootstrap_gn() {
-	if tc-is-cross-compiler; then
-		local -x AR=${BUILD_AR}
-		local -x CC=${BUILD_CC}
-		local -x CXX=${BUILD_CXX}
-		local -x NM=${BUILD_NM}
-		local -x CFLAGS=${BUILD_CFLAGS}
-		local -x CXXFLAGS=${BUILD_CXXFLAGS}
-		local -x LDFLAGS=${BUILD_LDFLAGS}
-	fi
-	einfo "Building GN..."
-	set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_libsrtp (bug #459932).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		# https://chromium.googlesource.com/chromium/src/+/4f1a60552748d150783655ee6f7b6f7084e3af95
-		#fontconfig
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libpng
-		libwebp
-		libxml
-		libxslt
-		openh264
-		re2
-		snappy
-		yasm
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-libvpx; then
-		gn_system_libraries+=( libvpx )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=true"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-	myconf_gn+=" use_cups=$(usex cups true false)"
-	myconf_gn+=" use_gconf=false"
-	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
-	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" fieldtrial_testing_like_official_build=true"
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
-
-	# Disable forced lld, bug 641556
-	myconf_gn+=" use_lld=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	local google_default_client_id="329227923882.apps.googleusercontent.com"
-	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
-	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
-
-	local myarch="$(tc-arch)"
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex neon arm-neon arm)
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Prevent linker from running out of address space, bug #471810 .
-		if use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
-		fi
-	fi
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# https://bugs.gentoo.org/588596
-	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	if ! use system-ffmpeg; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	bootstrap_gn
-
-	einfo "Configuring Chromium..."
-	set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_compile() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Work around circular dep issue
-	# https://chromium-review.googlesource.com/c/chromium/src/+/617768
-	eninja -C out/Release gen/ui/accessibility/ax_enums.h
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-
-	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	if use widevine; then
-		# These will be provided by chrome-binary-plugins
-		rm out/Release/libwidevinecdm*.so || die
-	fi
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	doins out/Release/*.so
-
-	if ! use system-icu; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	insinto "${CHROMIUM_HOME}/swiftshader"
-	doins out/Release/swiftshader/*.so
-
-	# Install icons and desktop entry.
-	local branding size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	local mime_types="text/html;text/xml;application/xhtml+xml;"
-	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
-	mime_types+="x-scheme-handler/ftp;" # bug #412185
-	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
-	make_desktop_entry \
-		chromium-browser \
-		"Chromium" \
-		chromium-browser \
-		"Network;WebBrowser" \
-		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
-	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-}
diff --git a/www-client/chromium/chromium-65.0.3315.3.ebuild b/www-client/chromium/chromium-65.0.3315.3.ebuild
new file mode 100644
index 000000000000..b8011501a833
--- /dev/null
+++ b/www-client/chromium/chromium-65.0.3315.3.ebuild
@@ -0,0 +1,682 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+PYTHON_COMPAT=( python2_7 )
+
+CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
+	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
+	sv sw ta te th tr uk vi zh-CN zh-TW"
+
+inherit check-reqs chromium-2 eutils gnome2-utils flag-o-matic multilib ninja-utils pax-utils portability python-any-r1 readme.gentoo-r1 toolchain-funcs versionator xdg-utils
+
+DESCRIPTION="Open-source version of Google Chrome web browser"
+HOMEPAGE="http://chromium.org/"
+SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="component-build cups gnome-keyring +hangouts jumbo-build kerberos neon pic +proprietary-codecs pulseaudio selinux +suid +system-ffmpeg +system-icu +system-libvpx +tcmalloc widevine"
+RESTRICT="!system-ffmpeg? ( proprietary-codecs? ( bindist ) )"
+
+COMMON_DEPEND="
+	app-accessibility/at-spi2-atk:2
+	app-arch/bzip2:=
+	cups? ( >=net-print/cups-1.3.11:= )
+	dev-libs/atk
+	dev-libs/expat:=
+	dev-libs/glib:2
+	system-icu? ( >=dev-libs/icu-59:= )
+	>=dev-libs/libxml2-2.9.4-r3:=[icu]
+	dev-libs/libxslt:=
+	dev-libs/nspr:=
+	>=dev-libs/nss-3.26:=
+	>=dev-libs/re2-0.2016.05.01:=
+	gnome-keyring? ( >=gnome-base/libgnome-keyring-3.12:= )
+	>=media-libs/alsa-lib-1.0.19:=
+	media-libs/fontconfig:=
+	media-libs/freetype:=
+	>=media-libs/harfbuzz-1.6.0:=[icu(-)]
+	media-libs/libjpeg-turbo:=
+	media-libs/libpng:=
+	system-libvpx? ( media-libs/libvpx:=[postproc,svc] )
+	>=media-libs/openh264-1.6.0:=
+	pulseaudio? ( media-sound/pulseaudio:= )
+	system-ffmpeg? (
+		>=media-video/ffmpeg-3:=
+		|| (
+			media-video/ffmpeg[-samba]
+			>=net-fs/samba-4.5.10-r1[-debug(-)]
+		)
+		!=net-fs/samba-4.5.12
+		media-libs/opus:=
+	)
+	sys-apps/dbus:=
+	sys-apps/pciutils:=
+	virtual/udev
+	x11-libs/cairo:=
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11:=
+	x11-libs/libXcomposite:=
+	x11-libs/libXcursor:=
+	x11-libs/libXdamage:=
+	x11-libs/libXext:=
+	x11-libs/libXfixes:=
+	>=x11-libs/libXi-1.6.0:=
+	x11-libs/libXrandr:=
+	x11-libs/libXrender:=
+	x11-libs/libXScrnSaver:=
+	x11-libs/libXtst:=
+	x11-libs/pango:=
+	app-arch/snappy:=
+	media-libs/flac:=
+	>=media-libs/libwebp-0.4.0:=
+	sys-libs/zlib:=[minizip]
+	kerberos? ( virtual/krb5 )
+"
+# For nvidia-drivers blocker, see bug #413637 .
+RDEPEND="${COMMON_DEPEND}
+	!=www-client/chromium-9999
+	!<www-plugins/chrome-binary-plugins-57
+	x11-misc/xdg-utils
+	virtual/opengl
+	virtual/ttf-fonts
+	selinux? ( sec-policy/selinux-chromium )
+	tcmalloc? ( !<x11-drivers/nvidia-drivers-331.20 )
+	widevine? ( www-plugins/chrome-binary-plugins[widevine(-)] )
+"
+# dev-vcs/git - https://bugs.gentoo.org/593476
+# sys-apps/sandbox - https://crbug.com/586444
+DEPEND="${COMMON_DEPEND}
+	>=app-arch/gzip-1.7
+	!arm? (
+		dev-lang/yasm
+	)
+	dev-lang/perl
+	>=dev-util/gperf-3.0.3
+	>=dev-util/ninja-1.7.2
+	>=net-libs/nodejs-6.9.4
+	sys-apps/hwids[usb(+)]
+	>=sys-devel/bison-2.4.3
+	sys-devel/flex
+	virtual/pkgconfig
+	dev-vcs/git
+	$(python_gen_any_dep '
+		dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]
+		>=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	')
+"
+
+# Keep this in sync with the python_gen_any_dep call.
+python_check_deps() {
+	has_version --host-root "dev-python/beautifulsoup:python-2[${PYTHON_USEDEP}]" &&
+	has_version --host-root ">=dev-python/beautifulsoup-4.3.2:4[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/html5lib[${PYTHON_USEDEP}]" &&
+	has_version --host-root "dev-python/simplejson[${PYTHON_USEDEP}]"
+}
+
+if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
+	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
+fi
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+Some web pages may require additional fonts to display properly.
+Try installing some of the following packages if some characters
+are not displayed properly:
+- media-fonts/arphicfonts
+- media-fonts/bitstream-cyberbit
+- media-fonts/droid
+- media-fonts/ipamonafont
+- media-fonts/noto
+- media-fonts/ja-ipafonts
+- media-fonts/takao-fonts
+- media-fonts/wqy-microhei
+- media-fonts/wqy-zenhei
+
+To fix broken icons on the Downloads page, you should install an icon
+theme that covers the appropriate MIME types, and configure this as your
+GTK+ icon theme.
+"
+
+PATCHES=(
+	"${FILESDIR}/chromium-widevine-r1.patch"
+	"${FILESDIR}/chromium-FORTIFY_SOURCE-r2.patch"
+	"${FILESDIR}/chromium-webrtc-r0.patch"
+	"${FILESDIR}/chromium-memcpy-r0.patch"
+	"${FILESDIR}/chromium-clang-r2.patch"
+	"${FILESDIR}/chromium-gn-r0.patch"
+	"${FILESDIR}/chromium-vulkan-r0.patch"
+	"${FILESDIR}/chromium-gcc-r0.patch"
+)
+
+pre_build_checks() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		local -x CPP="$(tc-getCXX) -E"
+		if tc-is-clang && ! version_is_at_least "3.9.1" "$(clang-fullversion)"; then
+			# bugs: #601654
+			die "At least clang 3.9.1 is required"
+		fi
+		if tc-is-gcc && ! version_is_at_least 5.0 "$(gcc-version)"; then
+			# bugs: #535730, #525374, #518668, #600288, #627356
+			die "At least gcc 5.0 is required"
+		fi
+	fi
+
+	# Check build requirements, bug #541816 and bug #471810 .
+	CHECKREQS_MEMORY="3G"
+	CHECKREQS_DISK_BUILD="5G"
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		CHECKREQS_DISK_BUILD="25G"
+		if ! use component-build; then
+			CHECKREQS_MEMORY="16G"
+		fi
+	fi
+	eshopts_pop
+	check-reqs_pkg_setup
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+
+	chromium_suid_sandbox_check_kernel_config
+}
+
+src_prepare() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	default
+
+	mkdir -p third_party/node/linux/node-linux-x64/bin || die
+	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
+
+	local keeplibs=(
+		base/third_party/dmg_fp
+		base/third_party/dynamic_annotations
+		base/third_party/icu
+		base/third_party/nspr
+		base/third_party/superfasthash
+		base/third_party/symbolize
+		base/third_party/valgrind
+		base/third_party/xdg_mime
+		base/third_party/xdg_user_dirs
+		chrome/third_party/mozilla_security_manager
+		courgette/third_party
+		net/third_party/mozilla_security_manager
+		net/third_party/nss
+		third_party/WebKit
+		third_party/analytics
+		third_party/angle
+		third_party/angle/src/common/third_party/base
+		third_party/angle/src/common/third_party/smhasher
+		third_party/angle/src/third_party/compiler
+		third_party/angle/src/third_party/libXNVCtrl
+		third_party/angle/src/third_party/trace_event
+		third_party/blink
+		third_party/boringssl
+		third_party/boringssl/src/third_party/fiat
+		third_party/breakpad
+		third_party/breakpad/breakpad/src/third_party/curl
+		third_party/brotli
+		third_party/cacheinvalidation
+		third_party/catapult
+		third_party/catapult/common/py_vulcanize/third_party/rcssmin
+		third_party/catapult/common/py_vulcanize/third_party/rjsmin
+		third_party/catapult/third_party/polymer
+		third_party/catapult/tracing/third_party/d3
+		third_party/catapult/tracing/third_party/gl-matrix
+		third_party/catapult/tracing/third_party/jszip
+		third_party/catapult/tracing/third_party/mannwhitneyu
+		third_party/catapult/tracing/third_party/oboe
+		third_party/catapult/tracing/third_party/pako
+		third_party/ced
+		third_party/cld_3
+		third_party/crc32c
+		third_party/cros_system_api
+		third_party/devscripts
+		third_party/dom_distiller_js
+		third_party/fips181
+		third_party/flatbuffers
+		third_party/flot
+		third_party/freetype
+		third_party/glslang-angle
+		third_party/google_input_tools
+		third_party/google_input_tools/third_party/closure_library
+		third_party/google_input_tools/third_party/closure_library/third_party/closure
+		third_party/googletest
+		third_party/hunspell
+		third_party/iccjpeg
+		third_party/inspector_protocol
+		third_party/jinja2
+		third_party/jstemplate
+		third_party/khronos
+		third_party/leveldatabase
+		third_party/libXNVCtrl
+		third_party/libaddressinput
+		third_party/libaom
+		third_party/libaom/source/libaom/third_party/x86inc
+		third_party/libjingle
+		third_party/libphonenumber
+		third_party/libsecret
+		third_party/libsrtp
+		third_party/libudev
+		third_party/libwebm
+		third_party/libxml/chromium
+		third_party/libyuv
+		third_party/lss
+		third_party/lzma_sdk
+		third_party/markupsafe
+		third_party/mesa
+		third_party/metrics_proto
+		third_party/modp_b64
+		third_party/mt19937ar
+		third_party/node
+		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
+		third_party/openmax_dl
+		third_party/ots
+		third_party/pdfium
+		third_party/pdfium/third_party/agg23
+		third_party/pdfium/third_party/base
+		third_party/pdfium/third_party/build
+		third_party/pdfium/third_party/bigint
+		third_party/pdfium/third_party/freetype
+		third_party/pdfium/third_party/lcms
+		third_party/pdfium/third_party/libopenjpeg20
+		third_party/pdfium/third_party/libpng16
+		third_party/pdfium/third_party/libtiff
+		third_party/ply
+		third_party/polymer
+		third_party/protobuf
+		third_party/protobuf/third_party/six
+		third_party/qcms
+		third_party/s2cellid
+		third_party/sfntly
+		third_party/skia
+		third_party/skia/third_party/gif
+		third_party/skia/third_party/vulkan
+		third_party/smhasher
+		third_party/spirv-headers
+		third_party/spirv-tools-angle
+		third_party/sqlite
+		third_party/swiftshader
+		third_party/swiftshader/third_party/llvm-subzero
+		third_party/swiftshader/third_party/subzero
+		third_party/usrsctp
+		third_party/vulkan
+		third_party/vulkan-validation-layers
+		third_party/web-animations-js
+		third_party/webdriver
+		third_party/webrtc
+		third_party/widevine
+		third_party/woff2
+		third_party/zlib/google
+		url/third_party/mozilla
+		v8/src/third_party/valgrind
+		v8/src/third_party/utf8-decoder
+		v8/third_party/inspector_protocol
+
+		# gyp -> gn leftovers
+		base/third_party/libevent
+		third_party/adobe
+		third_party/speech-dispatcher
+		third_party/usb_ids
+		third_party/xdg-utils
+		third_party/yasm/run_yasm.py
+	)
+	if ! use system-ffmpeg; then
+		keeplibs+=( third_party/ffmpeg third_party/opus )
+	fi
+	if ! use system-icu; then
+		keeplibs+=( third_party/icu )
+	fi
+	if ! use system-libvpx; then
+		keeplibs+=( third_party/libvpx )
+		keeplibs+=( third_party/libvpx/source/libvpx/third_party/x86inc )
+	fi
+	if use tcmalloc; then
+		keeplibs+=( third_party/tcmalloc )
+	fi
+
+	# Remove most bundled libraries. Some are still needed.
+	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
+}
+
+bootstrap_gn() {
+	if tc-is-cross-compiler; then
+		local -x AR=${BUILD_AR}
+		local -x CC=${BUILD_CC}
+		local -x CXX=${BUILD_CXX}
+		local -x NM=${BUILD_NM}
+		local -x CFLAGS=${BUILD_CFLAGS}
+		local -x CXXFLAGS=${BUILD_CXXFLAGS}
+		local -x LDFLAGS=${BUILD_LDFLAGS}
+	fi
+	einfo "Building GN..."
+	set -- tools/gn/bootstrap/bootstrap.py -s -v --no-clean
+	echo "$@"
+	"$@" || die
+}
+
+src_configure() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	local myconf_gn=""
+
+	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
+	myconf_gn+=" is_debug=false"
+
+	# Component build isn't generally intended for use by end users. It's mostly useful
+	# for development and debugging.
+	myconf_gn+=" is_component_build=$(usex component-build true false)"
+
+	# https://chromium.googlesource.com/chromium/src/+/lkcr/docs/jumbo.md
+	myconf_gn+=" use_jumbo_build=$(usex jumbo-build true false)"
+
+	myconf_gn+=" use_allocator=$(usex tcmalloc \"tcmalloc\" \"none\")"
+
+	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
+	myconf_gn+=" enable_nacl=false"
+
+	# Use system-provided libraries.
+	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
+	# TODO: use_system_hunspell (upstream changes needed).
+	# TODO: use_system_libsrtp (bug #459932).
+	# TODO: use_system_protobuf (bug #525560).
+	# TODO: use_system_ssl (http://crbug.com/58087).
+	# TODO: use_system_sqlite (http://crbug.com/22208).
+
+	# libevent: https://bugs.gentoo.org/593458
+	local gn_system_libraries=(
+		flac
+		fontconfig
+		freetype
+		# Need harfbuzz_from_pkgconfig target
+		#harfbuzz-ng
+		libdrm
+		libjpeg
+		libpng
+		libwebp
+		libxml
+		libxslt
+		openh264
+		re2
+		snappy
+		yasm
+		zlib
+	)
+	if use system-ffmpeg; then
+		gn_system_libraries+=( ffmpeg opus )
+	fi
+	if use system-icu; then
+		gn_system_libraries+=( icu )
+	fi
+	if use system-libvpx; then
+		gn_system_libraries+=( libvpx )
+	fi
+	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
+
+	# See dependency logic in third_party/BUILD.gn
+	myconf_gn+=" use_system_harfbuzz=true"
+
+	# Optional dependencies.
+	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
+	myconf_gn+=" enable_widevine=$(usex widevine true false)"
+	myconf_gn+=" use_cups=$(usex cups true false)"
+	myconf_gn+=" use_gnome_keyring=$(usex gnome-keyring true false)"
+	myconf_gn+=" use_kerberos=$(usex kerberos true false)"
+	myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
+
+	# TODO: link_pulseaudio=true for GN.
+
+	myconf_gn+=" fieldtrial_testing_like_official_build=true"
+
+	if tc-is-clang; then
+		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
+	else
+		myconf_gn+=" is_clang=false"
+	fi
+
+	# Never use bundled gold binary. Disable gold linker flags for now.
+	# Do not use bundled clang.
+	# Trying to use gold results in linker crash.
+	myconf_gn+=" use_gold=false use_sysroot=false linux_use_bundled_binutils=false use_custom_libcxx=false"
+
+	# Disable forced lld, bug 641556
+	myconf_gn+=" use_lld=false"
+
+	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
+	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
+	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
+
+	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
+	# Note: these are for Gentoo use ONLY. For your own distribution,
+	# please get your own set of keys. Feel free to contact chromium@gentoo.org
+	# for more info.
+	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
+	local google_default_client_id="329227923882.apps.googleusercontent.com"
+	local google_default_client_secret="vgKG0NNv7GoDpbtoFNLxCUXu"
+	myconf_gn+=" google_api_key=\"${google_api_key}\""
+	myconf_gn+=" google_default_client_id=\"${google_default_client_id}\""
+	myconf_gn+=" google_default_client_secret=\"${google_default_client_secret}\""
+
+	local myarch="$(tc-arch)"
+	if [[ $myarch = amd64 ]] ; then
+		myconf_gn+=" target_cpu=\"x64\""
+		ffmpeg_target_arch=x64
+	elif [[ $myarch = x86 ]] ; then
+		myconf_gn+=" target_cpu=\"x86\""
+		ffmpeg_target_arch=ia32
+	elif [[ $myarch = arm64 ]] ; then
+		myconf_gn+=" target_cpu=\"arm64\""
+		ffmpeg_target_arch=arm64
+	elif [[ $myarch = arm ]] ; then
+		myconf_gn+=" target_cpu=\"arm\""
+		ffmpeg_target_arch=$(usex neon arm-neon arm)
+	else
+		die "Failed to determine target arch, got '$myarch'."
+	fi
+
+	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
+	# Depending on GCC version the warnings are different and we don't want
+	# the build to fail because of that.
+	myconf_gn+=" treat_warnings_as_errors=false"
+
+	# Disable fatal linker warnings, bug 506268.
+	myconf_gn+=" fatal_linker_warnings=false"
+
+	# Avoid CFLAGS problems, bug #352457, bug #390147.
+	if ! use custom-cflags; then
+		replace-flags "-Os" "-O2"
+		strip-flags
+
+		# Prevent linker from running out of address space, bug #471810 .
+		if use x86; then
+			filter-flags "-g*"
+		fi
+
+		# Prevent libvpx build failures. Bug 530248, 544702, 546984.
+		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
+			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2
+		fi
+	fi
+
+	# Make sure the build system will use the right tools, bug #340795.
+	tc-export AR CC CXX NM
+
+	# Define a custom toolchain for GN
+	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
+
+	if tc-is-cross-compiler; then
+		tc-export BUILD_{AR,CC,CXX,NM}
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
+		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
+	else
+		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
+	fi
+
+	# https://bugs.gentoo.org/588596
+	append-cxxflags $(test-flags-CXX -fno-delete-null-pointer-checks)
+
+	# Bug 491582.
+	export TMPDIR="${WORKDIR}/temp"
+	mkdir -p -m 755 "${TMPDIR}" || die
+
+	if ! use system-ffmpeg; then
+		local build_ffmpeg_args=""
+		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
+			build_ffmpeg_args+=" --disable-asm"
+		fi
+
+		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
+		einfo "Configuring bundled ffmpeg..."
+		pushd third_party/ffmpeg > /dev/null || die
+		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
+			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
+		chromium/scripts/copy_config.sh || die
+		chromium/scripts/generate_gn.py || die
+		popd > /dev/null || die
+	fi
+
+	bootstrap_gn
+
+	einfo "Configuring Chromium..."
+	set -- out/Release/gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
+	echo "$@"
+	"$@" || die
+}
+
+src_compile() {
+	# Calling this here supports resumption via FEATURES=keepwork
+	python_setup
+
+	# Build mksnapshot and pax-mark it.
+	local x
+	for x in mksnapshot v8_context_snapshot_generator; do
+		if tc-is-cross-compiler; then
+			eninja -C out/Release "host/${x}"
+			pax-mark m "out/Release/host/${x}"
+		else
+			eninja -C out/Release "${x}"
+			pax-mark m "out/Release/${x}"
+		fi
+	done
+
+	# Work around circular dep issue
+	# https://chromium-review.googlesource.com/c/chromium/src/+/617768
+	eninja -C out/Release gen/ui/accessibility/ax_enums.h
+
+	# Even though ninja autodetects number of CPUs, we respect
+	# user's options, for debugging with -j 1 or any other reason.
+	eninja -C out/Release chrome chromedriver
+	use suid && eninja -C out/Release chrome_sandbox
+
+	pax-mark m out/Release/chrome
+}
+
+src_install() {
+	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
+	exeinto "${CHROMIUM_HOME}"
+	doexe out/Release/chrome
+
+	if use suid; then
+		newexe out/Release/chrome_sandbox chrome-sandbox
+		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
+	fi
+
+	doexe out/Release/chromedriver
+
+	local sedargs=( -e "s:/usr/lib/:/usr/$(get_libdir)/:g" )
+	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r3.sh" > chromium-launcher.sh || die
+	doexe chromium-launcher.sh
+
+	# It is important that we name the target "chromium-browser",
+	# xdg-utils expect it; bug #355517.
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
+	# keep the old symlink around for consistency
+	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
+
+	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
+
+	# Allow users to override command-line options, bug #357629.
+	insinto /etc/chromium
+	newins "${FILESDIR}/chromium.default" "default"
+
+	pushd out/Release/locales > /dev/null || die
+	chromium_remove_language_paks
+	popd
+
+	if use widevine; then
+		# These will be provided by chrome-binary-plugins
+		rm out/Release/libwidevinecdm*.so || die
+	fi
+
+	insinto "${CHROMIUM_HOME}"
+	doins out/Release/*.bin
+	doins out/Release/*.pak
+	doins out/Release/*.so
+
+	if ! use system-icu; then
+		doins out/Release/icudtl.dat
+	fi
+
+	doins -r out/Release/locales
+	doins -r out/Release/resources
+
+	insinto "${CHROMIUM_HOME}/swiftshader"
+	doins out/Release/swiftshader/*.so
+
+	# Install icons and desktop entry.
+	local branding size
+	for size in 16 22 24 32 48 64 128 256 ; do
+		case ${size} in
+			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
+				*) branding="chrome/app/theme/chromium" ;;
+		esac
+		newicon -s ${size} "${branding}/product_logo_${size}.png" \
+			chromium-browser.png
+	done
+
+	local mime_types="text/html;text/xml;application/xhtml+xml;"
+	mime_types+="x-scheme-handler/http;x-scheme-handler/https;" # bug #360797
+	mime_types+="x-scheme-handler/ftp;" # bug #412185
+	mime_types+="x-scheme-handler/mailto;x-scheme-handler/webcal;" # bug #416393
+	make_desktop_entry \
+		chromium-browser \
+		"Chromium" \
+		chromium-browser \
+		"Network;WebBrowser" \
+		"MimeType=${mime_types}\nStartupWMClass=chromium-browser"
+	sed -e "/^Exec/s/$/ %U/" -i "${ED}"/usr/share/applications/*.desktop || die
+
+	# Install GNOME default application entry (bug #303100).
+	insinto /usr/share/gnome-control-center/default-apps
+	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
+
+	readme.gentoo_create_doc
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+	xdg_desktop_database_update
+	readme.gentoo_print_elog
+}
diff --git a/www-client/chromium/files/chromium-gcc-r0.patch b/www-client/chromium/files/chromium-gcc-r0.patch
new file mode 100644
index 000000000000..b0aaae8de558
--- /dev/null
+++ b/www-client/chromium/files/chromium-gcc-r0.patch
@@ -0,0 +1,55 @@
+From 353219b1d808a8980af93eff5412ec2863557e35 Mon Sep 17 00:00:00 2001
+From: Jose Dapena Paz <jose.dapena@lge.com>
+Date: Wed, 10 Jan 2018 15:34:25 +0000
+Subject: [PATCH] GCC fixes: avoid symbol collision between Element::ComputedAccessibleNode and ComputedAccessibleNode.
+
+GCC at least fails to compile if the method has the same name of the class. To avoid
+this we rename the getter method to be prefixed with Get.
+
+Change-Id: I7f7ac2ecf0947718f72e78ccef019c3239c9b921
+Reviewed-on: https://chromium-review.googlesource.com/857716
+Reviewed-by: Daniel Cheng <dcheng@chromium.org>
+Reviewed-by: Hayato Ito <hayato@chromium.org>
+Commit-Queue: José Dapena Paz <jose.dapena@lge.com>
+Cr-Commit-Position: refs/heads/master@{#528322}
+---
+
+diff --git a/third_party/WebKit/Source/core/dom/Element.cpp b/third_party/WebKit/Source/core/dom/Element.cpp
+index 4f50b7d..d0fa7b1 100644
+--- a/third_party/WebKit/Source/core/dom/Element.cpp
++++ b/third_party/WebKit/Source/core/dom/Element.cpp
+@@ -1276,7 +1276,7 @@
+   return rare_data.EnsureAccessibleNode(this);
+ }
+ 
+-ComputedAccessibleNode* Element::ComputedAccessibleNode() {
++ComputedAccessibleNode* Element::GetComputedAccessibleNode() {
+   if (!RuntimeEnabledFeatures::AccessibilityObjectModelEnabled())
+     return nullptr;
+ 
+diff --git a/third_party/WebKit/Source/core/dom/Element.h b/third_party/WebKit/Source/core/dom/Element.h
+index 733596b..986e31a 100644
+--- a/third_party/WebKit/Source/core/dom/Element.h
++++ b/third_party/WebKit/Source/core/dom/Element.h
+@@ -295,7 +295,7 @@
+   AccessibleNode* ExistingAccessibleNode() const;
+   AccessibleNode* accessibleNode();
+ 
+-  ComputedAccessibleNode* ComputedAccessibleNode();
++  ComputedAccessibleNode* GetComputedAccessibleNode();
+ 
+   void DidMoveToNewDocument(Document&) override;
+ 
+diff --git a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
+index 642f55f..f6a8d8e 100644
+--- a/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
++++ b/third_party/WebKit/Source/core/frame/LocalDOMWindow.cpp
+@@ -1110,7 +1110,7 @@
+     Element* element) {
+   DCHECK(element);
+   ComputedAccessibleNode* computed_accessible_node =
+-      element->ComputedAccessibleNode();
++      element->GetComputedAccessibleNode();
+   return computed_accessible_node->ComputePromiseProperty(script_state);
+ }
+ 
diff --git a/www-client/chromium/files/chromium-gn-r0.patch b/www-client/chromium/files/chromium-gn-r0.patch
new file mode 100644
index 000000000000..8f01e864ce5e
--- /dev/null
+++ b/www-client/chromium/files/chromium-gn-r0.patch
@@ -0,0 +1,33 @@
+From 47b25a1f83f8166c6cd5cf1f13bf6dcce125511a Mon Sep 17 00:00:00 2001
+From: Tom Anderson <thomasanderson@chromium.org>
+Date: Tue, 9 Jan 2018 15:23:14 -0800
+Subject: [PATCH] Fix gn bootstrap
+
+BUG=800553
+R=dpranke@chromium.org
+
+Change-Id: I5c1cfeb7542bf990c59451aabcae7c120cbf09c0
+Reviewed-on: https://chromium-review.googlesource.com/858276
+Reviewed-by: Dirk Pranke <dpranke@chromium.org>
+Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
+Cr-Commit-Position: refs/heads/master@{#528197}
+---
+ tools/gn/bootstrap/bootstrap.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/tools/gn/bootstrap/bootstrap.py b/tools/gn/bootstrap/bootstrap.py
+index a0f32ad31df0..5376c6253a32 100755
+--- a/tools/gn/bootstrap/bootstrap.py
++++ b/tools/gn/bootstrap/bootstrap.py
+@@ -178,6 +178,11 @@ def build_gn_with_ninja_manually(tempdir, options):
+   root_gen_dir = os.path.join(tempdir, 'gen')
+   mkdir_p(root_gen_dir)
+ 
++  write_buildflag_header_manually(
++      root_gen_dir,
++      'base/synchronization/synchronization_flags.h',
++      {'ENABLE_MUTEX_PRIORITY_INHERITANCE': 'false'})
++
+   write_buildflag_header_manually(root_gen_dir, 'base/allocator/features.h',
+       {'USE_ALLOCATOR_SHIM': 'true' if is_linux else 'false'})
+ 
diff --git a/www-client/chromium/files/chromium-vulkan-r0.patch b/www-client/chromium/files/chromium-vulkan-r0.patch
new file mode 100644
index 000000000000..4553bb766679
--- /dev/null
+++ b/www-client/chromium/files/chromium-vulkan-r0.patch
@@ -0,0 +1,120 @@
+From 949b4f07fd1ef5b208136fe38327c28c95f18928 Mon Sep 17 00:00:00 2001
+From: Jamie Madill <jmadill@chromium.org>
+Date: Mon, 08 Jan 2018 11:15:38 -0500
+Subject: [PATCH] Vulkan: Allow for no .git directory in build.
+
+The SPIRV-Tools 'external revision generate' script is coded such that
+it assumes a .git folder is present. This causes a problem for the
+tarball build. We can fix this by using the same tooling we use for
+ANGLE's commit id script to check if the .git directory is present
+before running the generator. If it is missing, we insert a hard-coded
+dummy header. Also use the 'DEPS' file as a placeholder for .git/HEAD
+to check if the current revision needs updating.
+
+Bug: chromium:799620
+Bug: angleproject:2237
+Change-Id: Icea8e9c66f1600df7dca2aaa45fe449f687f5b55
+Reviewed-on: https://chromium-review.googlesource.com/854255
+Reviewed-by: Jamie Madill <jmadill@chromium.org>
+Commit-Queue: Jamie Madill <jmadill@chromium.org>
+---
+
+diff --git a/third_party/angle/src/commit_id.py b/third_party/angle/src/commit_id.py
+index bbdb810..57651a5 100644
+--- a/third_party/angle/src/commit_id.py
++++ b/third_party/angle/src/commit_id.py
+@@ -23,6 +23,9 @@
+         print("0")
+     sys.exit(0)
+ 
++if len(sys.argv) < 4 or operation != 'gen':
++    sys.exit(usage)
++
+ output_file = sys.argv[3]
+ commit_id_size = 12
+ 
+diff --git a/third_party/angle/src/vulkan_support/BUILD.gn b/third_party/angle/src/vulkan_support/BUILD.gn
+index fe61826..24f5a3a 100644
+--- a/third_party/angle/src/vulkan_support/BUILD.gn
++++ b/third_party/angle/src/vulkan_support/BUILD.gn
+@@ -145,21 +145,40 @@
+   }
+ }
+ 
+-# This could be generalized to a foreach if other revisions are added.
+-action("spirv_tools_external_revision_generate") {
+-  script = "$vulkan_layers_dir/scripts/external_revision_generator.py"
+-  inputs = [
+-    "$spirv_tools_dir/.git/HEAD",
+-    "$spirv_tools_dir/.git/index",
+-  ]
+-  outputs = [
+-    "$vulkan_gen_dir/spirv_tools_commit_id.h",
+-  ]
+-  args = [
+-    "$raw_spirv_tools_dir",
+-    "SPIRV_TOOLS_COMMIT_ID",
+-    "$raw_vulkan_gen_dir/spirv_tools_commit_id.h",
+-  ]
++spirv_git_is_present = exec_script("$angle_root/src/commit_id.py",
++                                   [
++                                     "check",
++                                     raw_spirv_tools_dir,
++                                   ],
++                                   "value")
++
++spirv_use_commit_id = spirv_git_is_present == 1
++
++if (spirv_use_commit_id) {
++  # This could be generalized to a foreach if other revisions are added.
++  action("spirv_tools_external_revision_generate") {
++    script = "$vulkan_layers_dir/scripts/external_revision_generator.py"
++    inputs = [
++      "$angle_root/DEPS",
++    ]
++    outputs = [
++      "$vulkan_gen_dir/spirv_tools_commit_id.h",
++    ]
++    args = [
++      "$raw_spirv_tools_dir",
++      "SPIRV_TOOLS_COMMIT_ID",
++      "$raw_vulkan_gen_dir/spirv_tools_commit_id.h",
++    ]
++  }
++} else {
++  copy("spirv_tools_external_revision_generate") {
++    sources = [
++      "dummy_spirv_tools_commit_id.h",
++    ]
++    outputs = [
++      "$vulkan_gen_dir/spirv_tools_commit_id.h",
++    ]
++  }
+ }
+ 
+ config("vulkan_generate_helper_files_config") {
+@@ -864,7 +883,7 @@
+       sources += [ "$vulkan_layers_dir/layers/VkLayer_$name.def" ]
+     }
+     if (is_linux) {
+-      ldflags =  [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ]
++      ldflags = [ "-Wl,-Bsymbolic,--exclude-libs,ALL" ]
+     }
+   }
+ }
+diff --git a/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h b/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h
+new file mode 100644
+index 0000000..e1793bd
+--- /dev/null
++++ b/third_party/angle/src/vulkan_support/dummy_spirv_tools_commit_id.h
+@@ -0,0 +1,10 @@
++//
++// Copyright 2018 The ANGLE Project Authors. All rights reserved.
++// Use of this source code is governed by a BSD-style license that can be
++// found in the LICENSE file.
++//
++// This file is a dummy file to enable building SPIRV tools when git is absent.
++
++#pragma once
++
++#define SPIRV_TOOLS_COMMIT_ID "0000000000000000000000000000000000000000"
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index f197e7f49f12..22f63a390243 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_64.0.3282.71-1_amd64.deb 52841228 BLAKE2B 109c2986bae1c419fbd262548b05ed1dc27d829becc2c2f3a8114ca58c6f1a876e7bd888d7e8e63e6e1214c556883d0481eb39e9bdb44ec28a763a84a8b73d03 SHA512 b5e8b6cfa95a98a19bf666d48abddc534bee7e40e04c0504a6d45c3aa09cf8709579508037d087fb9d6d96432041c73e67188153f7f90005ecd5a65d07c6dd5e
-EBUILD google-chrome-beta-64.0.3282.71.ebuild 3593 BLAKE2B bc6a87fae269cce9f7fc44957ec4bf9b0d410204a1e3cc7774c4301ef5b804de042f69ac7e5e89adb3f64ee24fb320115f207317e1046bfcf2e8515ed7f6469c SHA512 c8267d0725d52f925bd923e172e2d73651112a5992e1716ae057cd021a39fc6d291f1c92e13ed19b807bfaa6696b9572699a5088e27c686001cdf9556f73802a
+DIST google-chrome-beta_64.0.3282.85-1_amd64.deb 52867444 BLAKE2B 987842fb8b525ae3996ef9136bc4feb75b459ae959f21e6fe0fc8ad9267a7b479bac2a78621b9f76c445afa7f442debc35fb03142615efa9f970a48cd7687ec0 SHA512 39527aaf1f36df32bf461d2ddd3a3025ab5627aa7eb950be70eb3c73b60a2cf57b733b14b014ac10ab47c8514045c6d8b1c36b5c59e6425c4f54c65d5adaa0d5
+EBUILD google-chrome-beta-64.0.3282.85.ebuild 3593 BLAKE2B bc6a87fae269cce9f7fc44957ec4bf9b0d410204a1e3cc7774c4301ef5b804de042f69ac7e5e89adb3f64ee24fb320115f207317e1046bfcf2e8515ed7f6469c SHA512 c8267d0725d52f925bd923e172e2d73651112a5992e1716ae057cd021a39fc6d291f1c92e13ed19b807bfaa6696b9572699a5088e27c686001cdf9556f73802a
 MISC metadata.xml 517 BLAKE2B dfd840aa3f7845f67c8d6cca488d89845ca7c259eb4df00f8458ae48b1962df91ca8299ef34785f635dcab25b445246e999fbbfef3bdd7117a4ee1b14beca420 SHA512 837becd9e41aca24694cd10a7bddbc5ca501aca983832daccb4c091a7712267ef20051e7a19af02bc3b48eed89c9e18aa0d46ca2411e1d58d045ceb732a180af
diff --git a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.71.ebuild b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.85.ebuild
index de7c15f9a485..de7c15f9a485 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.71.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-64.0.3282.85.ebuild
diff --git a/www-client/otter/Manifest b/www-client/otter/Manifest
index 1f391012c960..dce54d04e767 100644
--- a/www-client/otter/Manifest
+++ b/www-client/otter/Manifest
@@ -1,4 +1,6 @@
 DIST otter-0.9.91.tar.gz 4422341 BLAKE2B bdf1efbee982bbdd4890c6c45cc82c804066b9e2af67d8ace9da387cf9fabb591320880d5394de9fa7004fba0bebbc30d24fd0dcb9e3c5cdf8b00d0d467a8bca SHA512 d7a98c5a9ef8dc2cd134ca20885c4332f96ef5ebb31bee968d132ca6cc6f30786e382be42decd10e4b0d85f7ddd67fb6dd008ac130d4ba4cf5cbb7423ce9f63d
+DIST otter-0.9.94.tar.gz 4585316 BLAKE2B 7fd450b1cb0102006680964fa9f858b5bed12094e076b4ab5a0cfdb9f790f5627b67d1521d2715919ff3d469b7c953680833e0f091be1320dade9cfc4ea844a4 SHA512 33943c145d40b9fed0afdfa90cf46d2604978347421ac39bfa7d1e9a90c61542fcd8899d039a4b68fc4e7cd6f9175ac9381966e3bc4a822d45ca70a66b6e9f95
 EBUILD otter-0.9.91-r1.ebuild 1546 BLAKE2B d24608ab0196febb78fc30c83ef3d38812f08baedf912c0a23b36093bb04dc9e6c7451fb8b9829a689e4337d193ade1dbd4ed2e48a22c7992785c9a6fc000991 SHA512 f50badc13ee4d80046d9297eb517974e2fa10c06388692a45af3f449b8f15221c3c80f8a7eca833ed80480f1ab8e9f5d989bba8caf9f0f1de00f7e11396194d3
+EBUILD otter-0.9.94.ebuild 1546 BLAKE2B e65b7c8c6616a68c377eac9117167b3de7226be22aa74fe38814d952ec1419032e7836c4f83143697bf19f367861386af9e5ae4bb018c7c65c5e0ee1ad4a5509 SHA512 6a53e5efbd4a6c1fd3c4965b1db558e5a9ff755edaee6866de67fd50f206231b71f5e7c2ffe53c9412969da80cef97c37572219db18b89ebded681e43e853123
 EBUILD otter-9999.ebuild 1439 BLAKE2B ce1243c228b0a16c7a36ac5fbddf427cb21ee4fc25365b46f9737961468032c73c9e6c320b580e7a773e3d84f24b325e3337a1fd0c397a78e530881f7e8205b6 SHA512 7c573c6345f86856cc963f75586d28ed4d00af58d927186155376c8cb0e910ecf5d1ba4c92e26b022013a25fbe804298045bc8af2434b41f29502648fa3b3fe8
 MISC metadata.xml 320 BLAKE2B abca9b58563d140145b8fe8927675138d15746ce226d0e07e0a666f272019dcfcb1b34c806b503850e68df20c41d8e18e01d91b9621b87f80c0d99236cef0ced SHA512 54633afce956f33df7b286e0ff6c765f0a9e08b7a79d154d25b93ab6a5a38475b6b377d40f9456aa5dc245c23654933ddbb02bd5fca8fdf090350f83f48ff3c8
diff --git a/www-client/otter/otter-0.9.94.ebuild b/www-client/otter/otter-0.9.94.ebuild
new file mode 100644
index 000000000000..ba2a9c83403d
--- /dev/null
+++ b/www-client/otter/otter-0.9.94.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit eutils 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="spell"
+
+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/qtwebkit:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxmlpatterns:5
+	spell? ( kde-frameworks/sonnet )
+"
+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_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/qutebrowser/Manifest b/www-client/qutebrowser/Manifest
index ccf78de62d4f..844e41a89972 100644
--- a/www-client/qutebrowser/Manifest
+++ b/www-client/qutebrowser/Manifest
@@ -1,8 +1,6 @@
-DIST qutebrowser-1.0.2.tar.gz 3272237 BLAKE2B 24a1e81678e99a1bf4d3c444e4da91898caa5b1bce7176ae59a34583bf476a24446f9d34d83e4c939697405454bf866071d18756d32d6cafad255fc175dd333b SHA512 a2b548dd7577064000845e696b87d65e0d7452053741832036c6a89f5f3d1cf03a241e4c8c202c57bf87ecc843a7003dd3d5eb32169a32420345ff46e9cf3186
-DIST qutebrowser-1.0.3-1.tar.gz 3289802 BLAKE2B 80b9f3e2f7cf9fc96ccaab752cc311135788c69f6ba3ca750570c919846aab46b92e8742c6400c01283e6d33fdccda2d94c3b136890cb0cb0dfbab03686e4324 SHA512 66bd486ddeee7e1a81a30175d7703d47947d9cbfea62e229f6886665039d68ef34cffd78a3ae9535fe77fcbc298d5a0cab5357d37705f25b40f91d3fc05dbf4c
 DIST qutebrowser-1.0.4.tar.gz 3354132 BLAKE2B 272372eee5e59f4f53ab53b535bdc504176e9ae91181ea96063bac3be827bf681539bab52af0be5bc55da4663c4f5b83edc7aa99d54dccd848c3c7bd38b48759 SHA512 197188e1145dcd59089efe4162e471c4d947e84aff2b0dd30582e19d0045a442e81d388e154335e5cce62dd132d379353db932825dbd2cd041372cca795f3e77
-EBUILD qutebrowser-1.0.2.ebuild 2262 BLAKE2B 0a6ee485987e402eb1cc32ccc0cef6c9a52da9389dc6378e47ac74fe17d57550b0073fbff101fd5581716b85369327605c77bc0b1d047b82867ff18f6ff36876 SHA512 df7effaa910eb1c98e40dd5f55436ec76d3c6a1e153c860e77af69b38d2fc79e1e6308edbd410bd5d0560327397a9f030da3e41cff7cae80b1f7b5de21e56569
-EBUILD qutebrowser-1.0.3.ebuild 2007 BLAKE2B a64dbf0fe8234a91caf78c059dc88bb15c8dc655f143b52c06c13d3fbcf2a9b8f75c34a547bd67961d5192560b383dab63be8ab3c325160a8467f082700a847a SHA512 461efe93b386dec158e1b2d2db45e153f563993bbdaf4ed2d148d631bd1cf813843cceb76184493694c042a75a8c8a4636b5b33aab5a732e7e39c88e67b62c77
+DIST qutebrowser-1.1.0.tar.gz 3468120 BLAKE2B fbde2b6ae685c8d9f2ac9e15a6454f6015351d96bd0886dddfa3e58a1d54a6cedead58cea8dc0a7e95cc504771ad62c74145f547a0a778a4194c2d6b1650862b SHA512 6f14869c787c6140716c0686f9e3abfb44303dd3b04d9d0443c672065c1585c108d87f088ca7254926c077a916e891242ae53c36a2bb6028921462955d083571
 EBUILD qutebrowser-1.0.4.ebuild 2005 BLAKE2B 03a01c10c1d39b85b98fd500a52ebdc62367f046bfafbae315827711f09501ccb9125f68124949844518ff3c1e8127a46742f70d4b02fc1e1f4ae4c6e4e248bd SHA512 51821081bdfc9a4650343c99fea14fdb7599f1691cd22014933a04303e92947aa73d9016531b21ca8a601374cd7a7b2a46c9bb18ca0841c9ac0915aef698d247
+EBUILD qutebrowser-1.1.0.ebuild 2005 BLAKE2B 330559c2ca17ccba51df27f172f9b304186cf895d5eae00b7e0b0876057377fd4aff859f7e72ae7b7fae1a81c00485be8511ff501973915bc1962914b3d60793 SHA512 b7de83ed4059748b04d6f65bdc1456f9c2211f1ba8e1a81f998b5bcf659ad7d790a1584c88ab811768b2862d257714f81164b9f10b5952855c818662475c0e36
 EBUILD qutebrowser-9999.ebuild 2005 BLAKE2B 03a01c10c1d39b85b98fd500a52ebdc62367f046bfafbae315827711f09501ccb9125f68124949844518ff3c1e8127a46742f70d4b02fc1e1f4ae4c6e4e248bd SHA512 51821081bdfc9a4650343c99fea14fdb7599f1691cd22014933a04303e92947aa73d9016531b21ca8a601374cd7a7b2a46c9bb18ca0841c9ac0915aef698d247
 MISC metadata.xml 445 BLAKE2B 11eed2c826838fbdf314c3c1a070bf152fd440891896e5adf6614c29685a4a4c4f5bf46e767de31ef7fbe3ee057ae752f12cfa078c5dda41860cf41708844d2e SHA512 441a63c005894a6527b1521de85b2a26ba107c79fd0663521250808381fe2264972049d14585f153ba3a81d026d715f604382c40489da72398d9eb0fbfd5a6ed
diff --git a/www-client/qutebrowser/qutebrowser-1.0.2.ebuild b/www-client/qutebrowser/qutebrowser-1.0.2.ebuild
deleted file mode 100644
index 68396ff73a44..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.0.2.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit distutils-r1 eutils gnome2-utils xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
-	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-"
-
-if [[ ${PV} == "9999" ]] ; then
-	# Highlighting needed to create help files.  Alternatively,
-	# scripts/asciidoc2html.py could be patched to optionally set
-	# '--attribute pygments' when calling asciidoc
-	DEPEND="${DEPEND}
-		dev-util/source-highlight"
-fi
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
-	if [[ ${PV} == "9999" ]]; then
-		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
-	fi
-
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_test() {
-	py.test tests || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-
-	domenu misc/${PN}.desktop
-	doicon -s scalable icons/${PN}.svg
-
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	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/www-client/qutebrowser/qutebrowser-1.0.3.ebuild b/www-client/qutebrowser/qutebrowser-1.0.3.ebuild
deleted file mode 100644
index 389a61a8d828..000000000000
--- a/www-client/qutebrowser/qutebrowser-1.0.3.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{3_5,3_6} )
-
-inherit distutils-r1 eutils gnome2-utils xdg-utils
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}-1.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
-HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="test"
-
-COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
-RDEPEND="${COMMON_DEPEND}
-	dev-python/attrs[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
-	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
-	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
-	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
-	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
-"
-
-# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
-# isn't complete and X11 is required in order to start up qutebrowser.
-RESTRICT="test"
-
-python_compile_all() {
-	if [[ ${PV} == "9999" ]]; then
-		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
-	fi
-
-	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
-}
-
-python_test() {
-	py.test tests || die "Tests failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	doman doc/${PN}.1
-	domenu misc/${PN}.desktop
-	doicon -s scalable icons/${PN}.svg
-
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	optfeature "PDF display support" www-plugins/pdfjs
-	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/www-client/qutebrowser/qutebrowser-1.1.0.ebuild b/www-client/qutebrowser/qutebrowser-1.1.0.ebuild
new file mode 100644
index 000000000000..e7535337c44e
--- /dev/null
+++ b/www-client/qutebrowser/qutebrowser-1.1.0.ebuild
@@ -0,0 +1,76 @@
+# 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 distutils-r1 eutils gnome2-utils xdg-utils
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/${PN}/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="A keyboard-driven, vim-like browser based on PyQt5 and QtWebEngine"
+HOMEPAGE="https://www.qutebrowser.org/ https://github.com/qutebrowser/qutebrowser"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="test"
+
+COMMON_DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	test? ( dev-python/pytest[${PYTHON_USEDEP}] )"
+RDEPEND="${COMMON_DEPEND}
+	dev-python/attrs[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.8[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.1.3[${PYTHON_USEDEP}]
+	>=dev-python/pypeg2-2.15.2[${PYTHON_USEDEP}]
+	>=dev-python/PyQt5-5.7.1[${PYTHON_USEDEP},declarative,gui,network,opengl,printsupport,sql,webengine,widgets]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+"
+
+# Tests restricted as the deplist (misc/requirements/requirements-tests.txt)
+# isn't complete and X11 is required in order to start up qutebrowser.
+RESTRICT="test"
+
+python_compile_all() {
+	if [[ ${PV} == "9999" ]]; then
+		"${PYTHON}" scripts/asciidoc2html.py || die "Failed generating docs"
+	fi
+
+	a2x -f manpage doc/${PN}.1.asciidoc || die "Failed generating man page"
+}
+
+python_test() {
+	py.test tests || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	doman doc/${PN}.1
+	domenu misc/${PN}.desktop
+	doicon -s scalable icons/${PN}.svg
+
+	distutils-r1_python_install_all
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	optfeature "PDF display support" www-plugins/pdfjs
+	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/www-client/w3m/Manifest b/www-client/w3m/Manifest
index 453982207611..aa9119ccc746 100644
--- a/www-client/w3m/Manifest
+++ b/www-client/w3m/Manifest
@@ -2,5 +2,5 @@ AUX w3m-0.5.3-fix-missing-time.patch 308 BLAKE2B a9df10a5d61c43d2f02817588aeba17
 AUX w3m-0.5.3-underlinking.patch 790 BLAKE2B 8739298c6773395d1f240ab23a09333922f0a37098a6a23dfddfb4a48ce4d46bf6ae1c8262e0ce4ad395a3d71d5e275b3c78038a284b229b3e8e405607c4983f SHA512 a9848610fbaf124453dc77640617785f5a3b3eb3f3c761cf0e29ea26c9481156339ef6d9efa4977d8dc0b28696bda8b5a2bef87150f86a0f516fa93e4efa2ee8
 AUX w3m.mailcap 44 BLAKE2B ae8bde48a638a61bcac9c6b3a0e001666e0c17a3e6fff2d2b4da870fde8a5fc0eb8314d9b818399ae502209a2fa4fbdf4bfb07e56e29a275cb2133656da52dfc SHA512 a66ef535a62f593910c1c99865363e7fc8af1815d24f2ccda86a72c0b777ff388100677f0e14e6f57a6786fdbde62cfc3fea554e659d54663f44cfba3e5c67d2
 DIST w3m-0.5.3.git20161120.tar.gz 2177917 BLAKE2B 48e7d9fee00431d65e4ae486d1cf5a376542fb0655215d95455d6f0e3ba63a6dfb243a858e0bb5e745ac75713091b17fa5c5a63c91a3e837c911ef1f576ce497 SHA512 81ecf9e5d9067a82efa5464e5f9396327a6333f9e414458a972b2b7bff138bd17c490b5258e34cb1e338c7a6c0dd6105a1bfd1e0d02edfadead79caa39106a5c
-EBUILD w3m-0.5.3-r9.ebuild 3217 BLAKE2B 383177eb681ef2fa13e2df70804a43f9638997f2b97216f5247b48fda90436f00e97eba06ba6b1b4ff45b7e209cb0511ad993657656199117c731e44acf4a774 SHA512 ffec9bd251b7b8fc6d5b32435beaca4200ffa9051cc2fbf1573270dba8a394ebeaac7ffde3ea61d7a7cfda6ec2f15cf0ea992f8d7560a1e00a0a04cf1e7366a7
+EBUILD w3m-0.5.3-r9.ebuild 3219 BLAKE2B d7877ab94c11f4011e5a3734b253a12fd259a34c8ab173458236026c10114398eba0fc908d1e6ac6bd3c054213b8433df4d53b72b547de8c7d2c2fb18f3c2f18 SHA512 f159b03a9c50276b4f90bd3655d108cbd49d8f6f67c7445261e1511d14c6c5ac15cd132221fa436fde13c913a15e00a5992933bd378c7a54a01021be692bfd4b
 MISC metadata.xml 439 BLAKE2B 07628d4420012e2d592a6e53a530aba00b8659dcfa5fb440b0ad4ef42013608842d6bf9ef7f7253e4d05da73e1f1390afccf2e7f559bea1a544841b0864b04f4 SHA512 a51eb2e908d9f231b0817f237bb40e42e9e39c0a9f07dc8e7ffbd054ba3ae3a8b6b1a4c443eeef0b28a13008134a20764e6d3234df9215f35f0359fefb8dc67b
diff --git a/www-client/w3m/w3m-0.5.3-r9.ebuild b/www-client/w3m/w3m-0.5.3-r9.ebuild
index cb8054271746..9fef12101d50 100644
--- a/www-client/w3m/w3m-0.5.3-r9.ebuild
+++ b/www-client/w3m/w3m-0.5.3-r9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -20,7 +20,7 @@ IUSE="X fbcon gpm gtk imlib libressl lynxkeymap nls nntp ssl unicode xface l10n_
 # allow us to build w/o X, so we have to give up framebuffer w3mimg....
 RDEPEND=">=sys-libs/ncurses-5.2-r3:0=
 	>=sys-libs/zlib-1.1.3-r2
-	>=dev-libs/boehm-gc-6.2
+	>=dev-libs/boehm-gc-6.2:=
 	X? ( x11-libs/libXext x11-libs/libXdmcp )
 	gtk? ( x11-libs/gdk-pixbuf )
 	!gtk? ( imlib? ( >=media-libs/imlib2-1.1.0[X] ) )
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 67267aba93c9..163175289eb2 100644
--- a/www-plugins/Manifest.gz
+++ b/www-plugins/Manifest.gz
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index a7051f594fc1..048de6cf5678 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,7 +1,7 @@
-DIST google-chrome-beta_64.0.3282.71-1_amd64.deb 52841228 BLAKE2B 109c2986bae1c419fbd262548b05ed1dc27d829becc2c2f3a8114ca58c6f1a876e7bd888d7e8e63e6e1214c556883d0481eb39e9bdb44ec28a763a84a8b73d03 SHA512 b5e8b6cfa95a98a19bf666d48abddc534bee7e40e04c0504a6d45c3aa09cf8709579508037d087fb9d6d96432041c73e67188153f7f90005ecd5a65d07c6dd5e
+DIST google-chrome-beta_64.0.3282.85-1_amd64.deb 52867444 BLAKE2B 987842fb8b525ae3996ef9136bc4feb75b459ae959f21e6fe0fc8ad9267a7b479bac2a78621b9f76c445afa7f442debc35fb03142615efa9f970a48cd7687ec0 SHA512 39527aaf1f36df32bf461d2ddd3a3025ab5627aa7eb950be70eb3c73b60a2cf57b733b14b014ac10ab47c8514045c6d8b1c36b5c59e6425c4f54c65d5adaa0d5
 DIST google-chrome-stable_63.0.3239.132-1_amd64.deb 49565326 BLAKE2B 827949d0de954f3be5717674b4d1ed7d81147e23634144625c20c23274f468a8e2be7567efae0a52ddefa9bb130e2d5c00f46924104ed04c8ea1258680a2a368 SHA512 d3be097e7cc7f40038f3318eed6fac2feef890157ebc50b9b4936b941ceb4cce13ae46e76d78c82788e360b6abbe3ba69b11925bbfc4211c68665fc82659fada
 DIST google-chrome-unstable_65.0.3315.3-1_amd64.deb 53186146 BLAKE2B e256d7a71a78fbcb804b1548c3d7b3665e47c1a01c376675c891384e76fb7599a26348ae55e3c791f0ad3639db87f0cac09f5b77506a6d19a7f4e2dbb1ffe41f SHA512 f4a832f3346c5612f47d56a325de4dbb520ba841c65840428c60872f76b6ed260c993c56dd77880c9874579b31a24fa8acda9ee21bef8425406b3cbd925e2a8d
 EBUILD chrome-binary-plugins-63.0.3239.132.ebuild 1438 BLAKE2B 25df8bdde008f7711eb41c4f616ba55ad4fee20604ba67ffd3e0b55b016896b1e71258cd894f1060e69b3ba65499ed16218bc835f5bff1318fe6529c01e9b8da SHA512 bf8818ec496fb2be1edda7f6e84920e048f8f7017e53a4d14bd52329b458f38efd2d5cc3b39190385a5e0926c8cbd6f73f2433c7abd259fdb70d51e0e245c0bb
-EBUILD chrome-binary-plugins-64.0.3282.71_beta.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
+EBUILD chrome-binary-plugins-64.0.3282.85_beta.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
 EBUILD chrome-binary-plugins-65.0.3315.3_alpha.ebuild 1439 BLAKE2B 5f77619a2d3be3c2840d7f0dd9e4e5b74fb89d9218e04c61c49047155c4124efcf6b78b4549207ed0211dbc27f4fe57626511e5f1dcc6daed062aefdc2481b17 SHA512 265ee07635c092c6c7d84b1e6276730416f87e513bfbfa70b5943a2790aa62ba4c4b184fb772794fc4e9e9765dc86099665a50d339a89b2ac360176493a2ef9f
 MISC metadata.xml 341 BLAKE2B da1d1a85bb21e659671b98e12d0b3b31760dab269f8d298b44923f6936a4c43a27b67bff50adf76cb883460d5fe3112027d9b678826eeb220448cd114805320e SHA512 253960d995af2946bafa0bcd96a874e50197aa629efd0dfe7ce404dc72180a2298119b9cabd0b605c65b0894fe0316f7b3bdab602bdfade4323a0bdd70311fdd
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.71_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.85_beta.ebuild
index e94c35d47021..e94c35d47021 100644
--- a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.71_beta.ebuild
+++ b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-64.0.3282.85_beta.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 6342f5c0214b..4bd7da316f6c 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/puma/Manifest b/www-servers/puma/Manifest
index 51ea84d49ccc..8227acba7e8d 100644
--- a/www-servers/puma/Manifest
+++ b/www-servers/puma/Manifest
@@ -1,9 +1,5 @@
 DIST puma-3.10.0.tar.gz 158843 BLAKE2B 94f206c2b1334b2b63da3962b0a9077cd2e9671c705c4db23acc44098c02902ac3ca1b8cb0b39a0e68282d39103b61adc0334814095e313d9de02d819ab8af92 SHA512 a0a97c75408c8e9ab108b0d2edaa955bf0052d0d0ba7641be52f645ffaf61d9c647f863910e084319a705de7b27a763209f5aeda50e29db94442d9ac59866813
 DIST puma-3.11.0.tar.gz 207387 BLAKE2B b95af60358a9e6877eec34b4cab80c00512e6f9c518f302d6373eee3042b4f439d655aafc719461f7d286fea565e82e6f7ad541a7b0a17d3c2f49067f3e11dd1 SHA512 55e7be6a6c8abc7c8bba4c793b9515150d989358259bbd6546cd8a52d9e6cfb0b7e20c3f813790359ae141865f991d0daadf043e884e2cbc1a1bdfabadca8a16
-DIST puma-3.6.2.tar.gz 152250 BLAKE2B c226d532de2f321d22949e6992d7497714ca91dfee28003104bb23a27402f33bb3eebfef02fe6e53c2002fa739c7a9417c38a950c62182e12f3fce8275290463 SHA512 d80138f37b22753f2fefeba1c6bd315d8a6ded0e718df84ede6979b7634b6ebae1c4a2aa98bf233e8bc2d0113201f0e9c752e4d128ce4b812897680694f1ce9f
-DIST puma-3.9.1.tar.gz 156801 BLAKE2B d741365a8864fb2a66dd5e3bf0f0bab4097d16a164dae146f07077e047993dc5666709fb1b3867b722e8ad1becc6490402fa849942027ceffa88c9c8e5e010e5 SHA512 612e4dda7e3ead5c71df113031856d1ff2f001bfeaff448a81afa373b4b84a37c98e4f73ab8c2a763dd70e55a03fd60b9cafad134367989a90781d91ef0214a7
 EBUILD puma-3.10.0.ebuild 1984 BLAKE2B 679d465e8f473d20e1b103a797013fad2e64f5888e840af4bb4cd7bbdca8fd684253824eb59e81d81d3cbf8d36db7dd971c200a29b41eab0a7c3a1579ecde8dc SHA512 71dba8b8bfdcb5ec415d903e8bf90617cd40ae027fe0459036818b3af239225f3989031fd3bf51e417f18c4b411d54355c2d4c1df0e27f335f7881e3c061b4ba
-EBUILD puma-3.11.0.ebuild 1977 BLAKE2B 40bbbd633b44229e3f8aaae6b39fdc1f44c77472d70eae4270e0d7fa3ab9f85a14a605a8ef5628935d9d8b6c077e306e5ec601091924af37ff9f3bf6ed609c20 SHA512 d203c5fdf969750a4ea06ad3b9c2a3847e876139ed35fb831e105f3f36d9b1fefd8e91b5d9892a7eafd76b1614e864e4f137a858e437fb1e88eb72259f1b13c2
-EBUILD puma-3.6.2.ebuild 1562 BLAKE2B 4b337f5c74f7fe57ee5dbf3c8c07c97526f159c287cdf555d601ded0370a34e74bdc68365020a0234b273671add789ce9d06568767910c41ee158804e34dbc0f SHA512 24d34f792c97867baf1b5c91f5679e8b8d7921f11e04df5b302ab161c2bae85a63a812066aee85bcbff2f3116b3b1385cfc9009ba7279505c6f846b5c4a5b95b
-EBUILD puma-3.9.1.ebuild 1984 BLAKE2B 679d465e8f473d20e1b103a797013fad2e64f5888e840af4bb4cd7bbdca8fd684253824eb59e81d81d3cbf8d36db7dd971c200a29b41eab0a7c3a1579ecde8dc SHA512 71dba8b8bfdcb5ec415d903e8bf90617cd40ae027fe0459036818b3af239225f3989031fd3bf51e417f18c4b411d54355c2d4c1df0e27f335f7881e3c061b4ba
+EBUILD puma-3.11.0.ebuild 1976 BLAKE2B bbfa885fbc2070cfad87d4bbc68f48500066f235b644204fc4e73eb1681da23fcd3710ff64ea0add865df0eff0966092651febf7c623b3fb6b3dc0dd6fa02dc1 SHA512 ab5c53b27ec80f7e1228c4c6c525e1a47651cb57e8027f31f86a23b2e5ac45a7b8dcbfa0dd75d1adc9e34eeecb485f2449b6dce05b7e41cd63cfe5ca88372b8c
 MISC metadata.xml 709 BLAKE2B f0a69d0e7f4c5e593ff5648b51de393610f579fd9fff372749fca4491e8dd57b7e853f87104e8b86f8e90013fe54f8c3141e28ae87d17432e60f329f51a67db6 SHA512 dd872907d8e164d0b63f1b4db076d9407c33581ae80ecafb119904ceebe4c05eb74d01d51c3217cf475faf02d3732e9854553fc980c1b054c42b95af58ee1c0e
diff --git a/www-servers/puma/puma-3.11.0.ebuild b/www-servers/puma/puma-3.11.0.ebuild
index 5ebdb4097bc3..c9409bdf937d 100644
--- a/www-servers/puma/puma-3.11.0.ebuild
+++ b/www-servers/puma/puma-3.11.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64"
+KEYWORDS="amd64 ~arm ~arm64"
 IUSE=""
 
 DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
diff --git a/www-servers/puma/puma-3.6.2.ebuild b/www-servers/puma/puma-3.6.2.ebuild
deleted file mode 100644
index f3905616d94f..000000000000
--- a/www-servers/puma/puma-3.6.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-USE_RUBY="ruby21 ruby22 ruby23"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="http://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0"
-
-ruby_add_bdepend "virtual/ruby-ssl
-	test? ( dev-ruby/rack >=dev-ruby/minitest-5.8:5 >=dev-ruby/test-unit-3.0:2 )"
-
-all_ruby_prepare() {
-	# Avoid test failing inconsistently
-	sed -i -e '/phased_restart_via_pumactl/,/^  end/ s:^:#:' test/test_integration.rb || die
-
-	# Avoid test we did not run previously that is failing
-	rm -f test/test_cli.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
-		-e 's/localhost/127.0.0.1/' test/shell/* || die
-	sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/puma_http11 extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/puma_http11
-	cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
-}
-
-each_ruby_test() {
-	einfo "Running test suite"
-	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.8'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-
-	einfo "Running integration tests"
-	pushd test/shell
-	sh run.sh || die
-	popd
-}
diff --git a/www-servers/puma/puma-3.9.1.ebuild b/www-servers/puma/puma-3.9.1.ebuild
deleted file mode 100644
index 118aa44cbc3d..000000000000
--- a/www-servers/puma/puma-3.9.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-USE_RUBY="ruby21 ruby22 ruby23 ruby24"
-
-RUBY_FAKEGEM_RECIPE_DOC="rdoc"
-
-inherit multilib ruby-fakegem
-
-DESCRIPTION="a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack"
-HOMEPAGE="http://puma.io/"
-SRC_URI="https://github.com/puma/puma/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~amd64 ~arm ~arm64"
-IUSE=""
-
-DEPEND+=" dev-libs/openssl:0 test? ( net-misc/curl )"
-RDEPEND+=" dev-libs/openssl:0"
-
-ruby_add_bdepend "virtual/ruby-ssl
-	test? ( dev-ruby/rack >=dev-ruby/minitest-5.9:5 >=dev-ruby/test-unit-3.0:2 )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/ s:^:#:' test/helper.rb || die
-
-	# Avoid test failing inconsistently
-	sed -i -e '/phased_restart_via_pumactl/,/^  end/ s:^:#:' test/test_integration.rb || die
-
-	# Avoid test we did not run previously that is failing
-	rm -f test/test_cli.rb || die
-
-	# Avoid test that trigger a bug in ruby very easily and lead to
-	# failure. This affects all current puma versions in combination
-	# with the latest ruby versions, so we add this new version anyway
-	# while allowing these tests to fail.
-	# https://github.com/puma/puma/pull/1345
-	rm -f test/test_{persistent,puma_server,puma_server_ssl}.rb || die
-}
-
-each_ruby_prepare() {
-	sed -i -e 's:ruby -rubygems:'${RUBY}' -rubygems:' \
-		-e 's/localhost/127.0.0.1/' test/shell/* || die
-	sed -i -e '1ilog_requests' test/shell/t{1,2}_conf.rb || die
-}
-
-each_ruby_configure() {
-	${RUBY} -Cext/puma_http11 extconf.rb || die
-}
-
-each_ruby_compile() {
-	emake V=1 -Cext/puma_http11
-	cp ext/puma_http11/puma_http11$(get_modname) lib/puma/ || die
-}
-
-each_ruby_test() {
-	einfo "Running test suite"
-	${RUBY} -Ilib:.:test -e "gem 'minitest', '~>5.9'; gem 'test-unit', '~>3.0'; require 'minitest/autorun'; Dir['test/**/*test_*.rb'].each{|f| require f}" || die
-
-	einfo "Running integration tests"
-	pushd test/shell
-	#sh run.sh || die
-	popd
-}
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index d87d9b5e0e24..9be2cd161d4e 100644
--- a/x11-libs/Manifest.gz
+++ b/x11-libs/Manifest.gz
diff --git a/x11-libs/gdk-pixbuf/Manifest b/x11-libs/gdk-pixbuf/Manifest
index b33083995492..b46d49e6ef9d 100644
--- a/x11-libs/gdk-pixbuf/Manifest
+++ b/x11-libs/gdk-pixbuf/Manifest
@@ -4,5 +4,5 @@ AUX gdk-pixbuf-2.32.3-fix-lowmem-uclibc.patch 1075 BLAKE2B e6fc37605b136d12dbc7e
 DIST gdk-pixbuf-2.36.10.tar.xz 5772196 BLAKE2B 542df9a5b9d3e790cb592b714a402633eaf37ecd4a21d597f307bdc3f5a0a35e3c3d9e3f6c822e163d0d64b9de62d7b120cb2b174f3109bdffc5e08225506f0c SHA512 d080d20baa20efe58cc5e5d043532f57e7950c0f7a3661998f924ae2a819f6bf1113e1da7785ac2063dfa582576d418eea5b3c80ea3db16057de43cc3f911d35
 DIST gdk-pixbuf-2.36.11.tar.xz 5675908 BLAKE2B 1b111c2866b06ff5da5d5e043481956d6ffbc69fa66236d91b29a6e923c01b91054eb491d2ba15a2e5d2d694f143eb0cc472bbed9bfce0bc015d6602449920fa SHA512 231e13ef2339fc6953788e8597a0c455143273338793ed835dac6ccf42e26e0292dec4121a4976b859ba8ffaa81b3ca5b250b54bd4897dbd3146a1874a59d4e3
 EBUILD gdk-pixbuf-2.36.10-r2.ebuild 3795 BLAKE2B e3a6b029120e43a6395096782c3d73599ef953321e3f46480b7211199e7b7326017b0674f71cae3298a81c183b602545294de14d351edb0fee53970f4e8421fd SHA512 737a797da5cec04c2f61c6cf5df869f87e1050dd608cb2f1a670c28364c349f3aba6b51b45adeda36bb5f58f1a7a39c3b9d989d61c2b118c50a409a622d381c2
-EBUILD gdk-pixbuf-2.36.11.ebuild 3893 BLAKE2B 470bfec07a8c38410284dc44907d4aa09ef02c2a57a7f900174933dec7c002eaaf3cb1da49e4ac969ac0aadc66803ce77da970974dbeb37d12ebf87dab9640fe SHA512 98af3703315a23eecb103d3fab88dfc8369ad72d5e7f5ab50d2f037307c571f23347e968565c3cc9ca18bcbeb41a82ff1f8a1823e70c1f3de8568fa542e1eda5
+EBUILD gdk-pixbuf-2.36.11.ebuild 3892 BLAKE2B 3cc0e1ab04ea492b71c871870a9cbe6c12c5d7cb27eed0ccf968222e30c9e0e00f05a59fbd570a1f30d7956f675f192842634b5fe9a37b91d9ebbd4960a08e63 SHA512 0dd5145259a4b80bff17bdd8169ab485e89635a81b33b7b6db1993481df00e07256f137d8eebaa43d2144f9d2044bf7e9c32f520331f63ebc3ccfa67c76b0496
 MISC metadata.xml 342 BLAKE2B 5c92b45d7291b4eec6ceb423c901fb1222fa8eea6d39dd62bae495f4203862447ec15727e6e1e8b65dc6f9cbd7c2372464ad21540d130d44e842e33c887151e3 SHA512 c889bb461ef578170d304b124dbf7ffb9ae35fd4b7530caa4ec15b815c4cda2c297971e6023faf4c4ca81460ab4971c6369093a99b2891f3c1837cb80caa8a7a
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
index 80f31f97b247..cc27c2fc30e2 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.36.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ HOMEPAGE="https://git.gnome.org/browse/gdk-pixbuf"
 
 LICENSE="LGPL-2+"
 SLOT="2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="X debug +introspection jpeg jpeg2k tiff test"
 
 COMMON_DEPEND="
diff --git a/x11-libs/goocanvas/Manifest b/x11-libs/goocanvas/Manifest
index b062e33d612b..3e771641208a 100644
--- a/x11-libs/goocanvas/Manifest
+++ b/x11-libs/goocanvas/Manifest
@@ -2,5 +2,5 @@ AUX goocanvas-1.0.0-gold.patch 848 BLAKE2B 5d808bc92fa4acedd0be7610e8b75030a3593
 DIST goocanvas-1.0.0.tar.bz2 570552 BLAKE2B 00b1a3d59448cc2f40dd20b0c97977cfc477a6656f32e2106b3f3bd5c42b8b625e270d9f96de44f30caf83b744b331699e7c6385b5269bf7b22e3bb25a879948 SHA512 fef4364b57dc777b6dcceb026f940121a24a8a3792e8d37d320eb47b7747ab0d54d8d7911b4ff77c21ca2b251937c9312da04221bbc246a07bbf4062689de644
 DIST goocanvas-2.0.4.tar.xz 584272 BLAKE2B 027ab47c1e9c241f74509001426367e86025ec8ea5901cf64c2014f8c32b83ce60870ca754dd15e8982a7023b77d3856b39dbbbdd636de6da47d361cb15a940e SHA512 e57dfd59d9b9cb64deadfeac193c11a89347c7f0e966377cfb98afcc2b46be13fe05d253a96e63dc7e6981c75e6e871040b83d8d0aee95cb62b79965d6be5688
 EBUILD goocanvas-1.0.0.ebuild 1256 BLAKE2B 63d66e4e465f24c64f47c9b5439c20b2330b7bc246cc54da26f23bc1bf9ed058f6ae83d19f391909beb0a9f2ea3b884688e8ce664adc952074bcfd928c0ff198 SHA512 83729254a1f425bd1e953b4a69dec8fee7f8f28357c1e71e635c46b7b7615da090883c5ff914bea81825cb923b43dcbedbf793d842dc9fcd0df9ce577b08fea8
-EBUILD goocanvas-2.0.4.ebuild 1612 BLAKE2B f8b8f6aa47ce634a42d604b98cea44885642af0a4f3b980c495db512000cc399d75316aa89fb5e70ce4f97984848a523ec5fd3a0467601d791ad29a9e1e7ba9e SHA512 82b95ca69affcce08591420a7c3e48a4bdebd298bd30d058046fa9af581aee9f1937b4cdd930731a2cf6d4e5ca626f1d83795d21209b2cdfae33c65b2b9bb4f5
+EBUILD goocanvas-2.0.4.ebuild 1611 BLAKE2B 0c8ba1fc6f37aadcb936251154fce2fd6bee69a29326a64b640740fe654fe669e9284cfc1714d39aea87dac5debeae9a190df6fadfde22fc206b4979a708354a SHA512 bbcb3602dbceebcaa537df7eeb93689017ee5accb4a46e0a694bfc099dd4e4213de3e90af3fbd1dbf9332b70a7b47b7549eab793611aa4f060beef2455af09d1
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
diff --git a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild b/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
index 2d7cc282da6a..af360bb3fb6f 100644
--- a/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
+++ b/x11-libs/goocanvas/goocanvas-2.0.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://wiki.gnome.org/GooCanvas"
 
 LICENSE="LGPL-2"
 SLOT="2.0"
-KEYWORDS="alpha amd64 ia64 ppc ppc64 ~sparc x86 ~x86-fbsd"
+KEYWORDS="alpha amd64 ia64 ppc ppc64 sparc x86 ~x86-fbsd"
 IUSE="examples +introspection python"
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
diff --git a/x11-libs/gtk+/Manifest b/x11-libs/gtk+/Manifest
index 31c1559829dd..0c8036daddb4 100644
--- a/x11-libs/gtk+/Manifest
+++ b/x11-libs/gtk+/Manifest
@@ -2,10 +2,13 @@ AUX gtk+-2.24.24-out-of-source.patch 1487 BLAKE2B f322f3872c8e1f02f6d1d52cdfdb4b
 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+-3.22.19.tar.xz 18841024 BLAKE2B dc4c27d022c6766036b16e52b53b4aa3946c41457abaabca390bdba2b720db71b9c584101990928af1bef73dc49f7b71a951ba0000bd52e11aa5306a1d877f18 SHA512 c83198794433ee6eb29f8740d59bd7056cd36808b4bff1a99563ab1a1742e6635dab4f2a8be33317f74d3b336f0d1adc28dd91410da056b50a08c215f184dce2
+DIST gtk+-3.22.26.tar.xz 18922136 BLAKE2B a1e43be24abe2bda8eb63f3794b191b152abb5717334f8f46fe3158eb7ec92d5413ed3ca0df2a1ad676deacee3e7ce5e737661ec5f5c911609d40d3b9379c4c4 SHA512 2fd3a4175168d37f243359bac5df84722a2830fe5b62f86b914ce39ff500f0361e412843922343dffef8bee8f1205799ff86dd3ae8ac419928f4fe977e0e946f
 EBUILD gtk+-2.24.31-r1.ebuild 10104 BLAKE2B 2d9f63b1aaea867dc1bf0267e0e4000590ae10bfc3b4e1f3539cc1d83b55e874383f621db1cb5564283c069f606ed90dcb5c8cc3c45716507bbff31924da0ba3 SHA512 7efbaaa3ffccb8268f50fdf05cc96f0c87a6801a64e89977153368ae334176325ee77822fa663455e808d18008e54faf86c0d5a4cf9b6d5dc995ca8c3d33f61e
 EBUILD gtk+-3.22.19.ebuild 6779 BLAKE2B d3116d1930a2f383ada49111144c8371cce1a07c990757d7e8a936e13f65beb90c33385dc87d13deea0022f89755d3c01d632c922e7fd6ad30619a968d70b418 SHA512 8d04280a143b9ace7b9ee2149e6554149e0306a70c90806cad6063f05afd8cacba30d4ba88091f8bc9ec2344f5bead4c4ee8e61d21cbbfccb9656fe8fbd03345
+EBUILD gtk+-3.22.26.ebuild 6961 BLAKE2B f7efd4cd7ea7a91ed82a1eab888a3eb317a72e8c5d71adac4e5d231d69ca51298eb7c997c9da8db631f4c7ba46738e0b14b00d5cc56a3f2d773af95367a31f69 SHA512 8ef4e04588eff83a258b03241a0794c8f962077bd36bf2372f78dc70588ebd0a4d0ba3877338495d3bc977f9ba04d26fa7d24053a6b4368ff22a31704622eed1
 MISC metadata.xml 834 BLAKE2B 0b1145d2da83bf549af3758dbca4c5dbf734e5c90c99f3856404b98584dc18d913ac70a19480fb0a16cc503c9831e4209df77c0adf7283eb0d8146079a381fe9 SHA512 e1ec73c4c9433c70c17fc3826193d8289200e347a32d67a824b803213ac281f21364a08c21c819c3e93a2d8582d90bef48766f22ba9ed495099b3eb6071aa561
diff --git a/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch b/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch
new file mode 100644
index 000000000000..8913bc88bd4e
--- /dev/null
+++ b/x11-libs/gtk+/files/gtk+-3.22.20-libcloudproviders-automagic.patch
@@ -0,0 +1,57 @@
+From 4588c9c6463d8958d8305caafa58ea5c263fd352 Mon Sep 17 00:00:00 2001
+From: Gilles Dartiguelongue <eva@gentoo.org>
+Date: Tue, 16 Jan 2018 09:07:38 +0100
+Subject: [PATCH] Fix libcloudproviders check
+
+Use autotools managed variables and make use of pkgconfig macros.
+---
+ configure.ac | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 24110386b4..cebe66c2e5 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -349,8 +349,10 @@ AC_ARG_ENABLE(mir-backend,
+ 
+ AC_ARG_ENABLE(cloudproviders,
+               [AS_HELP_STRING([--enable-cloudproviders],
+-                              [enable libcloudproviders integration])],
+-                              [cloudproviders_set=yes])
++                              [enable libcloudproviders integration])
++              ],
++              [],
++              [enable_cloudproviders=yes])
+ 
+ if test -z "$backend_set"; then
+   if test "$platform_win32" = yes; then
+@@ -1350,17 +1352,15 @@ fi
+ # Check for libcloudproviders
+ 
+ CLOUDPROVIDER_PACKAGES=""
+-if test "x$cloudproviders_set" = "xyes"; then
+-  CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version"
+-  if $PKG_CONFIG --exists $CLOUDPROVIDER_PACKAGES ; then
+-    AC_DEFINE(HAVE_CLOUDPROVIDERS, [1],
+-              [Define if libcloudproviders is available]
+-              )
+-  else
+-    AC_MSG_ERROR([
+-*** libcloudproviders not found.])
+-  fi
+-fi
++AS_IF([test "$enable_cloudproviders" = "yes"],
++      [
++          CLOUDPROVIDER_PACKAGES="cloudproviders >= cloudproviders_required_version"
++          PKG_CHECK_EXISTS(
++              [$CLOUDPROVIDER_PACKAGES],
++              [AC_DEFINE(HAVE_CLOUDPROVIDERS, [1], [Define if libcloudproviders is available])],
++              [AC_MSG_ERROR([*** libcloudproviders not found])]
++          )
++      ])
+ 
+ CFLAGS="$saved_cflags"
+ LDFLAGS="$saved_ldflags"
+-- 
+2.15.1
+
diff --git a/x11-libs/gtk+/gtk+-3.22.26.ebuild b/x11-libs/gtk+/gtk+-3.22.26.ebuild
new file mode 100644
index 000000000000..0f2ed64289cf
--- /dev/null
+++ b/x11-libs/gtk+/gtk+-3.22.26.ebuild
@@ -0,0 +1,231 @@
+# 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 ~arm-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-proto/xextproto[${MULTILIB_USEDEP}]
+		x11-proto/xproto[${MULTILIB_USEDEP}]
+		x11-proto/inputproto[${MULTILIB_USEDEP}]
+		x11-proto/damageproto[${MULTILIB_USEDEP}]
+		xinerama? ( x11-proto/xineramaproto[${MULTILIB_USEDEP}] )
+	)
+	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/gtksourceview/Manifest b/x11-libs/gtksourceview/Manifest
index b379e1544d61..0b6ff122cc3a 100644
--- a/x11-libs/gtksourceview/Manifest
+++ b/x11-libs/gtksourceview/Manifest
@@ -9,5 +9,5 @@ EBUILD gtksourceview-2.10.5-r3.ebuild 1353 BLAKE2B e019389cd3e530c9f1d696d3574d7
 EBUILD gtksourceview-3.22.2.ebuild 1323 BLAKE2B 8ecf0ab49a768d96515df5c4790c30cb6a1d8382b45c9aa2110c392274af1f9b05987ace8ba9e5c787cae3b7c4248c37c33aac2070cfd7d9d60654e212191e2b SHA512 ff2ca2a7344608b335d59bb2391e85342e082a523ef1a799dd47c4c989f8e7bb294027f551b13546c2d84aac35913b2e0d122d52a1df03b5df289b652159fc45
 EBUILD gtksourceview-3.24.3.ebuild 1331 BLAKE2B d679001eba2791cec08a0ca1c9a35fbcb024a13e11af021045161e985f7d85a8e9d4b04e3ef58366a4616f4f771263c661e4e004c8fe26146cfa057abe73e61f SHA512 9282a5de6620b638b901e49e493b7b538870ac0baf95d200a597ae99968115b85a2f566ecc4dc55142664259efe111a117cc06e96b7f3c596b2b47bb8d6fca26
 EBUILD gtksourceview-3.24.4.ebuild 1331 BLAKE2B d679001eba2791cec08a0ca1c9a35fbcb024a13e11af021045161e985f7d85a8e9d4b04e3ef58366a4616f4f771263c661e4e004c8fe26146cfa057abe73e61f SHA512 9282a5de6620b638b901e49e493b7b538870ac0baf95d200a597ae99968115b85a2f566ecc4dc55142664259efe111a117cc06e96b7f3c596b2b47bb8d6fca26
-EBUILD gtksourceview-3.24.6.ebuild 1331 BLAKE2B d679001eba2791cec08a0ca1c9a35fbcb024a13e11af021045161e985f7d85a8e9d4b04e3ef58366a4616f4f771263c661e4e004c8fe26146cfa057abe73e61f SHA512 9282a5de6620b638b901e49e493b7b538870ac0baf95d200a597ae99968115b85a2f566ecc4dc55142664259efe111a117cc06e96b7f3c596b2b47bb8d6fca26
+EBUILD gtksourceview-3.24.6.ebuild 1330 BLAKE2B 68eaad50ed2d8e65bbf38d3baa58e23a6ebfb4b35bfef4891663f700d630c14ac73ac067fa3b797207506098a4ecfd2f1c6d3553fcad6d86546edef11e6ac399 SHA512 34d55a040b4fb3fed69ad40c8fd98be6a7122eb36f54a472bca89559647665a6b23c84192a7ec66779aecee15d757d89b604bb75bcf244ae6f325ee8dddda992
 MISC metadata.xml 318 BLAKE2B 63b73a76e8f01503afd3f29f3329056ce6b95614aceef233ee4308ab7589dd5f0f35b84f317ecdf5829847a01bdf18987ca87e345ea7e92bf9556d81b15dde1f SHA512 c0954dc93b8b12dbad5d31805afc40d8075c55aafc209d6292cdbc50727f4e17a24353d115004e1e6974fdbb4bdfdb1588ff86ad93b6a60cd1ed430c13865ac5
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
index 1e25a7583c48..a43aec49f40f 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -16,7 +16,7 @@ SLOT="3.0/3"
 IUSE="glade +introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 
 RDEPEND="
 	>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libQGLViewer/Manifest b/x11-libs/libQGLViewer/Manifest
index adebfbf809a2..02ab05c1af34 100644
--- a/x11-libs/libQGLViewer/Manifest
+++ b/x11-libs/libQGLViewer/Manifest
@@ -1,3 +1,5 @@
 DIST libQGLViewer-2.6.4.tar.gz 2996712 BLAKE2B c57df2a538d74a3cb9f919e572f02ce0cb8093e95e117202b2b12503cd3423552244edf3ee79fda17581fa3c7dfa7192d2303117eef097c97d5f983d3e33d6c1 SHA512 fae9caa7fe049b13ba970c971a9454700631cac18d46b6154ae4e155fabe64dc3b8eacf968dce69292743ade6c8c2772e236505ee8099bbf9ed291382dbd65f0
+DIST libQGLViewer-2.7.1.tar.gz 3078737 BLAKE2B 0374c60374af0f4594ee79fafd53440654e9bb5114cef38e50deba86584cc55eef03d2177b5d54829f5b111d4d029384fff19f8a5bebf750cac1ab8cfe6afaa5 SHA512 1f597d737614f07682bde0d886c9c2eee57f478607a4caeac40922f66a6310ff30ea32e8ab44de0b23e0d1e5db2e6deea8c4fe3bc2cddc78ed5b971f638b09bd
 EBUILD libQGLViewer-2.6.4.ebuild 1235 BLAKE2B 4065cbec81221c971c48cb67edba095cd75b4553afe4e4543f9ff22b4ab63cda20e0a903b81915ef654c63ff5007182d1baf17fb8b335e6d421f535192ad6c65 SHA512 96bb2854665c64eb9821ac27497810a28e29c3e3056e0d853eb91bd7677636b983518824fdeead5932eb4f19797516b2af304a645aef3152b218b55aa4bf49cc
+EBUILD libQGLViewer-2.7.1.ebuild 1291 BLAKE2B 711010c65c0a0cebe90f239d1f223ee3a66cce014770e712b9997eca165bd39af562a44d000f5271aec7df0cb303c924ffe0785166b4ed0dc567940d9a011f7a SHA512 6620cba4f14e98f4b827ded73d98a9ef935fd7da30a8908005cad327b339f4a962a6476b2890f27565e129adf9a326058d8f644acaf7d50d69ed0259cf0e87ed
 MISC metadata.xml 337 BLAKE2B d41f3f134ae930728e76d4924cd145a6a958482a008c047deda9e0ac8864496ceed43f939792583cc49bb572785a4924fb3e44da738b6ea2c84e43ca592844f4 SHA512 a699f6197293d6a53643064a2bcb524626e70c2f9557e8599ceadcf16b8d0fceeb98da2eb3691ed4b2fae0385416b1c238b3eff76228c3f420995b1d62f05e4e
diff --git a/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild b/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild
new file mode 100644
index 000000000000..19eae03cf769
--- /dev/null
+++ b/x11-libs/libQGLViewer/libQGLViewer-2.7.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="5"
+
+inherit qmake-utils multilib flag-o-matic
+
+DESCRIPTION="C++ library based on Qt that eases the creation of OpenGL 3D viewers"
+HOMEPAGE="http://www.libqglviewer.com"
+SRC_URI="http://www.libqglviewer.com/src/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0/qt5"
+KEYWORDS="~amd64 ~arm"
+IUSE="designer examples"
+
+DEPEND="virtual/opengl
+	virtual/glu
+	dev-qt/qtopengl:5
+	dev-qt/qtcore:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	dev-qt/qtgui:5"
+RDEPEND="${DEPEND}
+	designer? ( dev-qt/designer:5 )"
+
+src_configure() {
+	append-ldflags "-L${S}/QGLViewer"
+	sed -e 's#designerPlugin##' -i ${P}.pro || die
+	use examples || sed -e 's#examples examples/contribs##' -i ${P}.pro || die
+	eqmake5 ${P}.pro \
+		PREFIX="${EPREFIX}/usr" \
+		LIB_DIR="${EPREFIX}/usr/$(get_libdir)" \
+		DOC_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
+	if use designer ; then
+		cd "${S}/designerPlugin"
+		eqmake5 designerPlugin.pro
+	fi
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+	dodoc README
+
+	if use designer ; then
+		cd "${S}/designerPlugin"
+		emake INSTALL_ROOT="${D}" install
+	fi
+
+	if use examples ; then
+		exeinto /usr/bin/${PN}-examples
+		doexe $(find "${S}/examples" -type f -executable ! -name '*.vcproj')
+	fi
+}
diff --git a/x11-libs/libwnck/Manifest b/x11-libs/libwnck/Manifest
index bedf64621feb..74e74d0b97ed 100644
--- a/x11-libs/libwnck/Manifest
+++ b/x11-libs/libwnck/Manifest
@@ -3,5 +3,5 @@ DIST libwnck-3.20.1.tar.xz 693932 BLAKE2B 6a411ce9aa721ad158ba4c6cde6ca33892f834
 DIST libwnck-3.24.1.tar.xz 821508 BLAKE2B 18bc01a08107e0b2b040cb6036a80cb289955aa9365b7568292aa1c29dc77758bc9b11caa57b8cff6bebb75dd1d0bf7135b0cebed1e42c6ccc1c1372c6a224b5 SHA512 e8a31ab2dc0c282f1e0994ce6a2ccd18678dc5c140943399262e795052b7f5da2d6a5d388a74f4b10f8fac66ab138983a9caaee4e72c92a17c01ca5c39b731e1
 EBUILD libwnck-2.31.0.ebuild 1259 BLAKE2B edd3433c026c1403b11f3fb7a7dc75c1c2110e843f025db21a00590549ce060349b6f10dd689b1d28b04aec7d9eaa835f80ccedb806af78f0a302b404f53629c SHA512 f950573e13c676f6f7a802a7773b2b5bf1e6fc09d9c87e106edb4e94322ba3ae22fe39d1944803cba9011dc0ed05ab9e05230f31051a36f0c6d3b9288556f908
 EBUILD libwnck-3.20.1.ebuild 1165 BLAKE2B 20830076f1e238c26302ff8caa9174684f452598835f990b9c9cdc2dc8bcbccb2cd556fa30712d6d8de174949dea0ac3d162197bc640be37e9dbe513f4663e48 SHA512 32f9bca3d0a1b8dcfc3a086f0572d8a042ef7779dba599304caef2bdbf717565d05cae8ad3205cdd48a744e7a18429506c1b44c9325a542b4e682d78a841f25e
-EBUILD libwnck-3.24.1.ebuild 1163 BLAKE2B dab08a2dcc63acb58593474ba439b8bde22ed8f501c30681bd6f738f03f051841efc6b5636164d8b80330d20b7b5103d831c1934703c376ccbbda2aa91c06650 SHA512 8c2d9de455489d7948349166b056cf37a07c6b9f613421036674251540f2815bd5f093d3a2b64c9f47f9a575a4a82db7ecc6c35701e9bdce7d36bb2501777f72
+EBUILD libwnck-3.24.1.ebuild 1162 BLAKE2B 03d076551ab173e0df9871ceda391e1c95815ef0f12d0434e0926803404385fe58e1fe97983d3bff73d6d90728eea3faf7e5c18056a54875376a0d59249d7acd SHA512 bab57305c1419aa5fc8957e1d1f4248fb8a417cb4cbcce56757bcfa8707e0731056fcccba049b5f29f27ba45909f774589192779e11c49749a0235f973b688f8
 MISC metadata.xml 364 BLAKE2B c8583191e40b2bf98262fbd4401a0ac47e53ec64294178a919499695b014f3ae8ee623de803cfffde58b4d63eda4572035703c5f1d550f14f4dcc974e9035c65 SHA512 47cae64c0f13376c312169703c6213582e37ccc70f00599754d7fa3daf0511e5da4221cd659e9ad98fe90d7791b0d513db45d2d0b7f1d833ef125f64ba40f2ce
diff --git a/x11-libs/libwnck/libwnck-3.24.1.ebuild b/x11-libs/libwnck/libwnck-3.24.1.ebuild
index c34de53769af..18be9c88be4a 100644
--- a/x11-libs/libwnck/libwnck-3.24.1.ebuild
+++ b/x11-libs/libwnck/libwnck-3.24.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="https://developer.gnome.org/libwnck/stable/"
 
 LICENSE="LGPL-2+"
 SLOT="3"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~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 ~x86-macos ~x64-solaris ~x86-solaris"
 
 IUSE="+introspection startup-notification tools"
 
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest
index 839327ec93ee..454d8a06088b 100644
--- a/x11-libs/pango/Manifest
+++ b/x11-libs/pango/Manifest
@@ -2,6 +2,6 @@ DIST pango-1.40.12.tar.xz 856228 BLAKE2B c6fe562f64ac7b641b5b8519f831b999418ab06
 DIST pango-1.40.14.tar.xz 858388 BLAKE2B 1afcff08c38aa59ec57cdf43aa503e70a8c03b7d59c730060c9e3537f78ffe9a63e3aa1cb74ce9ce8d72541b5a5be8becb951f665f4663b108114686c41452c8 SHA512 35ba7bc8be3992f206ccc2cc5aca0b94e2a3832f887fc9c45b0e29fddcb9051ce05a74377de0ca4ff95a87983b15688fa5d379d592faf87aa8eaca25ac18b7ea
 DIST pango-1.40.3.tar.xz 1061044 BLAKE2B 79acd03144b58a3c160888cf4e3638faaf622cfcb406ddcd6a17907bddb7b3c6bf8c4a8ffbedb095664b7d19daa6837239e317d03e9a485f01b832227d1c3b7d SHA512 ff82395e8487624dffe212975b72b3383dcebb197a8675c8b409665e3e2e30fc23d9a6c25c3129a115adb7182b2a71a49550dbe881eb7ee9bbc572de6ba18d27
 EBUILD pango-1.40.12.ebuild 1701 BLAKE2B 08661b1dbc7dac4666817a1ab895b5eb0d7d30e2312c7bafe95c608bee0db22d2600480061461c4d59d6d0039ef7eb0b24573b7ce7090ec2d3d351038c0c1fc4 SHA512 285956d3935c0ac69d0ce7279bed589b6005342081deb22f5bc5708e08b289135c32a3edfde903ad34b2aeec45a829c0fcc48f1ab3cb00f60985b1e6e2faa771
-EBUILD pango-1.40.14.ebuild 1710 BLAKE2B a558602931b39ae272cf0081fd45a2248d4534eee9280e06269161e8c3b970b007b70e548982b9b6c7e43484be940f4c9a350af919d5f82fa46add17020eba0d SHA512 1b0778e455cebf395c6685dab3750fbfcfee1e4d38e682eda82988f1178597fa2829f68a3799ee24f15d3093213d13f95726ad816652d1f8d8fe81a394ca1515
+EBUILD pango-1.40.14.ebuild 1709 BLAKE2B 8b181676b787b2b16d657c34eb016091f774577a3e20f3708cf75d249fa33c383f06803762499bc51d9c2bbf26e1ff7f800ba38731871b3d441f0de43d248f83 SHA512 b64fa42e109bb1cdb2638fdfadbae00c2fe5b9c85742d31ffcea7f1af13f679d61db23d22398f4e3b29a6b18241f53e318e9a6605a198e23bcf248175738d423
 EBUILD pango-1.40.3.ebuild 1710 BLAKE2B bf310621d2b86abf1162aa80788b5d6c6db33bb05ce13f398705cb0fe45389007f7494ecff8f1d6fb6f1752ef94ee358b27baef1052e4bdb725a6c47c820da70 SHA512 6fbbf1ba010f5d5d527822ff2f4f43a6184dbb61b4c3c9e61507bf65c17f815caea1bfa8793dacd7f902d0d42c66d1beb31ec66ac70452730b6c1d08f6a1f139
 MISC metadata.xml 412 BLAKE2B a35a48a5b045c8d88090806f3ae50702a22a89828429c18682810ab492f743b4c1ef48369a7cb3b2a473eb059da899d20810d7533a63295ae848ac1b1c44f490 SHA512 bf95749c7606d0556904e6a6db1636fe93a919b35c6ab8252087f11658c40dcb08aa0dfce74fafe67e609b2c20f9e8ec632dc878a80e467442b7994d03dea27e
diff --git a/x11-libs/pango/pango-1.40.14.ebuild b/x11-libs/pango/pango-1.40.14.ebuild
index 0b59c658a54d..7fc0f9a5613a 100644
--- a/x11-libs/pango/pango-1.40.14.ebuild
+++ b/x11-libs/pango/pango-1.40.14.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ HOMEPAGE="http://www.pango.org/"
 
 LICENSE="LGPL-2+ FTL"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~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 ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 IUSE="X +introspection test"
 
diff --git a/x11-libs/vte/Manifest b/x11-libs/vte/Manifest
index af8e95597c5c..dec53063396e 100644
--- a/x11-libs/vte/Manifest
+++ b/x11-libs/vte/Manifest
@@ -13,5 +13,5 @@ EBUILD vte-0.28.2-r208.ebuild 2973 BLAKE2B 7ee8e830fd6499df69012a9d69cfe21343f46
 EBUILD vte-0.36.5.ebuild 1695 BLAKE2B 3d83e03aa9a8aea1e17db966f44f33e500a60a99c0d2e8fe9113f66ff3b30e8cc9800f5889b6b94140b096bffc8103bc105c6ed9556fa680558b98cdbe52dcb3 SHA512 b0665651664f07d69741836d0e870710ec271807fd2da982b544eab42d48da74bb5800324c91cce1ca21080488606d2f5e3263ed3e73357812d5680f3cad91ba
 EBUILD vte-0.46.2.ebuild 1898 BLAKE2B 663e631d3d2b638b0bc1f1f5d8cd30bf9509bb8419b0293cc14b49b65a0548e2a218ccaf05ef7942210ddb69fb4b21d47e99b7dd16d6e1d6404e048b31d965dd SHA512 e966d45f6d46ca821ee4891fdfc7f03d01db9c64327b2146178407cf1adb8730d02723c205043d7bda68ec49d851d34412d4bb8d35908dcaebaf733e3ee5021d
 EBUILD vte-0.48.3.ebuild 2343 BLAKE2B dea244e7833cacf5afd7ee1e4e3f2fcf0a918b925d58e234ad7a8f5b653129284a27ba4600a191649e537e13d96123a9d9659b4f75ccf91a7938b583314ef80d SHA512 33aacf93302abd2f25d7ea7db14e57a30064ad26459077a670ec69dd0b629d37aa5574ae9c2b4b76f83583b411152dd4db6516b4274e059617afcee1dbe27deb
-EBUILD vte-0.48.4.ebuild 2331 BLAKE2B 9f07847825ccfe4443be55e44972c453b14cb5f3096ba9bd763b493adbc9bc4ea5bb88feeee4c612a2ed7cb6a521f490ec0be362a7f1ad4d0ccfa344fecdaa50 SHA512 8c4b1c87a3073ab3afb04716c6dba8183575383cbe595376d2fb660019114099af88983e112ad8ef3cf07c1fcbbdebd1d286524c6aac421d53a2340a142719ed
+EBUILD vte-0.48.4.ebuild 2330 BLAKE2B fed8ec20e375b2adc2a1abf4068b00a99f491f11d5e04ff3d7522ef5e969753c3cc152abbdea0711bffcfd2b94f10b1c07f3909967a1b75d1891ddc02296f9f0 SHA512 65cd9a4df6bf523b507bea3835802dd023d2d1c5a8c85559c25e04fd5586c94689616fad4fabae2cfe2a75cd0b9e9fdbd0ded7eaf7b9a13ae77b99765c23fa66
 MISC metadata.xml 348 BLAKE2B 3bf56ab8eced6c72e3d4dcb9979464b9652010b09d6576da3f1b9061f92b508d9bfa11ae081083ff07b2d7ec05c8e72123e25d6ec8c6edfa738b241a9f4339cb SHA512 3e3da8172df02c72e955968530e757124b502cb2b3ff750fdc3c52f28c763f22d918fa9b2f08da7d1b87bf3719e4cc726528c9496adde96eee3111f08a54d8d4
diff --git a/x11-libs/vte/vte-0.48.4.ebuild b/x11-libs/vte/vte-0.48.4.ebuild
index 1bf0b7cec476..59b075338be7 100644
--- a/x11-libs/vte/vte-0.48.4.ebuild
+++ b/x11-libs/vte/vte-0.48.4.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.gnome.org/action/show/Apps/Terminal/VTE"
 LICENSE="LGPL-2+"
 SLOT="2.91"
 IUSE="+crypt debug glade +introspection vala vanilla"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-solaris ~x86-solaris"
 REQUIRED_USE="vala? ( introspection )"
 
 SRC_URI="${SRC_URI} !vanilla? ( https://dev.gentoo.org/~eva/distfiles/${PN}/${P}-command-notify.patch.xz )"
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index 49fa92da78ae..998b38e37473 100644
--- a/x11-misc/Manifest.gz
+++ b/x11-misc/Manifest.gz
diff --git a/x11-misc/evolvotron/Manifest b/x11-misc/evolvotron/Manifest
index 3498f6d17080..e8dd821824e8 100644
--- a/x11-misc/evolvotron/Manifest
+++ b/x11-misc/evolvotron/Manifest
@@ -2,5 +2,5 @@ AUX evolvotron-0.6.3-gcc6.patch 474 BLAKE2B daa07a4e92e7de0970070d965b3dad024390
 DIST evolvotron-0.6.3.tar.gz 182357 BLAKE2B cbd095eac272aa035bf398ce00448b693242f0ac7e4d8387d9204e6be6eb624e1639a14f0f06193b8d0f041a0aae5d401e38049f5c8c6205503015d8d845e92d SHA512 4cb5e3bda340c3444c5d59aa0569010c1845104a67996a596840aec768964a96798dc61bab7c6a77de3a4586010d8d066941795145400ad9a3fd336269e681a9
 DIST evolvotron-0.7.1.tar.gz 179516 BLAKE2B b73c813fdf134e0e4c7882e06a12bc06acfb6dcdf4a38043c4c30027bf00da10df85d6877abdbd8ca6393496038ba9fa0c32a16b0f37dd14d72cc63c00a17d1c SHA512 74f48dc0881a82d999ccc910df026da80fcc46a906fe2fbb8edbae50a1fa42a3379087f00dd21fd9e5d69cee7c6fc745b80f8703b1af1ebc3a1cdb52ffbe16e9
 EBUILD evolvotron-0.6.3-r1.ebuild 902 BLAKE2B 39a12651668223354b254cc7feebce9a245067e1cb23f062b2479ff674066d936d9c6b305b41ee3a602b14d30771edfbfd9f02c174cd7a2117171168cd2807b8 SHA512 b5c575894cb61a6f825422e98dc75fcb205ebd8731ef30af844ea66612fe4d86ac5a52145d2ee39fdbc42fc1032733b9cad6cbb9e17d211b737b7883dc97684c
-EBUILD evolvotron-0.7.1.ebuild 927 BLAKE2B 14c7dcc8a4d0c122c1210abab06f8186122da5ca4b7448b96cc5fea95f8ef528aab72106dcef8e7a0d2c871456c44b39a018af895f31a11352defcd8cfa5285b SHA512 ee14028ce80282acaa5e1cac9da0b29df71564b61a185d17725ce2033034775b785c2c3cb05b1bbbd169cf31712e4596addc005a9aa2ed51cf077d801c87c1ea
+EBUILD evolvotron-0.7.1.ebuild 926 BLAKE2B f7aeea92f7ce67e9b6389be235620d28b3eff107c20c5ba68f04143a38a85be4a9336c1585b9ef8aec76a7e7bfc67ded116b426ba8519785deb537eb6c06ae5d SHA512 bd107c5f926162ec3ae4eff9896b7aa34c2bfccb158659cb1a623a7c00a73f7ad8e39319faf7715adbeb52f25bff1d1ae8f6f3e6657ae194dc6a0f870fc7e6ac
 MISC metadata.xml 356 BLAKE2B bcffe50af78659801374955b8bb13970760d0d565c89a210d2ee98059078df0bbd5634e95f2cbc9e922e8b29f21cacb7b6339b6004ac4619b21706b7da85be14 SHA512 7cea09fe7cfe3d43572ab13f83921cd252cb4a12bfc9fb4e2629cbd96c90a07fef8613090514ad562ee112960f88bdcbbe18daa185470780bd714e95aa6bfb47
diff --git a/x11-misc/evolvotron/evolvotron-0.7.1.ebuild b/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
index 23a6d14e48f1..fc3c4c587a69 100644
--- a/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
+++ b/x11-misc/evolvotron/evolvotron-0.7.1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ~ppc ~x86 ~x86-fbsd"
 
 RDEPEND="
 	dev-libs/boost:=
diff --git a/x11-misc/qtfm/Manifest b/x11-misc/qtfm/Manifest
index 4e30fee16346..ca9bab818362 100644
--- a/x11-misc/qtfm/Manifest
+++ b/x11-misc/qtfm/Manifest
@@ -1,4 +1,6 @@
 AUX qtfm-5.5-gcc6.patch 346 BLAKE2B 9b4757b2a6564c8842653c991b5c35e711a7291e0e745bdddffa1156cb0f4ae263aeb0573b998b0298f7c9b45dca7ff3990b4e18e055731f5794193dccf202e5 SHA512 e73c2be9cd2b5f3410500b813865c34458ec51a8902c4bf85faa607e7eb98f7e2f9c393a570dc6761938e2081cb43267bb8ab0a2d7450e10098b8f8db05a8634
 DIST qtfm-5.5.tar.gz 149667 BLAKE2B f369495fd5fba183e7bb5b38db61a8a667d5835b42cf78f424d0db4bb4f0c7fcb0856578df30cb50547c7799fa16147d17951b72d99398937774bd097487ccbf SHA512 0d592b482f35c76b424cc581394d34299bb93367f287f57718d640df256f352fef7e389a8370889d0d78ca8afb9868cdfb56ae15671614e279365b72f9e629e0
+DIST qtfm-5.9.zip 172616 BLAKE2B 50219cb9afbca78b4fe7767631e91008254f6a4e745c3f1b87b821dc49655117d6d61a0aeb37cb1771641aac6b5ccfa8eefaa6e2f6d453c68061594e47bf5c5e SHA512 7686a84f1678e1f04f439d65290f5c93da25fbe80487a37f4ce32eae0d29d7a03a169d3dd9cbc81c2b678f54d9fdc01967b6c1b1cb8a19cf37a910a19918a2ba
 EBUILD qtfm-5.5-r1.ebuild 957 BLAKE2B 992031bcf7ea55aef82b409361bf36e2cf5af5bf596daebfee82c657ec05e89d0b263d11170ba6a208c8bc3c2eb5e8c4101bbdd5690dece9aca67789f57b4c48 SHA512 d658f4f3aabd6f92786672b9985f89e061f2508d8d46ca81180578ba088c498a649335e8c6f28ac1f1ab80f198cc99542951911f1d05d54a1d9c4c60ff298f10
+EBUILD qtfm-5.9.ebuild 1403 BLAKE2B 147e4c89fb3a5726be72d9e0c86f8e6e655a9a299c2bd87ef98758f4d27f89a47c63c581841a427b6e94c2c7e08356336a6c409e07b33dd93b13b065df80ebe2 SHA512 011f881aeaad7a13eb85e1bef8eb6b5679d14dc5132097065623bea54aed93e77fc382360ac5114871fcb3d8e4892ab3e995e3024942c4a0a7c56f3a58ee9efa
 MISC metadata.xml 376 BLAKE2B 5ece57e5fdfd4b9837bd82904a447698fdca5d0f3a2b905a272c2364034984e7b207c58e5e2205d1602911b7e1e719698bef8aa9ee11448c8c6de14a0625155e SHA512 dcf748d475de6eadfc319fdef1bcbcdf9e597f4f14dffe6df90ecc68f7825973ea84a56b1569950bf0d3793b5960c479b616c398b7b763dc73f06cd6b9dd435d
diff --git a/x11-misc/qtfm/qtfm-5.9.ebuild b/x11-misc/qtfm/qtfm-5.9.ebuild
new file mode 100644
index 000000000000..b6555362773a
--- /dev/null
+++ b/x11-misc/qtfm/qtfm-5.9.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit qmake-utils xdg-utils
+
+DESCRIPTION="A small, lightweight file manager for desktops based on pure Qt"
+HOMEPAGE="http://www.qtfm.org/"
+SRC_URI="https://dev.gentoo.org/~jer/${P}.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtwidgets:5
+	sys-apps/file
+"
+DEPEND="
+	${RDEPEND}
+	dev-qt/qtchooser
+"
+PATCHES=( "${FILESDIR}"/${PN}-5.5-gcc6.patch )
+S=${WORKDIR}/${PN}-master
+
+QTFM_LINGUAS="
+	da de es fr it pl ru sr sv zh zh_TW
+"
+for lingua in ${QTFM_LINGUAS}; do
+	IUSE+=" l10n_${lingua/_/-}"
+done
+
+src_prepare() {
+	rm translations/${PN}_XX.ts || die
+
+	default
+
+	sed -i \
+		-e '/MimeType=/s|$|;|' \
+		-e '/Categories=/s|$|;System;FileTools;|' \
+		${PN}.desktop || die
+}
+
+src_configure() {
+	if [[ -n "${L10N}" ]]; then
+		local lingua
+		for lingua in ${QTFM_LINGUAS}; do
+			if ! use l10n_${lingua/_/-}; then
+				sed -i -e "s:translations/${PN}_${lingua}.qm::g" ${PN}.pro || die
+				rm translations/${PN}_${lingua}.ts || die
+			fi
+		done
+	fi
+
+	lrelease translations/*.ts || die
+	eqmake5
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	einstalldocs
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+	xdg_mimeinfo_database_update
+}
diff --git a/x11-misc/screengrab/Manifest b/x11-misc/screengrab/Manifest
index 5afcd8424550..48d2a9f99af6 100644
--- a/x11-misc/screengrab/Manifest
+++ b/x11-misc/screengrab/Manifest
@@ -1,5 +1,5 @@
 DIST screengrab-1.2.1.tar.gz 156692 BLAKE2B 481a989de626a8307544ba8dd55bde95019c646fa238657543b024c34ca9c0cb4ae502acf0dcaeb9a0db8af96e4cef068de20fb3919cfa2745f956a2444a7c2c SHA512 12892eaf33fe48875c1d0dccdc631cc64c246ba2ba10432539099b35e75c36f19c8ff8b97dee959575f214ea852d1afaa9cf46476f98e0978b379a05df101805
 DIST screengrab-1.97.tar.gz 161792 BLAKE2B c2f53cd3d7333d89737ae55753a03de2d3c39f7adcc85f278d54bfb6d734e6f71d9126f035184262bf437e4a5032350f4f7a07060a3eb4014dab15563f78db29 SHA512 4fea4fe68a212ef5436b4f2b2db64e6f830233e5af0cd28259ad84d292e5df6a38e22de1ba40efe083f18ffc973be78aafa0d9eed990229b5e2a8660d1b6ece1
 EBUILD screengrab-1.2.1-r1.ebuild 707 BLAKE2B f9f7ed2d34b20d75db942af7596007184b74c3bf06f0848cb1b6209035c4612768c5ff824369bef21bd9cea4e08da8f81fffecf5674554996066bf501853e935 SHA512 65cde44c9e4b59427eb1e612524ae6af87c666aac8e86cdc7ba7543e2f1e709a4563ffa60da2f08f91a67a4048fbadde5719d210ebef9271a9ebae84b0ac8b06
-EBUILD screengrab-1.97.ebuild 720 BLAKE2B d04845edffa7d7380476f0026cccbe2dbad20f9271300f0c30513f412f52b8b899da9333fab7f6c6feb5fb0ea3e35ad236adcf16916ba45bae04a9be27a299e7 SHA512 afb366bed856d58deabe293a591b29e774c4a65ebf52fe69d6a77e7891bce528a3faae78fdedee6183a0020fdee6a18adbc3b0679185281a732f0c85c8f1449e
+EBUILD screengrab-1.97.ebuild 719 BLAKE2B 1efa0f65ecee9d139b1dfa1b77167aaadd70aafee59eeb3c8ae3127ad23072e7136f9f17494c375917433b98702af36c8b3dc581537efc30c0c76c293f3e2d17 SHA512 c2eb52cd647dc6e4da83c50be5fc51d77057cb39d5163b3d5e89cac43092d19d53548025f3a581307450e98a39e955aa050d71b656c61ae6b79470ea77e9b20f
 MISC metadata.xml 444 BLAKE2B 2fb0a84a26a3063f8bbd3b1ad9857b358935de8e262b5ad60be88e62f36568c4fc2e0f5f42728de6e414ee21ec14ea61b14515fee9711e10ea5ab9bb2b998e1a SHA512 7fd9195b7a9cf80ebcf7b845bb8a85adbf2ea5c83988ea389c10a7c56300fd0678ff901eecf907afa755500b3cf18b6a165fa2587ad9dcbd234f36a4c4254956
diff --git a/x11-misc/screengrab/screengrab-1.97.ebuild b/x11-misc/screengrab/screengrab-1.97.ebuild
index af621c5c6208..e2d42076a371 100644
--- a/x11-misc/screengrab/screengrab-1.97.ebuild
+++ b/x11-misc/screengrab/screengrab-1.97.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/QtDesktop/screengrab/archive/${PV}.tar.gz -> ${P}.ta
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 DEPEND="
diff --git a/x11-misc/zim/Manifest b/x11-misc/zim/Manifest
index 1264c1be7c9a..5ee6ecbff92b 100644
--- a/x11-misc/zim/Manifest
+++ b/x11-misc/zim/Manifest
@@ -2,7 +2,9 @@ AUX zim-0.60-remove-ubuntu-theme.patch 669 BLAKE2B fbb3fe0082e7567f4ae9d0bd03109
 DIST zim-0.65.tar.gz 1899614 BLAKE2B e7989d91120f2ffe0668c996b5abd61cc1cb12b2a5acf9023dfd87819b4c8834bba09f2211c901512d9fe186eee7939e44a5f098c09ef65f1d28cc55eb97e9b7 SHA512 dee652087d3d986b80353e9087abe363392354f40db11f8819d0b3f3c6f133c08c66c651a92ed77c1656f1135998ac02622eca08ac2e28c8fb3149a724a0f7fb
 DIST zim-0.66.tar.gz 2020216 BLAKE2B 7a2af3dca2ff72dd94c605c4fa89b0d3be1413643c781aa151483445e6a029db6021ed84df797b6d9aaac05fd791fe50e4bdc9f1682d252e80f083bf37a10602 SHA512 9693dba8ee6ad915a85ca999674350b278043559ba4adf93c03c8815211ecab451a6e2dceaf62ea7048609eb86f19485f2dd77dbaaf6f2d81f97f6450bf25ca9
 DIST zim-0.67.tar.gz 2034747 BLAKE2B 47e49191e699f93727f566593d616ef0da5b826dccb2f952c6220627d67f295d40e57b9e00dec8395a933a0378c0b1b05c25db7a2cb30fd4509e6ee06269c831 SHA512 0f3387a74a9d6a1e972b4ad411230b9318c58432bd853ef6d45cd535dcdef901369a70dd619b842f1e6564a4b583075865d30acb75cc7649facf5acfe43d8b94
+DIST zim-0.68-rc1.tar.gz 2602967 BLAKE2B 7a1eed33e8d7f27ea287c993f1dde5e8d89cc9435f909ede5696f80ceaee454a38d0ab903313d6a07375797bd43cf48925e81be725094d4a4ce188f750fcac9e SHA512 60c2c654f6b40edcf029efb8367e18a8c4cca7fde11339f4ab9b3724f07f4041aae5740cd7a42fe3b2f836537c699ad597cef0eaec0b0511cb7c65b40ea6e04e
 EBUILD zim-0.65.ebuild 1822 BLAKE2B 49464c5b2ffe8447f7f96f18953c853caa6de322f855607d95b64bb72ba24cf9357d75a8876b5a2bace678d44b092ea42ab17b452dde43f4a75cf016847cf862 SHA512 bebb179fd5c993a91307ad3054feb8af96d54cae2fde754ce0fb844c68aa25227fb430417125490b55d4c1c5aa2ca34372bf2dee20ce6275e4eb1b288b65c77e
 EBUILD zim-0.66.ebuild 1824 BLAKE2B ecb564bf1426bd29fc8466842993b5d4520d049cc72d4da68f1d1df565aeb81be4823b4fe08115aca92d6a5f90665663f40c617c30438ba874af6316a5b2f091 SHA512 23cf416615bcc2cf4719474fb8a79b196916b3fd6fc2a3eaa018e3e00cf8a37a56d7446ad21adb866e727d942300443cec51eda4beaf2830bd7b1d4ec28b9677
 EBUILD zim-0.67.ebuild 1873 BLAKE2B 52826353f0a1dc9f00aa54bdabe07073123f31e502195f868b1bbaec7a6d03c9906e8540bc189565f6e0f55e0086152f653e4ba416d80dcb88b9358493542d23 SHA512 8f57af64bb33b49b1ea66de20d571bdd63e0d063cebc8be7043eab944136c203f39bf6246d85dafe90c800191f8f98980ef6f090b934249edf4113f6310de027
+EBUILD zim-0.68_rc1.ebuild 1907 BLAKE2B 992ff1fb7288e7eb27a02bccbffcb306f230e066d8f83ad295a47c7985ee7f66cb81457dcd36bce4d91ccf57eb7df667e370b380e3f598887d2b735a631b11da SHA512 cb950e69e37aca3c6a063b62c4dd85418430c0edfae9a612423feec396529aa5a0d2ed77effaf056c2c082c3617eef96e090fe34649181aa52068baa91fad576
 MISC metadata.xml 824 BLAKE2B a6ac745b62015073844af9a8aae0ef1d6ca6b7c28e881c7b85d31e00c808076fa944feec5980cdefc72b5ddfa2cecb98fc96b4745df12743212a4d572679408d SHA512 26a4774e75f0a06bfedc2c26f4ca688f9a2644935302e0674ba5a5308af88bc90f291a01f5b10bba62ac0f0a46561d63bfd9289de67bc53c4be454542ea76816
diff --git a/x11-misc/zim/zim-0.68_rc1.ebuild b/x11-misc/zim/zim-0.68_rc1.ebuild
new file mode 100644
index 000000000000..be1a907e7ced
--- /dev/null
+++ b/x11-misc/zim/zim-0.68_rc1.ebuild
@@ -0,0 +1,85 @@
+# 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="sqlite"
+DISTUTILS_SINGLE_IMPL=1
+
+inherit xdg-utils distutils-r1 gnome2-utils virtualx
+
+MY_P=${P/_/-}
+DESCRIPTION="A desktop wiki"
+HOMEPAGE="http://zim-wiki.org/"
+SRC_URI="http://zim-wiki.org/downloads/${MY_P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+RDEPEND="dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pygobject:2[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	x11-misc/xdg-utils
+	test? (
+		dev-vcs/bzr
+		dev-vcs/git
+		dev-vcs/mercurial )"
+
+DOCS=( CHANGELOG.txt README.txt HACKING )
+PATCHES=( "${FILESDIR}"/${PN}-0.60-remove-ubuntu-theme.patch )
+
+S="${WORKDIR}"/${MY_P}
+
+python_prepare_all() {
+	sed -i -e "s/'USER'/'LOGNAME'/g" zim/__init__.py zim/fs.py || die
+
+	if [[ ${LINGUAS} ]]; then
+		local lingua
+		for lingua in translations/*.po; do
+			lingua=${lingua/.po}
+			lingua=${lingua/translations\/}
+			has ${lingua} ${LINGUAS} || \
+				{ rm translations/${lingua}.po || die; }
+		done
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	VIRTUALX_COMMAND="${PYTHON}" virtualmake test.py
+}
+
+python_install() {
+	distutils-r1_python_install --skip-xdg-cmd
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+	if ! has_version ${CATEGORY}/${PN}; then
+		einfo "Please emerge these packages for additional functionality"
+		einfo "    dev-lang/R"
+		einfo "    dev-python/gtkspell-python"
+		einfo "    dev-vcs/bzr"
+		einfo "    gnome-extra/zeitgeist"
+		einfo "    media-gfx/graphviz"
+		einfo "    media-gfx/imagemagick"
+		einfo "    media-gfx/scrot"
+		einfo "    media-sound/lilypond"
+		einfo "    sci-visualization/gnuplot"
+		einfo "    virtual/latex-base app-text/dvipng"
+	fi
+}
+
+pkg_postrm() {
+	xdg_mimeinfo_database_update
+	gnome2_icon_cache_update
+}
diff --git a/x11-plugins/Manifest.gz b/x11-plugins/Manifest.gz
index 5bca394bc467..56dcde025eef 100644
--- a/x11-plugins/Manifest.gz
+++ b/x11-plugins/Manifest.gz
diff --git a/x11-plugins/pidgin-sipe/Manifest b/x11-plugins/pidgin-sipe/Manifest
index 4616e119c8c7..83259a8a6efe 100644
--- a/x11-plugins/pidgin-sipe/Manifest
+++ b/x11-plugins/pidgin-sipe/Manifest
@@ -1,8 +1,6 @@
-DIST pidgin-sipe-1.21.1.tar.gz 1212621 BLAKE2B f2fb149a867af1771987857e90eccd0cc9a9624749eafb101b3f1c4e956c63e4f43c237a86925af34a8db81e03b287b1972e19e2bb1315959eb1cb606ef485bb SHA512 d9b5ad67967c35e29d6742d9d09346c7702a339450de7522aad73f0b379505f24104a306292ee91960c679498073376081479b335eab8eba090e492f444b5378
 DIST pidgin-sipe-1.22.0.tar.gz 1255851 BLAKE2B 442206854bc420f8a93a34246f28a923adc83c08a9c113d871f920799e2b33505a14b4181d1b20aa65e03c6d6483b01be22e66ed4496ea8571247bfc560d2a97 SHA512 4135bbf526659663b0b053592d889588574ed2a1bc9346e6ba62960203409e2604552ffb02ed32e2b4bb46c4f40f62089302b301344b9f7b45657e64a585f7ed
 DIST pidgin-sipe-1.22.1.tar.gz 1265440 BLAKE2B 88f5ef6473af2b50aab0d2adfb9bccf62c9654a1d80319d5e8e43b18719e875e0b3fda45a76e85a6fd892fd516dcfbf5f5ec4a134b1525972eaf35b9841d5210 SHA512 1fff886b32f7f8cb99a0af710b3a1502f62d27dedb541a9e2d8ae9eaf5eb7be0983216e730ccc912c20eee3d940ed1f789f704ee21736db76d141efda66ec018
 DIST pidgin-sipe-1.23.0.tar.gz 1296050 BLAKE2B 1c69587ab6407b6c83dda349ab9a5ad61e3e1d8936b58d7edd71cbead3f8573ab60f7e95866968ec55163a533077be268d6166354d9d22cd2110e6b2ae1708c0 SHA512 8ed0c353e83707b99059791b97568d874634eb1d5ec1a43031864cc8469dc859e7485eb617fe5e23960c091fb15334a903452827ef8a650ed4d677f3a2222cef
-EBUILD pidgin-sipe-1.21.1.ebuild 1311 BLAKE2B 6e4775ea9f2bc979b1bfeeefa343a4efdc3aa2ec8fef56b4e0e6988efff0a428e88a85ba11c2ed1cb152b836642c5cda2359bffbc735b769d8b01d73eb6d8947 SHA512 349bd4adff488c0cdc94230cee7112818eb1a99dbd56ea36f351e66b6a7215d72623fb1aaef7b6a0d3bf8b6364f293748adabf793ebae51da2f6356dc387927c
 EBUILD pidgin-sipe-1.22.0.ebuild 1341 BLAKE2B ed5be88ca89073860f316078ec1133c2320513fc15e07d694b0c364959ab1b445d4b356a626d54a5b746d154619991669728bac87cb322380a43ec9749a73dc4 SHA512 eff9f421b21e3f108ba85c8f6f3ba22420c262cd1df01f3a5c6ffce5a56bd2c79e4641279dab12c54fc40a6733868a105835f8fecac3440a179c3e8aa519e46f
 EBUILD pidgin-sipe-1.22.1.ebuild 1343 BLAKE2B 15d14dfbc6f20da9ecd1be0b0a6c8816abe7484583a2d9356e278080cffb6c81b2247752c2ba1267964ed200a04bb039e5a18c64b5c1be0084445743da89cfb6 SHA512 43baf3436eb8e9728c09cf2b99565e73c7e69ab0d93708ac03039d785ac280110ceec8ccfa42beaa59e1998ef0dad63a39b268ed34cfa71ddc7a6ca1574b172d
 EBUILD pidgin-sipe-1.23.0.ebuild 1344 BLAKE2B 3a1721aa32f475098613ad9e9bc7f2fbc763bafd792f56241255a645b71fc9fcdb980a476f72349e5d73f23cba7398bb89f56d0345cc6f8d4c0d98a09a6ad272 SHA512 3079263ade25f09405f42d95c5c0a22cb5444593d7343573549c68fb0893444621704bdf4182c437d9aba9a09a7dcc3dc611abf3f7c337202d513ce5d47f9cc6
diff --git a/x11-plugins/pidgin-sipe/pidgin-sipe-1.21.1.ebuild b/x11-plugins/pidgin-sipe/pidgin-sipe-1.21.1.ebuild
deleted file mode 100644
index f09eaef8eedd..000000000000
--- a/x11-plugins/pidgin-sipe/pidgin-sipe-1.21.1.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools eutils
-
-DESCRIPTION="Pidgin Plug-in SIPE (Sip Exchange Protocol)"
-HOMEPAGE="http://sipe.sourceforge.net/"
-SRC_URI="mirror://sourceforge/sipe/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-IUSE="debug kerberos ocs2005-message-hack openssl telepathy voice"
-
-RDEPEND=">=dev-libs/gmime-2.4.16
-	dev-libs/libxml2
-	openssl? ( dev-libs/openssl:= )
-	!openssl? ( dev-libs/nss )
-	kerberos? ( virtual/krb5 )
-	voice? (
-		>=dev-libs/glib-2.28.0
-		>=net-libs/libnice-0.1.0
-		media-libs/gstreamer:0.10
-		>=net-im/pidgin-2.8.0
-	)
-	!voice? (
-		>=dev-libs/glib-2.12.0:2
-		net-im/pidgin
-	)
-	telepathy? (
-		>=sys-apps/dbus-1.1.0
-		>=dev-libs/dbus-glib-0.61
-		>=dev-libs/glib-2.28:2
-		>=net-libs/telepathy-glib-0.18.0
-	)
-"
-
-DEPEND="dev-util/intltool
-	virtual/pkgconfig
-	${RDEPEND}
-"
-
-src_prepare() {
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-purple \
-		--disable-quality-check \
-		$(use_enable telepathy) \
-		$(use_enable debug) \
-		$(use_enable ocs2005-message-hack) \
-		$(use_with kerberos krb5) \
-		$(use_with voice vv) \
-		$(use_enable !openssl nss) \
-		$(use_enable openssl)
-}
-
-src_install() {
-	emake install DESTDIR="${D}"
-	dodoc AUTHORS ChangeLog NEWS TODO README
-}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 2f6012f1e786..b40c11c73817 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/guake/Manifest b/x11-terms/guake/Manifest
index 8cf6c227a9c1..fbee867c6a8d 100644
--- a/x11-terms/guake/Manifest
+++ b/x11-terms/guake/Manifest
@@ -1,8 +1,8 @@
-DIST guake-0.8.11.tar.gz 410464 BLAKE2B ccefa02bc5b18e9688a9c6f4dcb5206ae08182c359f84ae6189d580bf72682290ee49504891df8f7d6cc8a2f32116d83b6274ce041d62a97d29068f3d2db6b48 SHA512 c11e3b1294e26eed12a42db51dab4b1fd8f41e2436e9203748df57a46694182e69b112a2ef13b63a0be50a54ed5bc65ed1092737a123c9e43910154fecc94687
 DIST guake-0.8.12.tar.gz 410820 BLAKE2B 47138b058b4e3145bab3a78a4e2a400649147369fd8ea10b10c8be9bd801ba5c58e1625bf7b91c7cb82178868e76ca43679bf03eb3b418b1d6160ff465777130 SHA512 492d5f601925b3ef33536fad441492ec2e440f4f59c39fe45a415bdcca1e1424c9e41958b3b43c87d502c665db5d558222065b0d0ef6af4137e5562db1401aff
+DIST guake-0.8.13.tar.gz 410816 BLAKE2B 37240d5f86cee596243a23ce47c3d3502cc889dc90d98e8a073325bd8c7fb74929308b5f91756100b2bd641134992e61ec833581380b3733613cf83526e26e92 SHA512 89c21bab2b1e5fc17c16349e4a4a4e8d089b084ddffedcf7a20aa059d4269a2a1c5754ec7b343f4f0e2ffae135b78a6128b8c14642f50645ddd52f700fd82a38
 DIST guake-0.8.8.tar.gz 395143 BLAKE2B 34b47948fd03e3187ca5cad4697b0bffd81f5c1add3951a42904837075768bc9f39a278a0e0e3bd555e1d3a9814efd5aefae3c1baa9fac98108eb6dfc81f6035 SHA512 cbff208ea985669c5063793aaa74504a0de92127b52af23499b7c95df7c3841558ae61586e56771ce8e0d444bbe95a95e12e1af41f8a4ac9c74c13b3e9df8dc2
-EBUILD guake-0.8.11.ebuild 1061 BLAKE2B efcc5590bcfe1a80b98a708b8d9086dab647422c0916b2c9c5acadccd95eba3e78f05976d561df949fefa10eb55e3d47ba807d5af636b14a2189b3bd5967fa76 SHA512 be7aadda9705d2948f1fa18a0adbd38536de768e724d2185824121c46b48199128281e3189ced568de9aea6c2bb59e85ad0d8c9e0369d8d82586840f2fc33828
 EBUILD guake-0.8.12.ebuild 1061 BLAKE2B 612ed58bcfddcb870c16fdf09cf6c76c55af652c2fba08a6fb9453ef090c3f8b08e326c278fe84d4fa6537c594ea3651dd29dd1ccece14e36a747a828f2dde6e SHA512 aaaa86875a7895377e99d06a4aa5fe2c0a62cdc058eb6aab9827370f79db9f3a16f967318f5daeff322cb005333fd30392b286652da00fc529cd7ca12f0fd039
+EBUILD guake-0.8.13.ebuild 1061 BLAKE2B 612ed58bcfddcb870c16fdf09cf6c76c55af652c2fba08a6fb9453ef090c3f8b08e326c278fe84d4fa6537c594ea3651dd29dd1ccece14e36a747a828f2dde6e SHA512 aaaa86875a7895377e99d06a4aa5fe2c0a62cdc058eb6aab9827370f79db9f3a16f967318f5daeff322cb005333fd30392b286652da00fc529cd7ca12f0fd039
 EBUILD guake-0.8.8.ebuild 1058 BLAKE2B 5dbb934d346f0278b921a6a25d28d1dee40460ca122d7e4594a78f1f6a4043afa576d6813f2231ef9747667141ca9c3deb182aef00bb7b30bf89d14ad6b2c0db SHA512 c54fcbf25a5c05632fac0d8d63c3ac1b65a55e9eb8e5e33a0130f6f2622514da25b3d0af6d8231040dc6a2e362cc34f1b7b2a88484f29503d3566c103d173135
 EBUILD guake-9999.ebuild 1084 BLAKE2B 2acc98de63dc489fa76d969dbeb91c6363c5c624e6052327dee8b143f60729cad5a6fad414e9bae2774c16a34314812f5d5237789a6898693aa042587d6641e8 SHA512 fd45ce1f2b51ca645e7a68b58d3a8483b530e8f99033a7e756375512481e4087f89f9f72fc6845b84882fdf79c9cba8c7b447935d64df0fdba5058dcfa90a8a2
 MISC metadata.xml 362 BLAKE2B a0ef1875797df07778deab0b5755c7714df46cc267bed36b37729395e303d5415fe8d0a61cc292c37af28118c4dc9346520ecdc0c7d942c3bde045a79bcd1dd3 SHA512 a3a6f19649b81ef87c6775fea804fed2358e2a440fe7c2328ea6f743fa3ae303ad743a8067746b05be2b23090e7dbbb6fee4b05c0d8ce12605378de7cc7cca72
diff --git a/x11-terms/guake/guake-0.8.11.ebuild b/x11-terms/guake/guake-0.8.11.ebuild
deleted file mode 100644
index 2a8e13d38000..000000000000
--- a/x11-terms/guake/guake-0.8.11.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
-
-GNOME2_LA_PUNT=yes
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools eutils gnome2 python-single-r1
-
-DESCRIPTION="Drop-down terminal for GTK+ desktops"
-HOMEPAGE="https://github.com/Guake/guake"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/keybinder:0[python,${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
-	dev-python/gconf-python[${PYTHON_USEDEP}]
-	dev-python/notify-python[${PYTHON_USEDEP}]
-	dev-python/pygtk[${PYTHON_USEDEP}]
-	dev-python/pyxdg[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/vte:0[python]
-"
-DEPEND="
-	${RDEPEND}
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-DOCS=( AUTHORS ChangeLog NEWS README.rst )
-
-src_prepare() {
-	eapply_user
-
-	eautoreconf
-
-	gnome2_src_prepare
-}
-
-pkg_postinst() {
-	gnome2_pkg_postinst
-}
-
-pkg_postrm() {
-	gnome2_pkg_postrm
-}
diff --git a/x11-terms/guake/guake-0.8.13.ebuild b/x11-terms/guake/guake-0.8.13.ebuild
new file mode 100644
index 000000000000..8af1404f5b97
--- /dev/null
+++ b/x11-terms/guake/guake-0.8.13.ebuild
@@ -0,0 +1,54 @@
+# 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 autotools eutils gnome2 python-single-r1
+
+DESCRIPTION="Drop-down terminal for GTK+ desktops"
+HOMEPAGE="https://github.com/Guake/guake"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/keybinder:0[python,${PYTHON_USEDEP}]
+	dev-python/dbus-python[${PYTHON_USEDEP}]
+	dev-python/gconf-python[${PYTHON_USEDEP}]
+	dev-python/notify-python[${PYTHON_USEDEP}]
+	dev-python/pygtk[${PYTHON_USEDEP}]
+	dev-python/pyxdg[${PYTHON_USEDEP}]
+	x11-libs/gtk+:2
+	x11-libs/libX11
+	x11-libs/vte:0[python]
+"
+DEPEND="
+	${RDEPEND}
+	dev-util/intltool
+	virtual/pkgconfig
+"
+
+DOCS=( AUTHORS ChangeLog NEWS README.rst )
+
+src_prepare() {
+	eapply_user
+
+	eautoreconf
+
+	gnome2_src_prepare
+}
+
+pkg_postinst() {
+	gnome2_pkg_postinst
+}
+
+pkg_postrm() {
+	gnome2_pkg_postrm
+}
diff --git a/x11-terms/mate-terminal/Manifest b/x11-terms/mate-terminal/Manifest
index 49cccc704727..2155ddb5eeee 100644
--- a/x11-terms/mate-terminal/Manifest
+++ b/x11-terms/mate-terminal/Manifest
@@ -1,10 +1,10 @@
 DIST mate-terminal-1.12.1.tar.xz 1143628 BLAKE2B 241edfc9cf36518638e7817e4f11ab89dfcbbc1dd11d7e10ee17bc81ceb8224fd582a1cab4b4e2aa3a24f2997298689f7bc98f07b698243885cad1c85a81eea6 SHA512 c37b725db1522153fcb4dc596205f9382605bf981504217c8b087a4d7e6086a5c40644cdab1eb3c0593632d4f38d45fbcdfd763cb1ef62ff7359335c54b6ff42
 DIST mate-terminal-1.14.1.tar.xz 1313612 BLAKE2B d8710d336964d7bc46e2e309de214bd5968697ae4b9ee750b30ff5af93480ba2bf74661698b14e4a81287c3689be4e45afb1031864183c9864773ea2097b2b2c SHA512 e7c68dfce1e9b886449774567f225cf267366ab857e510de3bae9867442306defe0b1d86bc90782326f4c252620311f6846a50b89a3f8939e8cfb816e25db209
-DIST mate-terminal-1.16.1.tar.xz 1269040 BLAKE2B b8853e1a6330883d2841e0e73488a7558e5060804aa8896cf3137f41cef06aed20e22adad1ac87a451de16e2f60698b1c2184aad5c95544086b45a833e73e3a2 SHA512 28505ba425ecdcacb33a49b082101887ee012b37026d92a2ec666f5251ca28fb6c039c1066c55d533cad195c75577c00d93a2b3fad08d20f3619891596e6c2e1
+DIST mate-terminal-1.16.3.tar.xz 1279764 BLAKE2B 2908a9d003f1fd0e9faae3a69b55fe2a21c8ce7f54e91497964090f24f1abe553c0c4e9a28d31ac8351e9745acd496b843e1282c74fe37e41590d1b30faa5688 SHA512 b5045b57e6ad8931230edbd83cbad4e99422ccf8dbeb760327d091993012981c0ad6bfc7ae39aaeffdf8beb27a18d74c831b4e51bcef7709d7dc63bf77bcf7ad
 DIST mate-terminal-1.18.1.tar.xz 1299492 BLAKE2B 4d011e1a7cd2662cec3aaf8b345da8544d9e7956cc4404ee252bea7b39c5afff11e5e646e7442dfe0991985bf2f3119eb36316ac685af9f502ffd5d75b3b321c SHA512 3b102c683137951d425c5c4f177e1498be037cabb9483bd89fea61c1c03e9a5d481a5aa9418e92f3007ac64f7ed3bf298109ba9564f741634c4b5dad94ddddf3
 EBUILD mate-terminal-1.12.1-r1.ebuild 826 BLAKE2B acb174bb84906768e94f111ebe6785b0138567ad82ece9a50489feb261e137c1fe55a8f9fb4ef23298f8582a0478446de0e88a51e453431eb08687cdfb3618b3 SHA512 68f12ae9b1a734a4c69347487a7974a9dabdb971f0286abdf87e6485119aec13b85db64f1c4d504733ab2a57115870fe06e08449740e1602d0c0478a67612623
 EBUILD mate-terminal-1.12.1.ebuild 821 BLAKE2B a479523ff16449f56372133ce46e8ac30f0da377810a801b2bce3c69db0f360bff4b980ad062cdc67c6b375d765e926e1b3d39e826b4b0b4ed013d318ba69872 SHA512 80f90a2640950924ba5c7133d11fbfa7f44ca1914d4c5b387b8712ea1dd62247051dca12cd978dd204cebd7400bdd223220a70f046ed651adefac2ad927e370a
 EBUILD mate-terminal-1.14.1-r1.ebuild 866 BLAKE2B 7d1162a088fc9b90ed036b571adb0b64b2adcde79764ff399d3a3ff9ea32935a8f9f94350da622828eed599d07b8a15125ed8a49b2d6c92ea8bef8de181dfddd SHA512 aeb95bf228187367d4f84e874982b7a9fd2a7fdbd7cf55b4b3f29ae8e7765d14558d8d22ee25dc95d96e771aa73a0f82069ada2bc0c12ff33a0c8bf706bb14c0
-EBUILD mate-terminal-1.16.1-r2.ebuild 727 BLAKE2B bb9b7999a8d477cafdf5ed58fe4d066e66030ee907e29d81a669b400c4becdbaa9e18b7f5e59f82d90ba6e2c0b755c30cd7192666f2d340bd189ea0160ad797b SHA512 a2ac4837e016ac8d4ca407353da9fc56477e3058c6217b40f8ff7cddea4879928590df665795064d991bb81b425fd506e716264223cc3f3dccd276018c8575e8
+EBUILD mate-terminal-1.16.3.ebuild 727 BLAKE2B 322a0b3055192fa1a470ef3262cd5b3c0ed019c5665d11067f4981dea847dda196784dd31a7c3ac7dcad5a012fee9c8b0260def69d45d1dba7ec736987b8c895 SHA512 34ddf000b0c34e5ff8deeccd003457b390028b3ed7584cbc389257e00501a9267b78a950a2624da1320eb87fe1972afd213860787698a0aa4c48fc58cb55eb03
 EBUILD mate-terminal-1.18.1.ebuild 734 BLAKE2B b50b4728f312e67e3bf5f7c2643ef9732d2e55e66016c11e32877752c1c24d3d5f0e9108f65c378c040f865fee869b149972da7942afea94d5df0b96df7901cc SHA512 35c07abb60bf50e1daaab549882841e4918862853419686fc458c6a35df90c906f56f8912172f4fa0aeb2c21085f6a6585a2602557e4acce9a25f43a47655db3
 MISC metadata.xml 418 BLAKE2B d1b548c3d32a7ace12f9b99517feb78a64263476a32bbb9dfb167f67039ae207e1cabed5201121f0576fbc1e507c8dbb7b6277598872710e4ffc1927d67e319b SHA512 fc7439e9cd6aee179e6e6bf2ad282c0a62dc78b53dc5a0b33798ac90006159ffcc00625c156cdf93a474ef592ee3be2134ac4c7778d5d8b2768fed1ae1464cee
diff --git a/x11-terms/mate-terminal/mate-terminal-1.16.1-r2.ebuild b/x11-terms/mate-terminal/mate-terminal-1.16.1-r2.ebuild
deleted file mode 100644
index 4184916b569b..000000000000
--- a/x11-terms/mate-terminal/mate-terminal-1.16.1-r2.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="The MATE Terminal"
-LICENSE="GPL-3"
-SLOT="0"
-
-IUSE=""
-
-COMMON_DEPEND="dev-libs/atk:0
-	>=dev-libs/glib-2.36:2
-	>=gnome-base/dconf-0.13.4:0
-	x11-libs/gdk-pixbuf:2
-	x11-libs/libICE:0
-	x11-libs/libSM:0
-	x11-libs/libX11:0
-	x11-libs/pango:0
-	>=x11-libs/gtk+-3.14:3[X]
-	>=x11-libs/vte-0.38:2.91"
-
-RDEPEND="${COMMON_DEPEND}
-	>=mate-base/mate-desktop-1.6"
-
-DEPEND="${COMMON_DEPEND}
-	app-text/rarian:0
-	>=app-text/scrollkeeper-dtd-1:1.0
-	app-text/yelp-tools:0
-	>=dev-util/intltool-0.50.1:*
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
diff --git a/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild b/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild
new file mode 100644
index 000000000000..33f211aa820c
--- /dev/null
+++ b/x11-terms/mate-terminal/mate-terminal-1.16.3.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="The MATE Terminal"
+LICENSE="GPL-3"
+SLOT="0"
+
+IUSE=""
+
+COMMON_DEPEND="dev-libs/atk:0
+	>=dev-libs/glib-2.36:2
+	>=gnome-base/dconf-0.13.4:0
+	x11-libs/gdk-pixbuf:2
+	x11-libs/libICE:0
+	x11-libs/libSM:0
+	x11-libs/libX11:0
+	x11-libs/pango:0
+	>=x11-libs/gtk+-3.14:3[X]
+	>=x11-libs/vte-0.38:2.91"
+
+RDEPEND="${COMMON_DEPEND}
+	>=mate-base/mate-desktop-1.6"
+
+DEPEND="${COMMON_DEPEND}
+	app-text/rarian:0
+	>=app-text/scrollkeeper-dtd-1:1.0
+	app-text/yelp-tools:0
+	>=dev-util/intltool-0.50.1:*
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 8ff4647f96f3..8244e1a1173a 100644
--- a/x11-themes/Manifest.gz
+++ b/x11-themes/Manifest.gz
diff --git a/x11-themes/adwaita-icon-theme/Manifest b/x11-themes/adwaita-icon-theme/Manifest
index 6e3449fc4c78..560773c02ab6 100644
--- a/x11-themes/adwaita-icon-theme/Manifest
+++ b/x11-themes/adwaita-icon-theme/Manifest
@@ -3,5 +3,5 @@ DIST adwaita-icon-theme-3.22.0.tar.xz 18395856 BLAKE2B 8b6a7f10b1598803db431eb43
 DIST adwaita-icon-theme-3.24.0.tar.xz 20717972 BLAKE2B cce76731e7c33d42330eb2e0039979db3f2280fe84ef427ac6295244f750eedb93584efddb4299260846facb7c3afb9d1baa86a5ddd8d36f3d81220d18dc49a1 SHA512 d415859bc46deb3dcf5e845af88689c507d6b110d6312af75145d6c46cc277ca2d17ae6a0f506c09ca7d543c5eca47b2506169bb0482ae68f2e3baef70889090
 DIST tango-gentoo-v1.1.tar.gz 29322 BLAKE2B 83fa2bf37727e60851dd679054fe1b153ebfea58c9a9a40f891f7d68d3b047b02e8effa1d1b4e08d64500a2072ce7200f159c92a352da7124de27e1b05bb6027 SHA512 87d47ddab68361db6d99866c51705dcb3e198f8345a1096859acf2c6cca5099dd23c7fb30d124f52c4933ea38fd45fadffbbe6ecbdfa84f5b60938a4824f9045
 EBUILD adwaita-icon-theme-3.22.0-r2.ebuild 1488 BLAKE2B db0463bdc5502471613fc6cf96406db5cc75654975e19f14452cf64d8447848f5a36b5c5cd6b9bbc3703256e083117e68fdaedf8d21d9e02b2419aa5bab5026f SHA512 49569b7fcd8a51e573bb8213344c27ddcde529f7f87b4cb1a9288cc423f98220e5b5f3f991cafca177027c645df55c8d28b89bbef14bef3b6c92e0c6a9ca5cfe
-EBUILD adwaita-icon-theme-3.24.0.ebuild 1695 BLAKE2B bbf9ed7b26a5b710d0535f0ce8b06dbfbeb44b82d8819887f7e6938f37d7f7eaa2c66c193b9e4554036b13ee946b4c6f5b192a6d58954e80a12ea7a6b42c9999 SHA512 cf2b77ae8542f15a6a30e98595ecf1b3df587d425b6ebb6f45526aca4bb4b4efe7d4e7561b8eeedc3f3d4f7c5193a9bbec87b55ef7ccc5de7c4ce7a5b9c7f223
+EBUILD adwaita-icon-theme-3.24.0.ebuild 1694 BLAKE2B 59ad063b9d74f9392d859dbbff2c730f96017776d4d60f5f26921a48637d5124a5041f04b978791f6e9487b18b18af45ae13f8a262d795eb133a87a219950380 SHA512 a16bd763a358fc02f5616d753c50fd26c59b80cbcc2c9e4e15905807873d61c2507f5104ceb2665ef133cec83994e8518b4ccd720a12c84075ef117fda8af63c
 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506
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 9f8717ec63f1..6f664656409f 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-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="6"
@@ -17,7 +17,7 @@ LICENSE="
 "
 SLOT="0"
 IUSE="branding"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~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 ~arm-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/mate-icon-theme/Manifest b/x11-themes/mate-icon-theme/Manifest
index d36484f63dee..2dd2aa79cd54 100644
--- a/x11-themes/mate-icon-theme/Manifest
+++ b/x11-themes/mate-icon-theme/Manifest
@@ -1,9 +1,9 @@
 DIST mate-icon-theme-1.12.0.tar.xz 19330108 BLAKE2B 55c4aa0d228ce3e6d8d128959556f862f99b2a39dcacf7182b2376a8cda1a30cd5c04c122295e83137d3bc99728f40de623c37643ced931faf61c517016e76cd SHA512 b108a677ead07eec8811c4e97d478c1d0ee319a684e48076cffca893120537564748e9ecba02b44feabf3e255610e2d596c1490fdb2fc9fed5b04f1908c5726f
 DIST mate-icon-theme-1.14.0.tar.xz 19054508 BLAKE2B b9596a60e950b1429426cb7efbb472c0a53a333c6dbd1f281704441a6e8f3d2ee2b121994fa361c344280b13dd52616451c31e4ccfff9cc365851d710efaa6db SHA512 e75c1d6ad0781050a359fe1b54f836e9bc4e099f465a5bc4dc3e235432558304561c047f7f1e4d1764522073f04aa65ca9ae4dbde44627de8b3a9de1e7178490
-DIST mate-icon-theme-1.16.0.tar.xz 19056916 BLAKE2B ceb9fc5f61f60a21ad50784d00e4b7a8dabffa1154935a85ad1bb1233ed8bd882ba9f243e9708c46b7c58fb4cca8b344e709f16e3b27b5e9968a09d27ce23c88 SHA512 3d5d609715119d9e3b7c5aebafa3572e60757d9445978cba0a33d58e19623f2886f9a83ab58bfa29839acd773f5b46690b5619a9934828c123c4f2d727099714
+DIST mate-icon-theme-1.16.2.tar.xz 20071516 BLAKE2B b7f47ab4d35a1d24fbcb790f868f18f54fac6c68c1b4227a49dca5e82dc4aed41574d085cbc7921882cb7d617249d59c8f2e21930d77f8f2134882c7a950ed87 SHA512 cb863e4230eeca069e961fd363a72554ef79a53fb051b8a7d962851f5e594b3ef7f1416aa2da91561345787dabfd1a1eab899bc0b29ff15c02a08f22f4631e51
 DIST mate-icon-theme-1.18.2.tar.xz 20071792 BLAKE2B b9e14479b2fbf34a8c1ca9cd889099fc547924c3b9ebdf3035a730f946d9462ee8d44774fef2d66a7d1395051b85b9aac84d17be344c876c9767c601e97073fa SHA512 6e6d60b7eeba474d4d9d4d069f9fa4f8098cf54aa8367c02b05c5ec556ccd5310d791183ec961e9227867b37ec7e27b8ac8aadfee1f1446b34cee1985b4ef1fb
 EBUILD mate-icon-theme-1.12.0.ebuild 522 BLAKE2B ddc8976edcbb70f6401428130b173a78165952cdbbf44c0f37a264f525c15e670cdecc788ed15ff1362bf10b943eadc22ae4bff077a28b6dde6e7180d6b15013 SHA512 fe08073e659d76d88f987e5772d5e0fab36b0ecd8f407bcc1715e5d27086bacc627d1b3d32a1ab7713a9d5d5caa2540510714b25a4c9e53427039de10e9f6768
 EBUILD mate-icon-theme-1.14.0.ebuild 564 BLAKE2B 90a6c24bacc4499158c15818bb5f8e1792b25ca878b0a0d2653268aab41bdd396e289e998ff83115ec9d13bd6b19acd6de1780feb58bda69d77b203cab55efd8 SHA512 b464ad032d9768f5f398d7ab951ea056a4c022708c08464cf4fb3095b59064b94a570e8feffff94c08adf4dde389120690a302ac97d1118b792796d02a7bf999
-EBUILD mate-icon-theme-1.16.0.ebuild 564 BLAKE2B 90a6c24bacc4499158c15818bb5f8e1792b25ca878b0a0d2653268aab41bdd396e289e998ff83115ec9d13bd6b19acd6de1780feb58bda69d77b203cab55efd8 SHA512 b464ad032d9768f5f398d7ab951ea056a4c022708c08464cf4fb3095b59064b94a570e8feffff94c08adf4dde389120690a302ac97d1118b792796d02a7bf999
+EBUILD mate-icon-theme-1.16.2.ebuild 564 BLAKE2B 0078de882cc05f51f7339bb8b9bf5e505b784edc092a221b8164071434d190fc73c6902d1fb07a27ac2b4a23b49aeace81df5c6e471ce80e777f49e9c4a2cd18 SHA512 7a17dbf9bb286374e76601e186bfd0ffc181677293e029edeac7e9e5f8e6fc09ef166d5dd26028373cfeba39260cf99440700e7c6a5c7795957fcb1da2b338b2
 EBUILD mate-icon-theme-1.18.2.ebuild 571 BLAKE2B c2d92afb0e4e1fa497bc7033ca0fb0b7886e27063d4846c732b7e31543ee3fe2419c66b046d7c2d96549eee3bafcb7112ad8cee503bea29cfc1f7696b2c0b521 SHA512 0ae110c49cec495357fce7627278eb2371b8b7cbb0cca5eff2a18732c4431408cc4145b186da20782a06c3bef9960c550bd69d25c476a2e48ccfd23ec5ce9019
 MISC metadata.xml 344 BLAKE2B 68e920d9ee5bc270b90b69afd553a9010971d678bcaa94e11345369c0ac5be27719f2acb9d213ec48a42e6be609b2f8ea392a72d39b43bd24b2ebf76f162ce48 SHA512 fc069bbf06319886e8f884c8ffe2d869e4224a062f3aa26af997442db92015261c3e1ebe73e6e9c9e4d8dc69d1d3f7d8df12134967bebbbadaea98911dad05bf
diff --git a/x11-themes/mate-icon-theme/mate-icon-theme-1.16.0.ebuild b/x11-themes/mate-icon-theme/mate-icon-theme-1.16.0.ebuild
deleted file mode 100644
index eff34f68d1c6..000000000000
--- a/x11-themes/mate-icon-theme/mate-icon-theme-1.16.0.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit mate
-
-if [[ ${PV} != 9999 ]]; then
-	KEYWORDS="~amd64 ~arm ~x86"
-fi
-
-DESCRIPTION="MATE default icon themes"
-LICENSE="GPL-2"
-SLOT="0"
-
-COMMON_DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
-
-RDEPEND="${COMMON_DEPEND}"
-
-DEPEND="${COMMON_DEPEND}
-	>=dev-util/intltool-0.40:*
-	>=x11-misc/icon-naming-utils-0.8.7:0
-	sys-devel/gettext:*
-	virtual/pkgconfig:*"
-
-RESTRICT="binchecks strip"
-
-src_configure() {
-	mate_src_configure --enable-icon-mapping
-}
diff --git a/x11-themes/mate-icon-theme/mate-icon-theme-1.16.2.ebuild b/x11-themes/mate-icon-theme/mate-icon-theme-1.16.2.ebuild
new file mode 100644
index 000000000000..1e10653efdf6
--- /dev/null
+++ b/x11-themes/mate-icon-theme/mate-icon-theme-1.16.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit mate
+
+if [[ ${PV} != 9999 ]]; then
+	KEYWORDS="~amd64 ~arm ~x86"
+fi
+
+DESCRIPTION="MATE default icon themes"
+LICENSE="GPL-2"
+SLOT="0"
+
+COMMON_DEPEND=">=x11-themes/hicolor-icon-theme-0.10"
+
+RDEPEND="${COMMON_DEPEND}"
+
+DEPEND="${COMMON_DEPEND}
+	>=dev-util/intltool-0.40:*
+	>=x11-misc/icon-naming-utils-0.8.7:0
+	sys-devel/gettext:*
+	virtual/pkgconfig:*"
+
+RESTRICT="binchecks strip"
+
+src_configure() {
+	mate_src_configure --enable-icon-mapping
+}
diff --git a/x11-themes/mate-themes-meta/Manifest b/x11-themes/mate-themes-meta/Manifest
index 2acc96877123..93e87d003db4 100644
--- a/x11-themes/mate-themes-meta/Manifest
+++ b/x11-themes/mate-themes-meta/Manifest
@@ -1,2 +1,2 @@
-EBUILD mate-themes-meta-3-r2.ebuild 871 BLAKE2B b20c02e2ddb472b390a7183b0a65baf567f7763fadfce6b8b0114d925ce41c9b95737e127c611452bc875500208830e45a763f3841a3ebfb276931c4e7b7dc36 SHA512 97ab1b1dd76707036caf127a7729fa11fad5dd018d00a87cad19d32b7a090d0439028ab6d877206a0950e4b1268c83b6605ce42141427b46d897335399bca4ff
+EBUILD mate-themes-meta-3-r2.ebuild 604 BLAKE2B 877830dd6775a22d27f3a684bc0492f15588ebc619ea13c1e090daf84a3c5458d3ad91bb402268c2bb364ee522207ff7e89e66f1d05c7bda4105d875d50b3ef0 SHA512 bfd07324f8dc911613a390c6af6934aced8d41ad3a6f77f1e0c29b2b1c466355aea929205865d8a5a745bbbb37229fa29d591fa9356392f9a420e709a0686068
 MISC metadata.xml 353 BLAKE2B 4428f947c36672fb27aaf8803cb0992be2d5fe96385a7479027e8bdaee24590ed9acec5312b040fe70f8d8131d905221ca7aa1f23b4aaef587c482d878913e10 SHA512 f04ff1e8e0747331740a0615d5694f60408a5c995dd59284e296f5968bf472fbf20e398a6c8b7a09477cdbae31909f2f97815be6a00b81775d0ba5d677420886
diff --git a/x11-themes/mate-themes-meta/mate-themes-meta-3-r2.ebuild b/x11-themes/mate-themes-meta/mate-themes-meta-3-r2.ebuild
index fe74b094ab34..cb08da7bb1fb 100644
--- a/x11-themes/mate-themes-meta/mate-themes-meta-3-r2.ebuild
+++ b/x11-themes/mate-themes-meta/mate-themes-meta-3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,18 +25,6 @@ RDEPEND="|| (
 			x11-themes/mate-themes:0
 		)
 		(
-			=x11-libs/gtk+-3.16*:3
-			=x11-themes/mate-themes-3.16${MATE_THEMES_V}:0/3.16
-		)
-		(
-			=x11-libs/gtk+-3.18*:3
-			=x11-themes/mate-themes-3.18${MATE_THEMES_V}:0/3.18
-		)
-		(
-			=x11-libs/gtk+-3.20*:3
-			=x11-themes/mate-themes-3.20${MATE_THEMES_V}:0/3.20
-		)
-		(
 			=x11-libs/gtk+-3.22*:3
 			=x11-themes/mate-themes-3.22${MATE_THEMES_V}:0/3.22
 		)
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 11d207bb5d67..8ac565888a5e 100644
--- a/x11-wm/Manifest.gz
+++ b/x11-wm/Manifest.gz
diff --git a/x11-wm/i3/Manifest b/x11-wm/i3/Manifest
index cc769fd8037a..faa4cc77d250 100644
--- a/x11-wm/i3/Manifest
+++ b/x11-wm/i3/Manifest
@@ -4,7 +4,7 @@ DIST i3-4.13.tar.bz2 1121298 BLAKE2B 94f3940406d43083c8dc577b4216a32a08ad4c4b58e
 DIST i3-4.14.1.tar.bz2 1173560 BLAKE2B 96a0e1d75be13098fd530c3970464ce7710063f517c0d538939de6e7c799ab6b3ec005fb50216b1db4ccefd44584c584b263ac359bd9a86be53418d8f8d4beba SHA512 ef628af002947b40e1c88b0e872c6e93d4377a9674a120bd9adc3f323a38570b05124cd3047b5a26659e72070de2d00d83fb93186510c74ad8ddbf4f3df85472
 DIST i3-4.14.tar.gz 3936748 BLAKE2B 42678130be56bc695e5700e978ddbd34bfdaeda7a65252a05568581d76fe613e80e710f3a507110e7988077fe62048bf984d4009e722d877b178206cef600221 SHA512 fe3db78813987a15ed93d182968bcd5139e1d03f29d3e8effd9fce59f87bc8309407af0b2fa5f1cd83b8583e50ea0ade6b8eafc5dda6dea9161832dc9cebfdfe
 EBUILD i3-4.13-r1.ebuild 1898 BLAKE2B ee0a771f9735272a28285c38b30d9693d6eea70c4238142a271c2a31f3a54f874fb88b22acde07895577aeccf98f0ab124ae14cbc81249316c4a2f00cc88c1a1 SHA512 fa0fc10c2989175051e86ff329a560ad07ba0aac2c16e19f9e7426d7a74b96be4dda9146a899f4498858fdc9558ba27b3281c7df9ad936988310a441002aee0d
-EBUILD i3-4.14.1.ebuild 2378 BLAKE2B b1a492918c2473fe3ac05189022111c94d192474900c09301d3d53561d32511666103d27ceb1e8f704e50d5f2cd5dbd33074629e6baf2adca7ec538abbbcf798 SHA512 eca6107b9ca9eed35745dd2e4ef8aebe4a95a53327b33da3ba501a30080c6d4fc8825714562185278a5779b5dfc6084c1cb2f5224a43c9ae4d65d592e029c223
+EBUILD i3-4.14.1.ebuild 2288 BLAKE2B 8b61896ae179c7130cfe4e220347af27d68401a18703017036032c7100976541a240f65e10465bdb359cca6c1dc86717dab041b80507825f84e89ee6bfc84c0e SHA512 3a66ade6582d9c4a5c45b76eb0dc4d1c1278c51f4e55ddda5d80da65ae1154b13b7e02fecc663ae2605191366eb82affd10a885bf33240a9598f5e27effe915c
 EBUILD i3-4.14.ebuild 2018 BLAKE2B 1623ddaf5351872074ec15137bbe61ee855d65ea31915c8090346164e574af4b9d9180f0f8665d931a0cf6464c9ee40b2702f38919559a0851a5f560d1c94fac SHA512 1f6e635f080952aa55416e367f9bbbca4929a73cde2080e121fd76dd1396f01d43199871d09fed71f5b6680f0d94cef5d07c2b8f86675d63763464b6e3d95c2d
 EBUILD i3-9999.ebuild 1716 BLAKE2B 46975a8704867cb17347dc1a2abc133e1d12a1ad2db0f6e27d2e6cbd68fbcf1e52b6c7dc9da4a5da1f99958fedbe1eb6fe5329bf46778b868b656fe9f19a8558 SHA512 da9b92fdc17543284b129956fbb517f49d670121f2e3d0cd5fcec2239612810030a4d45f6d2178c22d6c939d3528bc97ca38c35c2073d45f8b208b56c6dcd505
 MISC metadata.xml 578 BLAKE2B f7f67f561bb427395103450b3e3c40d80001b4bc820b9c33fada9017e7c030d14940b4ca74669ded3f474ab1f4ae72b89ea640304752888212d86ba17c5b5405 SHA512 b0585d5a5d421e8176d1f47e250e049e41cbd375a19f4769d291108e81847dff71c1ded0cd22b25df50af69896941cb439c4c39317414784df57cfeb33dc946e
diff --git a/x11-wm/i3/i3-4.14.1.ebuild b/x11-wm/i3/i3-4.14.1.ebuild
index 1d884372499b..df485534f2f4 100644
--- a/x11-wm/i3/i3-4.14.1.ebuild
+++ b/x11-wm/i3/i3-4.14.1.ebuild
@@ -1,15 +1,16 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 AEVER=0.17
 
-inherit autotools virtualx
+inherit autotools out-of-source virtualx
 
 DESCRIPTION="An improved dynamic tiling window manager"
 HOMEPAGE="https://i3wm.org/"
 SRC_URI="https://i3wm.org/downloads/${P}.tar.bz2"
+
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm64 ~x86"
@@ -53,10 +54,6 @@ RDEPEND="${CDEPEND}
 # in type-punned pointers - which in turn causes test failures.
 REQUIRED_USE="test? ( debug )"
 
-DOCS=(
-	"RELEASE-NOTES-${PV}"
-	docs
-)
 PATCHES=(
 	"${FILESDIR}/${PN}-musl-GLOB_TILDE.patch"
 )
@@ -64,18 +61,6 @@ PATCHES=(
 # https://github.com/i3/i3/issues/3013
 RESTRICT="test"
 
-src_test() {
-	emake -C "${CBUILD}" \
-		test.commands_parser \
-		test.config_parser \
-		test.inject_randr15
-
-	virtx perl \
-		-I "${S}/testcases/lib" \
-		-I "${CBUILD}/testcases/lib" \
-		"${CBUILD}/testcases/complete-run.pl"
-}
-
 src_prepare() {
 	default
 
@@ -87,22 +72,30 @@ src_prepare() {
 	eautoreconf
 }
 
-src_configure() {
+my_src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
 	)
 	econf "${myeconfargs[@]}"
 }
 
-src_compile() {
-	emake -C "${CBUILD}"
+my_src_test() {
+	emake \
+		test.commands_parser \
+		test.config_parser \
+		test.inject_randr15
+
+	virtx perl \
+		-I "${S}/testcases/lib" \
+		-I "${BUILD_DIR}/testcases/lib" \
+		testcases/complete-run.pl
 }
 
-src_install() {
-	emake -C "${CBUILD}" DESTDIR="${D}" install
-	doman "${S}"/man/*.1
+my_src_install_all() {
+	doman man/*.1
 
-	use doc && einstalldocs
+	einstalldocs
+	use doc && dodoc -r docs "RELEASE-NOTES-${PV}"
 
 	exeinto /etc/X11/Sessions
 	doexe "${T}/i3wm"
diff --git a/x11-wm/marco/Manifest b/x11-wm/marco/Manifest
index ac22cda95850..46953bb07ae0 100644
--- a/x11-wm/marco/Manifest
+++ b/x11-wm/marco/Manifest
@@ -1,10 +1,10 @@
 DIST marco-1.12.1.tar.xz 1163996 BLAKE2B ff133af6d56a7c91c0b104fdbfe82ce16492429ec24a06251d106b76b52b3cf4c560ec1c304b398ced61350d79410aceb5e004fc4cd8d9893faae6743788cf34 SHA512 d271c4627fc50643d8e1a2faec33b5327999ad16a3975d62ea3ded956bccf3d5e015ed8085d43a200a34f1ea78f17d7e4ea4afaa9111e5f2e3a2230b51752945
 DIST marco-1.14.2.tar.xz 1244076 BLAKE2B a1f88f49a2d5048ba6fec2c5c5b86ff1ed546638256782ef1e9fa27f5253e65d67055e96d8d337d4bcc41fbe614164695483e76c2f2fac6bccd1f842548ab795 SHA512 6ca782f5dbbc01f5df4be901a1a6bf5b23398716e5802118482a0bf98e35f4dc544a6070358a931ca11f2d8b71cbbfb7e8768e0535c6605433a202be348ddf84
-DIST marco-1.16.0.tar.xz 1245540 BLAKE2B 11bd58e79f73f294edc808a9b0128dbba92f4bce190996a924fe15d4b0d9c718ab398f83d148e9e8c759fc9093c15eac554f5db65d1abcdd5c38894f8f5420cb SHA512 f353514dc69543e97fe08f9c67275c195ddc1c52b8b98dfb956351580b541a20b9f3a63d0b41939aca59e2416e58bb384206bbe2b8f56a26435b9760d23665b4
+DIST marco-1.16.1.tar.xz 1247072 BLAKE2B 71959f5b37a2e499ae7a304de279d0b87b56618ffb135e6792dccbbdf0fe4dbff091257d6c6e856162a0c80d3c08c0aae8233e94d8526af3072479b4d06a02b5 SHA512 c5f88d71378a210e6490edab2db8bedf12eb013ce89fe232863c6538b240f38b7393474893bcead6904aad1835d1dc8794328e71235f17194ba3f0c3c426de36
 DIST marco-1.18.1.tar.xz 1251108 BLAKE2B 8ef3a6f2fb8a412b99be2f721bc3484a11e5267c6a988a949162f939453868d559aab3fe2d9a5b926c70058ca6ab3a9accbd343548e5cdb05dfb99db81ef9a27 SHA512 d6851c8c1c5bc25993dc72de7e5090736d236942ad37124ef52d0c23cc66faa1e4288273160bb9c1d1c303c99e3e096dcf031b2ea70bde93858627f31034708c
 EBUILD marco-1.12.1-r1.ebuild 1565 BLAKE2B 52aa8d582b335fa717f24f6eea05a6b9b4c6458028cf3d369cfefd7afa9b710f3ddaa41732caabe107ead2503fb7248923688d3cee47dca90908361a8e112bf1 SHA512 f67061e9d5a4db1b1fab69e9895057148316ec31e085bb33cbc78501e6e77df5306d5fe16478f080680294767aa531eb9db7466c4ba839efc44e5cd438c026eb
 EBUILD marco-1.12.1.ebuild 1523 BLAKE2B 5309f6ea4d04f2d1d89cd93bcc5bc71e732ed302a4c8b725c568d4ca4733576011e85335ab149451134b6a12bf9b7fb40355ebb85cb283f7ce9ba9e750c46d12 SHA512 a032aa7dd3eaaef4b6a5dd38330ddebabd61b1f6dd6ebc9569e036368cc5b23e66dbde8f89886fa0a27115c4ba128767b479828bf52a9216d3d06095a9dcbe4d
 EBUILD marco-1.14.2-r1.ebuild 1606 BLAKE2B 9baad655deceb177686f705b5666c41de4913ef05e4d2127d00c4eae99e589fc53117e68ca20d1585834bbf0ebcfb745c35d36cb56f3c1255cc906a90cb7747d SHA512 4f67f7f03ff5efeb95c262ec9b22b2d202b8a884f1a183773600941171ec185142676458bbba96930c82d96bdd8963814eb77bf9c877501320091d63d53c0231
-EBUILD marco-1.16.0-r1.ebuild 1606 BLAKE2B 9baad655deceb177686f705b5666c41de4913ef05e4d2127d00c4eae99e589fc53117e68ca20d1585834bbf0ebcfb745c35d36cb56f3c1255cc906a90cb7747d SHA512 4f67f7f03ff5efeb95c262ec9b22b2d202b8a884f1a183773600941171ec185142676458bbba96930c82d96bdd8963814eb77bf9c877501320091d63d53c0231
+EBUILD marco-1.16.1.ebuild 1606 BLAKE2B 9baad655deceb177686f705b5666c41de4913ef05e4d2127d00c4eae99e589fc53117e68ca20d1585834bbf0ebcfb745c35d36cb56f3c1255cc906a90cb7747d SHA512 4f67f7f03ff5efeb95c262ec9b22b2d202b8a884f1a183773600941171ec185142676458bbba96930c82d96bdd8963814eb77bf9c877501320091d63d53c0231
 EBUILD marco-1.18.1.ebuild 1480 BLAKE2B 8e9c8a30b52686f628db419f22e4fdab76959f1a03c9b6083d9be265c477505febd88a2c469af064d161f1eeb37c3edcbd278a8935c68dfadc4a37fb47e46639 SHA512 242ca3e45e8f4c7ceebd32234e5ab6a749bd464d4714a86c21607b8cc6e9651d367f56fdee18083caa832625828d650a4527d602089e76c1de544cf0b3abe80e
 MISC metadata.xml 410 BLAKE2B 11d9345ad1a0ebbb5b537c27a3447cfb56cdcb621bb3df330f163612415a48e542a78c563689c33e52ee81eb19a9654a2ed45f27f45604b5f6cc2e6ef04953d5 SHA512 3736e03b4952f45354445560aa2aa6118a3257fe8b00d8d39df7946f65cfee017ef04f48447807387a9a4b6f37641bc55074efa7cadd944e1243feb183ab1d84
diff --git a/x11-wm/marco/marco-1.16.0-r1.ebuild b/x11-wm/marco/marco-1.16.1.ebuild
index 5cdf56cdaaf6..5cdf56cdaaf6 100644
--- a/x11-wm/marco/marco-1.16.0-r1.ebuild
+++ b/x11-wm/marco/marco-1.16.1.ebuild
diff --git a/x11-wm/xpra/Manifest b/x11-wm/xpra/Manifest
index 02ab9fdcda51..4f227de7f530 100644
--- a/x11-wm/xpra/Manifest
+++ b/x11-wm/xpra/Manifest
@@ -8,8 +8,8 @@ DIST xpra-2.0.2.tar.xz 1926876 BLAKE2B 2bd681ebbe6a7041975033c9a30e5b5fdf69352e8
 DIST xpra-2.1.3.tar.xz 2070192 BLAKE2B b1f54705c877317bf0a3397303af2a516f6e7deb6baa252065f768bd3fd07ec87991b04c14a3aa054da0655543185dfdb99fa2972fb1cd8a2a04d72bb31fafc6 SHA512 aa916953d34477c2c80d99a4d5733586b4122edbc18f2c9952a5d3c9581f7b8e8c55cb1ed4077989876a9a7431faa9c4f7f96f82fc007034f92cacad16429ef8
 DIST xpra-2.2.1.tar.xz 2195508 BLAKE2B 5f94e96ddce7df0001ca3ffbc64570c59f02b1b49fc45c364999f47d188b1ef349018e36ed070cf8c26f60efc77c24741f44856f307b68535c982e6082dc0d7a SHA512 fca213a72805b6b1d533f91cd5e4186bd881e083663488b697c71c79fb4a3bf312fd1491aef78cf363e429c5841d706e444c9e69c72351b1551ea7fc9395c0c6
 EBUILD xpra-1.0.6.ebuild 3954 BLAKE2B 374018a2ec481759522c31243937e4d81b8b58fa0334414bac81e0affc26869290af8842245cdca25a642a2e1c1c112421d4e099b28f98618b237c98d8196155 SHA512 adfc00b39fa458b1a178d723ff589f151a488c97ed4a35dd834d6beb3d8334150dce2cf59c189a6d6fe75d0117ea34d641560c14f0ca75c41b8c42396dc45ccc
-EBUILD xpra-1.0.9.ebuild 3978 BLAKE2B e5804682d43b89132eb8d563f02ce337369eb47bcbe8bdb3e603886bea09e56bd09a739226c5c2b3a745e0b17a11a53b0c1d74af9adcede4650d8d483dcaa939 SHA512 981a2483d631b46cd42ffa125d4b6889e9d6407b8d553613e4975487d7ffce4e667c9229db7e75b9009c44347dfc5e6b9d8570c10fb33c412336524b41c4aa33
+EBUILD xpra-1.0.9.ebuild 3977 BLAKE2B 947784a1b008925f090e4d914eff598f23629f391f56ba9fac2bb7dfb3a912f9189cd9a13ece1eb7ae929ad5d718e530a0e8738ea5218135020624fa28d2ecce SHA512 82b11382f3f4226871d1127c916da7c317bf1e0b4c68bf4d304fb468ea46a1e27b04f18c1682882201053269455752dafff6c18332c8a7bfc078f6289d97ca78
 EBUILD xpra-2.0.2.ebuild 3940 BLAKE2B b3cf94307d0b79fbf4f932d1992e185a4a4fd709af02090b10655fdafe0212ed774b7223f5a037f207b5d4b372ddb853e521b466910738cda475a2fc9f607fab SHA512 de48c1d149d6aed26a4bfa9609b25de384a67ff65e24340a1091f10d6a07ce98d33acdcca18ec7ef5e915154a06f33e4f7bd73f91b3bf179c235ed52a0d792a7
-EBUILD xpra-2.1.3.ebuild 3911 BLAKE2B 1bce77e2ca8e54af2d8238e1a98cfa5740c3dbf9ac217c18c91a2c508d6ec8e56c9c9f236b0fa8aa907f97b778d5a6891cea6f6d74fdfe834f6038abd279d181 SHA512 d425e3321a3e5cab6fca8f0604fd7e779a9707538e09eb9b3ec30b028de73514b1aea1c3e5f5ca44454883dc3cbc72f8aa8ef3de3210eb837d5c8cf49b85d40d
+EBUILD xpra-2.1.3.ebuild 3910 BLAKE2B 42d4229ec8a11ede29899809dabd5c87420a0ac866dafde20ddecfb821be1ff4d3fa40153f2c4c11d77f183340101b02913ed73d86dc8eeff5a5f2b22b2a22a6 SHA512 d7494e2ac2120d4f865e6167842f87301ca9813f8702268dabec8578db66611c3a0675f06f9d613de3973880f4b44bc45b2ad97a73d3935bb0442f6f6d5e0eec
 EBUILD xpra-2.2.1.ebuild 3966 BLAKE2B 5838f6f85d385dcaf9581a1120afd877b894dd3f4d7425ca03a6d5a04ed2ab2c70cdb6cfe8a1d9b55fab8947abb0d661bde00402161034703757adc9403a0c33 SHA512 570d920ad621117e8da3c618b52456c0502937fc2458fc6b68653619b89ac83e2f0578a284be62bb70b9ff54ab151153ad28912564f10a95b61552a6d2729b2d
 MISC metadata.xml 1087 BLAKE2B d8378019afa40ddee2d56f31ac3482374a018dbd2294a9163b2e85adbdb65b46d49872948cfc95915d0f1b986266be9c088ba5daf85ae74b9bb76275f3175b10 SHA512 8bf4ba96000fdf8b0c66d655194d4e5bf2f41f3e06754a7411cf5dc9c130d80519419cad73fff69418d01ae59db07b15aa96acd4ec4581958c22572abec6031c
diff --git a/x11-wm/xpra/xpra-1.0.9.ebuild b/x11-wm/xpra/xpra-1.0.9.ebuild
index e1fbabaa5fd3..92ba444e0a60 100644
--- a/x11-wm/xpra/xpra-1.0.9.ebuild
+++ b/x11-wm/xpra/xpra-1.0.9.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam webp"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
diff --git a/x11-wm/xpra/xpra-2.1.3.ebuild b/x11-wm/xpra/xpra-2.1.3.ebuild
index 2f9cea7ce6aa..a557140e32c0 100644
--- a/x11-wm/xpra/xpra-2.1.3.ebuild
+++ b/x11-wm/xpra/xpra-2.1.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ SRC_URI="http://xpra.org/src/${P}.tar.xz"
 
 LICENSE="GPL-2 BSD"
 SLOT="0"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="+client +clipboard csc cups dbus dec_avcodec2 enc_ffmpeg enc_x264 enc_x265 jpeg libav +lz4 lzo opengl pillow pulseaudio server sound test vpx webcam"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}